simplecov 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcd3fcd0c8e30121cc9f50e81b8b756f1153e8a3
-  data.tar.gz: 58d53aacce8c59039020aa58c651c6c66b04c414
+  metadata.gz: c4ded95468b70d7817ca95004ac38a0b6ad2e388
+  data.tar.gz: 2bb87e0871a8daa3955049fa6e808968d479ea48
 SHA512:
-  metadata.gz: 8edc40314d68f3964d6cdba4d99a9afb07f15e7bafdc5ecccdeda85ce2d662ff5016ccc0b5e78edf5668ca40c92bf168d2f3b031ca08b541a18f15d717354f69
-  data.tar.gz: 60b3f714f8701072f44186639a4915aae3b8fdd8341e31ad41b2bde07961917052c012106fccad8b2a54ced75be9f84f7f1f743b3ef64a7b7bd0671c906eea83
+  metadata.gz: af959d1c396d33ac1f1f76e6108993d1e0af61e1f9059feb4dcbb598e46eceb51b930370d6e1f5f3711dc498ced9176a72ae125498f1d3b385581bba00c61466
+  data.tar.gz: fd27be25b4cca08be020931d330cc2a958559a49c61c8058b6433a55d75252b263502c74445efa21ee7a7683aceee6a4650501fe00a07ee25dbad546aef891f5

data/.rubocop.yml

@@ -66,5 +66,12 @@ Style/FileName:
   Exclude:
     - 'spec/fixtures/utf-8.rb'
 
-Style/TrailingComma:
-  EnforcedStyleForMultiline: 'comma'
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/GuardClause:
+  Enabled: false
+
+Style/MutableConstant:
+  Exclude:
+    - 'lib/simplecov/version.rb' # required for older versions of rubygems

data/.travis.yml

@@ -13,15 +13,16 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.10
+  - 2.2.5
+  - 2.3.0
   - ruby-head
-  - jruby
+  - jruby-head
   - rbx-2
 
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby
+    - rvm: jruby-head
     - rvm: rbx-2
   fast_finish: true

data/CHANGELOG.md

@@ -1,17 +1,52 @@
-Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.11.0...master))
+Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.12.0...master))
+==========
+
+## Enhancements
+
+## Bugfixes
+
+0.12.0 2016-07-02 ([changes](https://github.com/colszowka/simplecov/compare/v0.11.2...v0.12.0))
+=================
+
+## Enhancements
+
+* Add support for JSON versions 2.x
+
+## Bugfixes
+
+* Fix coverage rate of the parallel_tests. See [#441](https://github.com/colszowka/simplecov/pull/441) (thanks @sinsoku)
+* Fix a regression on old rubies that failed to work with the recently introduced frozen VERSION string. See [#461](https://github.com/colszowka/simplecov/pull/461) (thanks @leafle)
+
+0.11.2 2016-02-03 ([changes](https://github.com/colszowka/simplecov/compare/v0.11.1...v0.11.2))
 =================
 
 ## Enhancements
 
+* Do not globally pollute Array and Hash with `merge_resultset` utility methods. See [#449](https://github.com/colszowka/simplecov/pull/449) (thanks @amatsuda)
+* Do not `mkdir_p` the `coverage_path` on every access of the method (See [#453](https://github.com/colszowka/simplecov/pull/453) (thanks @paddor)
+* Fixes a Ruby warning related to the `track_files` configuration. See [#447](https://github.com/colszowka/simplecov/pull/447) (thanks @craiglittle)
+* Add a group for background jobs to default Rails profile. See [#442](https://github.com/colszowka/simplecov/pull/442) (thanks @stve)
+
 ## Bugfixes
 
-0.11.0 2015-11-29 ([changes](https://github.com/colszowka/simplecov/compare/v0.10.0...v0.10.11))
+* Fix root_filter evaluates SimpleCov.root before initialization. See [#437](https://github.com/colszowka/simplecov/pull/437) (thanks @tmtm)
+
+0.11.1 2015-12-01 ([changes](https://github.com/colszowka/simplecov/compare/v0.11.0...v0.11.1))
+=================
+
+## Enhancements
+
+## Bugfixes
+
+* Fixed regression in `MultiFormatter.[]` with multiple arguments. See [#431](https://github.com/colszowka/simplecov/pull/431) (thanks @dillondrobena)
+
+0.11.0 2015-11-29 ([changes](https://github.com/colszowka/simplecov/compare/v0.10.0...v0.11.0))
 =================
 
 ## Enhancements
 
 * Added `SimpleCov.minimum_coverage_by_file` for per-file coverage thresholds. See [#392](https://github.com/colszowka/simplecov/pull/392) (thanks @ptashman)
-* Added `track_files` configuration option to specify a glob to always include in coverage results, whether or not those files are required. See [#422](https://github.com/colszowka/simplecov/pull/422) (thanks @hugopeixoto)
+* Added `track_files` configuration option to specify a glob to always include in coverage results, whether or not those files are required. By default, this is enabled in the Rails profile for common Rails directories. See [#422](https://github.com/colszowka/simplecov/pull/422) (thanks @hugopeixoto)
 * Speed up `root_filter` by an order of magnitude. See [#396](https://github.com/colszowka/simplecov/pull/396) (thanks @raszi)
 
 ## Bugfixes

data/Gemfile

@@ -6,7 +6,7 @@ source "https://rubygems.org"
 # Uncomment this to use development version of html formatter from github
 # gem 'simplecov-html', :github => 'colszowka/simplecov-html'
 
-gem "rake", ">= 10.3"
+gem "rake", Gem::Version.new(RUBY_VERSION) < Gem::Version.new("1.9.3") ? "~>10.3" : ">= 10.3"
 
 group :test do
   gem "rspec", ">= 3.2"
@@ -15,19 +15,21 @@ group :test do
     gem "activesupport", "~> 3.2.21"
     gem "i18n", "~> 0.6.11"
   end
-  platform :jruby, :ruby_19, :ruby_20, :ruby_21, :ruby_22 do
+  platform :ruby_18, :ruby_19 do
+    gem "mime-types", "~> 1.25"
+    gem "json", "~> 1.8"
+  end
+  platform :ruby_18, :ruby_19, :ruby_20, :ruby_21 do
+    gem "rack", "~> 1.6"
+  end
+  platform :jruby, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23 do
     gem "aruba", "~> 0.7.4"
-    gem "capybara", "~> 2.4"
-
-    # Hack until Capybara fixes its gemspec. 3.0 removed 1.9 support.
-    # See https://github.com/jnicklas/capybara/issues/1615
-    gem "mime-types", "~> 2.0.0"
-
-    gem "cucumber", "~> 2.0"
+    gem "capybara"
+    gem "cucumber"
     gem "phantomjs", "~> 1.9"
-    gem "poltergeist", "~> 1.1"
-    gem "rubocop", ">= 0.30"
-    gem "test-unit", "~> 3.0"
+    gem "poltergeist"
+    gem "rubocop", "~> 0.41.0"
+    gem "test-unit"
   end
 end
 

data/README.md

@@ -1,4 +1,4 @@
-SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)][Continuous Integration] [![Dependency Status](https://gemnasium.com/colszowka/simplecov.png)][Dependencies] [![Code Climate](https://codeclimate.com/github/colszowka/simplecov.png)](https://codeclimate.com/github/colszowka/simplecov) [![Inline docs](http://inch-ci.org/github/colszowka/simplecov.png)](http://inch-ci.org/github/colszowka/simplecov)
+SimpleCov [![Build Status](https://travis-ci.org/colszowka/simplecov.svg)][Continuous Integration] [![Dependency Status](https://gemnasium.com/colszowka/simplecov.svg)][Dependencies] [![Code Climate](https://codeclimate.com/github/colszowka/simplecov.svg)](https://codeclimate.com/github/colszowka/simplecov) [![Inline docs](http://inch-ci.org/github/colszowka/simplecov.svg)](http://inch-ci.org/github/colszowka/simplecov)
 =========
 **Code coverage for Ruby**
 
@@ -6,11 +6,8 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
   * [API documentation]
   * [Changelog]
   * [Rubygem]
-  * [Mailing List]
   * [Continuous Integration]
 
-**Important Notice: There is a bug that affects exit code handling on the 0.8 line of SimpleCov, see [#281](https://github.com/colszowka/simplecov/issues/281). Please use versions `>= 0.9` to avoid this.**
-
 [Coverage]: http://www.ruby-doc.org/stdlib-2.1.0/libdoc/coverage/rdoc/Coverage.html "API doc for Ruby's Coverage library"
 [Source Code]: https://github.com/colszowka/simplecov "Source Code @ GitHub"
 [API documentation]: http://rubydoc.info/gems/simplecov/frames "RDoc API Documentation at Rubydoc.info"
@@ -20,10 +17,6 @@ SimpleCov [![Build Status](https://secure.travis-ci.org/colszowka/simplecov.png)
 [Continuous Integration]: http://travis-ci.org/colszowka/simplecov "SimpleCov is built around the clock by travis-ci.org"
 [Dependencies]: https://gemnasium.com/colszowka/simplecov "SimpleCov dependencies on Gemnasium"
 [simplecov-html]: https://github.com/colszowka/simplecov-html "SimpleCov HTML Formatter Source Code @ GitHub"
-[Mailing List]: https://groups.google.com/forum/#!forum/simplecov "Open mailing list for discussion and announcements on Google Groups"
-[Pledgie]: http://www.pledgie.com/campaigns/18379
-
-[![You can support the development of SimpleCov via Pledgie - thanks for your help](https://pledgie.com/campaigns/18379.png?skin_name=chrome)][Pledgie]
 
 SimpleCov is a code coverage analysis tool for Ruby. It uses [Ruby's built-in Coverage][Coverage] library to gather code
 coverage data, but makes processing its results much easier by providing a clean API to filter, group, merge, format,
@@ -153,19 +146,6 @@ to use SimpleCov with them. Here's an overview of the known ones:
       <a href="https://github.com/colszowka/simplecov/pull/185">#185</a>
     </td>
   </tr>
-  <tr>
-    <th>
-      Riot
-    </th>
-    <td>
-      A user has reported problems with the coverage report using the riot
-      framework. If you experience similar trouble please follow up on the
-      related GitHub issue.
-    </td>
-    <td>
-      <a href="https://github.com/colszowka/simplecov/issues/80">#80</a>
-    </td>
-  </tr>
   <tr>
     <th>
       RubyMine

data/features/step_definitions/simplecov_steps.rb

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

data/features/support/env.rb

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

data/lib/simplecov/configuration.rb

@@ -28,6 +28,7 @@ module SimpleCov
     #
     def coverage_dir(dir = nil)
       return @coverage_dir if defined?(@coverage_dir) && dir.nil?
+      @coverage_path = nil # invalidate cache
       @coverage_dir = (dir || "coverage")
     end
 
@@ -37,9 +38,11 @@ module SimpleCov
     # values. Will create the directory if it's missing
     #
     def coverage_path
-      coverage_path = File.expand_path(coverage_dir, root)
-      FileUtils.mkdir_p coverage_path
-      coverage_path
+      @coverage_path ||= begin
+        coverage_path = File.expand_path(coverage_dir, root)
+        FileUtils.mkdir_p coverage_path
+        coverage_path
+      end
     end
 
     #
@@ -47,8 +50,9 @@ module SimpleCov
     # or not they were explicitly required. Without this, un-required files
     # will not be present in the final report.
     #
-    def track_files(glob)
-      @track_files_glob = glob
+    def track_files(glob = nil)
+      return @track_files if defined?(@track_files) && glob.nil?
+      @track_files = glob
     end
 
     #
@@ -81,7 +85,7 @@ module SimpleCov
     def formatter(formatter = nil)
       return @formatter if defined?(@formatter) && formatter.nil?
       @formatter = formatter
-      fail "No formatter configured. Please specify a formatter using SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter" unless @formatter
+      raise "No formatter configured. Please specify a formatter using SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter" unless @formatter
       @formatter
     end
 
@@ -114,7 +118,7 @@ module SimpleCov
       return @nocov_token if defined?(@nocov_token) && nocov_token.nil?
       @nocov_token = (nocov_token || "nocov")
     end
-    alias_method :skip_token, :nocov_token
+    alias skip_token nocov_token
 
     #
     # Returns the configured groups. Add groups using SimpleCov.add_group
@@ -285,7 +289,7 @@ module SimpleCov
       elsif filter_argument.is_a?(Array)
         SimpleCov::ArrayFilter.new(filter_argument)
       else
-        fail ArgumentError, "Please specify either a string or a block to filter with"
+        raise ArgumentError, "Please specify either a string or a block to filter with"
       end
     end
   end

data/lib/simplecov/defaults.rb

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

data/lib/simplecov/filter.rb

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

data/lib/simplecov/formatter/multi_formatter.rb

@@ -25,7 +25,7 @@ module SimpleCov
 
       def self.[](*args)
         warn "#{Kernel.caller.first}: [DEPRECATION] ::[] is deprecated. Use ::new instead."
-        new(*args)
+        new(Array([*args]))
       end
     end
   end

data/lib/simplecov/jruby_fix.rb

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

data/lib/simplecov/merge_helpers.rb

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

data/lib/simplecov/profiles.rb

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

data/lib/simplecov/result.rb

@@ -12,7 +12,7 @@ module SimpleCov
     attr_reader :original_result
     # Returns all files that are applicable to this result (sans filters!) as instances of SimpleCov::SourceFile. Aliased as :source_files
     attr_reader :files
-    alias_method :source_files, :files
+    alias source_files files
     # Explicitly set the Time this result has been created
     attr_writer :created_at
     # Explicitly set the command name that was used for this coverage result. Defaults to SimpleCov.command_name
@@ -24,6 +24,7 @@ module SimpleCov
     # Initialize a new SimpleCov::Result from given Coverage.result (a Hash of filenames each containing an array of
     # coverage data)
     def initialize(original_result)
+      original_result = original_result.dup.extend(SimpleCov::HashMergeHelper) unless original_result.is_a? SimpleCov::HashMergeHelper
       @original_result = original_result.freeze
       @files = SimpleCov::FileList.new(original_result.map do |filename, coverage|
         SimpleCov::SourceFile.new(filename, coverage) if File.file?(filename)

data/lib/simplecov/source_file.rb

@@ -20,14 +20,14 @@ module SimpleCov
       attr_reader :skipped
 
       # Lets grab some fancy aliases, shall we?
-      alias_method :source, :src
-      alias_method :line, :line_number
-      alias_method :number, :line_number
+      alias source src
+      alias line line_number
+      alias number line_number
 
       def initialize(src, line_number, coverage)
-        fail ArgumentError, "Only String accepted for source" unless src.is_a?(String)
-        fail ArgumentError, "Only Fixnum accepted for line_number" unless line_number.is_a?(Fixnum)
-        fail ArgumentError, "Only Fixnum and nil accepted for coverage" unless coverage.is_a?(Fixnum) || coverage.nil?
+        raise ArgumentError, "Only String accepted for source" unless src.is_a?(String)
+        raise ArgumentError, "Only Fixnum accepted for line_number" unless line_number.is_a?(Fixnum)
+        raise ArgumentError, "Only Fixnum and nil accepted for coverage" unless coverage.is_a?(Fixnum) || coverage.nil?
         @src         = src
         @line_number = line_number
         @coverage    = coverage
@@ -76,7 +76,7 @@ module SimpleCov
     attr_reader :coverage
     # The source code for this file. Aliased as :source
     attr_reader :src
-    alias_method :source, :src
+    alias source src
 
     def initialize(filename, coverage)
       @filename = filename
@@ -102,7 +102,7 @@ module SimpleCov
       process_skipped_lines!
       @lines
     end
-    alias_method :source_lines, :lines
+    alias source_lines lines
 
     # Access SimpleCov::SourceFile::Line source lines by line number
     def line(number)
@@ -116,7 +116,7 @@ module SimpleCov
       if relevant_lines.zero?
         0.0
       else
-        Float((covered_lines.count) * 100.0 / relevant_lines.to_f)
+        Float(covered_lines.count * 100.0 / relevant_lines.to_f)
       end
     end
 
@@ -172,8 +172,8 @@ module SimpleCov
       lines.each do |line|
         if line.src =~ /^([\s]*)#([\s]*)(\:#{SimpleCov.nocov_token}\:)/
           skipping = !skipping
-        else
-          line.skipped! if skipping
+        elsif skipping
+          line.skipped!
         end
       end
     end

data/lib/simplecov/version.rb

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

data/lib/simplecov.rb

@@ -2,13 +2,18 @@
 # Code coverage for ruby 1.9. Please check out README for a full introduction.
 #
 # Coverage may be inaccurate under JRUBY.
-if defined?(JRUBY_VERSION)
-  if ENV["JRUBY_OPTS"].to_s !~ /-Xcli.debug=true/
-    warn "Coverage may be inaccurate; Try setting JRUBY_OPTS=\"-Xcli.debug=true --debug\""
-    # see https://github.com/metricfu/metric_fu/pull/226
-    #     https://github.com/jruby/jruby/issues/1196
-    #     https://jira.codehaus.org/browse/JRUBY-6106
-    #     https://github.com/colszowka/simplecov/issues/86
+if defined?(JRUBY_VERSION) && defined?(JRuby)
+
+  # @see https://github.com/jruby/jruby/issues/1196
+  # @see https://github.com/metricfu/metric_fu/pull/226
+  # @see https://github.com/colszowka/simplecov/issues/420
+  # @see https://github.com/colszowka/simplecov/issues/86
+  # @see https://jira.codehaus.org/browse/JRUBY-6106
+
+  unless org.jruby.RubyInstanceConfig.FULL_TRACE_ENABLED
+    warn 'Coverage may be inaccurate; set the "--debug" command line option,' \
+      ' or do JRUBY_OPTS="--debug"' \
+      ' or set the "debug.fullTrace=true" option in your .jrubyrc'
   end
 end
 module SimpleCov
@@ -53,9 +58,9 @@ module SimpleCov
     # their coverage to zero.
     #
     def add_not_loaded_files(result)
-      if @track_files_glob
+      if track_files
         result = result.dup
-        Dir[@track_files_glob].each do |file|
+        Dir[track_files].each do |file|
           absolute = File.expand_path(file)
 
           result[absolute] ||= [0] * File.foreach(absolute).count
@@ -70,14 +75,22 @@ module SimpleCov
     # from cache using SimpleCov::ResultMerger if use_merging is activated (default)
     #
     def result
-      @result ||= SimpleCov::Result.new(add_not_loaded_files(Coverage.result)) if running
+      # Ensure the variable is defined to avoid ruby warnings
+      @result = nil unless defined?(@result)
+
+      # Collect our coverage result
+      if running && !result?
+        @result = SimpleCov::Result.new add_not_loaded_files(Coverage.result)
+      end
+
       # If we're using merging of results, store the current result
       # first, then merge the results and return those
       if use_merging
-        SimpleCov::ResultMerger.store_result(@result) if @result
-        return SimpleCov::ResultMerger.merged_result
+        SimpleCov::ResultMerger.store_result(@result) if result?
+
+        SimpleCov::ResultMerger.merged_result
       else
-        return @result if defined? @result
+        @result
       end
     ensure
       self.running = false
@@ -112,7 +125,7 @@ module SimpleCov
         grouped[name] = SimpleCov::FileList.new(files.select { |source_file| filter.matches?(source_file) })
         grouped_files += grouped[name]
       end
-      if groups.length > 0 && (other_files = files.reject { |source_file| grouped_files.include?(source_file) }).length > 0
+      if !groups.empty? && !(other_files = files.reject { |source_file| grouped_files.include?(source_file) }).empty?
         grouped["Ungrouped"] = SimpleCov::FileList.new(other_files)
       end
       grouped

data/simplecov.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.8.7"
 
-  gem.add_dependency "json", "~> 1.8"
+  gem.add_dependency "json", ">= 1.8", "< 3"
   gem.add_dependency "simplecov-html", "~> 0.10.0"
   gem.add_dependency "docile", "~> 1.1.0"
 

data/spec/1_8_fallbacks_spec.rb

@@ -12,11 +12,11 @@ describe "Ruby 1.8 fallback" do
   end
 
   it "return false when calling SimpleCov.start with a block" do
-    expect(SimpleCov.start { fail "Shouldn't reach this!" }).to be false
+    expect(SimpleCov.start { raise "Shouldn't reach this!" }).to be false
   end
 
   it "return false when calling SimpleCov.configure with a block" do
-    expect(SimpleCov.configure { fail "Shouldn't reach this!" }).to be false
+    expect(SimpleCov.configure { raise "Shouldn't reach this!" }).to be false
   end
 
   it "allow to define a profile" do

data/spec/faked_project/lib/faked_project/some_class.rb

@@ -14,7 +14,7 @@ class SomeClass
     if item == label
       return true
     else
-      fail "Item does not match label"
+      raise "Item does not match label"
     end
   rescue
     false

data/spec/faked_project/spec/forking_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 
 describe "forking" do
   it do
-    Process.waitpid(Kernel.fork {})
+    # TODO: The defined?(RUBY_ENGINE) check can be dropped for simplecov 1.0.0
+    Process.waitpid(Kernel.fork {}) unless defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
   end
 end

data/spec/fixtures/deleted_source_sample.rb

@@ -12,4 +12,4 @@ code = %{
 File.open(file, "w") { |f| f.print code }
 load file
 File.unlink file
-fail unless kill_the_buddha(3) == 27
+raise unless kill_the_buddha(3) == 27

data/spec/merge_helpers_spec.rb

@@ -9,13 +9,15 @@ describe "merge helpers" do
         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("resultset1.rb") => [1, 1, 1, 1],
-      }
+        source_fixture("parallel_tests.rb") => [nil, 0, nil, 0],
+      }.extend(SimpleCov::HashMergeHelper)
 
       @resultset2 = {
         source_fixture("sample.rb") => [1, nil, 1, 1, nil, nil, 1, 1, nil, nil],
         source_fixture("app/models/user.rb") => [nil, 1, 5, 1, nil, nil, 1, 0, nil, nil],
         source_fixture("app/controllers/sample_controller.rb") => [nil, 3, 1, nil, nil, nil, 1, 0, nil, nil],
         source_fixture("resultset2.rb") => [nil, 1, 1, nil],
+        source_fixture("parallel_tests.rb") => [nil, nil, 0, 0],
       }
     end
 
@@ -43,6 +45,10 @@ describe "merge helpers" do
       it "has proper results for resultset2.rb" do
         expect(subject[source_fixture("resultset2.rb")]).to eq([nil, 1, 1, nil])
       end
+
+      it "has proper results for parallel_tests.rb" do
+        expect(subject[source_fixture("parallel_tests.rb")]).to eq([nil, nil, nil, 0])
+      end
     end
 
     # See Github issue #6

data/spec/multi_formatter_spec.rb

@@ -0,0 +1,20 @@
+require "helper"
+
+require "simplecov/formatter/multi_formatter"
+
+describe SimpleCov::Formatter::MultiFormatter do
+  describe ".[]" do
+    # Regression test for https://github.com/colszowka/simplecov/issues/428
+    it "constructs a formatter with multiple children" do
+      # Silence deprecation warnings.
+      allow(described_class).to receive(:warn)
+
+      children = [
+        SimpleCov::Formatter::SimpleFormatter,
+        SimpleCov::Formatter::SimpleFormatter,
+      ]
+
+      expect(described_class[*children].new.formatters).to eq(children)
+    end
+  end
+end

data/spec/return_codes_spec.rb

@@ -4,14 +4,11 @@ require "helper"
 # See https://github.com/colszowka/simplecov/issues/5
 describe "return codes" do
   context "inside fixtures/frameworks" do
-    before do
-      @current_dir = Dir.getwd
-      Dir.chdir(File.join(File.dirname(__FILE__), "fixtures", "frameworks"))
-      FileUtils.rm_rf("./coverage")
-    end
-
-    after do
-      Dir.chdir(@current_dir)
+    around do |test|
+      Dir.chdir(File.join(File.dirname(__FILE__), "fixtures", "frameworks")) do
+        FileUtils.rm_rf("./coverage")
+        test.call
+      end
     end
 
     it "has return code 0 when running testunit_good.rb" do

data/spec/source_file_spec.rb

@@ -1,7 +1,7 @@
 require "helper"
 
 describe SimpleCov::SourceFile do
-  COVERAGE_FOR_SAMPLE_RB = [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil, nil, nil, nil, nil, nil, nil]
+  COVERAGE_FOR_SAMPLE_RB = [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil, nil, nil, nil, nil, nil, nil].freeze
   context "a source file initialized with some coverage data" do
     subject do
       SimpleCov::SourceFile.new(source_fixture("sample.rb"), COVERAGE_FOR_SAMPLE_RB)

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: simplecov-html
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +190,7 @@ files:
 - spec/fixtures/utf-8.rb
 - spec/helper.rb
 - spec/merge_helpers_spec.rb
+- spec/multi_formatter_spec.rb
 - spec/result_spec.rb
 - spec/return_codes_spec.rb
 - spec/source_file_line_spec.rb
@@ -208,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Code coverage for Ruby 1.9+ with a powerful configuration library and automatic
@@ -287,6 +294,7 @@ test_files:
 - spec/fixtures/utf-8.rb
 - spec/helper.rb
 - spec/merge_helpers_spec.rb
+- spec/multi_formatter_spec.rb
 - spec/result_spec.rb
 - spec/return_codes_spec.rb
 - spec/source_file_line_spec.rb