undercover 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6858f42ada692894674f818d7713d20e8239051d06547f72e721f6122dda53be
-  data.tar.gz: ef323b826f66d68a5ad0a5a7c14f5d37d3a85344f0efe82ac457181745000fb9
+  metadata.gz: 2a3601cf9aa4d26cee9c04f12b44273f8a67e0e8584b020e4e9bb763e03bf24e
+  data.tar.gz: 8198c30de2bc16734a1575b7aa0213c25ccafe120848dad9c24257d688b7bca9
 SHA512:
-  metadata.gz: 365149055a1553d4bc6dfde0475cd4b1bc6a3a82c7a0cb5c5fbcf7604c078e320bafcd85b783d495bc4667bff58c0ebffeb5ec76a982c61bcb366e8a9a8edc18
-  data.tar.gz: d5d7ec83fd50f1504f38bdd9961be84d365d5f3882045a1028f3daf45cd309a5ded497941e723cf3f3ce0eb335dfba34310f69b3d5efb91b0013fc5f69cc77a8
+  metadata.gz: 6e6a60fad9a478c37895ae24035022a9acf86f789ce0d798194b6d13b82c7db52c9de6590a9a9d3b8a84d304f220a30ef2c8e5226bab6fa58cea96f09c3856ca
+  data.tar.gz: fd1ca272d59b29debe708bd2f8df2bf867dccc60484416002dbf004d21ea83370e408e7703098f8d6e2ff0345d2234a7e662f94254a7dcc339f7370bae9f9885

data/.github/workflows/ruby.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.3', '3.0']
+        ruby: ['3.4', '3.0']
     steps:
       - uses: actions/checkout@v4
         with:
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: undercover-3.3.lcov
+          name: undercover-3.4.lcov
       - name: Upload coverage
         run: |
           ruby -e "$(curl -s https://undercover-ci.com/uploader.rb)" -- \

data/.tool-versions

@@ -1 +1 @@
-ruby 3.3.3
+ruby 3.4.2

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+# [0.6.4] - 2025-03-29
+
+### Fixed
+- Fix more false positives due to source file / coverage locator issues ([#222](https://github.com/grodowski/undercover/issues/222))
+
 # [0.6.3] - 2024-12-23
 
 ### Fixed

data/lib/undercover/cli.rb

@@ -20,7 +20,6 @@ module Undercover
 
       run_report(opts)
     end
-    # rubocop:enable
 
     def self.run_report(opts)
       report = Undercover::Report.new(changeset(opts), opts).build

data/lib/undercover/options.rb

@@ -5,16 +5,29 @@ require 'pathname'
 
 module Undercover
   class Options # rubocop:disable Metrics/ClassLength
-    RUN_MODE = [
-      RUN_MODE_DIFF_STRICT = :diff_strict, # warn for changed lines
-      # RUN_MODE_DIFF_FILES  = :diff_files, # warn for changed whole files
-      # RUN_MODE_ALL         = :diff_all, # warn for allthethings
-      # RUN_MODE_FILES       = :files # warn for specific files (cli option)
+    DIFF_TRIGGER_MODE = [
+      # Default, analyse all code blocks with changed lines. Untested lines and branches will trigger warnings if they
+      # strictly belong to the diff.
+      DIFF_TRIGGER_LINE = :diff_trigger_line,
+      #
+      # Doesn't exist yet
+      # Analyse all code blocks with changed lines. Untested lines and branches always trigger warnings for code block.
+      # DIFF_TRIGGER_BLOCK = :diff_trigger_block,
+      # Analyse all code blocks in each changed file.
+      # DIFF_TRIGGER_FILE = :diff_trigger_file,
+      # Analyse all code blocks in all files, ignores current diff (use --include-files and --exclude-files for control)
+      # ALL = :all,
     ].freeze
 
-    OUTPUT_FORMATTERS = [
-      OUTPUT_STDOUT = :stdout, # outputs warnings to stdout with exit 1
-      # OUTPUT_CIRCLEMATOR = :circlemator # posts warnings as review comments
+    FILE_SCOPE = [
+      # Extended scope helps identify Ruby files that are not required in the test suite.
+      # Warning: currently doesn't respect :nocov: syntax in files not traced by SimpleCov.
+      # (use --include-files and --exclude-files for control)
+      FILE_SCOPE_EXTENDED = :scope_extended,
+      #
+      # Doesn't exist yet
+      # Analyse file that appear in coverage reports. Historically, the default undercover mode.
+      # FILE_SCOPE_COVERAGE = :scope_coverage,
     ].freeze
 
     DEFAULT_FILE_INCLUDE_GLOBS = %w[*.rb *.rake *.ru Rakefile].freeze
@@ -25,14 +38,14 @@ module Undercover
                   :git_dir,
                   :compare,
                   :syntax_version,
+                  :run_mode,
+                  :file_scope,
                   :glob_allow_filters,
                   :glob_reject_filters
 
     def initialize
-      # TODO: use run modes
-      # TODO: use formatters
-      @run_mode = RUN_MODE_DIFF_STRICT
-      @enabled_formatters = [OUTPUT_STDOUT]
+      @run_mode = DIFF_TRIGGER_LINE
+      @file_scope = FILE_SCOPE_EXTENDED
       # set defaults
       self.path = '.'
       self.git_dir = '.git'

data/lib/undercover/result.rb

@@ -10,13 +10,13 @@ module Undercover
 
     def_delegators :node, :first_line, :last_line, :name
 
-    def initialize(node, file_cov, file_path) # rubocop:disable Metrics/MethodLength
+    def initialize(node, file_cov, file_path) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
       @node = node
       @coverage = file_cov.select do |ln, _|
         if first_line == last_line
           ln == first_line
-        elsif node.empty_def?
-          ln >= first_line
+        elsif node.empty_def? || node.is_a?(Imagen::Node::Block)
+          ln >= first_line && ln <= last_line # rubocop:disable Style/ComparableBetween
         else
           ln > first_line && ln < last_line
         end
@@ -98,11 +98,11 @@ module Undercover
             Rainbow(' hits: n/a').italic.darkgray.dark
         elsif covered.positive?
           Rainbow(formatted_line).green +
-            Rainbow(" hits: #{covered}").italic.darkgray.dark + \
+            Rainbow(" hits: #{covered}").italic.darkgray.dark +
             count_covered_branches(num)
         elsif covered.zero?
           Rainbow(formatted_line).red +
-            Rainbow(" hits: #{covered}").italic.darkgray.dark + \
+            Rainbow(" hits: #{covered}").italic.darkgray.dark +
             count_covered_branches(num)
         end
       end.join("\n")

data/lib/undercover/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Undercover
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/lib/undercover.rb

@@ -107,8 +107,7 @@ module Undercover
       return if root_ast.children.empty?
 
       loaded_files[key] = []
-      # TODO: children[0] ignores the lonely_method (see spec fixtures)!
-      root_ast.children[0].find_all(->(_) { true }).each do |imagen_node|
+      root_ast.find_all(->(node) { !node.is_a?(Imagen::Node::Root) }).each do |imagen_node|
         loaded_files[key] << Result.new(imagen_node, coverage, filepath)
       end
     end

data/undercover.gemspec

@@ -27,8 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 3.0.0'
 
+  spec.add_dependency 'base64'
   spec.add_dependency 'bigdecimal'
   spec.add_dependency 'imagen', '>= 0.2.0'
   spec.add_dependency 'rainbow', '>= 2.1', '< 4.0'
-  spec.add_dependency 'rugged', '>= 0.27', '< 1.8'
+  spec.add_dependency 'rugged', '>= 0.27', '< 1.10'
 end

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: undercover
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Jan Grodowski
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-23 00:00:00.000000000 Z
+date: 2025-03-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +80,7 @@ dependencies:
         version: '0.27'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,8 +90,7 @@ dependencies:
         version: '0.27'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.8'
-description:
+        version: '1.10'
 email:
 - jgrodowski@gmail.com
 executables:
@@ -121,7 +133,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Actionable code coverage - detects untested code blocks in recent changes
 test_files: []