Hello community, here is the log from the commit of package rubygem-simplecov for openSUSE:Factory checked in at 2016-03-01 09:43:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-simplecov (Old) and /work/SRC/openSUSE:Factory/.rubygem-simplecov.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-simplecov" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-simplecov/rubygem-simplecov.changes 2015-12-13 09:40:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-simplecov.new/rubygem-simplecov.changes 2016-03-01 09:43:40.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 4 05:41:02 UTC 2016 - coolo@suse.com + +- updated to version 0.11.2 + see installed CHANGELOG.md + +------------------------------------------------------------------- Old: ---- simplecov-0.11.1.gem New: ---- simplecov-0.11.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-simplecov.spec ++++++ --- /var/tmp/diff_new_pack.p6uyMB/_old 2016-03-01 09:43:41.000000000 +0100 +++ /var/tmp/diff_new_pack.p6uyMB/_new 2016-03-01 09:43:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-simplecov # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ # Name: rubygem-simplecov -Version: 0.11.1 +Version: 0.11.2 Release: 0 %define mod_name simplecov %define mod_full_name %{mod_name}-%{version} ++++++ simplecov-0.11.1.gem -> simplecov-0.11.2.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.rubocop.yml new/.rubocop.yml --- old/.rubocop.yml 2015-12-02 06:08:44.000000000 +0100 +++ new/.rubocop.yml 2016-02-03 14:42:53.000000000 +0100 @@ -66,5 +66,8 @@ Exclude: - 'spec/fixtures/utf-8.rb' -Style/TrailingComma: - EnforcedStyleForMultiline: 'comma' +Style/TrailingCommaInLiteral: + EnforcedStyleForMultiline: comma + +Style/GuardClause: + Enabled: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2015-12-02 06:08:44.000000000 +0100 +++ new/CHANGELOG.md 2016-02-03 14:42:53.000000000 +0100 @@ -1,10 +1,24 @@ -Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.11.0...master)) +Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.11.2...master)) ================= ## Enhancements ## Bugfixes +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 + +* 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)) ================= @@ -20,7 +34,7 @@ ## 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gemfile new/Gemfile --- old/Gemfile 2015-12-02 06:08:44.000000000 +0100 +++ new/Gemfile 2016-02-03 14:42:53.000000000 +0100 @@ -15,7 +15,7 @@ gem "activesupport", "~> 3.2.21" gem "i18n", "~> 0.6.11" end - platform :jruby, :ruby_19, :ruby_20, :ruby_21, :ruby_22 do + platform :jruby, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23 do gem "aruba", "~> 0.7.4" gem "capybara", "~> 2.4" @@ -26,7 +26,7 @@ gem "cucumber", "~> 2.0" gem "phantomjs", "~> 1.9" gem "poltergeist", "~> 1.1" - gem "rubocop", ">= 0.30" + gem "rubocop", "~> 0.36.0" gem "test-unit", "~> 3.0" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2015-12-02 06:08:44.000000000 +0100 +++ new/README.md 2016-02-03 14:42:53.000000000 +0100 @@ -6,11 +6,8 @@ * [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 @@ [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, Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/simplecov/configuration.rb new/lib/simplecov/configuration.rb --- old/lib/simplecov/configuration.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/lib/simplecov/configuration.rb 2016-02-03 14:42:53.000000000 +0100 @@ -28,6 +28,7 @@ # 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 @@ # 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 @@ # 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 # @@ -114,7 +118,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/simplecov/defaults.rb new/lib/simplecov/defaults.rb --- old/lib/simplecov/defaults.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/lib/simplecov/defaults.rb 2016-02-03 14:42:53.000000000 +0100 @@ -4,8 +4,9 @@ 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 @@ 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 @@ # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/simplecov/jruby_fix.rb new/lib/simplecov/jruby_fix.rb --- old/lib/simplecov/jruby_fix.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/lib/simplecov/jruby_fix.rb 2016-02-03 14:42:53.000000000 +0100 @@ -11,7 +11,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 = {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/simplecov/merge_helpers.rb new/lib/simplecov/merge_helpers.rb --- old/lib/simplecov/merge_helpers.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/lib/simplecov/merge_helpers.rb 2016-02-03 14:42:53.000000000 +0100 @@ -27,12 +27,9 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/simplecov/result.rb new/lib/simplecov/result.rb --- old/lib/simplecov/result.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/lib/simplecov/result.rb 2016-02-03 14:42:53.000000000 +0100 @@ -12,7 +12,7 @@ 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 @@ # 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/simplecov/source_file.rb new/lib/simplecov/source_file.rb --- old/lib/simplecov/source_file.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/lib/simplecov/source_file.rb 2016-02-03 14:42:53.000000000 +0100 @@ -20,9 +20,9 @@ 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) @@ -76,7 +76,7 @@ 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 @@ 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 @@ 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 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/simplecov/version.rb new/lib/simplecov/version.rb --- old/lib/simplecov/version.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/lib/simplecov/version.rb 2016-02-03 14:42:53.000000000 +0100 @@ -1,22 +1,25 @@ module SimpleCov - VERSION = "0.11.1" - def VERSION.to_a + version = "0.11.2" + + 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.freeze end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/simplecov.rb new/lib/simplecov.rb --- old/lib/simplecov.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/lib/simplecov.rb 2016-02-03 14:42:53.000000000 +0100 @@ -2,13 +2,17 @@ # 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 JRuby.runtime.debug? + warn 'Coverage may be inaccurate; set "cli.debug=true" ("-Xcli.debug=true") in your .jrubyrc or' \ + ' do JRUBY_OPTS="-d"' end end module SimpleCov @@ -53,9 +57,9 @@ # 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 +74,22 @@ # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-12-02 06:08:44.000000000 +0100 +++ new/metadata 2016-02-03 14:42:53.000000000 +0100 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: simplecov version: !ruby/object:Gem::Version - version: 0.11.1 + version: 0.11.2 platform: ruby authors: - Christoph Olszowka autorequire: bindir: bin cert_chain: [] -date: 2015-12-02 00:00:00.000000000 Z +date: 2016-02-03 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: json @@ -209,87 +209,9 @@ 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 merging of coverage across test suites -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 +test_files: [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/merge_helpers_spec.rb new/spec/merge_helpers_spec.rb --- old/spec/merge_helpers_spec.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/spec/merge_helpers_spec.rb 2016-02-03 14:42:53.000000000 +0100 @@ -9,7 +9,7 @@ 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], - } + }.extend(SimpleCov::HashMergeHelper) @resultset2 = { source_fixture("sample.rb") => [1, nil, 1, 1, nil, nil, 1, 1, nil, nil], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/source_file_spec.rb new/spec/source_file_spec.rb --- old/spec/source_file_spec.rb 2015-12-02 06:08:44.000000000 +0100 +++ new/spec/source_file_spec.rb 2016-02-03 14:42:53.000000000 +0100 @@ -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)