single_cov 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9013c1ed2b97cce637e61b99eaa10065168043c
-  data.tar.gz: e38fa0e5148d10bf3e597365f127c214f68aa48a
+  metadata.gz: c0559494539f0d0ca9209b84bde674198d89a56e
+  data.tar.gz: 2ce03aecd293040fea661925982345c06a11fa4d
 SHA512:
-  metadata.gz: e47ba2fa0586dbee6b63a7a1deb0d810e7fbfb722b42cee290750507de9bf441b95f21f0dd53b58d38a8715b9320fa79387561ad93ac0fb3e50f0c3aaa0b75e9
-  data.tar.gz: 181ff29f4d94703556fee5eaf2fcb6eacb0fdb590296684f00580ca74be7239fda452451e1e726cc2745068a0154bde54f60a19a3fd73d731d85a135d24852c7
+  metadata.gz: 37e9d7ad51bf85e3e405fb6f0f8f614eeb917a3f5a9a23b5a202bba56d70792853dd9571747327d29a1c841aae80a2da38768f6959da593965281971d0ac9988
+  data.tar.gz: ff595bc8c38abc1562624b63ba413dbf60041c52f5c76fedae08d5b17f3bdf721503461a33ccb128c3fc219406989681b8de0dc640e6fbd71b88b6496004dd15

data/lib/single_cov/version.rb

@@ -1,3 +1,3 @@
 module SingleCov
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/single_cov.rb

@@ -20,15 +20,17 @@ module SingleCov
     def all_covered?(result)
       errors = COVERAGES.map do |file, expected_uncovered|
         if coverage = result["#{root}/#{file}"]
-          lines = (coverage.is_a?(Hash) ? coverage.fetch(:lines) : coverage)
-          uncovered_lines = line_coverage(file, lines)
+          line_coverage = (coverage.is_a?(Hash) ? coverage.fetch(:lines) : coverage)
+          uncovered_lines = line_coverage.each_with_index.map { |c, i| i + 1 if c == 0 }.compact
 
-          if branches = (coverage.is_a?(Hash) && coverage[:branches])
-            uncovered_lines += branch_coverage(file, branches)
+          uncovered = uncovered_lines.map { |l| "#{file}:#{l}" }
+
+          if branch_coverage = (coverage.is_a?(Hash) && coverage[:branches])
+            uncovered += uncovered_branches(file, branch_coverage, uncovered_lines)
           end
 
-          next if uncovered_lines.size == expected_uncovered
-          warn_about_bad_coverage(file, expected_uncovered, uncovered_lines)
+          next if uncovered.size == expected_uncovered
+          warn_about_bad_coverage(file, expected_uncovered, uncovered)
         else
           warn_about_no_coverage(file)
         end
@@ -101,13 +103,11 @@ module SingleCov
 
     private
 
-    def line_coverage(file, coverage)
-      coverage.each_with_index.map { |c, i| "#{file}:#{i + 1}" if c == 0 }.compact
-    end
-
-    def branch_coverage(file, coverage)
+    def uncovered_branches(file, coverage, uncovered_lines)
       coverage.each_value.flat_map do |branch_part|
-        branch_part.select { |_k, v| v == 0 }.map { |k, _| "#{file}:#{k[2]}:#{k[3]+1}-#{k[4]}:#{k[5]+1}" }
+        branch_part.
+          select { |k, v| v.zero? && !uncovered_lines.include?(k[2]) }.
+          map { |k, _| "#{file}:#{k[2]}:#{k[3]+1}-#{k[4]}:#{k[5]+1}" }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: single_cov
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Michael Grosser