simplecov 0.5.4 → 0.6.0

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2
+rvm use 1.9.3-p125

data/.travis.yml

@@ -5,5 +5,9 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
-#  - rbx # Fails currently because of broken gemspec in Cucumber
-#  - jruby # Has trouble installing on travis-ci right now
+  - rbx
+  - jruby
+notifications:
+  email:
+    on_success: always
+    on_failure: always

data/CHANGELOG.md

@@ -1,13 +1,29 @@
+v0.6.0 (2012-02-22)
+===================
+
+  * [FEATURE] Auto-magic `rake simplecov` task for rails
+    (see https://github.com/colszowka/simplecov/pull/83, thanks @sunaku)
+  * [BUGFIX] Treat source files as UTF-8 to avoid encoding errors
+    (see https://github.com/colszowka/simplecov/pull/103, thanks @joeyates)
+  * [BUGFIX] Store the invoking terminal command right after loading so they are safe from
+    other libraries tampering with ARGV. Among other makes automatic Rails test suite splitting
+    (Unit/Functional/Integration) work with recent rake versions again
+    (see https://github.com/colszowka/simplecov/issues/110)
+  * [FEATURE] If guessing command name from the terminal command fails, try guessing from defined constants
+    (see https://github.com/colszowka/simplecov/commit/37afca54ef503c33d888e910f950b3b943cb9a6c)
+  * Some refactorings and cleanups as usual. Please refer to the github compare view for a full
+    list of changes: https://github.com/colszowka/simplecov/compare/v0.5.4...v0.6.0
+
 v0.5.4 (2011-10-12)
 ===================
 
-  * Do not give exit code 0 when there are exceptions prior to tests 
+  * Do not give exit code 0 when there are exceptions prior to tests
     (see https://github.com/colszowka/simplecov/issues/41, thanks @nbogie)
-  * The API for building custom filter classes is now more obvious, using #matches? instead of #passes? too. 
+  * The API for building custom filter classes is now more obvious, using #matches? instead of #passes? too.
     (see https://github.com/colszowka/simplecov/issues/85, thanks @robinroestenburg)
-  * Mailers are now part of the Rails adapter as their own group (see 
+  * Mailers are now part of the Rails adapter as their own group (see
     https://github.com/colszowka/simplecov/issues/79, thanks @geetarista)
-  * Removed fix for JRuby 1.6 RC1 float bug because it's been fixed 
+  * Removed fix for JRuby 1.6 RC1 float bug because it's been fixed
     (see https://github.com/colszowka/simplecov/issues/86)
   * Readme formatted in Markdown :)
 
@@ -17,10 +33,10 @@ v0.5.3 (2011-09-13)
   * Fix for encoding issues that came from the nocov processing mechanism
     (see https://github.com/colszowka/simplecov/issues/71)
   * :nocov: lines are now actually being reflected in the HTML report and are marked in yellow.
-  
+
   * The Favicon in the HTML report is now determined by the overall coverage and will have the color
     that the coverage percentage gets as a css class to immediately indicate coverage status on first sight.
-    
+
   * Introduced SimpleCov::SourceFile::Line#status method that returns the coverage status
     as a string for this line - made SimpleCov::HTML use that.
   * Refactored nocov processing and made it configurable using SimpleCov.ncov_token (or it's
@@ -38,9 +54,9 @@ v0.5.1 (2011-09-12)
 
   * Fix for invalid gemspec dependency string (see https://github.com/colszowka/simplecov/pull/70,
     http://blog.rubygems.org/2011/08/31/shaving-the-yaml-yacc.html, thanks @jspradlin)
-    
+
   * Added JSON in the form of the multi_json gem as dependency for those cases when built-in JSON
-    is unavailable (see https://github.com/colszowka/simplecov/issues/72 
+    is unavailable (see https://github.com/colszowka/simplecov/issues/72
     and https://github.com/colszowka/simplecov/pull/74, thanks @sferik)
 
 v0.5.0 (2011-09-09)

data/README.md

@@ -7,6 +7,7 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
   * [Changelog]
   * [Rubygem]
   * [Continuous Integration]
+  * IRC #simplecov on Freenode
 
 [Coverage]: http://www.ruby-doc.org/ruby-1.9/classes/Coverage.html "API doc for Ruby 1.9's Coverage library"
 [Source Code]: https://github.com/colszowka/simplecov "Source Code @ GitHub"
@@ -36,7 +37,7 @@ Getting started
 ---------------
 
 1. Add SimpleCov to your `Gemfile` and `bundle install`:
-      
+
         gem 'simplecov', :require => false, :group => :test
 
 2. Load and launch SimpleCov **at the very top** of your `test/test_helper.rb` (*or `spec_helper.rb`, cucumber `env.rb`, or whatever
@@ -46,21 +47,23 @@ Getting started
         SimpleCov.start
 
         # Previous content of test helper now starts here
-        
-      **Note:** If SimpleCov starts after your application code is already loaded (via `require`), it won't be able to track your files and their coverage!       
+
+      **Note:** If SimpleCov starts after your application code is already loaded (via `require`), it won't be able to track your files and their coverage!
       The `SimpleCov.start` **must** be issued **before any of your application code is required!**
 
-3. Run your tests, open up `coverage/index.html` in your browser and check out what you've missed so far. 
+3. Run your tests, open up `coverage/index.html` in your browser and check out what you've missed so far.
+
+4. Add the following to your `.gitignore` file to ensure that coverage results are not tracked by Git (optional):
+
+        coverage
 
 If you're making a Rails application, SimpleCov comes with a built-in adapter (see below for more information on what adapters are)
-which will get you started with groups for your Controllers, Views, Models and Helpers. To use it, the first two lines of 
+which will get you started with groups for your Controllers, Views, Models and Helpers. To use it, the first two lines of
 your test_helper should be like this:
 
     require 'simplecov'
     SimpleCov.start 'rails'
 
-
-
 ## Example output
 
 **Coverage results report, fully browsable locally with sorting and much more:**
@@ -88,7 +91,65 @@ Other test frameworks should work accordingly, whatever their setup file may be:
 You could even track what kind of code your UI testers are touching if you want to go overboard with things. SimpleCov does not
 care what kind of framework it is running in, it just looks at what code is being executed and generates a report about it.
 
-
+### Notes on specific frameworks and test utilities
+
+For some frameworks and testing tools there are quirks and problems you might want to know about if you want 
+to use SimpleCov with them. Here's an overview of the known ones:
+
+<table>
+<tr><th>Framework</th><th>Notes</th><th>Issue #</th></tr>
+<tr>
+ <td>
+   <b>Test/Unit 2</b>
+ </td>
+ <td>
+  Test Unit 2 used to mess with ARGV, leading to failure to detect the test process name in SimpleCov.
+  <code>test-unit</code> releases 2.4.3+ (Dec 11th, 2011) should have this problem resolved.
+ </td>
+ <td>
+  <a href="https://github.com/colszowka/simplecov/issues/45">SimpleCov #45</a> & 
+  <a href="https://github.com/test-unit/test-unit/pull/12">Test/Unit #12</a>
+ </td>
+</tr>
+<tr>
+ <td>
+   <b>Spork</b>
+ </td>
+ <td>
+  SimpleCov currently does not correctly cope with the way Spork (and similar forking testing tools) 
+  works. With the right configuration this might be resolvable. 
+  To make sure your coverage is reported correctly you probably should fall back to running your test suite
+  without spork when you want a coverage report.
+ </td>
+ <td>
+  <a href="https://github.com/colszowka/simplecov/issues/42">SimpleCov #42</a>
+ </td>
+</tr>
+<tr>
+ <td>
+   <b>parallel_tests</b>
+ </td>
+ <td>
+  SimpleCov does not detect parallel_test automatically yet but can be taught to do so
+  with a simple workaround explained at Issue #64.
+ </td>
+ <td>
+  <a href="https://github.com/colszowka/simplecov/issues/64">SimpleCov #64</a>
+ </td>
+</tr>
+<tr>
+ <td>
+   <b>Riot</b>
+ </td>
+ <td>
+  A user has reported problems with the coverage report using the riot framework. If you experience
+  similar trouble please follow up on the related Github issue.
+ </td>
+ <td>
+  <a href="https://github.com/colszowka/simplecov/issues/80">SimpleCov #80</a>
+ </td>
+</tr>
+</table>
 
 ## Configuring SimpleCov
 
@@ -109,7 +170,7 @@ care what kind of framework it is running in, it just looks at what code is bein
         SimpleCov.configure do
           some_config_option 'foo'
         end
-        
+
 Please check out the [Configuration] API documentation to find out what you can customize.
 
 
@@ -123,10 +184,10 @@ test setup helper and move the `SimpleCov.start` code with all your custom confi
 
     # test/test_helper.rb
     require 'simplecov'
-    
+
     # features/support/env.rb
     require 'simplecov'
-    
+
     # .simplecov
     SimpleCov.start 'rails' do
       # any custom configs like groups and filters can be here at a central place
@@ -379,8 +440,8 @@ CSV formatter for SimpleCov code coverage tool for ruby 1.9+
 [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)](http://travis-ci.org/colszowka/simplecov)
 
 Only Ruby 1.9+ ships with the coverage library that SimpleCov depends upon. SimpleCov is built against various other Rubies,
-including Rubinius and JRuby, in [Continuous Integration], but this happens only to ensure that SimpleCov does not make your 
-test suite crash right now. Whether SimpleCov will support JRuby/Rubinius in the future depends solely on whether those Ruby 
+including Rubinius and JRuby, in [Continuous Integration], but this happens only to ensure that SimpleCov does not make your
+test suite crash right now. Whether SimpleCov will support JRuby/Rubinius in the future depends solely on whether those Ruby
 interpreters add the coverage library.
 
 SimpleCov is built in [Continuous Integration] on 1.8.7, ree, 1.9.2, 1.9.3.
@@ -407,8 +468,8 @@ If you wont to contribute, please:
 
 Thanks to Aaron Patterson (http://engineering.attinteractive.com/2010/08/code-coverage-in-ruby-1-9/) for the original idea
 for this!
-    
+
 
 ## Copyright
 
-Copyright (c) 2010-2011 Christoph Olszowka. See LICENSE for details.
+Copyright (c) 2010-2012 Christoph Olszowka. See LICENSE for details.

data/Rakefile

@@ -1,3 +1,5 @@
+#!/usr/bin/env rake
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
@@ -8,7 +10,7 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
-
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new
+
+task :default => [:test, :cucumber]

data/features/config_nocov_token.feature

@@ -3,7 +3,7 @@ Feature:
 
   Code wrapped in # :nocov: will be ignored by coverage reports.
   The name of the token can be configured with SimpleCov.nocov_token or SimpleCov.skip_token
-  
+
   Scenario: Custom nocov token using nocov_token
     Given SimpleCov for Test/Unit is configured with:
       """
@@ -12,7 +12,7 @@ Feature:
         nocov_token 'skippit'
       end
       """
-      
+
     Given a file named "lib/faked_project/nocov.rb" with:
       """
       class SourceCodeWithNocov
@@ -40,7 +40,7 @@ Feature:
 
     And the report should be based upon:
       | Unit Tests |
-      
+
   Scenario: Custom nocov token using skip_token
     Given SimpleCov for Test/Unit is configured with:
       """
@@ -76,4 +76,4 @@ Feature:
     And there should be 5 skipped lines in the source files
 
     And the report should be based upon:
-      | Unit Tests |
+      | Unit Tests |

data/features/rspec_groups_using_filter_class.feature

@@ -2,9 +2,9 @@
 Feature: Grouping on RSpec using a custom filter class
 
   Next to passing a block or a string to define a group, you can also pass
-  a filter class. The filter class inherits from SimpleCov::Filter and 
-  must implement the matches? method, which is used to determine whether 
-  or not a file should be added to the group. 
+  a filter class. The filter class inherits from SimpleCov::Filter and
+  must implement the matches? method, which is used to determine whether
+  or not a file should be added to the group.
 
   Scenario:
     Given SimpleCov for RSpec is configured with:
@@ -31,7 +31,7 @@ Feature: Grouping on RSpec using a custom filter class
 
     And I should see the source files:
       | name                                    | coverage |
-      | lib/faked_project/framework_specific.rb | 75.0 %   | 
+      | lib/faked_project/framework_specific.rb | 75.0 %   |
       | lib/faked_project/some_class.rb         | 80.0 %   |
       | lib/faked_project.rb                    | 100.0 %  |
       | lib/faked_project/meta_magic.rb         | 100.0 %  |

data/features/skipping_code_blocks_manually.feature

@@ -3,7 +3,7 @@ Feature:
 
   When code is wrapped in :nocov: comment blocks, it does not count
   against the coverage numbers.
-  
+
   Background:
     Given SimpleCov for Test/Unit is configured with:
       """
@@ -34,12 +34,12 @@ Feature:
       | lib/faked_project/framework_specific.rb | 75.0 %   |
       | lib/faked_project/meta_magic.rb         | 100.0 %  |
       | lib/faked_project/nocov.rb              | 100.0 %  |
-      
+
     And there should be 5 skipped lines in the source files
 
     And the report should be based upon:
       | Unit Tests |
-      
+
   Scenario: Number of spaces should not mix up nocov results
     Given a file named "lib/faked_project/nocov.rb" with:
       """
@@ -67,4 +67,4 @@ Feature:
     And there should be 5 skipped lines in the source files
 
     And the report should be based upon:
-      | Unit Tests |
+      | Unit Tests |

data/features/step_definitions/html_steps.rb

@@ -42,4 +42,4 @@ end
 
 Then /^there should be (\d+) skipped lines in the source files$/ do |expected_count|
   all(".source_table ol li.skipped").count.should == expected_count.to_i
-end
+end

data/features/step_definitions/simplecov_steps.rb

@@ -12,7 +12,7 @@ Given /^SimpleCov for (.*) is configured with:$/ do |framework, config_body|
     else
       raise ArgumentError, "Could not identify test framework #{framework}!"
   end
-  
+
   steps %Q{
     Given a file named "#{framework_dir}/simplecov_config.rb" with:
       """

data/features/support/env.rb

@@ -22,5 +22,5 @@ Before do
     FileUtils.rm_rf 'project'
     FileUtils.cp_r File.join(this_dir, '../../test/faked_project/'), 'project'
   end
-  Given 'I cd to "project"'
+  step 'I cd to "project"'
 end

data/features/test_unit_groups_using_filter_class.feature

@@ -2,9 +2,9 @@
 Feature: Grouping on Test/Unit using a custom filter class
 
   Next to passing a block or a string to define a group, you can also pass
-  a filter class. The filter class inherits from SimpleCov::Filter and 
-  must implement the matches? method, which is used to determine whether 
-  or not a file should be added to the group. 
+  a filter class. The filter class inherits from SimpleCov::Filter and
+  must implement the matches? method, which is used to determine whether
+  or not a file should be added to the group.
 
   Scenario:
     Given SimpleCov for Test/Unit is configured with:
@@ -31,7 +31,7 @@ Feature: Grouping on Test/Unit using a custom filter class
 
     And I should see the source files:
       | name                                    | coverage |
-      | lib/faked_project/framework_specific.rb | 75.0 %   | 
+      | lib/faked_project/framework_specific.rb | 75.0 %   |
       | lib/faked_project/some_class.rb         | 80.0 %   |
       | lib/faked_project.rb                    | 100.0 %  |
       | lib/faked_project/meta_magic.rb         | 100.0 %  |

data/features/unicode_compatiblity.feature

@@ -3,7 +3,7 @@ Feature:
 
   Files with unicode in their source should be no problem at all for
   generating a proper coverage report.
-  
+
   Background:
     Given SimpleCov for Test/Unit is configured with:
       """

data/lib/simplecov.rb

@@ -118,3 +118,6 @@ require 'simplecov/version'
 
 # Load default config
 require 'simplecov/defaults'
+
+# Load Rails integration
+require 'simplecov/railtie' if defined? Rails

data/lib/simplecov/command_guesser.rb

@@ -2,20 +2,48 @@
 # Helper that tries to find out what test suite is running (for SimpleCov.command_name)
 #
 module SimpleCov::CommandGuesser
-  def self.guess(command)
-    case command
-      when /#{'test/functional/'}/
-        "Functional Tests"
-      when /#{'test/integration/'}/
-        "Integration Tests"
-      when /#{'test/'}/
-        "Unit Tests"
-      when /cucumber/, /features/
-        "Cucumber Features"
-      when /spec/
+  class << self
+    # Storage for the original command line call that invoked the test suite.
+    # This has got to be stored as early as possible because i.e. rake and test/unit 2
+    # have a habit of tampering with ARGV, which makes i.e. the automatic distinction
+    # between rails unit/functional/integration tests impossible without this cached
+    # item.
+    attr_accessor :original_run_command
+    
+    def guess
+      from_command_line_options || from_defined_constants
+    end
+    
+    private
+    
+    def from_command_line_options
+      case original_run_command
+        when /#{'test/functional/'}/
+          "Functional Tests"
+        when /#{'test/integration/'}/
+          "Integration Tests"
+        when /#{'test/'}/
+          "Unit Tests"
+        when /cucumber/, /features/
+          "Cucumber Features"
+        when /spec/
+          "RSpec"
+        else
+          nil
+      end
+    end
+  
+    def from_defined_constants
+      # If the command regexps fail, let's try checking defined constants.
+      if defined?(RSpec)
         "RSpec"
+      elsif defined?(Test::Unit)
+        "Unit Tests"
       else
-        return command
+        # TODO: Provide link to docs/wiki article
+        warn "SimpleCov failed to recognize the test framework and/or suite used. Please specify manually using SimpleCov.command_name 'Unit Tests'."
+        'Unknown Test Framework'
+      end
     end
   end
-end
+end

data/lib/simplecov/configuration.rb

@@ -57,10 +57,10 @@ module SimpleCov::Configuration
   # also check out the corresponding section in README.rdoc
   def command_name(name=nil)
     @name = name unless name.nil?
-    @name ||= SimpleCov::CommandGuesser.guess("#{$0} #{ARGV.join(" ")}")
+    @name ||= SimpleCov::CommandGuesser.guess
     @name
   end
-
+  
   #
   # Gets or sets the configured formatter.
   #
@@ -72,9 +72,9 @@ module SimpleCov::Configuration
     raise "No formatter configured. Please specify a formatter using SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter" unless @formatter
     @formatter
   end
-  
+
   #
-  # Certain code blocks (i.e. Ruby-implementation specific code) can be excluded from 
+  # Certain code blocks (i.e. Ruby-implementation specific code) can be excluded from
   # the coverage metrics by wrapping it inside # :nocov: comment blocks. The nocov token
   # can be configured to be any other string using this.
   #
@@ -195,6 +195,8 @@ module SimpleCov::Configuration
   def add_group(group_name, filter_argument=nil, &filter_proc)
     groups[group_name] = parse_filter(filter_argument, &filter_proc)
   end
+  
+  private
 
   #
   # The actal filter processor. Not meant for direct use

data/lib/simplecov/defaults.rb

@@ -36,6 +36,10 @@ SimpleCov.configure do
   # Exclude files outside of SimpleCov.root
   load_adapter 'root_filter'
 end
+
+# Gotta stash this a-s-a-p, see the CommandGuesser class and i.e. #110 for further info
+SimpleCov::CommandGuesser.original_run_command = "#{$0} #{ARGV.join(" ")}"
+
 at_exit do
   # Store the exit status of the test run since it goes away after calling the at_exit proc...
   if $! #was an exception thrown?
@@ -50,4 +54,4 @@ end
 
 # Autoload config from .simplecov if present
 config_path = File.join(SimpleCov.root, '.simplecov')
-load config_path if File.exist?(config_path)
+load config_path if File.exist?(config_path)

data/lib/simplecov/filter.rb

@@ -19,7 +19,7 @@ module SimpleCov
     def matches?(source_file)
       raise "The base filter class is not intended for direct use"
     end
-    
+
     def passes?(source_file)
       warn "DEPRECATION: SimpleCov::Filter#passes?(x) has been renamed to #matches?. Please update your custom filters accordingly!"
       matches?(source_file)

data/lib/simplecov/railtie.rb

@@ -0,0 +1,7 @@
+module SimpleCov
+  class Railtie < ::Rails::Railtie
+    rake_tasks do
+      load 'simplecov/railties/tasks.rake'
+    end
+  end
+end

data/lib/simplecov/railties/tasks.rake

@@ -0,0 +1,11 @@
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.name = 'simplecov'
+  t.loader = :direct # uses require() which skips PWD in Ruby 1.9
+  t.libs.push 'test', 'spec', Dir.pwd
+  t.test_files = FileList['{test,spec}/**/*_{test,spec}.rb']
+  t.ruby_opts.push '-r', 'simplecov', '-e', 'SimpleCov.start(:rails)'.inspect
+end
+
+require 'rake/clean'
+CLOBBER.include 'coverage'

data/lib/simplecov/result.rb

@@ -44,7 +44,7 @@ module SimpleCov
 
     # The multiple of coverage for this result
     def covered_strength
-      return @covered_strength if @convered_strength
+      return @covered_strength if @covered_strength
       m = 0
       @files.each do |file|
         original_result[file.filename].each do |line_result|

data/lib/simplecov/source_file.rb

@@ -46,7 +46,7 @@ module SimpleCov
       def never?
         not skipped? and coverage.nil?
       end
-      
+
       # Flags this line as skipped
       def skipped!
         @skipped = true
@@ -57,8 +57,8 @@ module SimpleCov
       def skipped?
 	      !!skipped
       end
-      
-      # The status of this line - either covered, missed, skipped or never. Useful i.e. for direct use 
+
+      # The status of this line - either covered, missed, skipped or never. Useful i.e. for direct use
       # as a css class in report generation
       def status
         return 'skipped' if skipped?
@@ -77,7 +77,8 @@ module SimpleCov
     alias_method :source, :src
 
     def initialize(filename, coverage)
-      @filename, @coverage, @src = filename, coverage, File.readlines(filename)
+      @filename, @coverage = filename, coverage
+      File.open(filename, "r:UTF-8") {|f| @src = f.readlines }
     end
 
     # Returns all source lines for this file as instances of SimpleCov::SourceFile::Line,

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.5.4"
-end
+  VERSION = "0.6.0"
+end

data/simplecov.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |gem|
   gem.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
   gem.summary     = gem.description
 
-  gem.add_dependency 'multi_json', '~> 1.0.3'
+  gem.add_dependency 'multi_json', '~> 1.0'
   gem.add_dependency 'simplecov-html', '~> 0.5.3'
-  gem.add_development_dependency 'aruba', '~> 0.4'
-  gem.add_development_dependency 'capybara', '~> 1.0'
-  gem.add_development_dependency 'cucumber', '~> 1.0.5'
-  gem.add_development_dependency 'rake', '~> 0.8'
-  gem.add_development_dependency 'rspec', '~> 2.6'
-  gem.add_development_dependency 'shoulda', '~> 2.10'
+  gem.add_development_dependency 'aruba'
+  gem.add_development_dependency 'capybara'
+  gem.add_development_dependency 'cucumber', '>= 1.1.4'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'shoulda'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/faked_project/lib/faked_project.rb

@@ -8,4 +8,4 @@ Dir[File.join(File.dirname(__FILE__), 'faked_project/*.rb')].each do |file|
   require file # Require all source files in project dynamically so we can inject some stuff depending on test situation
 end
 
-FakedProject.send :include, MetaMagic
+FakedProject.send :include, MetaMagic

data/test/fixtures/deleted_source_sample.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 require 'lib/simplecov'
-SimpleCov.start
+SimpleCov.start { command_name "Test" }
 
 dir = File.expand_path(File.dirname(__FILE__))
 file = File.join(dir, "generated_buddha.rb")

data/test/fixtures/utf-8.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+puts '135°C'

data/test/helper.rb

@@ -13,7 +13,7 @@ class Test::Unit::TestCase
   # Keep 1.8-rubies from complaining about missing tests in each file that covers only 1.9 functionality
   def default_test
   end
-  
+
 end
 
 require 'shoulda_macros'

data/test/shoulda_macros.rb

@@ -8,19 +8,19 @@ module ShouldaMacros
       yield
     end if ruby_versions.any? {|v| RUBY_VERSION =~ /#{v}/ }
   end
-  
+
   def should_be(boolean_flag)
     should "be #{boolean_flag}" do
       assert_equal true, subject.send(boolean_flag)
     end
   end
-  
+
   def should_not_be(boolean_flag)
     should "not be #{boolean_flag}" do
       assert_equal false, subject.send(boolean_flag)
     end
   end
-  
+
   def should_have(attr_name, expectation)
     should "have #{attr_name} == #{expectation.inspect}" do
       assert_equal expectation, subject.send(attr_name)

data/test/test_command_guesser.rb

@@ -5,7 +5,8 @@ class TestCommandGuesser < Test::Unit::TestCase
     def self.should_guess_command_name(expectation, *argv)
       argv.each do |args|
         should "return '#{expectation}' for '#{args}'" do
-          assert_equal expectation, SimpleCov::CommandGuesser.guess(args)
+          SimpleCov::CommandGuesser.original_run_command = args
+          assert_equal expectation, SimpleCov::CommandGuesser.guess
         end
       end
     end
@@ -15,6 +16,6 @@ class TestCommandGuesser < Test::Unit::TestCase
     should_guess_command_name "Integration Tests", '/some/path/test/integration/foo_bar_controller_test.rb'
     should_guess_command_name "Cucumber Features", 'features', 'cucumber', 'cucumber features'
     should_guess_command_name "RSpec", '/some/path/spec/foo.rb'
-    should_guess_command_name "some_arbitrary_command with arguments", 'some_arbitrary_command with arguments'
+    should_guess_command_name "Unit Tests", 'some_arbitrary_command with arguments' # Because Test::Unit const is defined!
   end
 end

data/test/test_source_file.rb

@@ -71,5 +71,16 @@ class TestSourceFile < Test::Unit::TestCase
         assert_match /^Warning: coverage data provided/, captured_output
       end
     end
+
+    context "Encoding" do
+      should "handle utf-8 encoded source files" do
+        source_file = SimpleCov::SourceFile.new(source_fixture('utf-8.rb'), [nil, nil, 1])
+
+        assert_nothing_raised do
+          source_file.process_skipped_lines!
+        end
+      end
+    end
+
   end
 end

data/test/test_source_file_line.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class TestSourceFileLine < Test::Unit::TestCase
 
-  
+
   on_ruby '1.9' do
     context "A source line" do
       setup do
@@ -26,10 +26,10 @@ class TestSourceFileLine < Test::Unit::TestCase
         assert_equal @line.line_number, @line.line
         assert_equal @line.line_number, @line.number
       end
-      
+
       context "flagged as skipped!" do
         setup { @line.skipped! }
-        
+
         should_not_be :covered?
         should_be :skipped?
         should_not_be :missed?
@@ -37,7 +37,7 @@ class TestSourceFileLine < Test::Unit::TestCase
         should_have :status, 'skipped'
       end
     end
-    
+
     context "A source line with coverage" do
       setup do
         @line = SimpleCov::SourceFile::Line.new('# the ruby source', 5, 3)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000 +02:00
-default_executable: 
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70223996324480 !ruby/object:Gem::Requirement
+  requirement: &70340785954640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223996324480
+  version_requirements: *70340785954640
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &70223996323980 !ruby/object:Gem::Requirement
+  requirement: &70340785954140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,73 +32,73 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70223996323980
+  version_requirements: *70340785954140
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70223996323380 !ruby/object:Gem::Requirement
+  requirement: &70340785953760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223996323380
+  version_requirements: *70340785953760
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70223996322760 !ruby/object:Gem::Requirement
+  requirement: &70340785953300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223996322760
+  version_requirements: *70340785953300
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70223996322160 !ruby/object:Gem::Requirement
+  requirement: &70340785952800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *70223996322160
+  version_requirements: *70340785952800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70223996321600 !ruby/object:Gem::Requirement
+  requirement: &70340785952380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223996321600
+  version_requirements: *70340785952380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70223996321120 !ruby/object:Gem::Requirement
+  requirement: &70340785951920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223996321120
+  version_requirements: *70340785951920
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70223996320600 !ruby/object:Gem::Requirement
+  requirement: &70340785951500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223996320600
+  version_requirements: *70340785951500
 description: Code coverage for Ruby 1.9 with a powerful configuration library and
   automatic merging of coverage across test suites
 email:
@@ -156,6 +155,8 @@ files:
 - lib/simplecov/formatter.rb
 - lib/simplecov/formatter/simple_formatter.rb
 - lib/simplecov/merge_helpers.rb
+- lib/simplecov/railtie.rb
+- lib/simplecov/railties/tasks.rake
 - lib/simplecov/result.rb
 - lib/simplecov/result_merger.rb
 - lib/simplecov/source_file.rb
@@ -189,6 +190,7 @@ files:
 - test/fixtures/resultset1.rb
 - test/fixtures/resultset2.rb
 - test/fixtures/sample.rb
+- test/fixtures/utf-8.rb
 - test/helper.rb
 - test/shoulda_macros.rb
 - test/test_1_8_fallbacks.rb
@@ -201,7 +203,6 @@ files:
 - test/test_return_codes.rb
 - test/test_source_file.rb
 - test/test_source_file_line.rb
-has_rdoc: true
 homepage: http://github.com/colszowka/simplecov
 licenses: []
 post_install_message: 
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Code coverage for Ruby 1.9 with a powerful configuration library and automatic
@@ -285,6 +286,7 @@ test_files:
 - test/fixtures/resultset1.rb
 - test/fixtures/resultset2.rb
 - test/fixtures/sample.rb
+- test/fixtures/utf-8.rb
 - test/helper.rb
 - test/shoulda_macros.rb
 - test/test_1_8_fallbacks.rb
@@ -297,3 +299,4 @@ test_files:
 - test/test_return_codes.rb
 - test/test_source_file.rb
 - test/test_source_file_line.rb
+has_rdoc: