danger-jacoco-instacart 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9fec5fb323f06e8bdffbfdc200b32801b1a74aaf596c374618afca9248326f1
-  data.tar.gz: 60d06a3074b5aa763632d8bd5661ebc82908cb514346e172b5d383d053d061ae
+  metadata.gz: 1abc0461e9b260a95c412ad877e45259ee557f26b9ed4de55eaa982cc84a0dad
+  data.tar.gz: be45bc45af39819be0735aa3d9a5456118a317c597890da3145fb00cbabe6b2b
 SHA512:
-  metadata.gz: 2d29d01cf0b2971a5fda3d26e7d82085b42853b852388d1ac84c284bc9856de86628d98d4f44b29e8bb68ccb9628c73a028271153cd8248551bb3e572f1be1ad
-  data.tar.gz: 02da2696139039613c08b30e576a2b2e512d8ce5770780e6e186af6fefff990c6030388b749d242932143da338c20b61bb12c1230cd13b0b91f6686650c4c2c4
+  metadata.gz: d2f3260792e92abff7de9d85f6cf67c6c93233b6b492937049167cf37a72f3e2dfc90dba09f8ba14da85e9a5991c8602c54439275c7c3b601026cbcd00b0afe3
+  data.tar.gz: 84bbc4e0f01417de4dac8a1d2b2da1c07e65e69769828154fa1bda935ffc8639145e79132ea0bc12734ac01e3c72fbac78717dc18f55a232b5d9d63e8019a409

data/.yardoc/checksums

@@ -1,6 +1,6 @@
 /Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/danger_jacoco.rb 38229d934b3315bb2a5a4eec18eb65f3c54d304f
-/Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/gem_version.rb ed9d8db86045983fb4286a8695d1d67276512c90
-/Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/plugin.rb 4d411eb29a16b42105f2775fd15d9ca0dc8e3093
+/Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/gem_version.rb fcee9a884aa0707169357197da0ee6d6298be6fa
+/Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/plugin.rb f1cb8c9c21dde323e5f7dd51b3f4387094361fcc
 /Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/sax_parser.rb 370e2799f8dbdf7d642c820214e6ea84c30c9cb0
 /Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/model/counter.rb 368f4a9811617b7a174ddf837a8fac49a4bc32a6
 /Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/model/report.rb 7cf45ee71ff347a130320f6190ddb25525c7095d

data/lib/jacoco/gem_version.rb

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

data/lib/jacoco/plugin.rb

@@ -20,9 +20,10 @@ module Danger
   # @tags jacoco, coverage, java, android, kotlin
   #
   class DangerJacoco < Plugin # rubocop:disable Metrics/ClassLength
-    attr_accessor :minimum_project_coverage_percentage, :minimum_class_coverage_percentage, :only_check_new_files,
-                  :files_extension, :minimum_package_coverage_map, :minimum_class_coverage_map,
-                  :fail_no_coverage_data_found, :title, :class_column_title, :subtitle_success, :subtitle_failure
+    attr_accessor :minimum_project_coverage_percentage, :minimum_class_coverage_percentage,
+                  :minimum_composable_class_coverage_percentage, :only_check_new_files, :files_extension,
+                  :minimum_package_coverage_map, :minimum_class_coverage_map, :fail_no_coverage_data_found,
+                  :title, :class_column_title, :subtitle_success, :subtitle_failure
 
     # Initialize the plugin with configured parameters or defaults
     def setup
@@ -44,6 +45,7 @@ module Danger
     def setup_minimum_coverages
       @minimum_project_coverage_percentage = 0 unless minimum_project_coverage_percentage
       @minimum_class_coverage_percentage = 0 unless minimum_class_coverage_percentage
+      @minimum_composable_class_coverage_percentage = 0 unless minimum_composable_class_coverage_percentage
       @minimum_package_coverage_map = {} unless minimum_package_coverage_map
       @minimum_class_coverage_map = {} unless minimum_class_coverage_map
     end
@@ -79,9 +81,10 @@ module Danger
       @fail_no_coverage_data_found = fail_no_coverage_data_found
 
       setup
-      classes = classes(delimiter)
+      class_to_file_path_hash = classes(delimiter)
+      classnames = class_to_file_path_hash.keys
 
-      parser = Jacoco::SAXParser.new(classes)
+      parser = Jacoco::SAXParser.new(classnames)
       Nokogiri::XML::SAX::Parser.new(parser).parse(File.open(path))
 
       total_covered = total_coverage(path)
@@ -90,7 +93,7 @@ module Danger
       report_markdown = header
       report_markdown += "| #{class_column_title} | Covered | Required | Status |\n"
       report_markdown += "|:---|:---:|:---:|:---:|\n"
-      class_coverage_above_minimum = markdown_class(parser, report_markdown, report_url)
+      class_coverage_above_minimum = markdown_class(parser, report_markdown, report_url, class_to_file_path_hash)
       subtitle = class_coverage_above_minimum ? subtitle_success : subtitle_failure
       report_markdown.insert(header.length, "#### #{subtitle}\n")
       markdown(report_markdown)
@@ -104,12 +107,17 @@ module Danger
     def classes(delimiter)
       git = @dangerfile.git
       affected_files = only_check_new_files ? git.added_files : git.added_files + git.modified_files
+      class_to_file_path_hash = {}
       affected_files.select { |file| files_extension.reduce(false) { |state, el| state || file.end_with?(el) } }
-                    .map { |file| file.split('.').first.split(delimiter)[1] }
+                    .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
+      class_to_file_path_hash
     end
 
     # It returns a specific class code coverage and an emoji status as well
-    def report_class(jacoco_class)
+    def report_class(jacoco_class, file_path)
       report_result = {
         covered: 'No coverage data found : -',
         status: ':black_joker:',
@@ -119,7 +127,7 @@ module Danger
       counter = coverage_counter(jacoco_class)
       unless counter.nil?
         coverage = (counter.covered.fdiv(counter.covered + counter.missed) * 100).floor
-        required_coverage = required_class_coverage(jacoco_class)
+        required_coverage = required_class_coverage(jacoco_class, file_path)
         status = coverage_status(coverage, required_coverage)
 
         report_result = {
@@ -133,13 +141,19 @@ module Danger
     end
 
     # Determines the required coverage for the class
-    def required_class_coverage(jacoco_class)
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def required_class_coverage(jacoco_class, file_path)
       key = minimum_class_coverage_map.keys.detect { |k| jacoco_class.name.match(k) } || jacoco_class.name
       required_coverage = minimum_class_coverage_map[key]
+      includes_composables = File.read(file_path).include? '@Composable' if File.exist?(file_path)
+      required_coverage = minimum_composable_class_coverage_percentage if required_coverage.nil? && includes_composables
       required_coverage = package_coverage(jacoco_class.name) if required_coverage.nil?
       required_coverage = minimum_class_coverage_percentage if required_coverage.nil?
       required_coverage
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     # it returns the most suitable coverage by package name to class or nil
     def package_coverage(class_name)
@@ -225,10 +239,11 @@ module Danger
     end
     # rubocop:enable Style/SignalException
 
-    def markdown_class(parser, report_markdown, report_url)
+    def markdown_class(parser, report_markdown, report_url, class_to_file_path_hash)
       class_coverage_above_minimum = true
       parser.classes.each do |jacoco_class| # Check metrics for each classes
-        rp = report_class(jacoco_class)
+        file_path = class_to_file_path_hash[jacoco_class.name]
+        rp = report_class(jacoco_class, file_path)
         rl = report_link(jacoco_class.name, report_url)
         ln = "| #{rl} | #{rp[:covered]}% | #{rp[:required_coverage_percentage]}% | #{rp[:status]} |\n"
         report_markdown << ln

data/spec/jacoco_spec.rb

@@ -325,6 +325,42 @@ module Danger
 
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 93% | 50% | :white_check_mark: |')
       end
+
+      describe 'with CachedRepository containing @Composable annotation' do
+        before do
+          allow(File).to receive(:exist?).with('src/java/com/example/CachedRepository.java').and_return(true)
+          allow(File).to receive(:read).with('src/java/com/example/CachedRepository.java').and_return('package com.kevin.mia.mikaela class Vika { @Composable fun someUiWidget() {} }')
+        end
+
+        it 'applies minimum_composable_class_coverage_percentage' do
+          path_a = "#{File.dirname(__FILE__)}/fixtures/output_a.xml"
+
+          @my_plugin.minimum_class_coverage_percentage = 55
+          @my_plugin.minimum_composable_class_coverage_percentage = 45
+
+          @my_plugin.report path_a
+
+          expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 50% | 45% | :white_check_mark: |')
+        end
+      end
+
+      describe 'with CachedRepository _not_ containing @Composable annotation' do
+        before do
+          allow(File).to receive(:exist?).with('src/java/com/example/CachedRepository.java').and_return(true)
+          allow(File).to receive(:read).with('src/java/com/example/CachedRepository.java').and_return('package com.kevin.mia.mikaela class Vika { fun main() {} }')
+        end
+
+        it 'does not apply minimum_composable_class_coverage_percentage' do
+          path_a = "#{File.dirname(__FILE__)}/fixtures/output_a.xml"
+
+          @my_plugin.minimum_class_coverage_percentage = 55
+          @my_plugin.minimum_composable_class_coverage_percentage = 45
+
+          @my_plugin.report path_a
+
+          expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 50% | 55% | :warning: |')
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-jacoco-instacart
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Anton Malinskiy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api