coverage-reporter 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 884a32e980f3653582c7d5972cb7b685b68c9d8a549bbbeb8e13dc795ca1804f
-  data.tar.gz: f272ed73340191e6164e9ba9fef97f9a07fa822018818fdfadf7d156580cd92e
+  metadata.gz: '084368a5d340a21403c9f358fbbd599cd48dc48dd429aec44a40b6eddfec5b4f'
+  data.tar.gz: 4f9f847624fe3f1a5692f757d316254f41eee376643bfb8f790edac4f89a228d
 SHA512:
-  metadata.gz: d44af9425eec9e3c847ecdaf1c6cb372a357fde57a591763caff5d58a010fb64f67f0009e5aa338b624bd022d65036d93c7158aa33f530fc1aeeda6accdd8440
-  data.tar.gz: 384dd0a379da698f8ef4749436d20efb71229b9f2d3c36bbccd4c66d35ed2754655ce2db451240b79b77e0382dbaf0c8b4379cf8f2ff29c94d57172c2e0c13f9
+  metadata.gz: e6aca8f9a84ff71d7570967e115ae2e17652e9c0514f18396f21a069222e30f7343ea7b9f11522a932f62edf1373ef081491a232ed6b8ebabe0c87fd868022cb
+  data.tar.gz: 1ffb8d0777fce695e3d32833d9b221c6749c8d59951afb45625a167ab755377c16519848f578037fca5f5238d081dd313bbe81edd4ff52050ea55f443e57cfd0

data/lib/coverage_reporter/coverage_collator.rb

@@ -8,6 +8,7 @@ module CoverageReporter
       @working_dir = options[:working_dir]
     end
 
+    # rubocop:disable Metrics/AbcSize
     def call
       require "simplecov"
       require "simplecov_json_formatter"
@@ -20,13 +21,16 @@ module CoverageReporter
 
       puts "Collate coverage files: #{coverage_files.join(', ')}"
 
+      ::SimpleCov.root(working_dir) if working_dir
+
       ::SimpleCov.collate(coverage_files) do
-        add_filter(build_filter) if filenames.any?
+        add_filter(build_filter) if filenames.any? && working_dir
         formatter(build_formatter)
       end
 
       puts "✅ Coverage merged and report generated."
     end
+    # rubocop:enable Metrics/AbcSize
 
     private
 
@@ -43,13 +47,9 @@ module CoverageReporter
 
     def build_filter
       lambda do |src_file|
-        normalized_filename = normalize_filename(src_file.filename)
+        normalized_filename = src_file.filename.gsub(working_dir, "").gsub(%r{^/}, "")
         filenames.none?(normalized_filename)
       end
     end
-
-    def normalize_filename(filename)
-      working_dir ? filename.gsub(working_dir, "").gsub(%r{^/}, "") : filename
-    end
   end
 end

data/lib/coverage_reporter/inline_comment_poster.rb

@@ -80,12 +80,59 @@ module CoverageReporter
 
     def existing_comment_for_path_and_lines(path, start_line, line)
       existing_coverage_comments.values.find do |comment|
-        if line == start_line
-          comment.path == path && comment.line == line
-        else
-          comment.path == path && comment.start_line == start_line && comment.line == line
-        end
+        next false unless comment.path == path
+
+        # Check if line numbers match
+        line_numbers_match = if line == start_line
+                               comment.line == line
+                             else
+                               comment.start_line == start_line && comment.line == line
+                             end
+
+        next false unless line_numbers_match
+
+        # Check if the content of the lines has changed
+        content_matches?(comment, path, start_line, line)
       end
     end
+
+    def content_matches?(existing_comment, path, start_line, line)
+      # Extract commit SHA from existing comment body
+      existing_commit_sha = extract_commit_sha_from_comment(existing_comment.body)
+      return false unless existing_commit_sha
+
+      # If commit SHA matches current commit, content is the same
+      return true if existing_commit_sha == commit_sha
+
+      # Get file content at both commits
+      existing_content = pull_request.file_content(path: path, commit_sha: existing_commit_sha)
+      current_content = pull_request.file_content(path: path, commit_sha: commit_sha)
+
+      return false unless existing_content && current_content
+
+      # Compare the lines at the specified range
+      existing_lines = extract_lines(existing_content, start_line, line)
+      current_lines = extract_lines(current_content, start_line, line)
+
+      existing_lines == current_lines
+    end
+
+    def extract_commit_sha_from_comment(comment_body)
+      return nil unless comment_body
+
+      # Extract commit SHA from format: "_Commit: abc123_"
+      match = comment_body.match(/_Commit:\s*([a-f0-9]+)_/i)
+      match ? match[1] : nil
+    end
+
+    def extract_lines(content, start_line, line)
+      lines = content.lines
+      # Convert to 0-based index
+      start_idx = start_line - 1
+      end_idx = line - 1
+
+      # Return the lines in the range (inclusive)
+      lines[start_idx..end_idx] || []
+    end
   end
 end

data/lib/coverage_reporter/pull_request.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "base64"
+
 module CoverageReporter
   class PullRequest
     def initialize(github_token:, repo:, pr_number:)
@@ -59,6 +61,18 @@ module CoverageReporter
       @diff ||= client.pull_request(repo, pr_number, accept: "application/vnd.github.v3.diff")
     end
 
+    def file_content(path:, commit_sha:)
+      content = client.contents(repo, path: path, ref: commit_sha)
+      # GitHub API returns file content as base64-encoded string
+      if content.encoding == "base64" && content.content
+        Base64.decode64(content.content)
+      elsif content.content
+        content.content
+      end
+    rescue Octokit::NotFound, Octokit::Error
+      nil
+    end
+
     private
 
     attr_reader :client, :repo, :pr_number

data/lib/coverage_reporter/uncovered_ranges_extractor.rb

@@ -33,14 +33,49 @@ module CoverageReporter
       return [] unless lines.is_a?(Array)
 
       uncovered_lines = []
-      lines.each_with_index do |count, idx|
-        # Only lines with 0 count are considered uncovered
-        # null values are not relevant for coverage
-        uncovered_lines << (idx + 1) if count == 0
+      i = 0
+
+      while i < lines.length
+        if lines[i] == 0
+          i = process_uncovered_range(lines, uncovered_lines, i)
+        else
+          i += 1
+        end
       end
+
       convert_to_ranges(uncovered_lines)
     end
 
+    def process_uncovered_range(lines, uncovered_lines, start_index)
+      i = start_index
+      # Found an uncovered line, start a range (always starts with 0)
+      uncovered_lines << (i + 1)
+      i += 1
+
+      # Continue through consecutive 0s and nils
+      # Include nil only if it's immediately followed by an uncovered line (0)
+      continue_uncovered_range(lines, uncovered_lines, i)
+    end
+
+    def continue_uncovered_range(lines, uncovered_lines, start_index)
+      i = start_index
+      while i < lines.length
+        break unless should_continue_range?(lines, i)
+
+        uncovered_lines << (i + 1)
+        i += 1
+      end
+      i
+    end
+
+    def should_continue_range?(lines, index)
+      return true if lines[index] == 0
+      return false unless lines[index].nil?
+
+      # Include nil only if it's immediately followed by an uncovered line (0)
+      index + 1 < lines.length && lines[index + 1] == 0
+    end
+
     def convert_to_ranges(lines)
       return [] if lines.empty?
 

data/lib/coverage_reporter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CoverageReporter
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: coverage-reporter
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Gabriel Taylor Russ
 bindir: exe
 cert_chain: []
-date: 2025-11-04 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit