simplecov 0.6.4 → 0.7.0

data/.gitignore

@@ -1,5 +1,6 @@
 .bundle
 Gemfile.lock
+gemfiles/*.lock
 
 ## MAC OS
 .DS_Store

data/.travis.yml

@@ -1,3 +1,5 @@
+before_install:
+  - echo "yes" | gem uninstall json
 script:
   - bundle
   - rake appraisal:install
@@ -6,10 +8,14 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - ruby-head
   - ree
-  - rbx
-  - jruby
+  - rbx-18mode
+  - jruby-18mode
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 notifications:
   email:
     on_success: always
-    on_failure: always
+    on_failure: always

data/.yardopts

@@ -0,0 +1 @@
+- **/*.md

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.7.0...master))
+-------------------
+
+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
+    any coverage drops between test runs.
+    See https://github.com/colszowka/simplecov/pull/151, https://github.com/colszowka/simplecov/issues/11,
+    https://github.com/colszowka/simplecov/issues/90, and https://github.com/colszowka/simplecov/issues/96 (thanks to @infertux)
+  * [FEATURE] SimpleCov now ships with a built-in MultiFormatter which allows the easy usage of multiple result formatters at
+    the same time without the need to write custom wrapper code.
+    See https://github.com/colszowka/simplecov/pull/158 (thanks to @nikitug)
+  * [BUGFIX] The usage of digits, hyphens and underscores in group names could lead to broken tab navigation
+    in the default simplecov-html reports. See https://github.com/colszowka/simplecov-html/pull/14 (thanks to @ebelgarts)
+  * [REFACTORING] A few more ruby warnings removed. See https://github.com/colszowka/simplecov/issues/106 and
+    https://github.com/colszowka/simplecov/pull/139. (thanks to @lukejahnke)
+  * A [Pledgie button](https://github.com/colszowka/simplecov/commit/63cfa99f8658fa5cc66a38c83b3195fdf71b9e93) for those that
+    feel generous :)
+  * 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))
 -------------------
 

data/CONTRIBUTING.md

@@ -0,0 +1,20 @@
+# Making Contributions
+
+To fetch & test the library for development, do:
+
+    $ git clone https://github.com/colszowka/simplecov.git
+    $ cd simplecov
+    $ bundle
+    $ rake appraisal:install
+    $ rake appraisal
+
+For more information on the appraisal gem (for testing against multiple gem dependency versions), please see
+https://github.com/thoughtbot/appraisal/
+
+If you want to contribute, please:
+
+  * Fork the project.
+  * Make your feature addition or bug fix.
+  * 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.

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 coverage for Ruby 1.9*
+**Code coverage for Ruby 1.9**
 
   * [Source Code]
   * [API documentation]
@@ -8,7 +8,7 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
   * [Rubygem]
   * [Continuous Integration]
 
-[Coverage]: http://www.ruby-doc.org/ruby-1.9/classes/Coverage.html "API doc for Ruby 1.9's Coverage library"
+[Coverage]: http://www.ruby-doc.org/stdlib-1.9.3/libdoc/coverage/rdoc/Coverage.html "API doc for Ruby 1.9'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"
@@ -17,7 +17,9 @@ 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"
+[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]
 
 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
@@ -48,8 +50,20 @@ Getting started
 
         # Previous content of test helper now starts here
 
-      **Note:** If SimpleCov starts after your application code is already loaded (via `require`), it won't be able to track your files and their coverage!
-      The `SimpleCov.start` **must** be issued **before any of your application code is required!**
+      **Note:** If SimpleCov starts after your application code is already loaded (via `require`), it won't be able to
+      track your files and their coverage! The `SimpleCov.start` **must** be issued **before any of your application code
+      is required!**
+
+      SimpleCov must be running in the process that you want the code coverage analysis to happen on. When testing a server
+      process (i.e. a JSON API endpoint) via a separate test process (i.e. when using Selenium) where you want to see all
+      code executed by the `rails server`, and not just code executed in your actual test files, you'll want to add something
+      like this to the top of `script/rails`:
+
+        if ENV['RAILS_ENV'] == 'test'
+          require 'simplecov'
+          SimpleCov.start 'rails'
+          puts "required simplecov"
+        end
 
 3. Run your tests, open up `coverage/index.html` in your browser and check out what you've missed so far.
 
@@ -148,6 +162,18 @@ to use SimpleCov with them. Here's an overview of the known ones:
   <a href="https://github.com/colszowka/simplecov/issues/80">SimpleCov #80</a>
  </td>
 </tr>
+<tr>
+ <td>
+   <b>RubyMine</b>
+ </td>
+ <td>
+  The <a href="https://www.jetbrains.com/ruby/">RubyMine IDE</a> has built-in support for SimpleCov's coverage reports,
+  though you might need to explicitly set the output root using `SimpleCov.root('foo/bar/baz')`
+ </td>
+ <td>
+  <a href="https://github.com/colszowka/simplecov/issues/95">SimpleCov #95</a>
+ </td>
+</tr>
 </table>
 
 ## Configuring SimpleCov
@@ -264,7 +290,7 @@ Add your groups with:
 
 Normally, you want to have your coverage analyzed across ALL of your test suites, right?
 
-Simplecov automatically caches coverage results in your (coverage_path)/resultset.yml. Those results will then
+Simplecov automatically caches coverage results in your (coverage_path)/.resultset.json. Those results will then
 be automatically merged when generating the result, so when coverage is set up properly for cucumber and your
 unit / functional / integration tests, all of those test suites will be taken into account when building the
 coverage report.
@@ -391,6 +417,23 @@ You can define what simplecov should do when your test suite finishes by customi
 
 Above is the default behaviour. Do whatever you like instead!
 
+### Minimum coverage
+
+You can define the minimum coverage percentage expected. SimpleCov will return non-zero if unmet.
+
+    SimpleCov.minimum_coverage 90
+
+### Maximum coverage drop
+
+You can define the maximum coverage drop percentage at once. SimpleCov will return non-zero if exceeded.
+
+    SimpleCov.maximum_coverage_drop 5
+
+### Refuse dropping coverage
+
+You can also entirely refuse dropping coverage between test runs:
+
+    SimpleCov.refuse_coverage_drop
 
 ## Using your own formatter
 
@@ -404,18 +447,12 @@ being an instance of SimpleCov::Result. Do whatever your wish with that!
 
 ## Using multiple formatters
 
-There is currently no built-in support for this, but you could help yourself with a wrapper class:
-
-    class SimpleCov::Formatter::MergedFormatter
-      def format(result)
-         SimpleCov::Formatter::HTMLFormatter.new.format(result)
-         SimpleCov::Formatter::CSVFormatter.new.format(result)
-      end
-    end
-
-Then configure the formatter to use the new merger:
+If you want to use multiple result formats, as of SimpleCov 0.7.0 you can use the built-in MultiFormatter:
 
-    SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCov::Formatter::CSVFormatter,
+    ]
 
 ## Available formatters
 
@@ -432,7 +469,10 @@ available:
 
 CSV formatter for SimpleCov code coverage tool for ruby 1.9+
 
+#### [simplecov-vim](https://github.com/nyarly/Simplecov-Vim)
+*by Judson Lester*
 
+A formatter for Simplecov that emits a Vim script to mark up code files with coverage information.
 
 ## Ruby version compatibility
 
@@ -445,27 +485,9 @@ interpreters add the coverage library.
 
 SimpleCov is built in [Continuous Integration] on 1.8.7, ree, 1.9.2, 1.9.3.
 
+## Contributing
 
-
-## Contributions
-
-To fetch & test the library for development, do:
-
-    $ git clone https://github.com/colszowka/simplecov.git
-    $ cd simplecov
-    $ bundle
-    $ rake appraisal:install
-    $ rake appraisal
-
-For more information on the appraisal gem (for testing against multiple gem dependency versions), please see
-https://github.com/thoughtbot/appraisal/
-
-If you want to contribute, please:
-
-  * Fork the project.
-  * Make your feature addition or bug fix.
-  * Add tests for it. This is important so I don't break it in a future version unintentionally.
-  * Send me a pull request on Github.
+See the [contributing guide](https://github.com/colszowka/simplecov/blob/master/CONTRIBUTING.md).
 
 ## Kudos
 

data/features/config_formatters.feature

@@ -0,0 +1,52 @@
+@test_unit @config
+Feature:
+
+  The formatter for test coverage can be customized
+  with the SimpleCov.formatter setting. There are two
+  built-in formatters:
+    SimpleCov::Formatter::SimpleFormatter is a simple
+    formatter returning a string of all files with
+    theirs coverages.
+    SimpleCov::Formatter::MultiFormatter is a formatter
+    used to call multiple formatters at once.
+
+  Scenario: With SimpleFormatter
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter
+      SimpleCov.at_exit do
+        puts SimpleCov.result.format!
+      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%)"
+
+  Scenario: With MultiFormatter
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+        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/maximum_coverage_drop.feature

@@ -0,0 +1,36 @@
+@test_unit @config
+Feature:
+
+  Exit code should be non-zero if the overall coverage decreases by more than
+  the maximum_coverage_drop threshold.
+
+  Scenario:
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.start do
+        add_filter 'test.rb'
+        maximum_coverage_drop 3.14
+      end
+      """
+
+    When I run `bundle exec rake test`
+    Then the exit status should be 0
+    And a file named "coverage/.last_run.json" should exist
+
+    Given a file named "lib/faked_project/missed.rb" with:
+      """
+      class UncoveredSourceCode
+        def foo
+          never_reached
+        rescue => err
+          but no one cares about invalid ruby here
+        end
+      end
+      """
+
+    When I run `bundle exec rake test`
+    Then the exit status should not be 0
+    And the output should contain "Coverage has dropped by 3.32% since the last time (maximum allowed: 3.14%)."
+    And a file named "coverage/.last_run.json" should exist
+

data/features/merging_test_unit_and_rspec.feature

@@ -34,7 +34,7 @@ Feature:
 
     And I should see the groups:
       | name      | coverage | files |
-      | All Files | 90.48%    | 4     |
+      | All Files | 90.48%   | 4     |
 
     And I should see the source files:
       | name                                    | coverage |

data/features/minimum_coverage.feature

@@ -0,0 +1,59 @@
+@test_unit @config
+Feature:
+
+  Exit code should be non-zero if the overall coverage is below the
+  minimum_coverage threshold.
+
+  Scenario:
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.start do
+        add_filter 'test.rb'
+        minimum_coverage 90
+      end
+      """
+
+    When I run `bundle exec rake test`
+    Then the exit status should not be 0
+    And the output should contain "Coverage (88.10%) is below the expected minimum coverage (90.00%)."
+
+  Scenario:
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.start do
+        add_filter 'test.rb'
+        minimum_coverage 88.11
+      end
+      """
+
+    When I run `bundle exec rake test`
+    Then the exit status should not be 0
+    And the output should contain "Coverage (88.10%) is below the expected minimum coverage (88.11%)."
+
+  Scenario:
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.start do
+        add_filter 'test.rb'
+        minimum_coverage 88.10
+      end
+      """
+
+    When I run `bundle exec rake test`
+    Then the exit status should be 0
+
+  Scenario:
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.start do
+        add_filter 'test.rb'
+      end
+      """
+
+    When I run `bundle exec rake test`
+    Then the exit status should be 0
+

data/features/refuse_coverage_drop.feature

@@ -0,0 +1,35 @@
+@test_unit @config
+Feature:
+
+  Exit code should be non-zero if the overall coverage decreases.
+
+  Scenario:
+    Given SimpleCov for Test/Unit is configured with:
+      """
+      require 'simplecov'
+      SimpleCov.start do
+        add_filter 'test.rb'
+        refuse_coverage_drop
+      end
+      """
+
+    When I run `bundle exec rake test`
+    Then the exit status should be 0
+    And a file named "coverage/.last_run.json" should exist
+
+    Given a file named "lib/faked_project/missed.rb" with:
+      """
+      class UncoveredSourceCode
+        def foo
+          never_reached
+        rescue => err
+          but no one cares about invalid ruby here
+        end
+      end
+      """
+
+    When I run `bundle exec rake test`
+    Then the exit status should not be 0
+    And the output should contain "Coverage has dropped by 3.32% since the last time (maximum allowed: 0.00%)."
+    And a file named "coverage/.last_run.json" should exist
+

data/lib/simplecov.rb

@@ -54,6 +54,14 @@ module SimpleCov
       self.running = false
     end
 
+    #
+    # Returns nil if the result has not been computed
+    # Otherwise, returns the result
+    #
+    def result?
+      defined? @result and @result
+    end
+
     #
     # Applies the configured filters to the given array of SimpleCov::SourceFile items
     #
@@ -105,12 +113,15 @@ end
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__)))
 require 'simplecov/configuration'
 SimpleCov.send :extend, SimpleCov::Configuration
+require 'simplecov/exit_codes'
+require 'simplecov/json'
 require 'simplecov/adapters'
 require 'simplecov/source_file'
 require 'simplecov/file_list'
 require 'simplecov/result'
 require 'simplecov/filter'
 require 'simplecov/formatter'
+require 'simplecov/last_run'
 require 'simplecov/merge_helpers'
 require 'simplecov/result_merger'
 require 'simplecov/command_guesser'

data/lib/simplecov/configuration.rb

@@ -60,7 +60,7 @@ module SimpleCov::Configuration
     @name ||= SimpleCov::CommandGuesser.guess
     @name
   end
-  
+
   #
   # Gets or sets the configured formatter.
   #
@@ -108,7 +108,7 @@ module SimpleCov::Configuration
   #   add_filter 'foobar'
   # end
   #
-  # This is equivalent to SimpleCov.add_filter 'foobar' and thus makes it easier to set a buchn of configure
+  # This is equivalent to SimpleCov.add_filter 'foobar' and thus makes it easier to set a bunch of configure
   # options at once.
   #
   def configure(&block)
@@ -138,7 +138,7 @@ module SimpleCov::Configuration
   # the SimpleCov.root is this.
   #
   def project_name(new_name=nil)
-    return @project_name if @project_name and new_name.nil?
+    return @project_name if defined? @project_name and @project_name and new_name.nil?
     @project_name = new_name if new_name.kind_of?(String)
     @project_name ||= File.basename(root.split('/').last).capitalize.gsub('_', ' ')
   end
@@ -148,8 +148,8 @@ module SimpleCov::Configuration
   # are joined and combined into a single coverage report
   #
   def use_merging(use=nil)
-    @use_merging = use unless use.nil? # Set if param given
-    @use_merging = true if @use_merging != false
+    @use_merging = use unless use.nil?
+    @use_merging = true unless defined? @use_merging and @use_merging == false
   end
 
   #
@@ -165,10 +165,38 @@ module SimpleCov::Configuration
   # Configure with SimpleCov.merge_timeout(3600) # 1hr
   #
   def merge_timeout(seconds=nil)
-    @merge_timeout = seconds if !seconds.nil? and seconds.kind_of?(Fixnum)
+    @merge_timeout = seconds if seconds.kind_of?(Fixnum)
     @merge_timeout ||= 600
   end
 
+  #
+  # Defines the minimum overall coverage required for the testsuite to pass.
+  # SimpleCov will return non-zero if the current coverage is below this threshold.
+  #
+  # Default is 0% (disabled)
+  #
+  def minimum_coverage(coverage=nil)
+    @minimum_coverage ||= (coverage || 0).to_f.round(2)
+  end
+
+  #
+  # Defines the maximum coverage drop at once allowed for the testsuite to pass.
+  # SimpleCov will return non-zero if the coverage decreases by more than this threshold.
+  #
+  # Default is 100% (disabled)
+  #
+  def maximum_coverage_drop(coverage_drop=nil)
+    @maximum_coverage_drop ||= (coverage_drop || 100).to_f.round(2)
+  end
+
+  #
+  # Refuses any coverage drop. That is, coverage is only allowed to increase.
+  # SimpleCov will return non-zero if the coverage decreases.
+  #
+  def refuse_coverage_drop
+    maximum_coverage_drop 0
+  end
+
   #
   # Add a filter to the processing chain.
   # There are three ways to define a filter:
@@ -195,7 +223,7 @@ module SimpleCov::Configuration
   def add_group(group_name, filter_argument=nil, &filter_proc)
     groups[group_name] = parse_filter(filter_argument, &filter_proc)
   end
-  
+
   private
 
   #

data/lib/simplecov/defaults.rb

@@ -46,9 +46,38 @@ at_exit do
     #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 : 1
+    @exit_status = $!.is_a?(SystemExit) ? $!.status : SimpleCov::ExitCodes::EXCEPTION
   end
+
   SimpleCov.at_exit.call
+
+  if SimpleCov.result? # Result has been computed
+    covered_percent = SimpleCov.result.covered_percent.round(2)
+
+    if @exit_status.to_i == 0 # No other errors
+      @exit_status = 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
+
+      elsif (last_run = SimpleCov::LastRun.read)
+        diff = last_run['result']['covered_percent'] - covered_percent
+        if diff > SimpleCov.maximum_coverage_drop
+          $stderr.puts "Coverage has dropped by %.2f%% since the last time (maximum allowed: %.2f%%)." % \
+                       [diff, SimpleCov.maximum_coverage_drop]
+
+          SimpleCov::ExitCodes::MAXIMUM_COVERAGE_DROP
+        end
+      end
+    end
+
+    metrics = {
+      :result => { :covered_percent => covered_percent }
+    }
+    SimpleCov::LastRun.write(metrics)
+  end
+
   exit @exit_status if @exit_status # Force exit with stored status (see github issue #5)
 end
 

data/lib/simplecov/exit_codes.rb

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

data/lib/simplecov/formatter.rb

@@ -5,3 +5,4 @@ module SimpleCov
 end
 
 require 'simplecov/formatter/simple_formatter'
+require 'simplecov/formatter/multi_formatter'

data/lib/simplecov/formatter/multi_formatter.rb

@@ -0,0 +1,25 @@
+class SimpleCov::Formatter::MultiFormatter
+  def self.[](*args)
+    Class.new(self) do
+      define_method :formatters do
+        @formatters ||= args
+      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
+      end
+    end
+  end
+
+  def formatters
+    @formatters ||= []
+  end
+
+end

data/lib/simplecov/json.rb

@@ -0,0 +1,27 @@
+require 'multi_json'
+
+module SimpleCov::JSON
+  class << self
+    def parse(json)
+      # Detect and use available MultiJson API - it changed in v1.3
+      if MultiJson.respond_to?(:adapter)
+        MultiJson.load(json)
+      else
+        MultiJson.decode(json)
+      end
+    end
+
+    def dump(string)
+      if defined? ::JSON
+        ::JSON.pretty_generate(string)
+      else
+        # Detect and use available MultiJson API - it changed in v1.3
+        if MultiJson.respond_to?(:adapter)
+          MultiJson.dump(string)
+        else
+          MultiJson.encode(string)
+        end
+      end
+    end
+  end
+end

data/lib/simplecov/last_run.rb

@@ -0,0 +1,20 @@
+module SimpleCov::LastRun
+  class << self
+    def last_run_path
+      File.join(SimpleCov.coverage_path, '.last_run.json')
+    end
+
+    def read
+      return nil unless File.exist?(last_run_path)
+
+      SimpleCov::JSON.parse(File.read(last_run_path))
+    end
+
+    def write(json)
+      File.open(last_run_path, "w+") do |f|
+        f.puts SimpleCov::JSON.dump(json)
+      end
+    end
+  end
+end
+

data/lib/simplecov/result_merger.rb

@@ -1,5 +1,3 @@
-require 'multi_json'
-
 #
 # Singleton that is responsible for caching, loading and merging
 # SimpleCov::Results into a single result for coverage analysis based
@@ -7,7 +5,7 @@ require 'multi_json'
 #
 module SimpleCov::ResultMerger
   class << self
-    # The path to the resultset.yml cache file
+    # The path to the .resultset.json cache file
     def resultset_path
       File.join(SimpleCov.coverage_path, '.resultset.json')
     end
@@ -15,12 +13,7 @@ module SimpleCov::ResultMerger
     # Loads the cached resultset from YAML and returns it as a Hash
     def resultset
       if stored_data
-        # Detect and use available MultiJson API - it changed in v1.3
-        if MultiJson.respond_to?(:adapter)
-          MultiJson.load(stored_data)
-        else
-          MultiJson.decode(stored_data)
-        end
+        SimpleCov::JSON.parse(stored_data)
       else
         {}
       end
@@ -73,16 +66,7 @@ module SimpleCov::ResultMerger
       command_name, data = result.to_hash.first
       new_set[command_name] = data
       File.open(resultset_path, "w+") do |f|
-        if defined? ::JSON
-          f.puts JSON.pretty_generate(new_set)
-        else
-          # Detect and use available MultiJson API - it changed in v1.3
-          if MultiJson.respond_to?(:adapter)
-            f.puts MultiJson.dump(new_set)
-          else
-            f.puts MultiJson.encode(new_set)
-          end
-        end
+        f.puts SimpleCov::JSON.dump(new_set)
       end
       true
     end

data/lib/simplecov/version.rb

@@ -1,3 +1,3 @@
 module SimpleCov
-  VERSION = "0.6.4"
+  VERSION = "0.7.0"
 end

data/simplecov.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary     = gem.description
 
   gem.add_dependency 'multi_json', '~> 1.0'
-  gem.add_dependency 'simplecov-html', '~> 0.5.3'
+  gem.add_dependency 'simplecov-html', '~> 0.7.0'
   gem.add_development_dependency 'aruba'
   gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'appraisal'

data/test/fixtures/sample.rb

@@ -10,7 +10,7 @@ class Foo
 
   #:nocov:
   def skipped
-	@foo * 2
+    @foo * 2
   end
   #:nocov:
 end

data/test/test_result.rb

@@ -21,7 +21,7 @@ class TestResult < Test::Unit::TestCase
 
         should "have 3 source files" do
           assert_equal 3, @result.source_files.count
-          assert @result.source_files.all? {|s| s.instance_of?(SimpleCov::SourceFile)}, "Not alL instances are of SimpleCov::SourceFile type"
+          assert @result.source_files.all? {|s| s.instance_of?(SimpleCov::SourceFile)}, "Not all instances are of SimpleCov::SourceFile type"
         end
 
         should "return an instance of SimpleCov::FileList for source_files and files" do
@@ -111,6 +111,21 @@ class TestResult < Test::Unit::TestCase
             assert_equal String, @result.format!.class
           end
         end
+
+        context "and multi formatter being used" do
+          setup do
+            SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+              SimpleCov::Formatter::SimpleFormatter,
+              SimpleCov::Formatter::SimpleFormatter,
+            ]
+          end
+
+          should "return an array containing formatted string with result.format!" do
+            formated = @result.format!
+            assert_equal 2, formated.count
+            assert_equal String, formated.first.class
+          end
+        end
       end
 
       context "with groups set up that do not match all files" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70152796757480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152796757480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &70152796756780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152796756780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70152796756220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152796756220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70152796755580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152796755580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70152796755020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152796755020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70152796754340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *70152796754340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70152796769980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152796769980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70152796769100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152796769100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70152796768260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152796768260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Code coverage for Ruby 1.9 with a powerful configuration library and
   automatic merging of coverage across test suites
 email:
@@ -120,8 +165,10 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- .yardopts
 - Appraisals
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -132,12 +179,16 @@ files:
 - features/config_command_name.feature
 - features/config_coverage_dir.feature
 - features/config_deactivate_merging.feature
+- features/config_formatters.feature
 - features/config_merge_timeout.feature
 - features/config_nocov_token.feature
 - features/config_project_name.feature
 - features/config_styles.feature
 - features/cucumber_basic.feature
+- features/maximum_coverage_drop.feature
 - features/merging_test_unit_and_rspec.feature
+- features/minimum_coverage.feature
+- features/refuse_coverage_drop.feature
 - features/rspec_basic.feature
 - features/rspec_fails_on_initialization.feature
 - features/rspec_groups_and_filters_basic.feature
@@ -157,18 +208,20 @@ files:
 - features/test_unit_without_simplecov.feature
 - features/unicode_compatiblity.feature
 - gemfiles/multi_json-legacy.gemfile
-- gemfiles/multi_json-legacy.gemfile.lock
 - gemfiles/multi_json-new.gemfile
-- gemfiles/multi_json-new.gemfile.lock
 - lib/simplecov.rb
 - lib/simplecov/adapters.rb
 - lib/simplecov/command_guesser.rb
 - lib/simplecov/configuration.rb
 - lib/simplecov/defaults.rb
+- lib/simplecov/exit_codes.rb
 - lib/simplecov/file_list.rb
 - lib/simplecov/filter.rb
 - lib/simplecov/formatter.rb
+- lib/simplecov/formatter/multi_formatter.rb
 - lib/simplecov/formatter/simple_formatter.rb
+- lib/simplecov/json.rb
+- lib/simplecov/last_run.rb
 - lib/simplecov/merge_helpers.rb
 - lib/simplecov/railtie.rb
 - lib/simplecov/railties/tasks.rake
@@ -233,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1802100492995601719
+      hash: -2872785497252698057
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -242,83 +295,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1802100492995601719
+      hash: -2872785497252698057
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Code coverage for Ruby 1.9 with a powerful configuration library and automatic
   merging of coverage across test suites
-test_files:
-- features/config_adapters.feature
-- features/config_autoload.feature
-- features/config_command_name.feature
-- features/config_coverage_dir.feature
-- features/config_deactivate_merging.feature
-- features/config_merge_timeout.feature
-- features/config_nocov_token.feature
-- features/config_project_name.feature
-- features/config_styles.feature
-- features/cucumber_basic.feature
-- features/merging_test_unit_and_rspec.feature
-- features/rspec_basic.feature
-- features/rspec_fails_on_initialization.feature
-- features/rspec_groups_and_filters_basic.feature
-- features/rspec_groups_and_filters_complex.feature
-- features/rspec_groups_using_filter_class.feature
-- features/rspec_without_simplecov.feature
-- features/skipping_code_blocks_manually.feature
-- features/step_definitions/html_steps.rb
-- features/step_definitions/simplecov_steps.rb
-- features/step_definitions/transformers.rb
-- features/step_definitions/web_steps.rb
-- features/support/env.rb
-- features/test_unit_basic.feature
-- features/test_unit_groups_and_filters_basic.feature
-- features/test_unit_groups_and_filters_complex.feature
-- features/test_unit_groups_using_filter_class.feature
-- features/test_unit_without_simplecov.feature
-- features/unicode_compatiblity.feature
-- test/faked_project/Gemfile
-- test/faked_project/Rakefile
-- test/faked_project/cucumber.yml
-- test/faked_project/features/step_definitions/my_steps.rb
-- test/faked_project/features/support/env.rb
-- test/faked_project/features/test_stuff.feature
-- test/faked_project/lib/faked_project.rb
-- test/faked_project/lib/faked_project/framework_specific.rb
-- test/faked_project/lib/faked_project/meta_magic.rb
-- test/faked_project/lib/faked_project/some_class.rb
-- test/faked_project/spec/faked_spec.rb
-- test/faked_project/spec/meta_magic_spec.rb
-- test/faked_project/spec/some_class_spec.rb
-- test/faked_project/spec/spec_helper.rb
-- test/faked_project/test/faked_test.rb
-- test/faked_project/test/meta_magic_test.rb
-- test/faked_project/test/some_class_test.rb
-- test/faked_project/test/test_helper.rb
-- test/fixtures/app/controllers/sample_controller.rb
-- test/fixtures/app/models/user.rb
-- test/fixtures/deleted_source_sample.rb
-- test/fixtures/frameworks/rspec_bad.rb
-- test/fixtures/frameworks/rspec_good.rb
-- test/fixtures/frameworks/testunit_bad.rb
-- test/fixtures/frameworks/testunit_good.rb
-- test/fixtures/iso-8859.rb
-- test/fixtures/resultset1.rb
-- test/fixtures/resultset2.rb
-- test/fixtures/sample.rb
-- test/fixtures/utf-8.rb
-- test/helper.rb
-- test/shoulda_macros.rb
-- test/test_1_8_fallbacks.rb
-- test/test_command_guesser.rb
-- test/test_deleted_source.rb
-- test/test_file_list.rb
-- test/test_filters.rb
-- test/test_merge_helpers.rb
-- test/test_result.rb
-- test/test_return_codes.rb
-- test/test_source_file.rb
-- test/test_source_file_line.rb
+test_files: []

data/gemfiles/multi_json-legacy.gemfile.lock

@@ -1,85 +0,0 @@
-PATH
-  remote: /Users/colszowka/Projects/github/colszowka/simplecov
-  specs:
-    simplecov (0.6.2)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.8)
-    appraisal (0.4.1)
-      bundler
-      rake
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
-      cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
-    builder (3.0.0)
-    capybara (1.1.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
-    cucumber (1.2.0)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.10.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    gherkin (2.10.0)
-      json (>= 1.4.6)
-    json (1.7.1)
-    libwebsocket (0.1.3)
-      addressable
-    mime-types (1.18)
-    multi_json (1.0.4)
-    nokogiri (1.5.2)
-    rack (1.4.1)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rubyzip (0.9.8)
-    selenium-webdriver (2.21.2)
-      childprocess (>= 0.2.5)
-      ffi (~> 1.0)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
-    simplecov-html (0.5.3)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  aruba
-  capybara
-  cucumber (>= 1.1.4)
-  multi_json (~> 1.0.0)
-  rake
-  rspec
-  shoulda
-  simplecov!

data/gemfiles/multi_json-new.gemfile.lock

@@ -1,85 +0,0 @@
-PATH
-  remote: /Users/colszowka/Projects/github/colszowka/simplecov
-  specs:
-    simplecov (0.6.2)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.8)
-    appraisal (0.4.1)
-      bundler
-      rake
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
-      cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
-    builder (3.0.0)
-    capybara (1.1.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
-    cucumber (1.2.0)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.10.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
-    ffi (1.0.11)
-    gherkin (2.10.0)
-      json (>= 1.4.6)
-    json (1.7.1)
-    libwebsocket (0.1.3)
-      addressable
-    mime-types (1.18)
-    multi_json (1.3.4)
-    nokogiri (1.5.2)
-    rack (1.4.1)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.0)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rubyzip (0.9.8)
-    selenium-webdriver (2.21.2)
-      childprocess (>= 0.2.5)
-      ffi (~> 1.0)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
-    simplecov-html (0.5.3)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  aruba
-  capybara
-  cucumber (>= 1.1.4)
-  multi_json (>= 1.3.4)
-  rake
-  rspec
-  shoulda
-  simplecov!