coverage-reporter 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4396828c1c0a640f1edd7a8ff354033e238d2eac7994e0e48de6090a97266665
-  data.tar.gz: f5c3048e767f25993afb0968995d9cde0511035354a2e75b8ab2abc0b171d89f
+  metadata.gz: '084368a5d340a21403c9f358fbbd599cd48dc48dd429aec44a40b6eddfec5b4f'
+  data.tar.gz: 4f9f847624fe3f1a5692f757d316254f41eee376643bfb8f790edac4f89a228d
 SHA512:
-  metadata.gz: 80129c5c2e16aa7667cfd6af3b49ed6f1691a75bcd3e5b9025ec660ae9eef6db35adb9de552e2ac2d68886cebbca79c6e05f0be8a3d88ab61bbb2f8a198f6f87
-  data.tar.gz: d451ca6c1f47e18d856c42e4466afd8c7776040113d09346d1c8fb003e72d57a69368b86bcdb88ebb610219a823db6930de2b42437b45352b8aaf0bf968d15d9
+  metadata.gz: e6aca8f9a84ff71d7570967e115ae2e17652e9c0514f18396f21a069222e30f7343ea7b9f11522a932f62edf1373ef081491a232ed6b8ebabe0c87fd868022cb
+  data.tar.gz: 1ffb8d0777fce695e3d32833d9b221c6749c8d59951afb45625a167ab755377c16519848f578037fca5f5238d081dd313bbe81edd4ff52050ea55f443e57cfd0

data/lib/coverage_reporter/cli.rb

@@ -9,12 +9,11 @@ module CoverageReporter
       when nil
         show_usage_and_exit
       when "report"
-        # Report command
-        options = Options::Report.parse(argv[1..])
-        Runner.new(options).run
+        report_options = Options::Report.parse(argv[1..])
+        ReportRunner.new(report_options).run
       when "collate"
         collate_options = Options::Collate.parse(argv[1..])
-        CoverageCollator.new(collate_options).call
+        CollateRunner.new(collate_options).run
       else
         show_unknown_command_error(argv.first)
       end

data/lib/coverage_reporter/collate_runner.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module CoverageReporter
+  class CollateRunner
+    def initialize(options)
+      @coverage_dir = options[:coverage_dir]
+      @modified_only = options[:modified_only]
+      @github_token = options[:github_token]
+      @repo = options[:repo]
+      @pr_number = options[:pr_number]
+      @working_dir = options[:working_dir]
+    end
+
+    def run
+      pull_request = PullRequest.new(github_token:, repo:, pr_number:)
+      filenames = modified_only ? ModifiedFilesExtractor.new(pull_request.diff).call : []
+      CoverageCollator.new(coverage_dir:, filenames:, working_dir:).call
+    end
+
+    private
+
+    attr_reader :coverage_dir, :modified_only, :github_token, :repo, :pr_number, :working_dir
+  end
+end

data/lib/coverage_reporter/coverage_collator.rb

@@ -4,8 +4,11 @@ module CoverageReporter
   class CoverageCollator
     def initialize(options={})
       @coverage_dir = options[:coverage_dir]
+      @filenames = options[:filenames]
+      @working_dir = options[:working_dir]
     end
 
+    # rubocop:disable Metrics/AbcSize
     def call
       require "simplecov"
       require "simplecov_json_formatter"
@@ -13,25 +16,40 @@ module CoverageReporter
       require "coverage_reporter/simple_cov/patches/result_hash_formatter_patch"
 
       # Collate JSON coverage reports and generate both HTML and JSON outputs
-      files = Dir["#{coverage_dir}/resultset-*.json"]
-      abort "No coverage JSON files found to collate" if files.empty?
-
-      puts "Collate coverage files: #{files.join(', ')}"
-
-      ::SimpleCov.collate(files) do
-        formatter ::SimpleCov::Formatter::MultiFormatter.new(
-          [
-            ::SimpleCov::Formatter::HypertextFormatter,
-            ::SimpleCov::Formatter::JSONFormatter
-          ]
-        )
+      coverage_files = Dir["#{coverage_dir}/resultset-*.json"]
+      abort "No coverage JSON files found to collate" if coverage_files.empty?
+
+      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? && working_dir
+        formatter(build_formatter)
       end
 
       puts "✅ Coverage merged and report generated."
     end
+    # rubocop:enable Metrics/AbcSize
 
     private
 
-    attr_reader :coverage_dir
+    attr_reader :coverage_dir, :filenames, :working_dir
+
+    def build_formatter
+      ::SimpleCov::Formatter::MultiFormatter.new(
+        [
+          ::SimpleCov::Formatter::JSONFormatter,
+          ::SimpleCov::Formatter::HypertextFormatter
+        ]
+      )
+    end
+
+    def build_filter
+      lambda do |src_file|
+        normalized_filename = src_file.filename.gsub(working_dir, "").gsub(%r{^/}, "")
+        filenames.none?(normalized_filename)
+      end
+    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/modified_files_extractor.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "set"
+
+module CoverageReporter
+  # Extracts a list of modified files from diff text
+  class ModifiedFilesExtractor
+    def initialize(diff_text)
+      @diff_text = diff_text
+    end
+
+    def call
+      return [] unless @diff_text
+
+      parse_diff(@diff_text)
+    rescue StandardError => e
+      puts "Warning: Could not parse diff text: #{e.message}"
+      []
+    end
+
+    private
+
+    def parse_diff(text)
+      modified_files = Set.new
+
+      text.each_line do |line|
+        if file_header_line?(line)
+          file_path = parse_file_path(line)
+          modified_files.add(file_path) if file_path
+        end
+      end
+
+      modified_files.to_a.sort
+    end
+
+    def file_header_line?(line)
+      line.start_with?("+++ ")
+    end
+
+    def parse_file_path(line)
+      return nil if line.end_with?(File::NULL)
+
+      line = line.chomp
+      if (m = line.match(%r{\A\+\+\+\s[wb]/(.+)\z}))
+        m[1]
+      end
+    end
+  end
+end

data/lib/coverage_reporter/options/collate.rb

@@ -7,26 +7,58 @@ module CoverageReporter
     class Collate < Base
       def self.defaults
         {
-          coverage_dir: "coverage"
+          coverage_dir:  "coverage",
+          modified_only: false,
+          github_token:  ENV.fetch("GITHUB_TOKEN", nil),
+          repo:          normalize_repo(ENV.fetch("REPO", nil)),
+          pr_number:     ENV.fetch("PR_NUMBER", nil),
+          working_dir:   nil
         }
       end
 
       def self.parse(argv)
         opts = defaults.dup
+        parser = build_parser(opts)
+        parser.parse!(argv)
+        opts
+      end
 
-        parser = OptionParser.new do |o|
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def self.build_parser(opts)
+        OptionParser.new do |o|
           o.banner = "Usage: coverage-reporter collate [options]"
           o.on("--coverage-dir DIR", "Directory containing coverage files (default: coverage)") do |v|
             opts[:coverage_dir] = v
           end
+          o.on("--modified-only", "Filter to only modified files") do
+            opts[:modified_only] = true
+          end
+          o.on("--github-token TOKEN", "GitHub token") do |v|
+            opts[:github_token] = v
+          end
+          o.on("--repo REPO", "Repository") do |v|
+            opts[:repo] = v
+          end
+          o.on("--pr-number PR_NUMBER", "Pull request number") do |v|
+            opts[:pr_number] = v
+          end
+          o.on("--working-dir DIR", "Working directory for coverage files") do |v|
+            opts[:working_dir] = v
+          end
           o.on_tail("-h", "--help", "Show help") do
             puts o
             exit 0
           end
         end
+      end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-        parser.parse!(argv)
-        opts
+      def self.normalize_repo(repo)
+        return repo if repo.nil? || repo.strip.empty?
+
+        repo.strip
+          .gsub(%r{^(https://github\.com/|git@github\.com:)}, "")
+          .gsub(/\.git$/, "")
       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/{runner.rb → report_runner.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module CoverageReporter
-  class Runner
+  class ReportRunner
     def initialize(options)
       @commit_sha           = options[:commit_sha]
       @coverage_report_path = options[:coverage_report_path]

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.1"
+  VERSION = "0.3.3"
 end

data/lib/coverage_reporter.rb

@@ -41,12 +41,14 @@ module CoverageReporter
   require_relative "coverage_reporter/inline_comment"
   require_relative "coverage_reporter/inline_comment_factory"
   require_relative "coverage_reporter/inline_comment_poster"
+  require_relative "coverage_reporter/modified_files_extractor"
   require_relative "coverage_reporter/modified_ranges_extractor"
   require_relative "coverage_reporter/options/base"
   require_relative "coverage_reporter/options/collate"
   require_relative "coverage_reporter/options/report"
   require_relative "coverage_reporter/pull_request"
-  require_relative "coverage_reporter/runner"
+  require_relative "coverage_reporter/report_runner"
+  require_relative "coverage_reporter/collate_runner"
   require_relative "coverage_reporter/uncovered_ranges_extractor"
   require_relative "coverage_reporter/simple_cov/patches/result_hash_formatter_patch"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: coverage-reporter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Gabriel Taylor Russ
 bindir: exe
 cert_chain: []
-date: 2025-10-26 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -77,6 +77,7 @@ files:
 - exe/coverage-reporter
 - lib/coverage_reporter.rb
 - lib/coverage_reporter/cli.rb
+- lib/coverage_reporter/collate_runner.rb
 - lib/coverage_reporter/coverage_analyzer.rb
 - lib/coverage_reporter/coverage_collator.rb
 - lib/coverage_reporter/coverage_report_loader.rb
@@ -85,12 +86,13 @@ files:
 - lib/coverage_reporter/inline_comment.rb
 - lib/coverage_reporter/inline_comment_factory.rb
 - lib/coverage_reporter/inline_comment_poster.rb
+- lib/coverage_reporter/modified_files_extractor.rb
 - lib/coverage_reporter/modified_ranges_extractor.rb
 - lib/coverage_reporter/options/base.rb
 - lib/coverage_reporter/options/collate.rb
 - lib/coverage_reporter/options/report.rb
 - lib/coverage_reporter/pull_request.rb
-- lib/coverage_reporter/runner.rb
+- lib/coverage_reporter/report_runner.rb
 - lib/coverage_reporter/simple_cov/patches/result_hash_formatter_patch.rb
 - lib/coverage_reporter/uncovered_ranges_extractor.rb
 - lib/coverage_reporter/version.rb