forking_test_runner 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ef7231c55483d9984e1bad7c369f8cca20b551f
-  data.tar.gz: f70d32f37163292c4d8a00cb9c336d58c54ee32d
+  metadata.gz: 20b5dbbcbf7a0eccd84759792ee55fc23df3f532
+  data.tar.gz: 60bb004e09edc70351417d004c48a744c4ffae5c
 SHA512:
-  metadata.gz: 0dc1603b7ce5f9c376675a56ed41951e6d4b3c0cf1a90f0151f2e02de7f77825db8717344a51c145d53ab2daa0b999c84dc0415a21e16c66f4ef88c2826eb62a
-  data.tar.gz: e71a5e3663de8ebbe739fdd6298691916cb9ca4c7d68d6141e2127e86576caeacdc1cebe5c2c5e337b8d9f37c582944f8e5c33411ff0c6a0539e88bde4fb8338
+  metadata.gz: 9805ac39da7d1a475e56c7b3054534d3258509e11d1938c1c2b3a788a822221cd5339124f80348bf0700ddfb7ef809e69d6d6a8995531227ead0185d245b5210
+  data.tar.gz: 3e7e2728ed1603e89765e112bd275480364051b88ef080ba5bb45a89958fa7aed1ce90bc491ffead1a1b0c67d3a4230e5faa43e8774ca073138bc5d2002256a9

data/lib/forking_test_runner.rb

@@ -13,26 +13,53 @@ module ForkingTestRunner
     def result
       original = super
       return original unless @capture_coverage
+      CoverageCapture.merge_coverage(original, @capture_coverage)
+    end
 
-      merged = original.dup
-      @capture_coverage.each do |file, coverage|
-        orig = merged[file]
-        merged[file] = if orig
-          merge_coverage(orig, coverage)
-        else
-          coverage
+    class << self
+      def merge_coverage(a, b)
+        merged = a.dup
+        b.each do |file, coverage|
+          orig = merged[file]
+          merged[file] = if orig
+            if coverage.is_a?(Array)
+              merge_lines_coverage(orig, coverage)
+            else
+              {
+                lines: merge_lines_coverage(orig.fetch(:lines), coverage.fetch(:lines)),
+                branches: merge_branches_coverage(orig.fetch(:branches), coverage.fetch(:branches))
+              }
+            end
+          else
+            coverage
+          end
         end
+        merged
       end
-      merged
-    end
 
-    private
+      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
+      # assuming b has same or more keys since it comes from a fork
+      # [nil,1,0] + [nil,nil,2] -> [nil,1,2]
+      def merge_lines_coverage(a, b)
+        b.each_with_index.map do |b_count, i|
+          a_count = a[i]
+          (a_count.nil? && b_count.nil?) ? nil : a_count.to_i + b_count.to_i
+        end
+      end
+
+      # assuming b has same or more keys since it comes from a fork
+      # {foo: {bar: 0, baz: 1}} + {foo: {bar: 1, baz: 0}} -> {foo: {bar: 1, baz: 1}}
+      def merge_branches_coverage(a, b)
+        b.each_with_object({}) do |(branch, v), all|
+          vb = v.dup
+          if part = a[branch]
+            part.each do |nested, a_count|
+              vb[nested] = a_count + vb[nested].to_i
+            end
+          end
+          all[branch] = vb
+        end
       end
     end
   end

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,3 @@
 module ForkingTestRunner
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Run every test in a fork to avoid pollution and get clean output per test