Now loading all files to ensure code coverage is accurate; Added temp…

…lates test; Updated rdoc dependency

Gemfile

@@ -14,10 +14,10 @@ gem "ruby-progressbar" # https://github.com/jfelchner/ruby-progressbar
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'coveralls', require: false
+  gem 'coveralls'
   gem "rake", "~> 10.0"
   gem "shoulda", ">= 3.0"
-  gem "rdoc", "~> 3.12"
+  gem "rdoc", ">= 4.0"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.0.1"
   gem "simplecov", ">= 0.8.0"

Gemfile.lock

@@ -64,7 +64,7 @@ GEM
     rack (1.5.2)
     rake (10.1.1)
     rdiscount (2.1.7)
-    rdoc (3.12.2)
+    rdoc (4.1.1)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -104,7 +104,7 @@ DEPENDENCIES
   jeweler (~> 2.0.1)
   mustache (~> 0.99.4)
   rake (~> 10.0)
-  rdoc (~> 3.12)
+  rdoc (>= 4.0)
   ronn
   ruby-progressbar
   shoulda (>= 3.0)

test/helper.rb

@@ -1,49 +1,49 @@
 require 'simplecov'
 require 'coveralls'
-
-=begin
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_profile 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-=end
-
 require 'rubygems'
 require 'bundler'
+
+Coveralls.wear!
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
+
 require 'test/unit'
 require 'shoulda'
 
+module SimpleCov::Configuration
+  def clean_filters
+    @filters = []
+  end
+end
+
+SimpleCov.configure do
+  clean_filters
+  load_profile 'test_frameworks'
+end
+
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
 
 ENV["COVERAGE"] && SimpleCov.start do
   add_filter "/.rvm/"
+  add_filter "/.rbenv/"
 end
 
-Coveralls.wear!
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'server'
 
+# Load all our application files to ensure that code coverage is accurate
+require 'loader'
+
 class Test::Unit::TestCase
 end

test/loader.rb

@@ -0,0 +1,14 @@
+require 'server/cli'
+require 'server/colorizer'
+require 'server/conf'
+require 'server/installed'
+require 'server/log'
+require 'server/signals'
+require 'server/step'
+require 'server/sys'
+require 'server/workflows/db'
+require 'server/workflows/web'
+require 'server/packages/nginx'
+require 'server/packages/phpfpm'
+require 'server/packages/templates/nginx'
+require 'server/packages/templates/renderer'

test/test_logger.rb

@@ -4,6 +4,7 @@
 class TestLogger < Test::Unit::TestCase
 
   context "Logger" do
+
     setup do
       @logger = Server::Log.new(StringIO.new)
     end

test/test_templates.rb

@@ -0,0 +1,14 @@
+require 'helper'
+require 'server/packages/templates/renderer'
+
+class TestTemplates < Test::Unit::TestCase
+
+  context "Templates" do
+
+    should "find the raw template path" do
+      assert Server::Templates::Renderer.template_path.is_a? String
+    end
+
+  end
+
+end