danger-jacoco-instacart 0.1.11 → 0.1.12.SNAPSHOT.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9fec5fb323f06e8bdffbfdc200b32801b1a74aaf596c374618afca9248326f1
-  data.tar.gz: 60d06a3074b5aa763632d8bd5661ebc82908cb514346e172b5d383d053d061ae
+  metadata.gz: b68f00cbed8e16eb566459431cfb6d296b84b2fec8b87f5e07cb40e513b08b1c
+  data.tar.gz: a14e683220953972e2ee3fa84ff6f4fd795c60701c8108d187a24f710b10eced
 SHA512:
-  metadata.gz: 2d29d01cf0b2971a5fda3d26e7d82085b42853b852388d1ac84c284bc9856de86628d98d4f44b29e8bb68ccb9628c73a028271153cd8248551bb3e572f1be1ad
-  data.tar.gz: 02da2696139039613c08b30e576a2b2e512d8ce5770780e6e186af6fefff990c6030388b749d242932143da338c20b61bb12c1230cd13b0b91f6686650c4c2c4
+  metadata.gz: 0a8ed5dfd7cf494b6e1ceb45f87d06d8666e6f92ec1e31b73a75bdf00a2cc209c67854d3d0eee1eb367b4311ac280a22115fb075d904538f611ccb44ac94d5e7
+  data.tar.gz: 6c2cc47baf7fea31de40f60b531a442a5daad3460b2ecf6360dc6e1860077a4888fff6e9e071c0d4775c87224533e66edf1483586418220953762ed76621399a

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 4109fe221b49a7d872a2d1bebf772583ed7c4437
+/Users/alexanderbezverhni/workspace/junk/danger-jacoco/lib/jacoco/plugin.rb 17233d007f6187a47676390d6499ab5c7cb3a2b8
 /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.SNAPSHOT.1'
 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)
@@ -213,22 +227,34 @@ module Danger
 
     # rubocop:disable Style/SignalException
     def report_fails(class_coverage_above_minimum, total_covered)
+      total_failure_message = ''
       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}%")
+        total_failure_message = "Total coverage of #{covered}%." \
+                                " Improve this to at least #{minimum_project_coverage_percentage}%"
+        fail(total_failure_message)
+        # rubocop:disable Lint/UnreachableCode (rubocop mistakenly thinks that raise is unreachable since priorly called "fail" raises by itself, but in fact "fail" is caught and handled)
+        raise CoverageRequirementsNotMetError, total_failure_message if class_coverage_above_minimum
+        # rubocop:enable Lint/UnreachableCode
       end
 
       return if class_coverage_above_minimum
 
-      fail("Class coverage is below minimum. Improve to at least #{minimum_class_coverage_percentage}%")
+      class_failure_message = 'Class coverage is below minimum.' \
+                              " Improve to at least #{minimum_class_coverage_percentage}%"
+      fail(class_failure_message)
+      # rubocop:disable Lint/UnreachableCode (rubocop mistakenly thinks that raise is unreachable since priorly called "fail" raises by itself, but in fact "fail" is caught and handled)
+      raise CoverageRequirementsNotMetError, "#{total_failure_message}. #{class_failure_message}"
+      # rubocop:enable Lint/UnreachableCode
     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
@@ -249,3 +275,10 @@ module Danger
     end
   end
 end
+
+# Exception that is being thrown when any of the coverage requirements aren't met
+class CoverageRequirementsNotMetError < StandardError
+  def initialize(msg = 'Coverage requirements not met')
+    super
+  end
+end

data/spec/jacoco_spec.rb

@@ -33,7 +33,7 @@ module Danger
         @my_plugin.minimum_project_coverage_percentage = 50
         @my_plugin.minimum_class_coverage_map = { 'com/example/CachedRepository' => 100 }
 
-        @my_plugin.report path_a
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Total coverage of 32.9%. Improve this to at least 50%. Class coverage is below minimum. Improve to at least 0%/)
 
         expect(@dangerfile.status_report[:errors]).to eq(['Total coverage of 32.9%. Improve this to at least 50%',
                                                           'Class coverage is below minimum. Improve to at least 0%'])
@@ -49,8 +49,7 @@ module Danger
         @my_plugin.minimum_project_coverage_percentage = 50
         @my_plugin.minimum_class_coverage_map = { '.*Repository' => 60 }
 
-        @my_plugin.report path_a
-
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Total coverage of 32.9%. Improve this to at least 50%. Class coverage is below minimum. Improve to at least 0%/)
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 50% | 60% | :warning: |')
       end
 
@@ -60,8 +59,7 @@ module Danger
         @my_plugin.minimum_project_coverage_percentage = 50
         @my_plugin.minimum_package_coverage_map = { 'com/example/' => 70 }
 
-        @my_plugin.report path_a
-
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Total coverage of 32.9%. Improve this to at least 50%/)
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 50% | 70% | :warning: |')
       end
 
@@ -74,8 +72,7 @@ module Danger
           'com/' => 90
         }
 
-        @my_plugin.report path_a
-
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Total coverage of 32.9%. Improve this to at least 50%/)
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 50% | 70% | :warning: |')
       end
 
@@ -88,8 +85,7 @@ module Danger
           'com/' => 30
         }
 
-        @my_plugin.report path_a
-
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Total coverage of 32.9%. Improve this to at least 50%/)
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 50% | 77% | :warning: |')
       end
 
@@ -103,8 +99,7 @@ module Danger
         }
         @my_plugin.minimum_class_coverage_map = { 'com/example/CachedRepository' => 100 }
 
-        @my_plugin.report path_a
-
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Total coverage of 32.9%. Improve this to at least 50%/)
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 50% | 100% | :warning: |')
       end
 
@@ -118,8 +113,7 @@ module Danger
         }
         @my_plugin.minimum_class_coverage_map = { 'com/example/CachedRepository' => 80 }
 
-        @my_plugin.report path_a
-
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Total coverage of 32.9%. Improve this to at least 50%/)
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 50% | 80% | :warning: |')
       end
 
@@ -156,7 +150,7 @@ module Danger
         @my_plugin.minimum_class_coverage_percentage = 70
         @my_plugin.only_check_new_files = true
 
-        @my_plugin.report path_a
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Class coverage is below minimum. Improve to at least 70%/)
 
         expect(@dangerfile.status_report[:markdowns][0].message).to include('### JaCoCo Code Coverage 55.59% :white_check_mark:')
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| Class | Covered | Required | Status |')
@@ -171,8 +165,7 @@ module Danger
         @my_plugin.minimum_class_coverage_percentage = 80
         @my_plugin.minimum_project_coverage_percentage = 50
 
-        @my_plugin.report(path_a, 'http://test.com/')
-
+        expect { @my_plugin.report(path_a, 'http://test.com/') }.to raise_error(CoverageRequirementsNotMetError, /Total coverage of 32.9%. Improve this to at least 50%. Class coverage is below minimum. Improve to at least 80%/)
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| [`com/example/CachedRepository`](http://test.com/com.example/CachedRepository.html) | 50% | 80% | :warning: |')
       end
 
@@ -234,7 +227,7 @@ module Danger
         @my_plugin.minimum_project_coverage_percentage = 30
         @my_plugin.minimum_class_coverage_percentage = 60
 
-        @my_plugin.report path_a
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Class coverage is below minimum. Improve to at least 60%/)
 
         expected = "### JaCoCo Code Coverage 32.9% :white_check_mark:\n"
         expected += "#### There are classes that do not meet coverage requirement :warning:\n"
@@ -268,7 +261,7 @@ module Danger
         @my_plugin.minimum_class_coverage_percentage = 60
         @my_plugin.subtitle_failure = 'Too bad :('
 
-        @my_plugin.report path_a
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Class coverage is below minimum. Improve to at least 60%/)
 
         expected = "### JaCoCo Code Coverage 32.9% :white_check_mark:\n"
         expected += "#### Too bad :(\n"
@@ -311,7 +304,7 @@ module Danger
 
         @my_plugin.minimum_class_coverage_percentage = 50
 
-        @my_plugin.report path_a
+        expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Class coverage is below minimum. Improve to at least 50%/)
 
         expect(@dangerfile.status_report[:markdowns][0].message).to include('| `com/example/CachedRepository` | 42% | 50% | :warning: |')
       end
@@ -325,6 +318,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
+
+          expect { @my_plugin.report(path_a) }.to raise_error(CoverageRequirementsNotMetError, /Class coverage is below minimum. Improve to at least 55%/)
+
+          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.SNAPSHOT.1
 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-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -228,9 +228,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: