single_cov 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e33169bc7e852c3671bd513b45a1060b1b472d51f2962e37bc2f436bf65a9e
-  data.tar.gz: 0715bf92881ae7b66088db7b4661b4e9b30d86ed1437d2d8a373e33e3741b727
+  metadata.gz: 8d35277b97cbcabd001c11de169153d1eda320dfcfbd7ad516406ee811e623eb
+  data.tar.gz: c5d9fb7c34b7cb1a67a772a8ce870dbfc40cc6b1ae9ee859a951bbc3cbf93120
 SHA512:
-  metadata.gz: 4554330293058a81f84444ba526183f73cdfe46a0432ca620004f2633519d160a83b94138e46f5089e8e72d1a71e3dc17a2b1afb0e1693b2c218bc22a27cd3d7
-  data.tar.gz: 00adfea4b2aa109ea76b9b956a448cf5958d8005cdaecfe95f699f50e8594f59faa03ea9bd409b8f197253fbe5fe881a1a1870e19fe2afabde096c77959bc74e
+  metadata.gz: 64b8de808afd738fae4817c0701c12905882a4122ac50b53cc3e13694f78a831bcbaa433a7e45115682ef3ea2beefd7b59d2442872ad2ce11a82999007e3c6c7
+  data.tar.gz: 7637465f16cadc6a8beec088abd9fff899a3d9052617dd9c89d786ee24e565cb6fa8a8508a69407d63c013088aa11a3b765ac152198fc395460a490536525295

data/lib/single_cov/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SingleCov
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

data/lib/single_cov.rb

@@ -40,7 +40,7 @@ module SingleCov
         # ignore lines that are marked as uncovered via comments
         # TODO: warn when using uncovered but the section is indeed covered
         content = File.readlines("#{root}/#{file}")
-        uncovered.reject! do |line_start, _, _, _|
+        uncovered.reject! do |line_start, _, _, _, _|
           content[line_start - 1].match?(UNCOVERED_COMMENT_MARKER)
         end
         next if uncovered.size == expected_uncovered
@@ -87,8 +87,10 @@ module SingleCov
       if missing_complete.any?
         errors << <<~MSG
           The following file(s) were previously marked as having 100% SingleCov test coverage (had no `coverage:` option) but are no longer marked as such.
-          Please increase test coverage in these files to maintain 100% coverage and remove `coverage:` usage.
           #{missing_complete.join("\n")}
+          Please increase test coverage in these files to maintain 100% coverage and remove `coverage:` usage.
+
+          If this test fails during a file removal, make it pass by removing all references to the removed file's path from the code base.
         MSG
       end
 
@@ -144,18 +146,13 @@ module SingleCov
     def uncovered(coverage)
       return coverage unless coverage.is_a?(Hash) # just lines
 
-      # [nil, 1, 0, 1, 0] -> [3, 5]
-      uncovered_lines = coverage.fetch(:lines)
-        .each_with_index
-        .select { |c, _| c == 0 }
-        .map { |_, i| i + 1 }
-        .compact
-
+      uncovered_lines = indexes(coverage.fetch(:lines), 0).map! { |i| i + 1 }
       uncovered_branches = uncovered_branches(coverage[:branches] || {})
-      uncovered_branches.reject! { |k| uncovered_lines.include?(k[0]) } # remove duplicates
+      uncovered_branches.reject! { |br| uncovered_lines.include?(br[0]) } # ignore branch when whole line is uncovered
 
+      # combine lines and branches while keeping them sorted
       all = uncovered_lines.concat uncovered_branches
-      all.sort_by! { |line_start, char_start, _, _| [line_start, char_start || 0] } # branches are unsorted
+      all.sort_by! { |line_start, char_start, _, _, _| [line_start, char_start || 0] } # branches are unsorted
       all
     end
 
@@ -172,19 +169,21 @@ module SingleCov
       (!defined?(@main_process_pid) || @main_process_pid == Process.pid)
     end
 
+    # {[branch_id] => {[branch_part] => coverage}} --> uncovered location
     def uncovered_branches(coverage)
-      # {[branch_id] => {[branch_part] => coverage}} --> {branch_part -> sum-of-coverage}
-      sum = Hash.new(0)
+      sum = {}
       coverage.each_value do |branch|
-        branch.each do |k, v|
-          sum[k.slice(2, 4)] += v
+        branch.filter_map do |part, c|
+          location = [part[2], part[3] + 1, part[4], part[5] + 1] # locations can be duplicated
+          type = part[0]
+          info = (sum[location] ||= [0, nil])
+          info[0] += c
+          info[1] = type if type == :else # only else is important to track since it often is not in the code
         end
       end
 
-      sum.select! { |_, v| v == 0 } # keep missing coverage
-      found = sum.map { |k, _| [k[0], k[1] + 1, k[2], k[3] + 1] }
-      found.uniq!
-      found
+      # keep location and type of missing coverage
+      sum.filter_map { |k, v| k + [v[1]] if v[0] == 0 }
     end
 
     def default_tests
@@ -195,6 +194,10 @@ module SingleCov
       Dir["#{root}/#{pattern}"].map! { |f| f.sub("#{root}/", '') }
     end
 
+    def indexes(list, find)
+      list.each_with_index.filter_map { |v, i| i if v == find }
+    end
+
     # do not ask for coverage when SimpleCov already does or it conflicts
     def coverage_results
       if defined?(SimpleCov) && (result = SimpleCov.instance_variable_get(:@result))
@@ -325,13 +328,13 @@ module SingleCov
         [
           "#{file} new uncovered lines introduced #{details}",
           red("Lines missing coverage:"),
-          *uncovered.map do |line_start, char_start, line_end, char_end|
+          *uncovered.map do |line_start, char_start, line_end, char_end, type|
             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
+              end + (type ? " # #{type}" : "")
             else
               "#{file}:#{line_start}"
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: single_cov
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-05-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email: michael@grosser.it