forking_test_runner 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 455fbc6f17156c672bf430e9b003c968d5607dc7
-  data.tar.gz: b7d396787d8df135c38d45587241dbb9f4eefdbb
+  metadata.gz: 17cad472149c140f2a0f3a3be8d62f2be58c1e6b
+  data.tar.gz: b60a9c8dada047c49bc63e47f2dac4eefc9af30f
 SHA512:
-  metadata.gz: b7f8da2b97dfd0c554eec9e74f74cfc06ad1053184b2d9811874a77797dc3673a8bda7f23398a7995f26d09a19d1fc6e372c4461bf3538b17037c8d3feffa199
-  data.tar.gz: 5031d3a3bebe4a34d6e66d9a9cbac3b92f64d0a01de61e0604e36cb18e1096bb8f5384d58af24a91a68a587324ff6e67fc4161b56541018e562fc177aa1d8b8a
+  metadata.gz: cc505b6161b01782421fc361a400ab5d8b2335b59bc77addbac26bbda7913d1e8dc455e7fb9ec34d3e29bacb14b0453ff35c3a4012e01e788258eceed384ad46
+  data.tar.gz: 50a6f0da185ed385affa0ae02273a432a3bb24bf2ac5cc40ba48cb58a4c37323e032066852d1b30e5b02116f084509bc5f61de6589151a9f52b8ec9008a53b3e

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,3 @@
 module ForkingTestRunner
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/forking_test_runner.rb

@@ -3,12 +3,52 @@ require 'benchmark'
 module ForkingTestRunner
   CLEAR = "------"
 
+  module CoverageCapture
+    def capture_coverage!
+      @capture_coverage = peek_result.dup
+    end
+
+    # override to add pre-fork captured coverage when someone asks for the results
+    def result
+      original = super
+      return original unless @capture_coverage
+
+      merged = original.dup
+      @capture_coverage.each do |file, coverage|
+        orig = merged[file]
+        merged[file] = if orig
+          merge_coverage(orig, coverage)
+        else
+          coverage
+        end
+      end
+      merged
+    end
+
+    private
+
+    # [nil,1,0] + [nil,nil,2] -> [nil,1,2]
+    def merge_coverage(a, b)
+      b.each_with_index.map do |b_count, i|
+        a_count = a[i]
+        (!b_count && !a_count) ? nil : b_count.to_i + a_count.to_i
+      end
+    end
+  end
+
   class << self
     def cli(argv)
       @rspec = delete_argv("--rspec", argv, arg: false)
       @no_fixtures = delete_argv("--no-fixtures", argv, arg: false)
-
       @quiet = delete_argv("--quiet", argv, arg: false)
+      @merge_coverage = delete_argv("--merge-coverage", argv, arg: false)
+
+      if @merge_coverage
+        raise "merge_coverage does not work on ruby prior to 2.3" if RUBY_VERSION < "2.3.0"
+        require 'coverage'
+        klass = (class << Coverage; self; end)
+        klass.prepend CoverageCapture
+      end
 
       disable_test_autorun
 
@@ -26,6 +66,8 @@ module ForkingTestRunner
         puts "Running tests #{tests.map(&:first).join(" ")}"
       end
 
+      Coverage.capture_coverage! if @merge_coverage
+
       # run all the tests
       results = tests.map do |file, expected|
         puts "#{CLEAR} >>> #{file} "

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Run every test in a fork to avoid pollution and get clean output per test