danger-jacoco-instacart 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2796b44c6c3c0252797c88e6836096d3f528524f2a3719111607df5375e00afa
-  data.tar.gz: bd5f313356ca48dc58e35a35c425b4b158686f924264fcacd1a48d54cb9a2108
+  metadata.gz: df299fa783dd834367d27d1d6eda84b2f233c5a1fa52126de5f72bfda735a556
+  data.tar.gz: add2beee08b15e8468291eb2413edb5db0d6320c19b8dcddbd273410076b030a
 SHA512:
-  metadata.gz: b9a81a4673b390c90b0e58626cad1a0b922a1158f6425f7e0999b03ca7c41c1d94b7b6bbe4ffc13eb0a4fb79dc2dff801f61d78b7945845b091bb79a3a71d8df
-  data.tar.gz: 283344a767f8500e3fda05291cb12c5a18c525ec8e0fd191ab8cae1f63d79c07c38f5140cb8334b5cb0449116977f653b7b00cc0d33fd0625f903c0f9253336a
+  metadata.gz: a9608c3ee2de69007df925218e7ab510d33f8bceec9e379ec16d5af3b4dc64f219bf45a1d398feee9f5d7b636f73a11c3d1be50881dfa09809ca8779a1169d03
+  data.tar.gz: 92a726b45f38ad97d9f4a917c2eea152be65b4d94991ca28a0ded329302c321cff37a7e4b46e49b1abf604a414a4a86aef8744e277be331873ea02e042976315

data/.rubocop.yml

@@ -1,4 +1,4 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 Metrics/MethodLength:
   Max: 20

data/README.md

@@ -35,5 +35,11 @@ to your `Dangerfile`
 1. Clone this repo
 2. Run `bundle install` to setup dependencies.
 3. Run `bundle exec rake spec` to run the tests.
+4. Run `bundle exec rubocop -A` to fix in-place what's fixable
 4. Use `bundle exec guard` to automatically have tests run as you make changes.
 5. Make your changes.
+
+### How to release new version
+1. Bump version in `lib/jacoco/gem_version.rb - X.Y.Z`
+2. `rake build`
+3. `gem push pkg/danger-jacoco-instacart-X.Y.Z.gem` 

data/lib/jacoco/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jacoco
-  VERSION = '0.1.14'
+  VERSION = '0.1.16'
 end

data/lib/jacoco/plugin.rb

@@ -31,7 +31,7 @@ module Danger
       setup_texts
       @files_to_check = [] unless files_to_check
       @files_extension = ['.kt', '.java'] unless files_extension
-      @file_to_create_on_failure = 'danger_jacoco_failure_status_file.txt' unless file_to_create_on_failure
+      @file_to_create_on_failure = 'danger_jacoco_failure_status_file.json' unless file_to_create_on_failure
     end
 
     # Initialize the plugin with configured optional texts
@@ -99,20 +99,61 @@ module Danger
       report_markdown.insert(header.length, "#### #{subtitle}\n")
       markdown(report_markdown)
 
-      report_fails(class_coverage_above_minimum, total_covered)
+      report_fails(parser, report_url, class_coverage_above_minimum, total_covered)
     end
     # rubocop:enable Style/AbcSize
 
     def classes(delimiter)
       class_to_file_path_hash = {}
-      files_to_check.select { |file| files_extension.reduce(false) { |state, el| state || file.end_with?(el) } }
-                    .each do |file| # "src/java/com/example/CachedRepository.java"
-                      classname = file.split('.').first.split(delimiter)[1] # "com/example/CachedRepository"
-                      class_to_file_path_hash[classname] = file
-                    end
+      # Initialize files_extension if it's nil
+      @files_extension = ['.kt', '.java'] if @files_extension.nil?
+
+      filtered_files_to_check.each do |file| # "src/java/com/example/CachedRepository.java"
+        # Get the package path
+        package_path = file.split('.').first.split(delimiter)[1] # "com/example/CachedRepository"
+        next unless package_path
+
+        # Add the primary class (filename-based class)
+        class_to_file_path_hash[package_path] = file
+
+        # For Kotlin files, we need to look for multiple classes/interfaces in the same file
+        add_kotlin_declarations(file, package_path, class_to_file_path_hash) if file.end_with?('.kt')
+      end
       class_to_file_path_hash
     end
 
+    # Returns files that match the configured file extensions
+    def filtered_files_to_check
+      files_to_check.select { |file| @files_extension.reduce(false) { |state, el| state || file.end_with?(el) } }
+    end
+
+    # Scans a Kotlin file for additional class/interface declarations and adds them to the hash
+    def add_kotlin_declarations(file, package_path, class_to_file_path_hash)
+      return unless File.exist?(file)
+
+      file_content = File.read(file)
+
+      # Look for class and interface declarations in the file
+      # Regex catches class/interface/object declarations with modifiers and generics
+      regex = /\b(?:(?:data|sealed|abstract|open|internal|private|protected|public|inline)\s+)*
+               (?:class|interface|object)\s+([A-Za-z0-9_]+)(?:<.*?>)?/x
+      declarations = file_content.scan(regex).flatten
+
+      # For each additional class/interface found (excluding the one matching the filename)
+      declarations.each do |class_name|
+        # Skip if it matches the primary class name (already added)
+        next if package_path.end_with?("/#{class_name}")
+
+        # Create full class path by replacing the last part with the class name
+        parts = package_path.split('/')
+        parts[-1] = class_name
+        additional_class_path = parts.join('/')
+
+        # Add to hash
+        class_to_file_path_hash[additional_class_path] = file
+      end
+    end
+
     # It returns a specific class code coverage and an emoji status as well
     def report_class(jacoco_class, file_path)
       report_result = {
@@ -223,13 +264,13 @@ module Danger
     end
 
     # rubocop:disable Style/SignalException
-    def report_fails(class_coverage_above_minimum, total_covered)
+    def report_fails(parser, report_url, class_coverage_above_minimum, total_covered)
       if total_covered[:covered] < minimum_project_coverage_percentage
         # fail danger if total coverage is smaller than minimum_project_coverage_percentage
         covered = total_covered[:covered]
         fail("Total coverage of #{covered}%. Improve this to at least #{minimum_project_coverage_percentage}%")
         # rubocop:disable Lint/UnreachableCode (rubocop mistakenly thinks that this line is unreachable since priorly called "fail" raises an error, but in fact "fail" is caught and handled)
-        create_status_file_on_failure if class_coverage_above_minimum
+        create_status_file_on_failure(parser, report_url) if class_coverage_above_minimum
         # rubocop:enable Lint/UnreachableCode
       end
 
@@ -237,13 +278,20 @@ module Danger
 
       fail("Class coverage is below minimum. Improve to at least #{minimum_class_coverage_percentage}%")
       # rubocop:disable Lint/UnreachableCode (rubocop mistakenly thinks that this line is unreachable since priorly called "fail" raises an error, but in fact "fail" is caught and handled)
-      create_status_file_on_failure
+      create_status_file_on_failure(parser, report_url)
       # rubocop:enable Lint/UnreachableCode
     end
     # rubocop:enable Style/SignalException
 
-    def create_status_file_on_failure
-      File.open(file_to_create_on_failure, 'w') {}
+    def create_status_file_on_failure(parser, report_url)
+      data = []
+      parser.classes.each do |jacoco_class|
+        data.push({ 'name' => jacoco_class.name, 'path' => report_filepath(jacoco_class.name, report_url) })
+      end
+
+      File.open(file_to_create_on_failure, 'w') do |f|
+        f.write({ 'failures' => data }.to_json)
+      end
     end
 
     def markdown_class(parser, report_markdown, report_url, class_to_file_path_hash)
@@ -265,8 +313,15 @@ module Danger
       if report_url.empty?
         "`#{class_name}`"
       else
-        report_filepath = "#{class_name.gsub(%r{/(?=[^/]*/.)}, '.')}.html"
-        "[`#{class_name}`](#{report_url + report_filepath})"
+        "[`#{class_name}`](#{report_url + report_filepath(class_name, report_url)})"
+      end
+    end
+
+    def report_filepath(class_name, report_url)
+      if report_url.empty?
+        class_name
+      else
+        "#{class_name.gsub(%r{/(?=[^/]*/.)}, '.')}.html"
       end
     end
   end

data/spec/jacoco_spec.rb

@@ -58,7 +58,7 @@ module Danger
         @my_plugin.files_to_check = ['src/java/com/example/CachedRepository.java', 'src/java/io/sample/UseCase.java']
         @my_plugin.minimum_class_coverage_percentage = 60
 
-        expect(File).to receive(:open).with('danger_jacoco_failure_status_file.txt', 'w')
+        expect(File).to receive(:open).with('danger_jacoco_failure_status_file.json', 'w')
         @my_plugin.report path_a
       end
 
@@ -384,6 +384,78 @@ module Danger
           expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 50% | 55% | :warning: |')
         end
       end
+
+      it 'test with kotlin multiples classes in same file' do
+        path_a = "#{File.dirname(__FILE__)}/fixtures/output_a.xml"
+
+        # Mock the Kotlin file with multiple classes
+        kotlin_file_path = 'src/kotlin/com/example/MultiClass.kt'
+        kotlin_file_content = <<~KOTLIN
+          package com.example
+
+          class MultiClass {
+            // some code
+          }
+
+          data class DataClass(val property: String) {
+            // some code
+          }
+
+          sealed class SealedClass {
+            // some code
+          }
+
+          private class PrivateClass {
+            // some code
+          }
+
+          abstract class AbstractClass {
+            // some code
+          }
+
+          class GenericClass<T> {
+            // some code
+          }
+
+          interface SomeInterface {
+            // some code
+          }
+
+          object SingletonObject {
+            // some code
+          }
+        KOTLIN
+
+        allow(File).to receive(:exist?).and_call_original
+        allow(File).to receive(:exist?).with(kotlin_file_path).and_return(true)
+        allow(File).to receive(:read).and_call_original
+        allow(File).to receive(:read).with(kotlin_file_path).and_return(kotlin_file_content)
+
+        @my_plugin.files_to_check = [kotlin_file_path]
+        @my_plugin.minimum_project_coverage_percentage = 0 # Avoid project coverage errors
+
+        # Use a block to capture the key-value pairs passed to classes
+        expect { |b| @my_plugin.classes(%r{/kotlin/}).each(&b) }.to yield_control.at_least(8).times
+
+        # Call report
+        @my_plugin.report path_a
+
+        # Check the class-to-file hash from SAXParser
+        class_file_hash = @my_plugin.classes(%r{/kotlin/})
+        expect(class_file_hash.keys).to include('com/example/MultiClass')
+        expect(class_file_hash.keys).to include('com/example/DataClass')
+        expect(class_file_hash.keys).to include('com/example/SealedClass')
+        expect(class_file_hash.keys).to include('com/example/PrivateClass')
+        expect(class_file_hash.keys).to include('com/example/AbstractClass')
+        expect(class_file_hash.keys).to include('com/example/GenericClass')
+        expect(class_file_hash.keys).to include('com/example/SomeInterface')
+        expect(class_file_hash.keys).to include('com/example/SingletonObject')
+
+        # All keys should map to the same file path
+        class_file_hash.each_value do |file_path|
+          expect(file_path).to eq(kotlin_file_path)
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -29,7 +29,6 @@ require 'danger_plugin'
 # it comes with an extra function `.string` which will
 # strip all ANSI colours from the string.
 
-# rubocop:disable Lint/NestedMethodDefinition
 def testing_ui
   @output = StringIO.new
   def @output.winsize
@@ -42,7 +41,6 @@ def testing_ui
   end
   cork
 end
-# rubocop:enable Lint/NestedMethodDefinition
 
 # Example environment (ENV) that would come from
 # running a PR on TravisCI

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: danger-jacoco-instacart
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Anton Malinskiy
 - Alexander Bezverhni
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2025-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -217,7 +217,7 @@ homepage: https://github.com/alexanderbezverhni/danger-jacoco
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -232,8 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: A longer description of danger-jacoco.
 test_files: