simplecov 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aee53c6d098222de6eef7ecc86e2ffc355b664d
-  data.tar.gz: f9b347700bdd580ecc4edba7a24d67c4b8c9e003
+  metadata.gz: 27181f8ed46248f7ebe05af087db2c6943824f83
+  data.tar.gz: 1457804d5cbd433e7c5f7b99a9b2f62c9e1c0f76
 SHA512:
-  metadata.gz: 8cb3e1de8a12231765a66cc56f036bef7aa2856d0b29990fb0e2a440d7878876c91b193d059306221e5b3ef4863d95ed80df53775cdb3275f6a1c52ce25006c9
-  data.tar.gz: 3a7fd5ed285ff6804d60a7ec5c644d727a1772f4510cbc93e6f934a43628f8703854ebddf6f879924420898b1585cde55f38dea86a14ab82bd9065f06660880d
+  metadata.gz: 50f425070a5b073e7f2a26cb7dda9582cec71d9f4db4c3b50f0c13ecea000f26e6d3b6206d3978aed1ffabdc7f566b72279b1f050d648f0be4390d346787d820
+  data.tar.gz: 1ddc40490eb2c85454083fba35b1fb265f69093ba96ab2a4f5f5562d10c660564de374a656f9b8216ec30bdc11113bf20d8950845fdb315f60dd9fc0b70391cc

data/.rspec

@@ -0,0 +1 @@
+--require rspec/legacy_formatters

data/.travis.yml

@@ -1,27 +1,20 @@
-before_install:
-  - echo "yes" | gem uninstall json
-script:
-  - bundle
-  - rake appraisal:install
-  - rake appraisal
+language: ruby
+gemfile:
+  - gemfiles/multi_json_legacy.gemfile
+  - gemfiles/multi_json_new.gemfile
 rvm:
-  - ree
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - rbx-18mode
-  - rbx-19mode
-#  - jruby-18mode
-#  - jruby-19mode
-#  - jruby-head
+  - 2.1
   - ruby-head
+  - jruby
+  - rbx-2
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: jruby-19mode
-    - rvm: rbx-19mode
+    - rvm: jruby
+    - rvm: rbx-2
+  fast_finish: true
 notifications:
   email:
     on_success: always

data/Appraisals

@@ -5,4 +5,4 @@ end
 
 appraise "multi_json-legacy" do
   gem "multi_json", "~> 1.0.0"
-end
+end

data/CHANGELOG.md

@@ -1,15 +1,57 @@
-Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.8.2...master))
+Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.9.0...master))
 ====================
 
+## Enhancements
+
+
+## Bugfixes
+
+
+0.9.0, 2014-07-17 ([changes](https://github.com/colszowka/simplecov/compare/v0.8.2...v0.9.0))
+====================
+
+**A warm welcome and big thank you to the new contributors [@xaviershay](https://github.com/xaviershay), [@sferik](https://github.com/sferik) and especially [@bf4](https://github.com/bf4) for tackling a whole lot of issues and pull requests for this release!**
+
+## Enhancements
+
+  * New interface to specify multiple formatters.
+    See [#317](https://github.com/colszowka/simplecov/pull/317) (thanks @sferik)
+  * Document in the README how to exclude code from coverage reports,
+    and that the feature shouldn't be abused for skipping untested
+    private code.
+    See [#304](https://github.com/colszowka/simplecov/issues/304)
+  * Clarify Ruby version support.
+    See [#279](https://github.com/colszowka/simplecov/pull/279) (thanks @deivid-rodriguez)
+
+## Bugfixes
+
+  * Ensure calculations return Floats, not Fixnum or Rational. Fixes segfaults with mathn.
+    See [#245](https://github.com/colszowka/simplecov/pull/245) (thanks to @bf4)
+  * Using `Kernel.exit` instead of exit to avoid uncaught throw :IRB_EXIT when
+    exiting irb sessions.
+    See [#287](https://github.com/colszowka/simplecov/pull/287) (thanks @wless1)
+    See [#285](https://github.com/colszowka/simplecov/issues/285)
+  * Does not look for .simplecov in ~/ when $HOME is not set.
+    See [#311](https://github.com/colszowka/simplecov/pull/311) (thanks @lasseebert)
+  * Exit with code only if it's Numeric > 0.
+    See [#302](https://github.com/colszowka/simplecov/pull/303)(thanks @hajder)
+  * Make default filter case insensitive.
+    See [#280](https://github.com/colszowka/simplecov/pull/280) (thanks @ryanatball)
+  * Improve regexp that matches functional tests.
+    See [#276](https://github.com/colszowka/simplecov/pull/276) (thanks @sferik)
+  * Fix TravisCI [#272](https://github.com/colszowka/simplecov/pull/272) [#278](https://github.com/colszowka/simplecov/pull/278), [#302](https://github.com/colszowka/simplecov/pull/302)
+  * Fix global config load.
+    See [#311](https://github.com/colszowka/simplecov/pull/311) (thanks @lasseebert)
+
 v0.8.2, 2013-11-20 ([changes](https://github.com/colszowka/simplecov/compare/v0.8.1...v0.8.2))
 =====================
 
 ## Bugfixes
 
-  * Replaced the locking behaviour [via lockfile gem](https://github.com/colszowka/simplecov/pull/185) with 
-    plain Ruby explicit file locking when merging results. This should make simplecov merging to behave well 
-    on Windows again. 
-    See [#258](https://github.com/colszowka/simplecov/issues/258) and 
+  * Replaced the locking behaviour [via lockfile gem](https://github.com/colszowka/simplecov/pull/185) with
+    plain Ruby explicit file locking when merging results. This should make simplecov merging to behave well
+    on Windows again.
+    See [#258](https://github.com/colszowka/simplecov/issues/258) and
     [#223](https://github.com/colszowka/simplecov/pull/223) (thanks to @tomykaira)
 
 v0.8.1, 2013-11-10 ([changes](https://github.com/colszowka/simplecov/compare/v0.8.0...v0.8.1))
@@ -32,7 +74,7 @@ quite stable in most circumstances. This release brings various further stabilit
 (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 
+Ruby 1.9+, and will not try to detect or bail silently on older Ruby versions. An appropriate deprecation warning
 has been added.
 
 ## Features
@@ -41,11 +83,11 @@ has been added.
     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, 
+  * 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 
+    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
@@ -53,13 +95,13 @@ has been added.
   * 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 
+    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. 
+    deprecated, but remain available for now.
     See [#207](https://github.com/colszowka/simplecov/pull/207) (thanks to @mikerobe)
   * Tweaks to the automatic test suite naming. In particular, `rspec/features` should now
     be correctly attributed to RSpec, not Cucumber.
@@ -67,7 +109,7 @@ has been added.
   * 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 
+    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)
@@ -76,7 +118,7 @@ has been added.
   * 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 
+    See [#242](https://github.com/colszowka/simplecov/pull/242) and
     [#213](https://github.com/colszowka/simplecov/pull/213) (thanks to @sferik and @infertux)
 
 ## Bugfixes
@@ -84,13 +126,13 @@ has been added.
   * 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 
+    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 
+    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 
+    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))

data/Gemfile

@@ -2,11 +2,11 @@ source "https://rubygems.org"
 gemspec
 
 if 'Integration test (cucumber) suite is 1.9+ only'.respond_to? :encoding
-  gem 'aruba', '~> 0.5.1'
+  gem 'aruba', '~> 0.6'
   gem 'capybara', '~> 2.0'
   gem 'poltergeist', '~> 1.1.0'
-  gem 'phantomjs', '~> 1.8.1'
-  gem 'cucumber', '>= 1.1.0'
+  gem 'phantomjs', '~> 1.9'
+  gem 'cucumber', '~> 1.1'
 end
 
 # shoulda-matchers depends on rails >= 4, but that does not work with Ruby < 1.9. So, to allow CI builds on those versions,

data/README.md

@@ -1,6 +1,6 @@
-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)
+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)
 =========
-**Code coverage for Ruby 1.9**
+**Code coverage for Ruby**
 
   * [Source Code]
   * [API documentation]
@@ -9,7 +9,9 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
   * [Mailing List]
   * [Continuous Integration]
 
-[Coverage]: http://www.ruby-doc.org/stdlib-1.9.3/libdoc/coverage/rdoc/Coverage.html "API doc for Ruby 1.9's Coverage library"
+**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.7.1` or `~> 0.9.0` 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"
 [Configuration]: http://rubydoc.info/gems/simplecov/SimpleCov/Configuration "Configuration options API documentation"
@@ -23,7 +25,7 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
 
 [![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
+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
 and display those results, thus giving you a complete code coverage suite that can be set up with just a couple lines of
 code.
@@ -103,7 +105,7 @@ SimpleCov.start 'rails'
 
 ## Use it with any framework!
 
-Similarily to the usage with Test::Unit described above, the only thing you have to do is to add the simplecov
+Similarly to the usage with Test::Unit described above, the only thing you have to do is to add the simplecov
 config to the very top of your Cucumber/RSpec/whatever setup file.
 
 Add the setup code to the **top** of `features/support/env.rb` (for Cucumber) or `spec/spec_helper.rb` (for RSpec).
@@ -142,8 +144,8 @@ to use SimpleCov with them. Here's an overview of the known ones:
    <b>Spork</b>
  </td>
  <td>
-  Because of the how Spork works internally (using preforking) there used to be trouble when using SimpleCov
-  with it, but that apparently has been resolved with a specific configuration strategy. See
+  Because of how Spork works internally (using preforking) there used to be trouble when using SimpleCov
+  with it, but that has apparently been resolved with a specific configuration strategy. See
   <a href="https://github.com/colszowka/simplecov/issues/42#issuecomment-4440284">this</a> comment.
  </td>
  <td>
@@ -243,7 +245,7 @@ end
 ## Filters
 
 Filters can be used to remove selected files from your coverage data. By default, a filter is applied that removes all files
-OUTSIDE of your project's root directory - otherwise you'd end up with a billion of coverage reports for source files in the
+OUTSIDE of your project's root directory - otherwise you'd end up with billions of coverage reports for source files in the
 gems you are using.
 
 Of course you can define your own to remove things like configuration files, tests or whatever you don't need in your coverage
@@ -276,7 +278,7 @@ end
 
 Block filters receive a SimpleCov::SourceFile instance and expect your block to return either true (if the file is to be removed
 from the result) or false (if the result should be kept). Please check out the RDoc for SimpleCov::SourceFile to learn about the
-methods available to you. In the above example, the filter will remove all files that have less then 5 lines of code.
+methods available to you. In the above example, the filter will remove all files that have less than 5 lines of code.
 
 #### Custom filter class
 
@@ -294,6 +296,23 @@ Defining your own filters is pretty easy: Just inherit from SimpleCov::Filter an
 the filter, a true return value from this method will result in the removal of the given source_file. The filter_argument method
 is being set in the SimpleCov::Filter initialize method and thus is set to 5 in this example.
 
+#### Ignoring/skipping code
+
+You can exclude code from the coverage report by wrapping it in `# :nocov:`.
+
+```ruby
+# :nocov:
+def skip_this_method
+  never_reached
+end
+# :nocov:
+```
+
+The name of the token can be changed to your liking. [Learn more about the nocov feature.][nocov]
+[nocov]: https://github.com/colszowka/simplecov/blob/master/features/config_nocov_token.feature
+
+**Note:** You shouldn't have to use the nocov token to skip private methods that are being included in your coverage. If you appropriately test the public interface of your classes and objects you should automatically get full coverage of your private methods.
+
 ## Default root filter and coverage for things outside of it
 
 By default, SimpleCov filters everything outside of the `SimpleCov.root` directory. However, sometimes you may want
@@ -370,7 +389,7 @@ SimpleCov.command_name "test:integration"
 SimpleCov.command_name "features"
 ```
 
-Note that this has only to be invoked ONCE PER TEST SUITE, so even if you have 200 unit test files, specifying it in
+Note that this only has to be invoked ONCE PER TEST SUITE, so even if you have 200 unit test files, specifying it in
 some_test.rb is fair enough.
 
 [simplecov-html] prints the used test suites in the footer of the generated coverage report.
@@ -393,7 +412,7 @@ it doesn't do your test speed any harm and you're always equipped with the lates
 
 Because of this, SimpleCov has no explicit built-in mechanism to run coverage only on demand.
 
-However, you can still accomplish this very easily by introducing a ENV variable conditional into your SimpleCov setup block, like this:
+However, you can still accomplish this very easily by introducing an ENV variable conditional into your SimpleCov setup block, like this:
 
 ```ruby
 SimpleCov.start if ENV["COVERAGE"]
@@ -514,10 +533,10 @@ being an instance of SimpleCov::Result. Do whatever your wish with that!
 
 ## Using multiple formatters
 
-If you want to use multiple result formats, as of SimpleCov 0.7.0 you can use the built-in MultiFormatter:
+As for SimpleCov 0.9.0, you can specify multiple result formats:
 
 ```ruby
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
   SimpleCov::Formatter::CSVFormatter,
 ]
@@ -536,7 +555,7 @@ available:
 #### [simplecov-csv](https://github.com/fguillen/simplecov-csv)
 *by Fernando Guillen*
 
-CSV formatter for SimpleCov code coverage tool for ruby 1.9+
+CSV formatter for SimpleCov
 
 #### [cadre](https://github.com/nyarly/cadre)
 *by Judson Lester*
@@ -567,7 +586,11 @@ including Rubinius and JRuby, in [Continuous Integration], but this happens only
 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.
+SimpleCov is built in [Continuous Integration] on 1.9.3, 2.0.0, 2.1.0 and ruby-head.
+
+## Want to find dead code in production?
+
+Try [coverband](https://github.com/danmayer/coverband).
 
 ## Contributing
 

data/features/config_formatters.feature

@@ -50,3 +50,28 @@ Feature:
     When I successfully run `bundle exec rake test`
     Then the output should contain "lib/faked_project/meta_magic.rb (coverage: 100.0%)"
     And the output should match /Formatter [^\s]* failed with RuntimeError: Unable to format/
+
+  Scenario: With multiple formatters
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.formatters = [
+        SimpleCov::Formatter::SimpleFormatter,
+        Class.new do
+          def format(result)
+            raise "Unable to format"
+          end
+        end
+      ]
+
+      SimpleCov.at_exit do
+        puts SimpleCov.result.format!.join
+      end
+      SimpleCov.start do
+        add_group 'Libs', 'lib/faked_project/'
+      end
+      """
+
+    When I successfully run `bundle exec rake test`
+    Then the output should contain "lib/faked_project/meta_magic.rb (coverage: 100.0%)"
+    And the output should match /Formatter [^\s]* failed with RuntimeError: Unable to format/

data/features/rspec_basic.feature

@@ -14,7 +14,7 @@ Feature:
     When I open the coverage report generated with `bundle exec rspec spec`
     Then I should see the groups:
       | name      | coverage | files |
-      | All Files | 90.74%   | 6     |
+      | All Files | 91.23%   | 6     |
 
     And I should see the source files:
       | name                                    | coverage |

data/features/rspec_groups_using_filter_class.feature

@@ -24,7 +24,7 @@ Feature: Grouping on RSpec using a custom filter class
     When I open the coverage report generated with `bundle exec rspec spec`
     Then I should see the groups:
       | name             | coverage | files |
-      | All Files        | 90.74%   | 6     |
+      | All Files        | 91.23%   | 6     |
       | By filter class  | 78.26%   | 2     |
       | By string        | 100.0%   | 1     |
       | Ungrouped        | 100.0%   | 3     |

data/features/step_definitions/html_steps.rb

@@ -13,18 +13,18 @@ World(GroupHelpers)
 Then /^I should see the groups:$/ do |table|
   expected_groups = table.hashes
   # Given group names should be the same number than those rendered in report
-  expected_groups.count.should == available_groups.count
+  expect(expected_groups.count).to eq(available_groups.count)
 
   # Verify each of the expected groups has a file list container and corresponding title and coverage number
   # as well as the correct number of links to files.
   expected_groups.each do |group|
     with_scope "#content ##{group["name"].gsub(/[^a-z]/i, '')}.file_list_container" do
       file_count_in_group = page.all('a.src_link').count
-      file_count_in_group.should == group["files"].to_i
+      expect(file_count_in_group).to eq(group["files"].to_i)
 
       with_scope "h2" do
-        page.should have_content(group["name"])
-        page.should have_content(group["coverage"])
+        expect(page).to have_content(group["name"])
+        expect(page).to have_content(group["coverage"])
       end
     end
   end
@@ -32,14 +32,14 @@ end
 
 Then /^I should see the source files:$/ do |table|
   expected_files = table.hashes
-  expected_files.length.should == available_source_files.count
+  expect(expected_files.length).to eq(available_source_files.count)
 
   # Find all filenames and their coverage present in coverage report
   files = available_source_files.map {|f| {"name" => f.find('h3').text, "coverage" => f.find('h4 > span').text} }
 
-  files.sort_by {|hsh| hsh["name"] }.should == expected_files.sort_by {|hsh| hsh["name"] }
+  expect(files.sort_by {|hsh| hsh["name"] }).to eq(expected_files.sort_by {|hsh| hsh["name"] })
 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
+  expect(all(".source_table ol li.skipped").count).to eq(expected_count.to_i)
 end

data/features/step_definitions/web_steps.rb

@@ -31,27 +31,27 @@ end
 
 Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
   with_scope(selector) do
-    page.should have_content(text)
+    expect(page).to have_content(text)
   end
 end
 
 Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
   regexp = Regexp.new(regexp)
   with_scope(selector) do
-    page.should have_xpath('//*', :text => regexp)
+    expect(page).to have_xpath('//*', :text => regexp)
   end
 end
 
 Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
   with_scope(selector) do
-    page.should have_no_content(text)
+    expect(page).to have_no_content(text)
   end
 end
 
 Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
   regexp = Regexp.new(regexp)
   with_scope(selector) do
-    page.should have_no_xpath('//*', :text => regexp)
+    expect(page).to have_no_xpath('//*', :text => regexp)
   end
 end
 

data/gemfiles/multi_json_legacy.gemfile

@@ -2,12 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "aruba", "~> 0.5.1"
+gem "aruba", "~> 0.6"
 gem "capybara", "~> 2.0"
 gem "poltergeist", "~> 1.1.0"
-gem "phantomjs", "~> 1.8.1"
-gem "cucumber", ">= 1.1.0"
+gem "phantomjs", "~> 1.9"
+gem "cucumber", "~> 1.1"
 gem "activesupport", "~> 3.2.0"
 gem "multi_json", "~> 1.0.0"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/multi_json_new.gemfile

@@ -2,12 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "aruba", "~> 0.5.1"
+gem "aruba", "~> 0.6"
 gem "capybara", "~> 2.0"
 gem "poltergeist", "~> 1.1.0"
-gem "phantomjs", "~> 1.8.1"
-gem "cucumber", ">= 1.1.0"
+gem "phantomjs", "~> 1.9"
+gem "cucumber", "~> 1.1"
 gem "activesupport", "~> 3.2.0"
 gem "multi_json", ">= 1.3.4"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/lib/simplecov/command_guesser.rb

@@ -9,11 +9,11 @@ module SimpleCov::CommandGuesser
     # between rails unit/functional/integration tests impossible without this cached
     # item.
     attr_accessor :original_run_command
-    
+
     def guess
       from_env || from_command_line_options || from_defined_constants
     end
-    
+
     private
 
     def from_env
@@ -24,10 +24,10 @@ module SimpleCov::CommandGuesser
         "(#{number}/#{ENV['PARALLEL_TEST_GROUPS']})"
       end
     end
-    
+
     def from_command_line_options
       case original_run_command
-        when /test\/functional\//, /test\/{.*?functional.*?}\//
+        when /test\/functional\//, /test\/\{.*functional.*\}\//
           "Functional Tests"
         when /test\/integration\//
           "Integration Tests"
@@ -41,7 +41,7 @@ module SimpleCov::CommandGuesser
           nil
       end
     end
-  
+
     def from_defined_constants
       # If the command regexps fail, let's try checking defined constants.
       if defined?(RSpec)

data/lib/simplecov/configuration.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'docile'
+require 'simplecov/formatter/multi_formatter'
 #
 # Bundles the configuration options used for SimpleCov. All methods
 # defined here are usable from SimpleCov directly. Please check out
@@ -74,6 +75,24 @@ module SimpleCov::Configuration
     @formatter
   end
 
+  #
+  # Sets the configured formatters.
+  #
+  def formatters=(formatters)
+    @formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
+  end
+
+  #
+  # Gets the configured formatters.
+  #
+  def formatters
+    if @formatter.is_a?(SimpleCov::Formatter::MultiFormatter)
+      @formatter.formatters
+    else
+      Array(formatter)
+    end
+  end
+
   #
   # 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

data/lib/simplecov/defaults.rb

@@ -4,7 +4,7 @@ require 'simplecov-html'
 SimpleCov.profiles.define 'root_filter' do
   # Exclude all files outside of simplecov root
   add_filter do |src|
-    !(src.filename =~ /^#{Regexp.escape(SimpleCov.root)}/)
+    !(src.filename =~ /^#{Regexp.escape(SimpleCov.root)}/i)
   end
 end
 
@@ -77,12 +77,18 @@ at_exit do
     SimpleCov::LastRun.write(:result => {:covered_percent => covered_percent})
   end
 
-  exit @exit_status # Force exit with stored status (see github issue #5)
+  # Force exit with stored status (see github issue #5)
+  # unless it's nil or 0 (see github issue #281)
+  Kernel.exit @exit_status if @exit_status && @exit_status > 0
 end
 
 # Autoload config from ~/.simplecov if present
-global_config_path = File.join(File.expand_path("~"), '.simplecov')
-load global_config_path if File.exist?(global_config_path)
+require 'etc'
+home_dir = Dir.home || Etc.getpwuid.dir || (user = ENV["USER"] && Dir.home(user))
+if home_dir
+  global_config_path = File.join(home_dir, '.simplecov')
+  load global_config_path if File.exist?(global_config_path)
+end
 
 # Autoload config from .simplecov if present
 config_path = File.join(SimpleCov.root, '.simplecov')

data/lib/simplecov/file_list.rb

@@ -31,14 +31,16 @@ class SimpleCov::FileList < Array
   end
 
   # Computes the coverage based upon lines covered and lines missed
+  # @return [Float]
   def covered_percent
     return 100.0 if empty? or lines_of_code == 0
-    covered_lines * 100.0 / lines_of_code
+    Float(covered_lines * 100.0 / lines_of_code)
   end
 
   # Computes the strength (hits / line) based upon lines covered and lines missed
+  # @return [Float]
   def covered_strength
-    return 0 if empty? or lines_of_code == 0
-    map {|f| f.covered_strength * f.lines_of_code }.inject(&:+) / lines_of_code
+    return 0.0 if empty? or lines_of_code == 0
+    Float(map {|f| f.covered_strength * f.lines_of_code }.inject(&:+) / lines_of_code)
   end
 end

data/lib/simplecov/formatter/multi_formatter.rb

@@ -1,25 +1,28 @@
-class SimpleCov::Formatter::MultiFormatter
-  def self.[](*args)
-    Class.new(self) do
-      define_method :formatters do
-        @formatters ||= args
+module SimpleCov
+  module Formatter
+    class MultiFormatter
+      def self.[](*args)
+        Class.new(self) do
+          define_method :formatters do
+            @formatters ||= args
+          end
+        end
       end
-    end
-  end
 
-  def format(result)
-    formatters.map do |formatter|
-      begin
-        formatter.new.format(result)
-      rescue => e
-        STDERR.puts("Formatter #{formatter} failed with #{e.class}: #{e.message} (#{e.backtrace.first})")
-        nil
+      def format(result)
+        formatters.map do |formatter|
+          begin
+            formatter.new.format(result)
+          rescue => e
+            STDERR.puts("Formatter #{formatter} failed with #{e.class}: #{e.message} (#{e.backtrace.first})")
+            nil
+          end
+        end
       end
-    end
-  end
 
-  def formatters
-    @formatters ||= []
+      def formatters
+        @formatters ||= []
+      end
+    end
   end
-
 end

data/lib/simplecov/formatter/simple_formatter.rb

@@ -1,19 +1,23 @@
 #
 # A ridiculously simple formatter for SimpleCov results.
 #
-class SimpleCov::Formatter::SimpleFormatter
-  # Takes a SimpleCov::Result and generates a string out of it
-  def format(result)
-    output = ""
-    result.groups.each do |name, files|
-      output << "Group: #{name}\n"
-      output << "="*40
-      output << "\n"
-      files.each do |file|
-        output << "#{file.filename} (coverage: #{file.covered_percent.round(2)}%)\n"
+module SimpleCov
+  module Formatter
+    class SimpleFormatter
+      # Takes a SimpleCov::Result and generates a string out of it
+      def format(result)
+        output = ""
+        result.groups.each do |name, files|
+          output << "Group: #{name}\n"
+          output << "="*40
+          output << "\n"
+          files.each do |file|
+            output << "#{file.filename} (coverage: #{file.covered_percent.round(2)}%)\n"
+          end
+          output << "\n"
+        end
+        output
       end
-      output << "\n"
     end
-    output
   end
 end

data/lib/simplecov/result_merger.rb

@@ -10,6 +10,10 @@ module SimpleCov::ResultMerger
       File.join(SimpleCov.coverage_path, '.resultset.json')
     end
 
+    def resultset_writelock
+      File.join(SimpleCov.coverage_path, '.resultset.json.lock')
+    end
+
     # Loads the cached resultset from YAML and returns it as a Hash
     def resultset
       if stored_data
@@ -66,12 +70,14 @@ module SimpleCov::ResultMerger
 
     # Saves the given SimpleCov::Result in the resultset cache
     def store_result(result)
-      new_set = resultset
-      command_name, data = result.to_hash.first
-      new_set[command_name] = data
-      File.open(resultset_path, "w+") do |f|
+      File.open(resultset_writelock, "w+") do |f|
         f.flock(File::LOCK_EX)
-        f.puts SimpleCov::JSON.dump(new_set)
+        new_set = resultset
+        command_name, data = result.to_hash.first
+        new_set[command_name] = data
+        File.open(resultset_path, "w+") do |f_|
+          f_.puts SimpleCov::JSON.dump(new_set)
+        end
       end
       true
     end

data/lib/simplecov/source_file.rb

@@ -111,24 +111,24 @@ module SimpleCov
       return 100.0 if lines.length == 0 or lines.length == never_lines.count
       relevant_lines = lines.count - never_lines.count - skipped_lines.count
       if relevant_lines == 0
-        0
+        0.0
       else
-        (covered_lines.count) * 100.0 / relevant_lines.to_f
+        Float((covered_lines.count) * 100.0 / relevant_lines.to_f)
       end
     end
 
     def covered_strength
-      return 0 if lines.length == 0 or lines.length == never_lines.count
+      return 0.0 if lines.length == 0 or lines.length == never_lines.count
 
       lines_strength = 0
       lines.each do |c|
         lines_strength += c.coverage if c.coverage
       end
 
-      effective_lines_count = (lines.count - never_lines.count - skipped_lines.count).to_f
+      effective_lines_count = Float(lines.count - never_lines.count - skipped_lines.count)
 
       if effective_lines_count == 0
-        0
+        0.0
       else
         strength = lines_strength / effective_lines_count
         round_float(strength, 1)
@@ -178,9 +178,10 @@ module SimpleCov
     private
 
     # ruby 1.9 could use Float#round(places) instead
+    # @return [Float]
     def round_float(float, places)
-      factor = (10 * places).to_f
-      (float * factor).round / factor
+      factor = Float(10 * places)
+      Float((float * factor).round / factor)
     end
   end
 end

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.8.2"
-end
+  VERSION = "0.9.0"
+end

data/simplecov.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'simplecov-html', '~> 0.8.0'
   gem.add_dependency 'docile', '~> 1.1.0'
 
-  gem.add_development_dependency 'appraisal', '~> 0.5.1'
-  gem.add_development_dependency 'rake', '~> 10.0.3'
-  gem.add_development_dependency 'rspec', '~> 2.13.0'
-  gem.add_development_dependency 'shoulda', '~> 3.4.0'
+  gem.add_development_dependency 'appraisal', '~> 1.0'
+  gem.add_development_dependency 'rake', '~> 10.3'
+  gem.add_development_dependency 'rspec', '~> 3.0'
+  gem.add_development_dependency 'rspec-legacy_formatters', '~> 1.0'
+  gem.add_development_dependency 'shoulda', '~> 3.5'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/faked_project/features/step_definitions/my_steps.rb

@@ -1,23 +1,23 @@
 Given /^I want to keep stuff simple$/ do
-  1.should == 1
+  expect(1).to eq(1)
 end
 
 When /^I write my cukes for the fake project$/ do
-  1.should == 1
+  expect(1).to eq(1)
 end
 
 Then /^I make all neccessary tests in a single step$/ do
-  FakedProject.foo.should == 'bar'
+  expect(FakedProject.foo).to eq('bar')
 
-  FrameworkSpecific.cucumber.should == "Only tested in Cucumber"
+  expect(FrameworkSpecific.cucumber).to eq("Only tested in Cucumber")
 
-  FakedProject.a_class_method.should == "this is a mixed-in class method"
+  expect(FakedProject.a_class_method).to eq("this is a mixed-in class method")
 
-  FakedProject.new.an_instance_method.should == "this is a mixed-in instance method"
-  FakedProject.new.dynamic.should == "A dynamically defined instance method"
+  expect(FakedProject.new.an_instance_method).to eq("this is a mixed-in instance method")
+  expect(FakedProject.new.dynamic).to eq("A dynamically defined instance method")
 
   something = SomeClass.new("foo")
-  something.reverse.should == 'oof'
-  something.compare_with('foo').should be_true
+  expect(something.reverse).to eq('oof')
+  expect(something.compare_with('foo')).to be true
 end
 

data/test/faked_project/spec/faked_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe FakedProject do
   it "should return proper foo" do
-    FakedProject.foo.should == 'bar'
+    expect(FakedProject.foo).to eq('bar')
   end
 
   it "should test it's framework specific method" do
-    FrameworkSpecific.rspec.should == "Only tested in RSpec"
+    expect(FrameworkSpecific.rspec).to eq("Only tested in RSpec")
   end
 end

data/test/faked_project/spec/meta_magic_spec.rb

@@ -2,9 +2,14 @@ require 'spec_helper'
 
 describe FakedProject do
   it "should have added a class method to FakedProject" do
-    FakedProject.a_class_method.should == "this is a mixed-in class method"
+    expect(FakedProject.a_class_method).to eq("this is a mixed-in class method")
   end
 
-  its(:an_instance_method) { should == "this is a mixed-in instance method" }
-  its(:dynamic) { should == "A dynamically defined instance method" }
+  it "should have added a mixed-in instance method to FakedProject" do
+    expect(subject.an_instance_method).to eq("this is a mixed-in instance method")
+  end
+
+  it "should have added a dyntamically-defined instance method to FakedProject" do
+    expect(subject.dynamic).to eq("A dynamically defined instance method")
+  end
 end

data/test/faked_project/spec/some_class_spec.rb

@@ -3,8 +3,11 @@ require 'spec_helper'
 describe SomeClass do
   subject { SomeClass.new("foo") }
 
-  its(:reverse) { should == 'oof' }
+  it "should be reversible" do
+    expect(subject.reverse).to eq('oof')
+  end
+
   it "should compare with 'foo'" do
-    subject.compare_with('foo').should be_true
+    expect(subject.compare_with('foo')).to be true
   end
 end

data/test/fixtures/frameworks/rspec_bad.rb

@@ -4,6 +4,6 @@ require 'rspec'
 SimpleCov.start
 describe 'exit status' do
   it "should exit with a non-zero exit status when assertion fails" do
-    1.should == 2
+    expect(1).to eq(2)
   end
 end

data/test/fixtures/frameworks/rspec_good.rb

@@ -4,6 +4,6 @@ require 'rspec'
 SimpleCov.start
 describe 'exit status' do
   it "should exit with a zero exit status when assertion fails" do
-    1.should == 1
+    expect(1).to eq(1)
   end
 end

metadata

@@ -1,113 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-html
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: docile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-legacy_formatters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.5'
 description: Code coverage for Ruby 1.9+ with a powerful configuration library and
   automatic merging of coverage across test suites
 email:
@@ -116,9 +130,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -237,17 +252,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Code coverage for Ruby 1.9+ with a powerful configuration library and automatic