forking_test_runner 1.6.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15dc01600948f014f33866de176d8d3991f5af044b7dc669a727a064522c8a99
-  data.tar.gz: 037b27bd86eab3c5a8a9095a5fb9a5a18b48fda7db9f5e2c505452ac6a931a70
+  metadata.gz: 310cb4e18cc6ae7699b73ed2ff52b7ace99f4c85ad6d96c57a2e3b26251a9be2
+  data.tar.gz: fc42925b1e5c1bc1039b2ef2900e29de0c9dea7494eb69517d13d1b3c3ee0f91
 SHA512:
-  metadata.gz: 53176ec4ca09268b4790bfbf438fbd40e1dd85344534cdb3655165114b20a82f355c4863b2e1fc4e18ac8eae5e6ee8aded5353af28d021176b1ba72829b47f0d
-  data.tar.gz: 5123b3023462d28fe1296b7b902d232f30ef9298104f957b316669c6ecce289f48f0ce1539b5fce3fb42f9c6001ccc2f8b08d01a5c1d278d35da31542597bc5c
+  metadata.gz: a37d5ec4d8cde469b487c7bffa9153c030aca524e8a9e91bd1ada13c8cdec6f2be5042588472620d9f39b2234d44470ea26d9b2beb4a3c3f7070d01439c6918a
+  data.tar.gz: 15d354d5a8047be55e86df400a6ebed70594e68b25afec6e2fd14cc9b163fd07dbe09a7b1eccd407d06822a13f70e81b1e061601e93eefb0d5af0647cfd34216

data/lib/forking_test_runner.rb

@@ -8,6 +8,7 @@ require 'tempfile'
 
 module ForkingTestRunner
   CLEAR = "------"
+  CONVERAGE_REPORT_PREFIX = "coverage/fork-"
 
   class << self
     def cli(argv)
@@ -79,6 +80,8 @@ module ForkingTestRunner
         record_test_runtime(mode, results, log)
       end
 
+      summarize_partial_reports if partial_reports_for_single_cov?
+
       # exit with success or failure
       success ? 0 : 1
     end
@@ -279,7 +282,10 @@ module ForkingTestRunner
     def run_test(file)
       stdout = change_program_name_to file do
         fork_with_captured_stdout do
-          SimpleCov.pid = Process.pid if defined?(SimpleCov) && SimpleCov.respond_to?(:pid=) # trick simplecov into reporting in this fork
+          SimpleCov.pid = Process.pid if defined?(SimpleCov) && SimpleCov.respond_to?(:pid=) # make simplecov report in this fork
+          if partial_reports_for_single_cov?
+            SingleCov.coverage_report = "#{CONVERAGE_REPORT_PREFIX}#{Process.pid}.json"
+          end
           if active_record?
             key = (ActiveRecord::VERSION::STRING >= "4.1.0" ? :test : "test")
             ActiveRecord::Base.establish_connection key
@@ -291,6 +297,10 @@ module ForkingTestRunner
       [$?.success?, stdout]
     end
 
+    def partial_reports_for_single_cov?
+      @options.fetch(:merge_coverage) && defined?(SingleCov) && SingleCov.respond_to?(:coverage_report=) && SingleCov.coverage_report
+    end
+
     def change_program_name_to(name)
       return yield if @options.fetch(:parallel)
       begin
@@ -347,9 +357,32 @@ module ForkingTestRunner
 
         if value
           minitest_class.autorun
-          require(file.start_with?('/') ? file : "./#{file}")
+          load file
         end
       end
     end
+
+    def summarize_partial_reports
+      reports = Dir.glob("#{CONVERAGE_REPORT_PREFIX}*")
+      return if reports.empty?
+      key = nil
+
+      require "json" # not a global dependency
+      coverage = reports.each_with_object({}) do |report, all|
+        data = JSON.parse(File.read(report), symbolize_names: true)
+        key ||= data.keys.first
+        suites = data.values
+        raise "Unsupported number of suites #{suites.size}" if suites.size != 1
+        all.replace CoverageCapture.merge_coverage(all, suites.first.fetch(:coverage))
+      ensure
+        File.unlink(report) # do not leave junk behind
+      end
+
+      data = JSON.pretty_generate(key => {"coverage" => coverage, "timestamp" => Time.now.to_i })
+      File.write(SingleCov.coverage_report, data)
+
+      # make it not override our report when it finishes for main process
+      SingleCov.coverage_report = nil
+    end
   end
 end

data/lib/forking_test_runner/cli.rb

@@ -7,7 +7,7 @@ module ForkingTestRunner
       [:quiet, "--quiet", "Quiet"],
       [:no_fixtures, "--no-fixtures", "Do not load fixtures"],
       [:no_ar, "--no-ar", "Disable ActiveRecord logic"],
-      [:merge_coverage, "--merge-coverage", "Merge base code coverage into indvidual files coverage, great for SingleCov"],
+      [:merge_coverage, "--merge-coverage", "Merge base code coverage into individual files coverage and summarize coverage report"],
       [
         :record_runtime,
         "--record-runtime=MODE",

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,3 @@
 module ForkingTestRunner
-  VERSION = "1.6.0"
+  VERSION = "1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -133,14 +133,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Run every test in a fork to avoid pollution and get clean output per test