single_cov 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03abb741a629409eca737e84185cbd61c34a24a65fdb5b4c381d295f00690eed
-  data.tar.gz: fee46d0a03e4812f372c375745ff9a02229292bc1c153e028ee7dc46691edfb0
+  metadata.gz: 12be958e8135fecd7c8e8dc446b97cae5dd0a7d1397c33ea851cffdeb7389ee0
+  data.tar.gz: 315153f27ef5c680a52584c95e28d96904b10c3c9a094d5e19b06ebac66dbfc1
 SHA512:
-  metadata.gz: 52da7209346a1ec927241e0db7390d664ef155a6146642e0895964cbcaa7c6e704ee6dc027591032fcb4727546543de60aa68ddd57f9b7e5f8879b9c98169a73
-  data.tar.gz: 3f0ae6f966cb07c608efd71cc8b87787c7506363c8bf2e43c4e334cf88b51122f56d2ad56864afc302b7158339eb4c5f3d8935f8a924c3132e43ab216604f700
+  metadata.gz: e3c97161e9ef85134dd6456b5e4ee75c0c9f0c5fe238f64bb5fbf9b9551e3773833f00ace1f567e4071e33f95d0b85fb79d0841765e1b2ddac83cd9a70ada3a9
+  data.tar.gz: 3bbf1d85f580c4affb6672c5d8b5ac4523b896379b282146484d7199ff9fb79263c96b692b22edd47b5bdd32269a3ac547ea67e4b48d38d32e5ff4956519406b

data/lib/single_cov/version.rb

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

data/lib/single_cov.rb

@@ -5,6 +5,9 @@ module SingleCov
   RAILS_APP_FOLDERS = ["models", "serializers", "helpers", "controllers", "mailers", "views", "jobs", "channels"]
   UNCOVERED_COMMENT_MARKER = /#.*uncovered/
   NOCOV_MARKER = /^\s*#\s*:nocov:/ # see https://github.com/simplecov-ruby/simplecov/blob/00376ea2f29ce7a7355b7c2d7d094b666b57cb9b/lib/simplecov/lines_classifier.rb#L16
+  SIMPLECOV_DISABLE_MARKER = /#\s*simplecov:disable\b/ # see https://github.com/simplecov-ruby/simplecov/blob/main/docs/Configuration.md#ignoringskipping-code
+  SIMPLECOV_DISABLE_BLOCK_MARKER = /^\s*#\s*simplecov:disable\b/
+  SIMPLECOV_ENABLE_BLOCK_MARKER = /^\s*#\s*simplecov:enable\b/
   PREFIXES_TO_IGNORE = [] # things to not prefix with lib/ etc
 
   class << self
@@ -43,7 +46,9 @@ module SingleCov
         content = File.readlines("#{root}/#{file}")
         nocov_lines_nums = nocov_line_numbers(content)
         uncovered.reject! do |line_start, _, _, _, _|
-          content[line_start - 1].match?(UNCOVERED_COMMENT_MARKER) ||
+          line = content[line_start - 1]
+          line.match?(UNCOVERED_COMMENT_MARKER) ||
+            line.match?(SIMPLECOV_DISABLE_MARKER) || # inline, block markers are comments and never uncovered
             nocov_lines_nums.include?(line_start)
         end
         next if uncovered.size == expected_uncovered
@@ -218,14 +223,24 @@ module SingleCov
       Dir["#{root}/#{pattern}"].map! { |f| f.sub("#{root}/", '') }
     end
 
-    # @returns [Integer] 1-based line numbers that are inside :nocov: blocks
+    # @returns [Integer] 1-based line numbers that are inside :nocov: or simplecov:disable blocks
+    # categories (line/branch/method) are ignored, every disable ignores lines and branches
+    # unclosed simplecov:disable runs until end of file, like simplecov
     def nocov_line_numbers(content)
-      inside = false
+      nocov = false
+      disabled = false
       content.each_with_index.filter_map do |line, index|
+        # marker lines themselves cannot be uncovered since they are only comments
         if line.match?(NOCOV_MARKER)
-          inside = !inside # toggle
-          nil # line itself cannot be uncovered since it is only a comment
-        elsif inside
+          nocov = !nocov # toggle
+          nil
+        elsif line.match?(SIMPLECOV_DISABLE_BLOCK_MARKER)
+          disabled = true
+          nil
+        elsif line.match?(SIMPLECOV_ENABLE_BLOCK_MARKER)
+          disabled = false
+          nil
+        elsif nocov || disabled
           index + 1
         end
       end

metadata

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