simplecov 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c477692497bba3df0d4545ed9d4e4e7fd18b6918
-  data.tar.gz: 9224079fa17a1993d471be4da3769f1c96139202
+  metadata.gz: c4ded95468b70d7817ca95004ac38a0b6ad2e388
+  data.tar.gz: 2bb87e0871a8daa3955049fa6e808968d479ea48
 SHA512:
-  metadata.gz: 1143ac48afac3679abfa6a1187c29ad3d832c94951096670ba78062b9df2d95ef893a8996287f3ec4b2da3a77bd1753697e6a6d9d00e0d04f333d2e531ddbf78
-  data.tar.gz: 62d25d8868801db9a8360743ef8bd0348b6ffb1f2fc99e674abbd703d7d1a9f0793ed6d6a7665206f149e9d2713fe58698d90d6a6b3839234453b3563c014411
+  metadata.gz: af959d1c396d33ac1f1f76e6108993d1e0af61e1f9059feb4dcbb598e46eceb51b930370d6e1f5f3711dc498ced9176a72ae125498f1d3b385581bba00c61466
+  data.tar.gz: fd27be25b4cca08be020931d330cc2a958559a49c61c8058b6433a55d75252b263502c74445efa21ee7a7683aceee6a4650501fe00a07ee25dbad546aef891f5

data/.rubocop.yml

@@ -71,3 +71,7 @@ Style/TrailingCommaInLiteral:
 
 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,10 +1,22 @@
-Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.11.2...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))
 =================
 

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 :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.36.0"
-    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**
 
@@ -146,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.rb

@@ -10,9 +10,10 @@ if defined?(JRUBY_VERSION) && defined?(JRuby)
   # @see https://github.com/colszowka/simplecov/issues/86
   # @see https://jira.codehaus.org/browse/JRUBY-6106
 
-  unless JRuby.runtime.debug?
-    warn 'Coverage may be inaccurate; set "cli.debug=true" ("-Xcli.debug=true") in your .jrubyrc or' \
-      ' do JRUBY_OPTS="-d"'
+  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
@@ -124,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/lib/simplecov/configuration.rb

@@ -85,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
 
@@ -289,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/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/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

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/source_file.rb

@@ -25,9 +25,9 @@ module SimpleCov
       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

data/lib/simplecov/version.rb

@@ -1,5 +1,5 @@
 module SimpleCov
-  version = "0.11.2"
+  version = "0.12.0"
 
   def version.to_a
     split(".").map(&:to_i)
@@ -21,5 +21,5 @@ module SimpleCov
     to_a[3]
   end
 
-  VERSION = version.freeze
+  VERSION = version
 end

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,6 +9,7 @@ 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 = {
@@ -16,6 +17,7 @@ describe "merge helpers" do
         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/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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 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
@@ -214,4 +220,82 @@ signing_key:
 specification_version: 4
 summary: Code coverage for Ruby 1.9+ with a powerful configuration library and automatic
   merging of coverage across test suites
-test_files: []
+test_files:
+- features/config_autoload.feature
+- 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_profiles.feature
+- features/config_project_name.feature
+- features/config_styles.feature
+- features/config_tracked_files.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
+- 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
+- spec/1_8_fallbacks_spec.rb
+- spec/command_guesser_spec.rb
+- spec/deleted_source_spec.rb
+- spec/faked_project/Gemfile
+- spec/faked_project/Rakefile
+- spec/faked_project/cucumber.yml
+- spec/faked_project/features/step_definitions/my_steps.rb
+- spec/faked_project/features/support/env.rb
+- spec/faked_project/features/test_stuff.feature
+- spec/faked_project/lib/faked_project.rb
+- spec/faked_project/lib/faked_project/framework_specific.rb
+- spec/faked_project/lib/faked_project/meta_magic.rb
+- spec/faked_project/lib/faked_project/some_class.rb
+- spec/faked_project/lib/faked_project/untested_class.rb
+- spec/faked_project/spec/faked_spec.rb
+- spec/faked_project/spec/forking_spec.rb
+- spec/faked_project/spec/meta_magic_spec.rb
+- spec/faked_project/spec/some_class_spec.rb
+- spec/faked_project/spec/spec_helper.rb
+- spec/faked_project/test/faked_test.rb
+- spec/faked_project/test/meta_magic_test.rb
+- spec/faked_project/test/some_class_test.rb
+- spec/faked_project/test/test_helper.rb
+- spec/file_list_spec.rb
+- spec/filters_spec.rb
+- spec/fixtures/app/controllers/sample_controller.rb
+- spec/fixtures/app/models/user.rb
+- spec/fixtures/deleted_source_sample.rb
+- spec/fixtures/frameworks/rspec_bad.rb
+- spec/fixtures/frameworks/rspec_good.rb
+- spec/fixtures/frameworks/testunit_bad.rb
+- spec/fixtures/frameworks/testunit_good.rb
+- spec/fixtures/iso-8859.rb
+- spec/fixtures/resultset1.rb
+- spec/fixtures/resultset2.rb
+- spec/fixtures/sample.rb
+- 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
+- spec/source_file_spec.rb