Fixing Coveralls for testing.

1 files changed, 21 insertions, 27 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 23d9a86..48bec6f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,39 +4,33 @@ require 'rubygems'
 require 'pathname'
 require 'psych'
 
-if ENV['COVERAGE']
+if ENV['COVERALLS']
+  require 'coveralls'
+  Coveralls.wear!
+elsif ENV['COVERAGE']
   require 'simplecov'
 
-  if ENV['COVERALLS']
-    require 'coveralls'
-    formatters = Coveralls::SimpleCov::Formatter
-  else
-    def try_require(resource, &block)
-      require resource
-      block.call
-    rescue LoadError
-      nil
-    end
-
-    formatters = [ SimpleCov::Formatter::HTMLFormatter ]
+  def require_do(resource, &block)
+    require resource
+    block.call
+  rescue LoadError
+    nil
+  end
 
-    try_require('simplecov-rcov') { formatters << SimpleCov::Formatter::RcovFormatter }
-    try_require('simplecov-vim/formatter') {
-      formatters << SimpleCov::Formatter::VimFormatter
-    }
-    try_require('simplecov-sublime-ruby-coverage') {
-      formatters << SimpleCov::Formatter::SublimeRubyCoverageFormatter
-    }
+  formatters = [ SimpleCov::Formatter::HTMLFormatter ]
 
-    formatters = if formatters.size == 1
-                   formatters.first
-                 else
-                   SimpleCov::Formatter::MultiFormatter[*formatters]
-                 end
-  end
+  require_do('simplecov-rcov') {
+    formatters << SimpleCov::Formatter::RcovFormatter
+  }
+  require_do('simplecov-vim/formatter') {
+    formatters << SimpleCov::Formatter::VimFormatter
+  }
+  require_do('simplecov-sublime-ruby-coverage') {
+    formatters << SimpleCov::Formatter::SublimeRubyCoverageFormatter
+  }
 
   SimpleCov.start do
-    formatter formatters
+    formatter SimpleCov::Formatter::MultiFormatter[*formatters]
   end
 end