Got the coverage reporting right

hannesg · Feb 17, 2013 · 3e81e56 · 3e81e56
1 parent 2afe8a1
commit 3e81e56
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,7 @@ gemspec
 group :development do
   gem 'escape_utils', :platforms => [:mri_19, :mri_18]
   gem 'coveralls', :require => false, :platforms => [:mri_19]
+  gem 'simplecov-console', :platforms => [:mri_19]
 end
 
 group :masochism do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -25,6 +25,7 @@ GEM
       adamantium (~> 0.0.5)
       backports (~> 2.7.0)
     escape_utils (0.2.4)
+    hirb (0.7.1)
     ice_nine (0.6.0)
     json (1.7.7)
     mbj-inflector (0.0.2)
@@ -56,6 +57,10 @@ GEM
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
+    simplecov-console (0.1.1)
+      colorize
+      hirb
+      simplecov
     simplecov-html (0.7.1)
     thor (0.17.0)
     to_source (0.2.18)
@@ -79,5 +84,6 @@ DEPENDENCIES
   rake
   redcarpet
   rspec
+  simplecov-console
   uri_template!
   yard
diff --git a/coverage/.last_run.json b/coverage/.last_run.json
@@ -0,0 +1,5 @@
+{
+  "result": {
+    "covered_percent": 97.81
+  }
+}
diff --git a/lib/uri_template/utils.rb b/lib/uri_template/utils.rb
@@ -14,7 +14,6 @@
 #
 #    (c) 2011 - 2012 by Hannes Georg
 #
-
 module URITemplate
 
   # An awesome little helper which helps iterating over a string.
@@ -132,11 +131,13 @@ def force_utf8(str)
 
       end
 
+      # :nocov:
       if "".respond_to?(:encode)
         include Encode
       else
         include Fallback
       end
+      # :nocov:
 
       private :force_utf8
 
@@ -226,14 +227,15 @@ def unescape_uri(s)
     end
 
     include StringEncoding
-
+    # :nocov:
     if Escaping.const_defined? :EscapeUtils
       include Escaping::EscapeUtils
       puts "Using escape_utils." if $VERBOSE
     else
       include Escaping::Pure
       puts "Not using escape_utils." if $VERBOSE
     end
+    # :nocov:
 
     # Converts an object to a param value.
     # Tries to call :to_param and then :to_s on that object.
@@ -260,9 +262,7 @@ def object_to_param(object)
     # @api private
     # Should we use \u.... or \x.. in regexps?
     def use_unicode?
-      return eval('Regexp.compile("\u0020")') =~ " "
-    rescue SyntaxError
-      false
+      eval('Regexp.compile("\u0020")') =~ " " rescue false
     end
 
     # Returns true when the given value is an array and it only consists of arrays with two items.

diff --git a/spec/helper.rb b/spec/helper.rb
@@ -15,19 +15,26 @@
 #    (c) 2011 - 2012 by Hannes Georg
 #
 
-$LOAD_PATH << File.expand_path('../lib',File.dirname(__FILE__))
-
 require 'bundler'
 Bundler.setup(:default,:development)
 
 if $0 !~ /mutant\z/
   # using coverage in mutant is pointless
   begin
     require 'simplecov'
+    require 'simplecov-console'
     require 'coveralls'
-    SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-    SimpleCov.add_filter('/spec')
-    SimpleCov.start
+    # the console output needs this to work:
+    ROOT = File.expand_path('../lib',File.dirname(__FILE__))
+    SimpleCov.start do
+      add_filter '/spec'
+      formatter SimpleCov::Formatter::MultiFormatter[
+        Coveralls::SimpleCov::Formatter,
+        SimpleCov::Formatter::Console
+      ]
+      refuse_coverage_drop
+      nocov_token "nocov"
+    end
   rescue LoadError
     warn 'Not using simplecov.'
   end