simplecov 0.14.0 → 0.15.0

data/spec/result_merger_spec.rb

@@ -1,10 +1,16 @@
 require "helper"
+require "tempfile"
+require "timeout"
 
 if SimpleCov.usable?
   describe SimpleCov::ResultMerger do
+    before do
+      SimpleCov::ResultMerger.clear_resultset
+      File.delete(SimpleCov::ResultMerger.resultset_path) if File.exist?(SimpleCov::ResultMerger.resultset_path)
+    end
+
     describe "with two faked coverage resultsets" do
       before do
-        SimpleCov.use_merging true
         @resultset1 = {
           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],
@@ -56,7 +62,7 @@ if SimpleCov.usable?
           end
 
           it "returns a hash containing keys ['result1' and 'result2'] for resultset" do
-            expect(SimpleCov::ResultMerger.resultset.keys.sort).to eq %w(result1 result2)
+            expect(SimpleCov::ResultMerger.resultset.keys.sort).to eq %w[result1 result2]
           end
 
           it "returns proper values for merged_result" do
@@ -73,15 +79,92 @@ if SimpleCov.usable?
               expect(SimpleCov::ResultMerger.results.length).to eq(1)
             end
           end
+        end
+      end
+    end
+
+    describe ".store_result" do
+      it "refreshes the resultset" do
+        set = SimpleCov::ResultMerger.resultset
+        SimpleCov::ResultMerger.store_result({})
+        new_set = SimpleCov::ResultMerger.resultset
+        expect(new_set).not_to be(set)
+      end
 
-          context "with merging disabled" do
-            before { SimpleCov.use_merging false }
+      it "persists to disk" do
+        SimpleCov::ResultMerger.store_result("a" => [1])
+        SimpleCov::ResultMerger.clear_resultset
+        new_set = SimpleCov::ResultMerger.resultset
+        expect(new_set).to eq("a" => [1])
+      end
+
+      it "synchronizes writes" do
+        expect(SimpleCov::ResultMerger).to receive(:synchronize_resultset)
+        SimpleCov::ResultMerger.store_result({})
+      end
+    end
 
-            it "returns nil for SimpleCov.result" do
-              expect(SimpleCov.result).to be_nil
+    describe ".resultset" do
+      it "caches" do
+        set = SimpleCov::ResultMerger.resultset
+        new_set = SimpleCov::ResultMerger.resultset
+        expect(new_set).to be(set)
+      end
+
+      it "synchronizes reads" do
+        expect(SimpleCov::ResultMerger).to receive(:synchronize_resultset)
+        SimpleCov::ResultMerger.resultset
+      end
+    end
+
+    describe ".synchronize_resultset" do
+      it "is reentrant (i.e. doesn't block its own process)" do
+        # without @resultset_locked, this spec would fail and
+        # `.store_result` wouldn't work
+        expect do
+          Timeout.timeout(1) do
+            SimpleCov::ResultMerger.synchronize_resultset do
+              SimpleCov::ResultMerger.synchronize_resultset do
+              end
             end
           end
+        end.not_to raise_error
+      end
+
+      it "blocks other processes" do
+        file = Tempfile.new("foo")
+
+        other_process = open("|ruby -e " + Shellwords.escape(<<-CODE) + " 2>/dev/null")
+          require "simplecov"
+          SimpleCov.coverage_dir(#{SimpleCov.coverage_dir.inspect})
+
+          # ensure the parent process has enough time to get a
+          # lock before we do
+          sleep 0.5
+
+          $stdout.sync = true
+          puts "running" # see `sleep`s in parent process
+
+          SimpleCov::ResultMerger.synchronize_resultset do
+            File.open(#{file.path.inspect}, "a") { |f| f.write("process 2\n") }
+          end
+        CODE
+
+        SimpleCov::ResultMerger.synchronize_resultset do
+          # wait until the child process is going, and then wait some more
+          # so we can be sure it blocks on the lock we already have.
+          sleep 0.1 until other_process.gets == "running\n"
+          sleep 1
+
+          # despite the sleeps, this will be written first since we got
+          # the first lock
+          File.open(file.path, "a") { |f| f.write("process 1\n") }
         end
+
+        # wait for it to finish
+        other_process.gets
+
+        expect(file.read).to eq("process 1\nprocess 2\n")
       end
     end
   end

data/spec/simplecov_spec.rb

@@ -0,0 +1,109 @@
+require "helper"
+
+if SimpleCov.usable?
+  describe SimpleCov do
+    describe ".result" do
+      before do
+        SimpleCov.clear_result
+        allow(Coverage).to receive(:result).once.and_return({})
+      end
+
+      context "with merging disabled" do
+        before do
+          allow(SimpleCov).to receive(:use_merging).once.and_return(false)
+        end
+
+        context "when not running" do
+          before do
+            allow(SimpleCov).to receive(:running).and_return(false)
+          end
+
+          it "returns nil" do
+            expect(SimpleCov.result).to be_nil
+          end
+        end
+
+        context "when running" do
+          before do
+            allow(SimpleCov).to receive(:running).and_return(true, false)
+          end
+
+          it "uses the result from Coverage" do
+            expect(Coverage).to receive(:result).once.and_return(__FILE__ => [0, 1])
+            expect(SimpleCov.result.filenames).to eq [__FILE__]
+          end
+
+          it "adds not-loaded-files" do
+            expect(SimpleCov).to receive(:add_not_loaded_files).once.and_return({})
+            SimpleCov.result
+          end
+
+          it "doesn't store the current coverage" do
+            expect(SimpleCov::ResultMerger).not_to receive(:store_result)
+            SimpleCov.result
+          end
+
+          it "doesn't merge the result" do
+            expect(SimpleCov::ResultMerger).not_to receive(:merged_result)
+            SimpleCov.result
+          end
+
+          it "caches its result" do
+            result = SimpleCov.result
+            expect(SimpleCov.result).to be(result)
+          end
+        end
+      end
+
+      context "with merging enabled" do
+        let(:the_merged_result) { double }
+
+        before do
+          allow(SimpleCov).to receive(:use_merging).once.and_return(true)
+          allow(SimpleCov::ResultMerger).to receive(:store_result).once
+          allow(SimpleCov::ResultMerger).to receive(:merged_result).once.and_return(the_merged_result)
+        end
+
+        context "when not running" do
+          before do
+            allow(SimpleCov).to receive(:running).and_return(false)
+          end
+
+          it "merges the result" do
+            expect(SimpleCov.result).to be(the_merged_result)
+          end
+        end
+
+        context "when running" do
+          before do
+            allow(SimpleCov).to receive(:running).and_return(true, false)
+          end
+
+          it "uses the result from Coverage" do
+            expect(Coverage).to receive(:result).once.and_return({})
+            SimpleCov.result
+          end
+
+          it "adds not-loaded-files" do
+            expect(SimpleCov).to receive(:add_not_loaded_files).once.and_return({})
+            SimpleCov.result
+          end
+
+          it "stores the current coverage" do
+            expect(SimpleCov::ResultMerger).to receive(:store_result).once
+            SimpleCov.result
+          end
+
+          it "merges the result" do
+            expect(SimpleCov.result).to be(the_merged_result)
+          end
+
+          it "caches its result" do
+            result = SimpleCov.result
+            expect(SimpleCov.result).to be(result)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/source_file_spec.rb

@@ -16,6 +16,10 @@ if SimpleCov.usable?
         expect(subject.src).to eq(subject.source)
       end
 
+      it "has a project filename which removes the project directory" do
+        expect(subject.project_filename).to eq("/spec/fixtures/sample.rb")
+      end
+
       it "has source_lines equal to lines" do
         expect(subject.lines).to eq(subject.source_lines)
       end
@@ -73,5 +77,69 @@ if SimpleCov.usable?
         expect(captured_output).to match(/^Warning: coverage data provided/)
       end
     end
+
+    context "a file that is never relevant" do
+      COVERAGE_FOR_NEVER_RB = [nil, nil].freeze
+
+      subject do
+        SimpleCov::SourceFile.new(source_fixture("never.rb"), COVERAGE_FOR_NEVER_RB)
+      end
+
+      it "has 0.0 covered_strength" do
+        expect(subject.covered_strength).to eq 0.0
+      end
+
+      it "has 0.0 covered_percent" do
+        expect(subject.covered_percent).to eq 100.0
+      end
+    end
+
+    context "a file where nothing is ever executed mixed with skipping #563" do
+      COVERAGE_FOR_SKIPPED_RB = [nil, nil, nil, nil].freeze
+
+      subject do
+        SimpleCov::SourceFile.new(source_fixture("skipped.rb"), COVERAGE_FOR_SKIPPED_RB)
+      end
+
+      it "has 0.0 covered_strength" do
+        expect(subject.covered_strength).to eq 0.0
+      end
+
+      it "has 0.0 covered_percent" do
+        expect(subject.covered_percent).to eq 0.0
+      end
+    end
+
+    context "a file where everything is skipped and missed #563" do
+      COVERAGE_FOR_SKIPPED_RB_2 = [nil, nil, 0, nil].freeze
+
+      subject do
+        SimpleCov::SourceFile.new(source_fixture("skipped.rb"), COVERAGE_FOR_SKIPPED_RB_2)
+      end
+
+      it "has 0.0 covered_strength" do
+        expect(subject.covered_strength).to eq 0.0
+      end
+
+      it "has 0.0 covered_percent" do
+        expect(subject.covered_percent).to eq 0.0
+      end
+    end
+
+    context "a file where everything is skipped/irrelevamt but executed #563" do
+      COVERAGE_FOR_SKIPPED_AND_EXECUTED_RB = [nil, nil, 1, 1, 0, nil, nil, nil].freeze
+
+      subject do
+        SimpleCov::SourceFile.new(source_fixture("skipped_and_executed.rb"), COVERAGE_FOR_SKIPPED_AND_EXECUTED_RB)
+      end
+
+      it "has 0.0 covered_strength" do
+        expect(subject.covered_strength).to eq 0.0
+      end
+
+      it "has 0.0 covered_percent" do
+        expect(subject.covered_percent).to eq 0.0
+      end
+    end
   end
 end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Christoph Olszowka
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -20,8 +19,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-  type: :runtime
+  name: json
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,42 +31,42 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: simplecov-html
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
-  type: :runtime
+  name: simplecov-html
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: docile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
-  type: :runtime
+  name: docile
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -106,6 +106,7 @@ files:
 - features/config_project_name.feature
 - features/config_styles.feature
 - features/config_tracked_files.feature
+- features/config_tracked_files_relevant_lines.feature
 - features/cucumber_basic.feature
 - features/maximum_coverage_drop.feature
 - features/merging_test_unit_and_rspec.feature
@@ -122,6 +123,7 @@ files:
 - features/step_definitions/simplecov_steps.rb
 - features/step_definitions/transformers.rb
 - features/step_definitions/web_steps.rb
+- features/support/aruba_freedom_patch.rb
 - features/support/env.rb
 - features/test_unit_basic.feature
 - features/test_unit_groups_and_filters_basic.feature
@@ -141,6 +143,7 @@ files:
 - lib/simplecov/formatter/simple_formatter.rb
 - lib/simplecov/jruby_fix.rb
 - lib/simplecov/last_run.rb
+- lib/simplecov/lines_classifier.rb
 - lib/simplecov/load_global_config.rb
 - lib/simplecov/no_defaults.rb
 - lib/simplecov/profiles.rb
@@ -187,17 +190,22 @@ files:
 - spec/fixtures/frameworks/testunit_bad.rb
 - spec/fixtures/frameworks/testunit_good.rb
 - spec/fixtures/iso-8859.rb
+- spec/fixtures/never.rb
 - spec/fixtures/resultset1.rb
 - spec/fixtures/resultset2.rb
 - spec/fixtures/sample.rb
+- spec/fixtures/skipped.rb
+- spec/fixtures/skipped_and_executed.rb
 - spec/fixtures/utf-8.rb
 - spec/helper.rb
 - spec/last_run_spec.rb
+- spec/lines_classifier_spec.rb
 - spec/multi_formatter_spec.rb
 - spec/raw_coverage_spec.rb
 - spec/result_merger_spec.rb
 - spec/result_spec.rb
 - spec/return_codes_spec.rb
+- spec/simplecov_spec.rb
 - spec/source_file_line_spec.rb
 - spec/source_file_spec.rb
 - spec/support/fail_rspec_on_ruby_warning.rb
@@ -205,7 +213,7 @@ homepage: http://github.com/colszowka/simplecov
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -220,9 +228,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.11
+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