simplecov 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ded95468b70d7817ca95004ac38a0b6ad2e388
-  data.tar.gz: 2bb87e0871a8daa3955049fa6e808968d479ea48
+  metadata.gz: 15fa4589e25ee4710bdbcec7485a4d8ec7be7abb
+  data.tar.gz: a1627cf287ce3c70ba2d60e0943f28f90fcdef79
 SHA512:
-  metadata.gz: af959d1c396d33ac1f1f76e6108993d1e0af61e1f9059feb4dcbb598e46eceb51b930370d6e1f5f3711dc498ced9176a72ae125498f1d3b385581bba00c61466
-  data.tar.gz: fd27be25b4cca08be020931d330cc2a958559a49c61c8058b6433a55d75252b263502c74445efa21ee7a7683aceee6a4650501fe00a07ee25dbad546aef891f5
+  metadata.gz: 03a052dcae5923fe19e56f6f20fbd390505f03dca386d51eaca4b525252054856ce492e783e6923ad3b89a46719b89556747b8bbac295513b1d245fba3232e79
+  data.tar.gz: e2cd84b984e35dfa0c048f375ed2555f08d4df239d616d7c70289b086b1904394b1344f177ad5d7dd08cfb695fe2c22d5375af8e07da5d773500b034d87d4b1c

data/.rubocop.yml

@@ -4,6 +4,9 @@ AllCops:
     - 'tmp/**/*'
     - 'vendor/bundle/**/*'
 
+Bundler/OrderedGems:
+  Enabled: false
+
 Lint/AmbiguousRegexpLiteral:
   Exclude:
     - 'features/**/*_steps.rb'
@@ -13,6 +16,10 @@ Lint/AmbiguousRegexpLiteral:
 Metrics/AbcSize:
   Max: 25 # TODO: Lower to 15
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+
 Metrics/BlockNesting:
   Max: 2
 

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 
 before_install:
+  - gem update --system
   - gem install bundler
 
 bundler_args: --without development --jobs=3 --retry=3
@@ -14,15 +15,18 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.5
-  - 2.3.0
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - ruby-head
   - jruby-head
+  - jruby-9.1.7.0
   - rbx-2
 
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: jruby-9.1.7.0
     - rvm: rbx-2
   fast_finish: true

data/CHANGELOG.md

@@ -1,10 +1,18 @@
-Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.12.0...master))
+0.13.0 2016-01-25 ([changes](https://github.com/colszowka/simplecov/compare/v0.12.0...v0.13.0))
 ==========
 
 ## Enhancements
 
+* Faster run times when a very large number of files is loaded into SimpleCov. See [#520](https://github.com/colszowka/simplecov/pull/520) (thanks @alyssais)
+* Only read in source code files that are actually used (faster when files are ignored etc.). See [#540](https://github.com/colszowka/simplecov/pull/540) (tahks @yui-knk)
+
 ## Bugfixes
 
+* Fix merging of resultsets if a file is missing on one side. See [#513](https://github.com/colszowka/simplecov/pull/513) (thanks @hanazuki)
+* Fix Ruby 2.4 deprecation warnings by using Integer instead of Fixnum. See [#523](https://github.com/colszowka/simplecov/pull/523) (thanks @nobu)
+* Force Ruby 2 to json 2. See [dc7417d50](https://github.com/colszowka/simplecov/commit/dc7417d5049b1809cea214314c15dd93a5dd964f) (thanks @amatsuda)
+* Various other gem dependency fixes for different gems on different ruby versions. (thanks @amatsuda)
+
 0.12.0 2016-07-02 ([changes](https://github.com/colszowka/simplecov/compare/v0.11.2...v0.12.0))
 =================
 

data/Gemfile

@@ -11,26 +11,28 @@ gem "rake", Gem::Version.new(RUBY_VERSION) < Gem::Version.new("1.9.3") ? "~>10.3
 group :test do
   gem "rspec", ">= 3.2"
   # Older versions of some gems required for Ruby 1.8.7 support
-  platform :ruby_18 do
+  platforms :ruby_18 do
     gem "activesupport", "~> 3.2.21"
     gem "i18n", "~> 0.6.11"
   end
-  platform :ruby_18, :ruby_19 do
+  platforms :ruby_18, :ruby_19 do
     gem "mime-types", "~> 1.25"
-    gem "json", "~> 1.8"
+    gem "addressable", "~> 2.3.0"
   end
-  platform :ruby_18, :ruby_19, :ruby_20, :ruby_21 do
+  platforms :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
+  platforms :jruby, :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24, :ruby_25 do
     gem "aruba", "~> 0.7.4"
     gem "capybara"
+    gem "nokogiri", RUBY_VERSION < "2.1" ? "~> 1.6.0" : ">= 1.7"
     gem "cucumber"
     gem "phantomjs", "~> 1.9"
     gem "poltergeist"
-    gem "rubocop", "~> 0.41.0"
+    gem "rubocop" unless RUBY_VERSION.start_with?("1.")
     gem "test-unit"
   end
+  gem "json", RUBY_VERSION.start_with?("1.") ? "~> 1.8" : "~> 2.0"
 end
 
 gemspec

data/README.md

@@ -101,12 +101,12 @@ Getting started
 
 **Coverage results report, fully browsable locally with sorting and much more:**
 
-![SimpleCov coverage report](http://colszowka.github.com/simplecov/devise_result-0.5.3.png)
+![SimpleCov coverage report](https://cloud.githubusercontent.com/assets/137793/17071162/db6f253e-502d-11e6-9d84-e40c3d75f333.png)
 
 
 **Source file coverage details view:**
 
-![SimpleCov source file detail view](http://colszowka.github.com/simplecov/devise_source_file-0.5.3.png)
+![SimpleCov source file detail view](https://cloud.githubusercontent.com/assets/137793/17071163/db6f9f0a-502d-11e6-816c-edb2c66fad8d.png)
 
 ## Use it with any framework!
 

data/Rakefile

@@ -27,10 +27,15 @@ rescue LoadError
 end
 
 # Cucumber integration test suite is for impls that work with simplecov only - a.k.a. 1.9+
-if RUBY_VERSION >= "1.9"
+if RUBY_VERSION.start_with? "1.8"
+  task :default => [:spec]
+else
   require "cucumber/rake/task"
   Cucumber::Rake::Task.new
-  task :default => [:spec, :cucumber, :rubocop]
-else
-  task :default => [:spec]
+
+  if RUBY_VERSION.start_with? "1.9"
+    task :default => [:spec, :cucumber]
+  else
+    task :default => [:spec, :cucumber, :rubocop]
+  end
 end

data/lib/simplecov/configuration.rb

@@ -192,7 +192,7 @@ module SimpleCov
     end
 
     #
-    # Defines them maximum age (in seconds) of a resultset to still be included in merged results.
+    # Defines the maximum age (in seconds) of a resultset to still be included in merged results.
     # i.e. If you run cucumber features, then later rake test, if the stored cucumber resultset is
     # more seconds ago than specified here, it won't be taken into account when merging (and is also
     # purged from the resultset cache)
@@ -204,7 +204,7 @@ module SimpleCov
     # Configure with SimpleCov.merge_timeout(3600) # 1hr
     #
     def merge_timeout(seconds = nil)
-      @merge_timeout = seconds if seconds.is_a?(Fixnum)
+      @merge_timeout = seconds if seconds.is_a?(Integer)
       @merge_timeout ||= 600
     end
 

data/lib/simplecov/defaults.rb

@@ -49,7 +49,7 @@ end
 # Gotta stash this a-s-a-p, see the CommandGuesser class and i.e. #110 for further info
 SimpleCov::CommandGuesser.original_run_command = "#{$PROGRAM_NAME} #{ARGV.join(' ')}"
 
-at_exit do
+at_exit do # rubocop:disable Metrics/BlockLength
   # If we are in a different process than called start, don't interfere.
   next if SimpleCov.pid != Process.pid
 

data/lib/simplecov/merge_helpers.rb

@@ -22,11 +22,14 @@ module SimpleCov
     def merge_resultset(hash)
       new_resultset = {}
       (keys + hash.keys).each do |filename|
-        new_resultset[filename] = []
+        new_resultset[filename] = nil
       end
 
       new_resultset.each_key do |filename|
-        new_resultset[filename] = (self[filename] || []).extend(SimpleCov::ArrayMergeHelper).merge_resultset(hash[filename] || [])
+        result1 = self[filename]
+        result2 = hash[filename]
+        new_resultset[filename] =
+          result1 && result2 ? result1.extend(ArrayMergeHelper).merge_resultset(result2) : (result1 || result2).dup
       end
       new_resultset
     end

data/lib/simplecov/result.rb

@@ -60,7 +60,7 @@ module SimpleCov
 
     # Returns a hash representation of this Result that can be used for marshalling it into JSON
     def to_hash
-      {command_name => {"coverage" => original_result.reject { |filename, _| !filenames.include?(filename) }, "timestamp" => created_at.to_i}}
+      {command_name => {"coverage" => coverage, "timestamp" => created_at.to_i}}
     end
 
     # Loads a SimpleCov::Result#to_hash dump
@@ -74,6 +74,11 @@ module SimpleCov
 
   private
 
+    def coverage
+      keys = original_result.keys & filenames
+      Hash[keys.zip(original_result.values_at(*keys))]
+    end
+
     # Applies all configured SimpleCov filters on this result's source files
     def filter!
       @files = SimpleCov.filtered(files)

data/lib/simplecov/source_file.rb

@@ -26,8 +26,8 @@ module SimpleCov
 
       def initialize(src, line_number, coverage)
         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?
+        raise ArgumentError, "Only Integer accepted for line_number" unless line_number.is_a?(Integer)
+        raise ArgumentError, "Only Integer and nil accepted for coverage" unless coverage.is_a?(Integer) || coverage.nil?
         @src         = src
         @line_number = line_number
         @coverage    = coverage
@@ -74,16 +74,20 @@ module SimpleCov
     attr_reader :filename
     # The array of coverage data received from the Coverage.result
     attr_reader :coverage
-    # The source code for this file. Aliased as :source
-    attr_reader :src
-    alias source src
 
     def initialize(filename, coverage)
       @filename = filename
       @coverage = coverage
-      File.open(filename, "rb") { |f| @src = f.readlines }
     end
 
+    # The source code for this file. Aliased as :source
+    def src
+      # We intentionally read source code lazily to
+      # suppress reading unused source code.
+      @src ||= File.open(filename, "rb", &:readlines)
+    end
+    alias source src
+
     # Returns all source lines for this file as instances of SimpleCov::SourceFile::Line,
     # and thus including coverage data. Aliased as :source_lines
     def lines

data/lib/simplecov/version.rb

@@ -1,5 +1,5 @@
 module SimpleCov
-  version = "0.12.0"
+  version = "0.13.0"
 
   def version.to_a
     split(".").map(&:to_i)

data/spec/1_8_fallbacks_spec.rb

@@ -6,24 +6,26 @@ require "helper"
 # TODO: This should be expanded upon all methods that could potentially
 # be called in a test/spec-helper simplecov config block
 #
-describe "Ruby 1.8 fallback" do
-  it "return false when calling SimpleCov.start" do
-    expect(SimpleCov.start).to be false
-  end
+if RUBY_VERSION.start_with? "1.8"
+  describe "Ruby 1.8 fallback" do
+    it "return false when calling SimpleCov.start" do
+      expect(SimpleCov.start).to be false
+    end
 
-  it "return false when calling SimpleCov.start with a block" do
-    expect(SimpleCov.start { raise "Shouldn't reach this!" }).to be false
-  end
+    it "return false when calling SimpleCov.start with a block" do
+      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 { raise "Shouldn't reach this!" }).to be false
-  end
+    it "return false when calling SimpleCov.configure with a block" do
+      expect(SimpleCov.configure { raise "Shouldn't reach this!" }).to be false
+    end
 
-  it "allow to define a profile" do
-    expect do
-      SimpleCov.profiles.define "testprofile" do
-        add_filter "/config/"
-      end
-    end.not_to raise_error
+    it "allow to define a profile" do
+      expect do
+        SimpleCov.profiles.define "testprofile" do
+          add_filter "/config/"
+        end
+      end.not_to raise_error
+    end
   end
-end if RUBY_VERSION.start_with? "1.8"
+end

data/spec/command_guesser_spec.rb

@@ -1,46 +1,48 @@
 require "helper"
 
-describe SimpleCov::CommandGuesser do
-  subject { SimpleCov::CommandGuesser }
-  it 'correctly guesses "Unit Tests" for unit tests' do
-    subject.original_run_command = "/some/path/test/units/foo_bar_test.rb"
-    expect(subject.guess).to eq("Unit Tests")
-    subject.original_run_command = "test/units/foo.rb"
-    expect(subject.guess).to eq("Unit Tests")
-    subject.original_run_command = "test/foo.rb"
-    expect(subject.guess).to eq("Unit Tests")
-    subject.original_run_command = "test/{models,helpers,unit}/**/*_test.rb"
-    expect(subject.guess).to eq("Unit Tests")
-  end
+if SimpleCov.usable?
+  describe SimpleCov::CommandGuesser do
+    subject { SimpleCov::CommandGuesser }
+    it 'correctly guesses "Unit Tests" for unit tests' do
+      subject.original_run_command = "/some/path/test/units/foo_bar_test.rb"
+      expect(subject.guess).to eq("Unit Tests")
+      subject.original_run_command = "test/units/foo.rb"
+      expect(subject.guess).to eq("Unit Tests")
+      subject.original_run_command = "test/foo.rb"
+      expect(subject.guess).to eq("Unit Tests")
+      subject.original_run_command = "test/{models,helpers,unit}/**/*_test.rb"
+      expect(subject.guess).to eq("Unit Tests")
+    end
 
-  it 'correctly guesses "Functional Tests" for functional tests' do
-    subject.original_run_command = "/some/path/test/functional/foo_bar_controller_test.rb"
-    expect(subject.guess).to eq("Functional Tests")
-    subject.original_run_command = "test/{controllers,mailers,functional}/**/*_test.rb"
-    expect(subject.guess).to eq("Functional Tests")
-  end
+    it 'correctly guesses "Functional Tests" for functional tests' do
+      subject.original_run_command = "/some/path/test/functional/foo_bar_controller_test.rb"
+      expect(subject.guess).to eq("Functional Tests")
+      subject.original_run_command = "test/{controllers,mailers,functional}/**/*_test.rb"
+      expect(subject.guess).to eq("Functional Tests")
+    end
 
-  it 'correctly guesses "Integration Tests" for integration tests' do
-    subject.original_run_command = "/some/path/test/integration/foo_bar_controller_test.rb"
-    expect(subject.guess).to eq("Integration Tests")
-    subject.original_run_command = "test/integration/**/*_test.rb"
-    expect(subject.guess).to eq("Integration Tests")
-  end
+    it 'correctly guesses "Integration Tests" for integration tests' do
+      subject.original_run_command = "/some/path/test/integration/foo_bar_controller_test.rb"
+      expect(subject.guess).to eq("Integration Tests")
+      subject.original_run_command = "test/integration/**/*_test.rb"
+      expect(subject.guess).to eq("Integration Tests")
+    end
 
-  it 'correctly guesses "Cucumber Features" for cucumber features' do
-    subject.original_run_command = "features"
-    expect(subject.guess).to eq("Cucumber Features")
-    subject.original_run_command = "cucumber"
-    expect(subject.guess).to eq("Cucumber Features")
-  end
+    it 'correctly guesses "Cucumber Features" for cucumber features' do
+      subject.original_run_command = "features"
+      expect(subject.guess).to eq("Cucumber Features")
+      subject.original_run_command = "cucumber"
+      expect(subject.guess).to eq("Cucumber Features")
+    end
 
-  it 'correctly guesses "RSpec" for RSpec' do
-    subject.original_run_command = "/some/path/spec/foo.rb"
-    expect(subject.guess).to eq("RSpec")
-  end
+    it 'correctly guesses "RSpec" for RSpec' do
+      subject.original_run_command = "/some/path/spec/foo.rb"
+      expect(subject.guess).to eq("RSpec")
+    end
 
-  it "defaults to RSpec because RSpec constant is defined" do
-    subject.original_run_command = "some_arbitrary_command with arguments"
-    expect(subject.guess).to eq("RSpec")
+    it "defaults to RSpec because RSpec constant is defined" do
+      subject.original_run_command = "some_arbitrary_command with arguments"
+      expect(subject.guess).to eq("RSpec")
+    end
   end
-end if SimpleCov.usable?
+end

data/spec/file_list_spec.rb

@@ -1,48 +1,50 @@
 require "helper"
 
-describe SimpleCov::Result do
-  subject do
-    original_result = {
-      source_fixture("sample.rb") => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil],
-      source_fixture("app/models/user.rb") => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil],
-      source_fixture("app/controllers/sample_controller.rb") => [nil, 2, 2, 0, nil, nil, 0, nil, nil, nil],
-    }
-    SimpleCov::Result.new(original_result).files
-  end
-
-  it "has 11 covered lines" do
-    expect(subject.covered_lines).to eq(11)
-  end
-
-  it "has 3 missed lines" do
-    expect(subject.missed_lines).to eq(3)
-  end
-
-  it "has 19 never lines" do
-    expect(subject.never_lines).to eq(19)
-  end
-
-  it "has 14 lines of code" do
-    expect(subject.lines_of_code).to eq(14)
-  end
-
-  it "has 3 skipped lines" do
-    expect(subject.skipped_lines).to eq(3)
-  end
-
-  it "has the correct covered percent" do
-    expect(subject.covered_percent).to eq(78.57142857142857)
-  end
-
-  it "has the correct covered percentages" do
-    expect(subject.covered_percentages).to eq([50.0, 80.0, 100.0])
-  end
-
-  it "has the correct least covered file" do
-    expect(subject.least_covered_file).to match(/sample_controller.rb/)
-  end
-
-  it "has the correct covered strength" do
-    expect(subject.covered_strength).to eq(0.9285714285714286)
-  end
-end if SimpleCov.usable?
+if SimpleCov.usable?
+  describe SimpleCov::Result do
+    subject do
+      original_result = {
+        source_fixture("sample.rb") => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil],
+        source_fixture("app/models/user.rb") => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil],
+        source_fixture("app/controllers/sample_controller.rb") => [nil, 2, 2, 0, nil, nil, 0, nil, nil, nil],
+      }
+      SimpleCov::Result.new(original_result).files
+    end
+
+    it "has 11 covered lines" do
+      expect(subject.covered_lines).to eq(11)
+    end
+
+    it "has 3 missed lines" do
+      expect(subject.missed_lines).to eq(3)
+    end
+
+    it "has 19 never lines" do
+      expect(subject.never_lines).to eq(19)
+    end
+
+    it "has 14 lines of code" do
+      expect(subject.lines_of_code).to eq(14)
+    end
+
+    it "has 3 skipped lines" do
+      expect(subject.skipped_lines).to eq(3)
+    end
+
+    it "has the correct covered percent" do
+      expect(subject.covered_percent).to eq(78.57142857142857)
+    end
+
+    it "has the correct covered percentages" do
+      expect(subject.covered_percentages).to eq([50.0, 80.0, 100.0])
+    end
+
+    it "has the correct least covered file" do
+      expect(subject.least_covered_file).to match(/sample_controller.rb/)
+    end
+
+    it "has the correct covered strength" do
+      expect(subject.covered_strength).to eq(0.9285714285714286)
+    end
+  end
+end