simplecov 0.11.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4af948b77b779812e38aae3eaa154f6a280c910
-  data.tar.gz: 80705587d23aeabb4a70eeb6a6e1ec0d1a8b7163
+  metadata.gz: 15fa4589e25ee4710bdbcec7485a4d8ec7be7abb
+  data.tar.gz: a1627cf287ce3c70ba2d60e0943f28f90fcdef79
 SHA512:
-  metadata.gz: 86e09f20723efd9b0cd2574b6bc0191c5f7f0483a4bd50d0d7d3b77d227239bda9db764e53b3254c7497a95ab052810786895f0fbb1ea1892bfaf505a56254aa
-  data.tar.gz: 1e2286d2c6bb0c683315b6ef74f80262a90610b58fde1465b6a21511075f37554a6ca17a0fa4219fed196da673d67685c85fa9441b91edd2cd6a4a258fa078fd
+  metadata.gz: 03a052dcae5923fe19e56f6f20fbd390505f03dca386d51eaca4b525252054856ce492e783e6923ad3b89a46719b89556747b8bbac295513b1d245fba3232e79
+  data.tar.gz: e2cd84b984e35dfa0c048f375ed2555f08d4df239d616d7c70289b086b1904394b1344f177ad5d7dd08cfb695fe2c22d5375af8e07da5d773500b034d87d4b1c

data/.rubocop.yml

@@ -4,6 +4,9 @@ AllCops:
     - 'tmp/**/*'
     - 'vendor/bundle/**/*'
 
+Bundler/OrderedGems:
+  Enabled: false
+
 Lint/AmbiguousRegexpLiteral:
   Exclude:
     - 'features/**/*_steps.rb'
@@ -13,6 +16,10 @@ Lint/AmbiguousRegexpLiteral:
 Metrics/AbcSize:
   Max: 25 # TODO: Lower to 15
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+
 Metrics/BlockNesting:
   Max: 2
 
@@ -66,5 +73,12 @@ Style/FileName:
   Exclude:
     - 'spec/fixtures/utf-8.rb'
 
-Style/TrailingComma:
-  EnforcedStyleForMultiline: 'comma'
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/GuardClause:
+  Enabled: false
+
+Style/MutableConstant:
+  Exclude:
+    - 'lib/simplecov/version.rb' # required for older versions of rubygems

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 before_install:
+  - gem update --system
   - gem install bundler
 
 bundler_args: --without development --jobs=3 --retry=3
@@ -13,15 +14,19 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - ruby-head
-  - jruby
+  - jruby-head
+  - jruby-9.1.7.0
   - rbx-2
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby
+    - rvm: jruby-head
+    - rvm: jruby-9.1.7.0
     - rvm: rbx-2
   fast_finish: true

data/CHANGELOG.md

@@ -1,10 +1,44 @@
-Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.11.0...master))
+0.13.0 2016-01-25 ([changes](https://github.com/colszowka/simplecov/compare/v0.12.0...v0.13.0))
+==========
+
+## Enhancements
+
+* Faster run times when a very large number of files is loaded into SimpleCov. See [#520](https://github.com/colszowka/simplecov/pull/520) (thanks @alyssais)
+* Only read in source code files that are actually used (faster when files are ignored etc.). See [#540](https://github.com/colszowka/simplecov/pull/540) (tahks @yui-knk)
+
+## Bugfixes
+
+* Fix merging of resultsets if a file is missing on one side. See [#513](https://github.com/colszowka/simplecov/pull/513) (thanks @hanazuki)
+* Fix Ruby 2.4 deprecation warnings by using Integer instead of Fixnum. See [#523](https://github.com/colszowka/simplecov/pull/523) (thanks @nobu)
+* Force Ruby 2 to json 2. See [dc7417d50](https://github.com/colszowka/simplecov/commit/dc7417d5049b1809cea214314c15dd93a5dd964f) (thanks @amatsuda)
+* Various other gem dependency fixes for different gems on different ruby versions. (thanks @amatsuda)
+
+0.12.0 2016-07-02 ([changes](https://github.com/colszowka/simplecov/compare/v0.11.2...v0.12.0))
 =================
 
 ## Enhancements
 
+* Add support for JSON versions 2.x
+
 ## Bugfixes
 
+* Fix coverage rate of the parallel_tests. See [#441](https://github.com/colszowka/simplecov/pull/441) (thanks @sinsoku)
+* Fix a regression on old rubies that failed to work with the recently introduced frozen VERSION string. See [#461](https://github.com/colszowka/simplecov/pull/461) (thanks @leafle)
+
+0.11.2 2016-02-03 ([changes](https://github.com/colszowka/simplecov/compare/v0.11.1...v0.11.2))
+=================
+
+## Enhancements
+
+* Do not globally pollute Array and Hash with `merge_resultset` utility methods. See [#449](https://github.com/colszowka/simplecov/pull/449) (thanks @amatsuda)
+* Do not `mkdir_p` the `coverage_path` on every access of the method (See [#453](https://github.com/colszowka/simplecov/pull/453) (thanks @paddor)
+* Fixes a Ruby warning related to the `track_files` configuration. See [#447](https://github.com/colszowka/simplecov/pull/447) (thanks @craiglittle)
+* Add a group for background jobs to default Rails profile. See [#442](https://github.com/colszowka/simplecov/pull/442) (thanks @stve)
+
+## Bugfixes
+
+* Fix root_filter evaluates SimpleCov.root before initialization. See [#437](https://github.com/colszowka/simplecov/pull/437) (thanks @tmtm)
+
 0.11.1 2015-12-01 ([changes](https://github.com/colszowka/simplecov/compare/v0.11.0...v0.11.1))
 =================
 
@@ -20,7 +54,7 @@ Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.11.0...m
 ## Enhancements
 
 * Added `SimpleCov.minimum_coverage_by_file` for per-file coverage thresholds. See [#392](https://github.com/colszowka/simplecov/pull/392) (thanks @ptashman)
-* Added `track_files` configuration option to specify a glob to always include in coverage results, whether or not those files are required. See [#422](https://github.com/colszowka/simplecov/pull/422) (thanks @hugopeixoto)
+* Added `track_files` configuration option to specify a glob to always include in coverage results, whether or not those files are required. By default, this is enabled in the Rails profile for common Rails directories. See [#422](https://github.com/colszowka/simplecov/pull/422) (thanks @hugopeixoto)
 * Speed up `root_filter` by an order of magnitude. See [#396](https://github.com/colszowka/simplecov/pull/396) (thanks @raszi)
 
 ## Bugfixes

data/Gemfile

@@ -6,29 +6,33 @@ source "https://rubygems.org"
 # Uncomment this to use development version of html formatter from github
 # gem 'simplecov-html', :github => 'colszowka/simplecov-html'
 
-gem "rake", ">= 10.3"
+gem "rake", Gem::Version.new(RUBY_VERSION) < Gem::Version.new("1.9.3") ? "~>10.3" : ">= 10.3"
 
 group :test do
   gem "rspec", ">= 3.2"
   # Older versions of some gems required for Ruby 1.8.7 support
-  platform :ruby_18 do
+  platforms :ruby_18 do
     gem "activesupport", "~> 3.2.21"
     gem "i18n", "~> 0.6.11"
   end
-  platform :jruby, :ruby_19, :ruby_20, :ruby_21, :ruby_22 do
+  platforms :ruby_18, :ruby_19 do
+    gem "mime-types", "~> 1.25"
+    gem "addressable", "~> 2.3.0"
+  end
+  platforms :ruby_18, :ruby_19, :ruby_20, :ruby_21 do
+    gem "rack", "~> 1.6"
+  end
+  platforms :jruby, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :ruby_25 do
     gem "aruba", "~> 0.7.4"
-    gem "capybara", "~> 2.4"
-
-    # Hack until Capybara fixes its gemspec. 3.0 removed 1.9 support.
-    # See https://github.com/jnicklas/capybara/issues/1615
-    gem "mime-types", "~> 2.0.0"
-
-    gem "cucumber", "~> 2.0"
+    gem "capybara"
+    gem "nokogiri", RUBY_VERSION < "2.1" ? "~> 1.6.0" : ">= 1.7"
+    gem "cucumber"
     gem "phantomjs", "~> 1.9"
-    gem "poltergeist", "~> 1.1"
-    gem "rubocop", ">= 0.30"
-    gem "test-unit", "~> 3.0"
+    gem "poltergeist"
+    gem "rubocop" unless RUBY_VERSION.start_with?("1.")
+    gem "test-unit"
   end
+  gem "json", RUBY_VERSION.start_with?("1.") ? "~> 1.8" : "~> 2.0"
 end
 
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)][Continuous Integration] [![Dependency Status](https://gemnasium.com/colszowka/simplecov.png)][Dependencies] [![Code Climate](https://codeclimate.com/github/colszowka/simplecov.png)](https://codeclimate.com/github/colszowka/simplecov) [![Inline docs](http://inch-ci.org/github/colszowka/simplecov.png)](http://inch-ci.org/github/colszowka/simplecov)
+SimpleCov [![Build Status](https://travis-ci.org/colszowka/simplecov.svg)][Continuous Integration] [![Dependency Status](https://gemnasium.com/colszowka/simplecov.svg)][Dependencies] [![Code Climate](https://codeclimate.com/github/colszowka/simplecov.svg)](https://codeclimate.com/github/colszowka/simplecov) [![Inline docs](http://inch-ci.org/github/colszowka/simplecov.svg)](http://inch-ci.org/github/colszowka/simplecov)
 =========
 **Code coverage for Ruby**
 
@@ -6,11 +6,8 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
   * [API documentation]
   * [Changelog]
   * [Rubygem]
-  * [Mailing List]
   * [Continuous Integration]
 
-**Important Notice: There is a bug that affects exit code handling on the 0.8 line of SimpleCov, see [#281](https://github.com/colszowka/simplecov/issues/281). Please use versions `>= 0.9` to avoid this.**
-
 [Coverage]: http://www.ruby-doc.org/stdlib-2.1.0/libdoc/coverage/rdoc/Coverage.html "API doc for Ruby's Coverage library"
 [Source Code]: https://github.com/colszowka/simplecov "Source Code @ GitHub"
 [API documentation]: http://rubydoc.info/gems/simplecov/frames "RDoc API Documentation at Rubydoc.info"
@@ -20,10 +17,6 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
 [Continuous Integration]: http://travis-ci.org/colszowka/simplecov "SimpleCov is built around the clock by travis-ci.org"
 [Dependencies]: https://gemnasium.com/colszowka/simplecov "SimpleCov dependencies on Gemnasium"
 [simplecov-html]: https://github.com/colszowka/simplecov-html "SimpleCov HTML Formatter Source Code @ GitHub"
-[Mailing List]: https://groups.google.com/forum/#!forum/simplecov "Open mailing list for discussion and announcements on Google Groups"
-[Pledgie]: http://www.pledgie.com/campaigns/18379
-
-[![You can support the development of SimpleCov via Pledgie - thanks for your help](https://pledgie.com/campaigns/18379.png?skin_name=chrome)][Pledgie]
 
 SimpleCov is a code coverage analysis tool for Ruby. It uses [Ruby's built-in Coverage][Coverage] library to gather code
 coverage data, but makes processing its results much easier by providing a clean API to filter, group, merge, format,
@@ -108,12 +101,12 @@ Getting started
 
 **Coverage results report, fully browsable locally with sorting and much more:**
 
-![SimpleCov coverage report](http://colszowka.github.com/simplecov/devise_result-0.5.3.png)
+![SimpleCov coverage report](https://cloud.githubusercontent.com/assets/137793/17071162/db6f253e-502d-11e6-9d84-e40c3d75f333.png)
 
 
 **Source file coverage details view:**
 
-![SimpleCov source file detail view](http://colszowka.github.com/simplecov/devise_source_file-0.5.3.png)
+![SimpleCov source file detail view](https://cloud.githubusercontent.com/assets/137793/17071163/db6f9f0a-502d-11e6-816c-edb2c66fad8d.png)
 
 ## Use it with any framework!
 
@@ -153,19 +146,6 @@ to use SimpleCov with them. Here's an overview of the known ones:
       <a href="https://github.com/colszowka/simplecov/pull/185">#185</a>
     </td>
   </tr>
-  <tr>
-    <th>
-      Riot
-    </th>
-    <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">#80</a>
-    </td>
-  </tr>
   <tr>
     <th>
       RubyMine

data/Rakefile

@@ -27,10 +27,15 @@ rescue LoadError
 end
 
 # Cucumber integration test suite is for impls that work with simplecov only - a.k.a. 1.9+
-if RUBY_VERSION >= "1.9"
+if RUBY_VERSION.start_with? "1.8"
+  task :default => [:spec]
+else
   require "cucumber/rake/task"
   Cucumber::Rake::Task.new
-  task :default => [:spec, :cucumber, :rubocop]
-else
-  task :default => [:spec]
+
+  if RUBY_VERSION.start_with? "1.9"
+    task :default => [:spec, :cucumber]
+  else
+    task :default => [:spec, :cucumber, :rubocop]
+  end
 end

data/features/step_definitions/simplecov_steps.rb

@@ -11,7 +11,7 @@ Given /^SimpleCov for (.*) is configured with:$/ do |framework, config_body|
     when /Cucumber/i
       "features/support"
     else
-      fail ArgumentError, "Could not identify test framework #{framework}!"
+      raise ArgumentError, "Could not identify test framework #{framework}!"
     end
   end
 

data/features/support/env.rb

@@ -45,6 +45,6 @@ end
 # Workaround for https://github.com/cucumber/aruba/pull/125
 Aruba.configure do |config|
   config.before_cmd do
-    set_env("JRUBY_OPTS", "-X-C --1.9")
+    set_env("JRUBY_OPTS", "--dev --debug")
   end
 end

data/lib/simplecov/configuration.rb

@@ -28,6 +28,7 @@ module SimpleCov
     #
     def coverage_dir(dir = nil)
       return @coverage_dir if defined?(@coverage_dir) && dir.nil?
+      @coverage_path = nil # invalidate cache
       @coverage_dir = (dir || "coverage")
     end
 
@@ -37,9 +38,11 @@ module SimpleCov
     # values. Will create the directory if it's missing
     #
     def coverage_path
-      coverage_path = File.expand_path(coverage_dir, root)
-      FileUtils.mkdir_p coverage_path
-      coverage_path
+      @coverage_path ||= begin
+        coverage_path = File.expand_path(coverage_dir, root)
+        FileUtils.mkdir_p coverage_path
+        coverage_path
+      end
     end
 
     #
@@ -47,8 +50,9 @@ module SimpleCov
     # or not they were explicitly required. Without this, un-required files
     # will not be present in the final report.
     #
-    def track_files(glob)
-      @track_files_glob = glob
+    def track_files(glob = nil)
+      return @track_files if defined?(@track_files) && glob.nil?
+      @track_files = glob
     end
 
     #
@@ -81,7 +85,7 @@ module SimpleCov
     def formatter(formatter = nil)
       return @formatter if defined?(@formatter) && formatter.nil?
       @formatter = formatter
-      fail "No formatter configured. Please specify a formatter using SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter" unless @formatter
+      raise "No formatter configured. Please specify a formatter using SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter" unless @formatter
       @formatter
     end
 
@@ -114,7 +118,7 @@ module SimpleCov
       return @nocov_token if defined?(@nocov_token) && nocov_token.nil?
       @nocov_token = (nocov_token || "nocov")
     end
-    alias_method :skip_token, :nocov_token
+    alias skip_token nocov_token
 
     #
     # Returns the configured groups. Add groups using SimpleCov.add_group
@@ -188,7 +192,7 @@ module SimpleCov
     end
 
     #
-    # Defines them maximum age (in seconds) of a resultset to still be included in merged results.
+    # Defines the maximum age (in seconds) of a resultset to still be included in merged results.
     # i.e. If you run cucumber features, then later rake test, if the stored cucumber resultset is
     # more seconds ago than specified here, it won't be taken into account when merging (and is also
     # purged from the resultset cache)
@@ -200,7 +204,7 @@ module SimpleCov
     # Configure with SimpleCov.merge_timeout(3600) # 1hr
     #
     def merge_timeout(seconds = nil)
-      @merge_timeout = seconds if seconds.is_a?(Fixnum)
+      @merge_timeout = seconds if seconds.is_a?(Integer)
       @merge_timeout ||= 600
     end
 
@@ -285,7 +289,7 @@ module SimpleCov
       elsif filter_argument.is_a?(Array)
         SimpleCov::ArrayFilter.new(filter_argument)
       else
-        fail ArgumentError, "Please specify either a string or a block to filter with"
+        raise ArgumentError, "Please specify either a string or a block to filter with"
       end
     end
   end

data/lib/simplecov/defaults.rb

@@ -4,8 +4,9 @@ require "pathname"
 
 SimpleCov.profiles.define "root_filter" do
   # Exclude all files outside of simplecov root
-  root_filter = /\A#{Regexp.escape(SimpleCov.root)}/io
+  root_filter = nil
   add_filter do |src|
+    root_filter ||= /\A#{Regexp.escape(SimpleCov.root)}/io
     !(src.filename =~ root_filter)
   end
 end
@@ -31,6 +32,7 @@ SimpleCov.profiles.define "rails" do
   add_group "Models", "app/models"
   add_group "Mailers", "app/mailers"
   add_group "Helpers", "app/helpers"
+  add_group "Jobs", %w(app/jobs app/workers)
   add_group "Libraries", "lib"
 
   track_files "{app,lib}/**/*.rb"
@@ -47,19 +49,20 @@ end
 # Gotta stash this a-s-a-p, see the CommandGuesser class and i.e. #110 for further info
 SimpleCov::CommandGuesser.original_run_command = "#{$PROGRAM_NAME} #{ARGV.join(' ')}"
 
-at_exit do
+at_exit do # rubocop:disable Metrics/BlockLength
   # If we are in a different process than called start, don't interfere.
   next if SimpleCov.pid != Process.pid
 
-  if $! # was an exception thrown?
-    # if it was a SystemExit, use the accompanying status
-    # otherwise set a non-zero status representing termination by some other exception
-    # (see github issue 41)
-    @exit_status = $!.is_a?(SystemExit) ? $!.status : SimpleCov::ExitCodes::EXCEPTION
-  else
-    # Store the exit status of the test run since it goes away after calling the at_exit proc...
-    @exit_status = SimpleCov::ExitCodes::SUCCESS
-  end
+  @exit_status = if $! # was an exception thrown?
+                   # if it was a SystemExit, use the accompanying status
+                   # otherwise set a non-zero status representing termination by
+                   # some other exception (see github issue 41)
+                   $!.is_a?(SystemExit) ? $!.status : SimpleCov::ExitCodes::EXCEPTION
+                 else
+                   # Store the exit status of the test run since it goes away
+                   # after calling the at_exit proc...
+                   SimpleCov::ExitCodes::SUCCESS
+                 end
 
   SimpleCov.at_exit.call
 

data/lib/simplecov/filter.rb

@@ -17,7 +17,7 @@ module SimpleCov
     end
 
     def matches?(_)
-      fail "The base filter class is not intended for direct use"
+      raise "The base filter class is not intended for direct use"
     end
 
     def passes?(source_file)

data/lib/simplecov/jruby_fix.rb

@@ -11,7 +11,7 @@ if defined?(JRUBY_VERSION) && JRUBY_VERSION.to_f < 1.7
   # This monkey patches Coverage to address those issues
   module Coverage
     class << self
-      alias_method :__broken_result__, :result
+      alias __broken_result__ result
 
       def result # rubocop:disable Metrics/MethodLength
         fixed = {}

data/lib/simplecov/merge_helpers.rb

@@ -4,13 +4,12 @@ module SimpleCov
     def merge_resultset(array)
       new_array = dup
       array.each_with_index do |element, i|
-        if element.nil? && new_array[i].nil?
-          new_array[i] = nil
-        else
-          local_value = element || 0
-          other_value = new_array[i] || 0
-          new_array[i] = local_value + other_value
-        end
+        pair = [element, new_array[i]]
+        new_array[i] = if pair.any?(&:nil?) && pair.map(&:to_i).all?(&:zero?)
+                         nil
+                       else
+                         element.to_i + new_array[i].to_i
+                       end
       end
       new_array
     end
@@ -23,16 +22,16 @@ module SimpleCov
     def merge_resultset(hash)
       new_resultset = {}
       (keys + hash.keys).each do |filename|
-        new_resultset[filename] = []
+        new_resultset[filename] = nil
       end
 
       new_resultset.each_key do |filename|
-        new_resultset[filename] = (self[filename] || []).merge_resultset(hash[filename] || [])
+        result1 = self[filename]
+        result2 = hash[filename]
+        new_resultset[filename] =
+          result1 && result2 ? result1.extend(ArrayMergeHelper).merge_resultset(result2) : (result1 || result2).dup
       end
       new_resultset
     end
   end
 end
-
-Array.send :include, SimpleCov::ArrayMergeHelper
-Hash.send :include, SimpleCov::HashMergeHelper

data/lib/simplecov/profiles.rb

@@ -15,7 +15,7 @@ module SimpleCov
     #
     def define(name, &blk)
       name = name.to_sym
-      fail "SimpleCov Profile '#{name}' is already defined" unless self[name].nil?
+      raise "SimpleCov Profile '#{name}' is already defined" unless self[name].nil?
       self[name] = blk
     end
 
@@ -24,7 +24,7 @@ module SimpleCov
     #
     def load(name)
       name = name.to_sym
-      fail "Could not find SimpleCov Profile called '#{name}'" unless key?(name)
+      raise "Could not find SimpleCov Profile called '#{name}'" unless key?(name)
       SimpleCov.configure(&self[name])
     end
   end

data/lib/simplecov/result.rb

@@ -12,7 +12,7 @@ module SimpleCov
     attr_reader :original_result
     # Returns all files that are applicable to this result (sans filters!) as instances of SimpleCov::SourceFile. Aliased as :source_files
     attr_reader :files
-    alias_method :source_files, :files
+    alias source_files files
     # Explicitly set the Time this result has been created
     attr_writer :created_at
     # Explicitly set the command name that was used for this coverage result. Defaults to SimpleCov.command_name
@@ -24,6 +24,7 @@ module SimpleCov
     # Initialize a new SimpleCov::Result from given Coverage.result (a Hash of filenames each containing an array of
     # coverage data)
     def initialize(original_result)
+      original_result = original_result.dup.extend(SimpleCov::HashMergeHelper) unless original_result.is_a? SimpleCov::HashMergeHelper
       @original_result = original_result.freeze
       @files = SimpleCov::FileList.new(original_result.map do |filename, coverage|
         SimpleCov::SourceFile.new(filename, coverage) if File.file?(filename)
@@ -59,7 +60,7 @@ module SimpleCov
 
     # Returns a hash representation of this Result that can be used for marshalling it into JSON
     def to_hash
-      {command_name => {"coverage" => original_result.reject { |filename, _| !filenames.include?(filename) }, "timestamp" => created_at.to_i}}
+      {command_name => {"coverage" => coverage, "timestamp" => created_at.to_i}}
     end
 
     # Loads a SimpleCov::Result#to_hash dump
@@ -73,6 +74,11 @@ module SimpleCov
 
   private
 
+    def coverage
+      keys = original_result.keys & filenames
+      Hash[keys.zip(original_result.values_at(*keys))]
+    end
+
     # Applies all configured SimpleCov filters on this result's source files
     def filter!
       @files = SimpleCov.filtered(files)

data/lib/simplecov/source_file.rb

@@ -20,14 +20,14 @@ module SimpleCov
       attr_reader :skipped
 
       # Lets grab some fancy aliases, shall we?
-      alias_method :source, :src
-      alias_method :line, :line_number
-      alias_method :number, :line_number
+      alias source src
+      alias line line_number
+      alias number line_number
 
       def initialize(src, line_number, coverage)
-        fail ArgumentError, "Only String accepted for source" unless src.is_a?(String)
-        fail ArgumentError, "Only Fixnum accepted for line_number" unless line_number.is_a?(Fixnum)
-        fail ArgumentError, "Only Fixnum and nil accepted for coverage" unless coverage.is_a?(Fixnum) || coverage.nil?
+        raise ArgumentError, "Only String accepted for source" unless src.is_a?(String)
+        raise ArgumentError, "Only Integer accepted for line_number" unless line_number.is_a?(Integer)
+        raise ArgumentError, "Only Integer and nil accepted for coverage" unless coverage.is_a?(Integer) || coverage.nil?
         @src         = src
         @line_number = line_number
         @coverage    = coverage
@@ -74,16 +74,20 @@ module SimpleCov
     attr_reader :filename
     # The array of coverage data received from the Coverage.result
     attr_reader :coverage
-    # The source code for this file. Aliased as :source
-    attr_reader :src
-    alias_method :source, :src
 
     def initialize(filename, coverage)
       @filename = filename
       @coverage = coverage
-      File.open(filename, "rb") { |f| @src = f.readlines }
     end
 
+    # The source code for this file. Aliased as :source
+    def src
+      # We intentionally read source code lazily to
+      # suppress reading unused source code.
+      @src ||= File.open(filename, "rb", &:readlines)
+    end
+    alias source src
+
     # Returns all source lines for this file as instances of SimpleCov::SourceFile::Line,
     # and thus including coverage data. Aliased as :source_lines
     def lines
@@ -102,7 +106,7 @@ module SimpleCov
       process_skipped_lines!
       @lines
     end
-    alias_method :source_lines, :lines
+    alias source_lines lines
 
     # Access SimpleCov::SourceFile::Line source lines by line number
     def line(number)
@@ -116,7 +120,7 @@ module SimpleCov
       if relevant_lines.zero?
         0.0
       else
-        Float((covered_lines.count) * 100.0 / relevant_lines.to_f)
+        Float(covered_lines.count * 100.0 / relevant_lines.to_f)
       end
     end
 
@@ -172,8 +176,8 @@ module SimpleCov
       lines.each do |line|
         if line.src =~ /^([\s]*)#([\s]*)(\:#{SimpleCov.nocov_token}\:)/
           skipping = !skipping
-        else
-          line.skipped! if skipping
+        elsif skipping
+          line.skipped!
         end
       end
     end

data/lib/simplecov/version.rb

@@ -1,22 +1,25 @@
 module SimpleCov
-  VERSION = "0.11.1"
-  def VERSION.to_a
+  version = "0.13.0"
+
+  def version.to_a
     split(".").map(&:to_i)
   end
 
-  def VERSION.major
+  def version.major
     to_a[0]
   end
 
-  def VERSION.minor
+  def version.minor
     to_a[1]
   end
 
-  def VERSION.patch
+  def version.patch
     to_a[2]
   end
 
-  def VERSION.pre
+  def version.pre
     to_a[3]
   end
+
+  VERSION = version
 end