simplecov 0.8.0.pre2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7768d38b9aeb395f607dda4c66716e0d2666e16a
-  data.tar.gz: 3cf5925dbcaf7506be09faaad38edca5bad8f488
+  metadata.gz: 61f56fdda1d314c0237f6838847332be44bb24cf
+  data.tar.gz: 8774f7ed6c24a12d78c8ae14cf4281f9ce8e8552
 SHA512:
-  metadata.gz: bd3a2f25dc14d3cc3b65309aa06ea37563929d0951fa7d6ec90f9b1b6868ea8a670764230cbb5e7cbf0807c8b04d22a16d051204159a56d8231af909aa4b67f1
-  data.tar.gz: 27f202f8386e4478fed7a746e7e464106220ffcf716f506e3dac4914cd7f186fda21b794637ff9b7b52381fcdacfce3bd6af24c14a998d98047888d33ebfdf01
+  metadata.gz: 164e46798ecc467c0affb93de2619573efff67f900897f11c96fa2404e40784134387698ab38cddc6c9c8df418b16d5511e233ae5b9f2d4a51e0e6d3fc4ba030
+  data.tar.gz: 07cabbfba38dc665fe26180cb66abcb1449d199c41c43dbe3db80a669d881ed459e017b03176d66d2200dbfbd25b2843943450bbb29c93d91bc8256e57439c68

data/CHANGELOG.md

@@ -1,25 +1,87 @@
-Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.7.1...master))
--------------------
+Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.8.1...master))
+====================
 
-  * [FEATURE] Adds support for Rails 4 command guessing. 
-    See [#181](https://github.com/colszowka/simplecov/pull/181) (thanks to @semanticart)
-  * [REFACTORING] Rename adapters to "profiles" given that they are bundles of settings. The old adapter methods are
+v0.8.1, 2013-11-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.8.0...v0.8.1))
+=====================
+
+## Bugfixes
+
+  * Fixed a regression introduced in 0.8.0 - the Forwardable STDLIB module is now required explicitly.
+    See [#256](https://github.com/colszowka/simplecov/pull/256) (thanks to @kylev)
+
+v0.8.0, 2013-11-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.7.1...v0.8.0))
+=====================
+
+## TL;DR
+
+It's been way too long since the last official release 0.7.1, but this was partly due to it proving itself
+quite stable in most circumstances. This release brings various further stability improvements to result set merging
+(especially when working with parallel_tests), the configuration, source file encodings, and command name guessing.
+
+The 0.8 line is the last one to cooperate with Ruby < 1.9. Starting with 0.9, SimpleCov will assume to be running in
+Ruby 1.9+, and will not try to detect or bail silently on older Ruby versions. An appropriate deprecation warning 
+has been added.
+
+## Features
+
+  * Configuration blocks now have access to variables and methods outside of the block's scope.
+    See [#238](https://github.com/colszowka/simplecov/pull/238) (thanks to @ms-tg)
+  * You can now have a global `~/.simplecov` configuration file.
+    See [#195](https://github.com/colszowka/simplecov/pull/195) (thanks to @spagalloco)
+  * simplecov-html now uses the MIT-licensed colorbox plugin. Some adjustments when viewing source files, 
+    including retaining the currently open file on refresh have been added.
+    See [simplecov-html #15](https://github.com/colszowka/simplecov-html/pull/15) (thanks to @chetan)
+  * Adds support for Rails 4 command guessing, removes default group `vendor/plugins`.
+    See [#181](https://github.com/colszowka/simplecov/pull/181) and 
+    [#203](https://github.com/colszowka/simplecov/pull/203) (thanks to @semanticart and @phallstrom)
+  * You can now load simplecov without the default settings by doing `require 'simplecov/no_defaults'`
+    or setting `ENV['SIMPLECOV_NO_DEFAULTS']`. Check `simplecov/defaults` to see what preconfigurations are getting
+    dropped by using this. See [#209](https://github.com/colszowka/simplecov/pull/209) (thanks to @ileitch)
+  * The result set merging now uses the `lockfile` gem to avoid race conditions.
+    See [#185](https://github.com/colszowka/simplecov/pull/185) (thanks to @jshraibman-mdsol).
+  * Automatically detect the usage of parallel_tests and adjust the command name with the test env number accordingly,
+    See [#64](https://github.com/colszowka/simplecov/issues/64) and 
+    [#185](https://github.com/colszowka/simplecov/pull/185) (thanks to @jshraibman-mdsol).
+
+## Enhancements
+
+  * Rename adapters to "profiles" given that they are bundles of settings. The old adapter methods are
     deprecated, but remain available for now. 
     See [#207](https://github.com/colszowka/simplecov/pull/207) (thanks to @mikerobe)
-  * [FEATURE] You can now load simplecov without the default settings by doing `require 'simplecov/no_defaults'
-    or setting `ENV['SIMPLECOV_NO_DEFAULTS']`. Check `simplecov/defaults` to see what preconfigurations are getting
-    dropped by using this.
-    See [#209](https://github.com/colszowka/simplecov/pull/209) (thanks to @ileitch)
-  * [REFACTORING] Tweaks to the automatic test suite naming. In particular, `rspec/features` should now
+  * Tweaks to the automatic test suite naming. In particular, `rspec/features` should now
     be correctly attributed to RSpec, not Cucumber.
     See [#212](https://github.com/colszowka/simplecov/pull/212) (thanks to @ersatzryan and @betelgeuse)
-  * [REFACTORING] The internal cucumber test suite now uses Capybara 2.
+  * MiniTest should now be identified correctly by the command name guesser.
+    See [#244](https://github.com/colszowka/simplecov/pull/244) (thanks to @envygeeks)
+  * Makes SimpleCov resilient to inclusion of mathn library.
+    See [#175](https://github.com/colszowka/simplecov/pull/175) and 
+    [#140](https://github.com/colszowka/simplecov/issues/140) (thanks to @scotje)
+  * Allow coverage_dir to be an absolute path.
+  * See [#190](https://github.com/colszowka/simplecov/pull/190) (thanks to @jshraibman-mdsol)
+  * The internal cucumber test suite now uses Capybara 2.
     See [#206](https://github.com/colszowka/simplecov/pull/206) (thanks to @infertux)
-  * [FEATURE] Automatically detect the usage of parallel_tests.
-    See https://github.com/colszowka/simplecov/issues/64
+  * Work-arounds for the Coverage library shipped in JRuby 1.6 to behave in line with MRI.
+    See [#174](https://github.com/colszowka/simplecov/pull/174) (thanks to @grddev)
+  * Fix warning: instance variable @exit_status not initialized.
+    See [#242](https://github.com/colszowka/simplecov/pull/242) and 
+    [#213](https://github.com/colszowka/simplecov/pull/213) (thanks to @sferik and @infertux)
+
+## Bugfixes
+
+  * Correct result calculations for people using :nocov: tags.
+    See [#215](https://github.com/colszowka/simplecov/pull/215) (thanks to @aokolish)
+  * Average hits per line for groups of files is now computed correctly.
+    See [#192](http://github.com/colszowka/simplecov/pull/192) and 
+    [#179](http://github.com/colszowka/simplecov/issues/179) (thanks to @graysonwright)
+  * Compatability with BINARY internal encoding.
+    See [#194](https://github.com/colszowka/simplecov/pull/194) and 
+    [#127](https://github.com/colszowka/simplecov/issues/127) (thanks to @justfalter)
+  * Special characters in `SimpleCov.root` are now correctly escaped before being used as a RegExp.
+    See [#204](https://github.com/colszowka/simplecov/issues/204) and 
+    [#237](https://github.com/colszowka/simplecov/pull/237) (thanks to @rli9)
 
 v0.7.1, 2012-10-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.7.0...v0.7.1))
--------------------
+=====================
 
   * [BUGFIX] The gem packages of 0.7.0 (both simplecov and simplecov-html) pushed to Rubygems had some file
     permission issues, leading to problems when installing SimpleCov in a root/system Rubygems install and then
@@ -29,7 +91,7 @@ v0.7.1, 2012-10-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.
 
 
 v0.7.0, 2012-10-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.6.4...v0.7.0))
--------------------
+=====================
 
   * [FEATURE] The new `maximum_coverage_drop` and `minimum_coverage` now allow you to fail your build when the
     coverage dropped by more than what you allowed or is below a minimum value required. Also, `refuse_coverage_drop` disallows
@@ -48,7 +110,7 @@ v0.7.0, 2012-10-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.
   * The usual bunch of README fixes and documentation tweaks. Thanks to everyone who contributed those!
 
 v0.6.4, 2012-05-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.6.3...v0.6.4))
--------------------
+=====================
 
   * [BUGFIX] Encoding issues with ISO-8859-encoded source files fixed.
     See https://github.com/colszowka/simplecov/pull/117. (thanks to @Deradon)
@@ -60,7 +122,7 @@ v0.6.4, 2012-05-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.
 
 
 v0.6.3, 2012-05-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.6.2...v0.6.3))
--------------------
+=====================
 
   * [BUGFIX] Modified the API-changes for newer multi_json versions introduced with #122 and v0.6.2 so
     they are backwards-compatible with older multi_json gems in order to avoid simplecov polluting
@@ -70,19 +132,19 @@ v0.6.3, 2012-05-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.
     multi_json gems and ensure the above actually works :)
 
 v0.6.2, 2012-04-20 ([changes](https://github.com/colszowka/simplecov/compare/v0.6.1...v0.6.2))
--------------------
+=====================
 
   * [Updated to latest version of MultiJSON and its new API (thanks to @sferik and @ronen).
     See https://github.com/colszowka/simplecov/pull/122
 
 v0.6.1, 2012-02-24 ([changes](https://github.com/colszowka/simplecov/compare/v0.6.0...v0.6.1))
--------------------
+=====================
 
   * [BUGFIX] Don't force-load Railtie on Rails < 3. Fixes regression introduced with
     #83. See https://github.com/colszowka/simplecov/issues/113
 
 v0.6.0, 2012-02-22 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.4...v0.6.0))
--------------------
+=====================
 
   * [FEATURE] Auto-magic `rake simplecov` task for rails
     (see https://github.com/colszowka/simplecov/pull/83, thanks @sunaku)
@@ -98,7 +160,7 @@ v0.6.0, 2012-02-22 ([changes](https://github.com/colszowka/simplecov/compare/v0.
     list of changes: https://github.com/colszowka/simplecov/compare/v0.5.4...v0.6.0
 
 v0.5.4, 2011-10-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.3...v0.5.4))
--------------------
+=====================
 
   * Do not give exit code 0 when there are exceptions prior to tests
     (see https://github.com/colszowka/simplecov/issues/41, thanks @nbogie)
@@ -111,7 +173,7 @@ v0.5.4, 2011-10-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.
   * Readme formatted in Markdown :)
 
 v0.5.3, 2011-09-13 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.2...v0.5.3))
--------------------
+=====================
 
   * Fix for encoding issues that came from the nocov processing mechanism
     (see https://github.com/colszowka/simplecov/issues/71)
@@ -126,13 +188,13 @@ v0.5.3, 2011-09-13 ([changes](https://github.com/colszowka/simplecov/compare/v0.
     alias SimpleCov.skip_token)
 
 v0.5.2, 2011-09-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.1...v0.5.2))
--------------------
+=====================
 
   * Another fix for a bug in JSON processing introduced with MultiJSON in 0.5.1
     (see https://github.com/colszowka/simplecov/pull/75, thanks @sferik)
 
 v0.5.1, 2011-09-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.5.0...v0.5.1))
--------------------
+=====================
 **Note: Yanked 2011-09-12 because the MultiJSON-patch had a crucial bug**
 
   * Fix for invalid gemspec dependency string (see https://github.com/colszowka/simplecov/pull/70,
@@ -143,7 +205,7 @@ v0.5.1, 2011-09-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.
     and https://github.com/colszowka/simplecov/pull/74, thanks @sferik)
 
 v0.5.0, 2011-09-09 ([changes](https://github.com/colszowka/simplecov/compare/v0.4.2...v0.5.4))
--------------------
+=====================
 **Note: Yanked 2011-09-09 because of trouble with the gemspec.**
 
   * JSON is now used instead of YAML for resultset caching (used for merging). Should resolve

data/CONTRIBUTING.md

@@ -18,3 +18,11 @@ If you want to contribute, please:
   * Add tests for it. This is important so I don't break it in a future version unintentionally.
   * **Bonus Points** go out to anyone who also updates `CHANGELOG.md` :)
   * Send me a pull request on Github.
+
+## Running Individual Tests
+
+This project uses Test::Unit. Individual tests can be run like this:
+
+```bash
+ruby -I test path/to/test.rb
+```

data/Gemfile

@@ -9,6 +9,10 @@ if 'Integration test (cucumber) suite is 1.9+ only'.respond_to? :encoding
   gem 'cucumber', '>= 1.1.0'
 end
 
+# shoulda-matchers depends on rails >= 4, but that does not work with Ruby < 1.9. So, to allow CI builds on those versions,
+# we gotta stick with the 3.x line.
+gem 'activesupport', '~> 3.2.0'
+
 # Uncomment this to use local copy of simplecov-html in development when checked out
 # gem 'simplecov-html', :path => ::File.dirname(__FILE__) + '/../simplecov-html'
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012 Christoph Olszowka
+Copyright (c) 2010-2013 Christoph Olszowka
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -21,7 +21,7 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
 [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](http://www.pledgie.com/campaigns/18379.png?skin_name=chrome)][Pledgie]
+[![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 1.9. It uses [1.9'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
@@ -155,11 +155,13 @@ to use SimpleCov with them. Here's an overview of the known ones:
    <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.
+  As of 0.8.0, SimpleCov should correctly recognize parallel_tests and supplement your test suite names
+  with their corresponding test env numbers. Locking of the resultset cache should ensure no race conditions
+  occur when results are merged.
  </td>
  <td>
   <a href="https://github.com/colszowka/simplecov/issues/64">SimpleCov #64</a>
+  <a href="https://github.com/colszowka/simplecov/pull/185">SimpleCov #185</a>
  </td>
 </tr>
 <tr>
@@ -296,7 +298,7 @@ is being set in the SimpleCov::Filter initialize method and thus is set to 5 in
 ## Groups
 
 You can separate your source files into groups. For example, in a rails app, you'll want to have separate listings for
-Models, Controllers, Helpers, Libs and Plugins. Group definition works similar to Filters (and indeed also accepts custom
+Models, Controllers, Helpers, and Libs. Group definition works similar to Filters (and indeed also accepts custom
 filter classes), but source files end up in a group when the filter passes (returns true), as opposed to filtering results,
 which exclude files from results when the filter results in a true value.
 
@@ -406,7 +408,6 @@ SimpleCov.profiles.define 'rails' do
   add_group 'Models', 'app/models'
   add_group 'Helpers', 'app/helpers'
   add_group 'Libraries', 'lib'
-  add_group 'Plugins', 'vendor/plugins'
 end
 ```
 
@@ -521,10 +522,10 @@ available:
 
 CSV formatter for SimpleCov code coverage tool for ruby 1.9+
 
-#### [simplecov-vim](https://github.com/nyarly/Simplecov-Vim)
+#### [cadre](https://github.com/nyarly/cadre)
 *by Judson Lester*
 
-A formatter for Simplecov that emits a Vim script to mark up code files with coverage information.
+Includes a formatter for Simplecov that emits a Vim script to mark up code files with coverage information.
 
 #### [simplecov-single_file_reporter](https://github.com/grosser/simplecov-single_file_reporter)
 *by [Michael Grosser](http://grosser.it)*
@@ -562,4 +563,4 @@ Thanks to Aaron Patterson for the original idea for this!
 
 ## Copyright
 
-Copyright (c) 2010-2012 Christoph Olszowka. See MIT-LICENSE for details.
+Copyright (c) 2010-2013 Christoph Olszowka. See MIT-LICENSE for details.

data/lib/simplecov.rb

@@ -116,7 +116,7 @@ module SimpleCov
 
       @usable = begin
         require 'coverage'
-        require 'simplecov/jruby16_fix'
+        require 'simplecov/jruby_fix'
         true
       rescue LoadError
         false

data/lib/simplecov/command_guesser.rb

@@ -48,6 +48,8 @@ module SimpleCov::CommandGuesser
         "RSpec"
       elsif defined?(Test::Unit)
         "Unit Tests"
+      elsif defined?(MiniTest)
+        "MiniTest"
       else
         # 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'."

data/lib/simplecov/defaults.rb

@@ -27,7 +27,6 @@ SimpleCov.profiles.define 'rails' do
   add_group 'Mailers', 'app/mailers'
   add_group 'Helpers', 'app/helpers'
   add_group 'Libraries', 'lib'
-  add_group 'Plugins', 'vendor/plugins'
 end
 
 # Default configuration
@@ -41,14 +40,15 @@ end
 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?
-    #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)
+
+  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
-    @exit_status = 0
+    # Store the exit status of the test run since it goes away after calling the at_exit proc...
+    @exit_status = SimpleCov::ExitCodes::SUCCESS
   end
 
   SimpleCov.at_exit.call
@@ -56,12 +56,12 @@ at_exit do
   if SimpleCov.result? # Result has been computed
     covered_percent = SimpleCov.result.covered_percent.round(2)
 
-    if @exit_status == 0 # No other errors
-      @exit_status = if covered_percent < SimpleCov.minimum_coverage
+    if @exit_status == SimpleCov::ExitCodes::SUCCESS # No other errors
+      if covered_percent < SimpleCov.minimum_coverage
         $stderr.puts "Coverage (%.2f%%) is below the expected minimum coverage (%.2f%%)." % \
                      [covered_percent, SimpleCov.minimum_coverage]
 
-        SimpleCov::ExitCodes::MINIMUM_COVERAGE
+        @exit_status = SimpleCov::ExitCodes::MINIMUM_COVERAGE
 
       elsif (last_run = SimpleCov::LastRun.read)
         diff = last_run['result']['covered_percent'] - covered_percent
@@ -69,18 +69,15 @@ at_exit do
           $stderr.puts "Coverage has dropped by %.2f%% since the last time (maximum allowed: %.2f%%)." % \
                        [diff, SimpleCov.maximum_coverage_drop]
 
-          SimpleCov::ExitCodes::MAXIMUM_COVERAGE_DROP
+          @exit_status = SimpleCov::ExitCodes::MAXIMUM_COVERAGE_DROP
         end
       end
     end
 
-    metrics = {
-      :result => { :covered_percent => covered_percent }
-    }
-    SimpleCov::LastRun.write(metrics)
+    SimpleCov::LastRun.write(:result => {:covered_percent => covered_percent})
   end
 
-  exit @exit_status if @exit_status # Force exit with stored status (see github issue #5)
+  exit @exit_status # Force exit with stored status (see github issue #5)
 end
 
 # Autoload config from ~/.simplecov if present

data/lib/simplecov/exit_codes.rb

@@ -1,4 +1,5 @@
 module SimpleCov::ExitCodes
+  SUCCESS = 0
   EXCEPTION = 1
   MINIMUM_COVERAGE = 2
   MAXIMUM_COVERAGE_DROP = 3

data/lib/simplecov/file_list.rb

@@ -39,6 +39,6 @@ class SimpleCov::FileList < Array
   # Computes the strength (hits / line) based upon lines covered and lines missed
   def covered_strength
     return 0 if empty? or lines_of_code == 0
-    map {|f| f.covered_strength }.inject(&:+).to_f / size
+    map {|f| f.covered_strength * f.lines_of_code }.inject(&:+) / lines_of_code
   end
 end

data/lib/simplecov/{jruby16_fix.rb → jruby_fix.rb}

@@ -16,6 +16,8 @@ if defined?(JRUBY_VERSION) && JRUBY_VERSION.to_f < 1.7
       def result
         fixed = {}
         __broken_result__.each do |path, executed_lines|
+          next unless File.file? path
+
           covered_lines = executed_lines.dup
 
           process = lambda do |node|
@@ -26,10 +28,7 @@ if defined?(JRUBY_VERSION) && JRUBY_VERSION.to_f < 1.7
             node.child_nodes.each(&process)
           end
 
-          begin
-            process[JRuby.parse(File.read(path), path)]
-          rescue => e
-          end
+          process[JRuby.parse(File.read(path), path)]
 
           if (first = covered_lines.detect { |x| x }) && first > 0
             fixed[File.expand_path(path)] = covered_lines

data/lib/simplecov/result.rb

@@ -1,4 +1,5 @@
 require 'digest/sha1'
+require 'forwardable'
 
 module SimpleCov
   #
@@ -6,6 +7,7 @@ module SimpleCov
   # library generates (Coverage.result).
   #
   class Result
+    extend Forwardable
     # Returns the original Coverage.result used for this instance of SimpleCov::Result
     attr_reader :original_result
     # Returns all files that are applicable to this result (sans filters!) as instances of SimpleCov::SourceFile. Aliased as :source_files
@@ -16,21 +18,16 @@ module SimpleCov
     # Explicitly set the command name that was used for this coverage result. Defaults to SimpleCov.command_name
     attr_writer :command_name
 
+    def_delegators :files, :covered_percent, :covered_strength, :covered_lines, :missed_lines
+    def_delegator :files, :lines_of_code, :total_lines
+
     # 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
-
-      # Squeeze filepaths (i.e. "/a/b/../c" becomes "/a/c")
-      @original_result.keys.each do |filename|
-        expanded_filename = File.expand_path filename
-        @original_result[expanded_filename] = @original_result.delete filename
-      end
-
-      @files = SimpleCov::FileList.new(@original_result.map do |filename, coverage|
+      @original_result = original_result.freeze
+      @files = SimpleCov::FileList.new(original_result.map do |filename, coverage|
         SimpleCov::SourceFile.new(filename, coverage) if File.file?(filename)
       end.compact.sort_by(&:filename))
-
       filter!
     end
 
@@ -44,56 +41,6 @@ module SimpleCov
       @groups ||= SimpleCov.grouped(files)
     end
 
-    # The overall percentual coverage for this result
-    def covered_percent
-      # Make sure that weird rounding error from #15, #23 and #24 does not occur again!
-      total_lines.zero? ? 0 : 100.0 * covered_lines / total_lines
-    end
-
-    # The multiple of coverage for this result
-    def covered_strength
-      return 0 if total_lines.zero?
-      return @covered_strength if @covered_strength
-      m = 0
-      @files.each do |file|
-        original_result[file.filename].each do |line_result|
-          if line_result
-            m += line_result
-          end
-        end
-      end
-      @covered_strength = m.to_f / total_lines
-    end
-
-    # Returns the count of lines that are covered
-    def covered_lines
-      return @covered_lines if defined? @covered_lines
-      @covered_lines = 0
-      @files.each do |file|
-        original_result[file.filename].each do |line_result|
-          @covered_lines += 1 if line_result and line_result > 0
-        end
-      end
-      @covered_lines
-    end
-
-    # Returns the count of missed lines
-    def missed_lines
-      return @missed_lines if defined? @missed_lines
-      @missed_lines = 0
-      @files.each do |file|
-        original_result[file.filename].each do |line_result|
-          @missed_lines += 1 if line_result == 0
-        end
-      end
-      @missed_lines
-    end
-
-    # Total count of relevant lines (covered + missed)
-    def total_lines
-      @total_lines ||= (covered_lines + missed_lines)
-    end
-
     # Applies the configured SimpleCov.formatter on this result
     def format!
       SimpleCov.formatter.new.format(self)

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.8.0.pre2"
+  VERSION = "0.8.1"
 end

data/simplecov.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'multi_json'
   gem.add_dependency 'lockfile', '>= 2.1.0'
-  gem.add_dependency 'simplecov-html', '~> 0.7.1'
+  gem.add_dependency 'simplecov-html', '~> 0.8.0'
   gem.add_dependency 'docile', '~> 1.1.0'
 
   gem.add_development_dependency 'appraisal', '~> 0.5.1'

data/test/test_file_list.rb

@@ -5,18 +5,17 @@ class TestFileList < Test::Unit::TestCase
     setup do
       original_result = {source_fixture('sample.rb') => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil],
           source_fixture('app/models/user.rb') => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil],
-          source_fixture('app/controllers/sample_controller.rb') => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil]}
+          source_fixture('app/controllers/sample_controller.rb') => [nil, 2, 2, 0, nil, nil, 0, nil, nil, nil]}
       @file_list = SimpleCov::Result.new(original_result).files
     end
 
-    should("have 13 covered_lines") { assert_equal 13, @file_list.covered_lines }
-    should("have 2 missed_lines")   { assert_equal 2, @file_list.missed_lines }
-    should("have 18 never_lines")   { assert_equal 18, @file_list.never_lines }
-    should("have 15 lines_of_code") { assert_equal 15, @file_list.lines_of_code }
+    should("have 11 covered_lines") { assert_equal 11, @file_list.covered_lines }
+    should("have 3 missed_lines")   { assert_equal 3, @file_list.missed_lines }
+    should("have 19 never_lines")   { assert_equal 19, @file_list.never_lines }
+    should("have 14 lines_of_code") { assert_equal 14, @file_list.lines_of_code }
     should("have 3 skipped_lines")  { assert_equal 3, @file_list.skipped_lines }
 
-    should "have correct covered_percent" do
-      assert_equal 100.0*13/15, @file_list.covered_percent
-    end
+    should("have correct covered_percent") { assert_equal 100.0*11/14, @file_list.covered_percent }
+    should("have correct covered_strength") { assert_equal 13.to_f/14, @file_list.covered_strength }
   end
 end if SimpleCov.usable?

data/test/test_result.rb

@@ -37,6 +37,12 @@ class TestResult < Test::Unit::TestCase
         assert_equal 100.0*13/15, @result.covered_percent
       end
 
+      [:covered_percent, :covered_strength, :covered_lines, :missed_lines, :total_lines].each do |msg|
+        should "respond to #{msg}" do
+          assert @result.respond_to? msg
+        end
+      end
+
       context "dumped with to_hash" do
         setup { @hash = @result.to_hash }
         should("be a hash") { assert_equal Hash, @hash.class }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre2
+  version: 0.8.1
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: docile
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ files:
 - lib/simplecov/formatter.rb
 - lib/simplecov/formatter/multi_formatter.rb
 - lib/simplecov/formatter/simple_formatter.rb
-- lib/simplecov/jruby16_fix.rb
+- lib/simplecov/jruby_fix.rb
 - lib/simplecov/json.rb
 - lib/simplecov/last_run.rb
 - lib/simplecov/merge_helpers.rb
@@ -256,9 +256,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3