single_cov 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2cf305464b1da18b681573d4e895ba407a3205665d17b2a6ebb344dfcf53d0c
-  data.tar.gz: baaf64ed79b78aaea3b4d19a60d4f068f38bee2473dae5ec7ac7a85392e8b05d
+  metadata.gz: 827ceb79a067459e6c40e66fc052fd9b922d73656562cc35a35b499b4dbf15c5
+  data.tar.gz: 8197618944b46a5e5bf34e095d48a9fbd533f64a2f4dae149d401051fa97b38e
 SHA512:
-  metadata.gz: 9c78ebf762c39a959945fba05bea127029d9594dcdf973e146e47ad9a5d1070e1db4196c2deac23e1c8ce44c886547b25e5f092f19f7b2643fe3b8611f67afab
-  data.tar.gz: 96633f2c63bd2e512a57e45130ce71aacc5d16f4e1636f77be274bfe405be9526728c69ab4d6d14bf9db5a13805cd30ccb6e47690f73db522df52c450d7c7ee2
+  metadata.gz: 1789876259d42f38c6a36a085d7043a2beeecda0bc768abc6c6b3ce818a6b82c1f472fbfb2f11c97ced7e1e855022a51da2f808f7a3e5bd39c90762b310f4220
+  data.tar.gz: d6a03f95df3616adee7715aa42101dedfc9daa514fa383cdc336fc46fa235a432916d5a4f931a19e765c890058aa26b69905fd48287074935c6600af27460e7a

data/lib/single_cov.rb

@@ -25,13 +25,12 @@ module SingleCov
       errors = COVERAGES.map do |file, expected_uncovered|
         if coverage = result["#{root}/#{file}"]
           line_coverage = (coverage.is_a?(Hash) ? coverage.fetch(:lines) : coverage)
-          uncovered = line_coverage.each_with_index.map { |c, i| i + 1 if c == 0 }.compact
-          branch_coverage = (coverage.is_a?(Hash) && coverage[:branches])
+          uncovered_lines = line_coverage.each_with_index.map { |c, i| i + 1 if c == 0 }.compact
 
-          if branch_coverage
-            uncovered.concat uncovered_branches(branch_coverage, uncovered)
-          end
+          branch_coverage = (coverage.is_a?(Hash) && coverage[:branches])
+          uncovered_branches = (branch_coverage ? uncovered_branches(branch_coverage, uncovered_lines) : [])
 
+          uncovered = uncovered_lines.concat uncovered_branches
           next if uncovered.size == expected_uncovered
 
           # ignore lines that are marked as uncovered via comments
@@ -40,16 +39,23 @@ module SingleCov
           uncovered.reject! do |line_start, _, _, _|
             content[line_start - 1].include?(UNCOVERED_COMMENT_MARKER)
           end
-
           next if uncovered.size == expected_uncovered
 
-          # branches are unsorted and added to the end, only sort when necessary
+          # branches are unsorted and added to the end, only sort when displayed
           if branch_coverage
             uncovered.sort_by! { |line_start, char_start, _, _| [line_start, char_start || 0] }
           end
 
           uncovered.map! do |line_start, char_start, line_end, char_end|
-            char_start ? "#{file}:#{line_start}:#{char_start}-#{line_end}:#{char_end}" : "#{file}:#{line_start}"
+            if char_start # branch coverage
+              if line_start == line_end
+                "#{file}:#{line_start}:#{char_start}-#{char_end}"
+              else # possibly unreachable since branches always seem to be on the same line
+                "#{file}:#{line_start}:#{char_start}-#{line_end}:#{char_end}"
+              end
+            else
+              "#{file}:#{line_start}"
+            end
           end
 
           warn_about_bad_coverage(file, expected_uncovered, uncovered)
@@ -145,8 +151,8 @@ module SingleCov
       end
 
       # show missing coverage
-      found = sum.select { |k, v| v.zero? && !uncovered_lines.include?(k[0]) }.
-        map { |k, _| [k[0], k[1]+1, k[2], k[3]+1] }
+      sum.select! { |k, v| v.zero? && !uncovered_lines.include?(k[0]) }
+      found = sum.map { |k, _| [k[0], k[1]+1, k[2], k[3]+1] }
       found.uniq!
       found
     end

data/lib/single_cov/version.rb

@@ -1,3 +1,3 @@
 module SingleCov
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: single_cov
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it