danger-detekt-instacart 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b764046152e872ed4909383bf6ee158807244d1aef3ad6f13ab8d1d89ae50f3b
-  data.tar.gz: 0df1e39db6cb862cc6b00d0a1ee8b2eefc8fb2f3be2cd4010f36f7ae90cd1092
+  metadata.gz: 121cbd9513e19e69a0d0b5a50aee136d4508d124869faec7b9609bc1c01c2fd0
+  data.tar.gz: '0288f83f40f8f83a6cd41a885613af2a6f693fcb0a94cf1610bf3ed838a1615c'
 SHA512:
-  metadata.gz: 2948c60dc188f6ffa8b8b9d0f8cfae99baff98176171d9a8419cb965c6dad328b0b21ecbbadae2125559127dc630233a32cf55b6786be3c00611c0c5cd23a077
-  data.tar.gz: f568ae43cc6f1e056aa6954af029168c70b6ddd2794dea27f0944334625ee218c69672a4c84ea25b8f378091a8c5bbabd550afba27960f786956a28e9221870f
+  metadata.gz: 75ea33c23366c94528d2fedfcf4380ee9fd2f230580016acc78438305b894a848198dffd7ff946264321cd9fc7be134ee47fd3139867a1cd9a3aa10a74735983
+  data.tar.gz: ff2f35504289856d75e772617148412ca14409573e59a7fa49fe9dc57bc8dc5cd6d98995367ad4c4470c1fabf9aad41ab56a7f888a740b73eb1c5c88926e80cc

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    danger-kotlin_detekt (0.0.3)
+    danger-kotlin_detekt (0.0.4)
       danger-plugin-api (~> 1.0)
       oga
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
-    ast (2.4.0)
-    claide (1.0.3)
+    ast (2.4.2)
+    claide (1.1.0)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.0.4)
+    danger (8.6.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -29,29 +29,51 @@ GEM
       faraday (>= 0.9.0, < 2.0)
       faraday-http-cache (~> 2.0)
       git (~> 1.7)
-      kramdown (~> 2.0)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
-      terminal-table (~> 1)
+      terminal-table (>= 1, < 4)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    diff-lcs (1.3)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.2.0)
+    diff-lcs (1.5.0)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.4.1)
       faraday (>= 0.8)
-    ffi (1.9.25)
-    formatador (0.2.5)
-    git (1.11.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    git (1.13.1)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
-    guard (2.14.2)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -59,78 +81,86 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    kramdown (2.3.1)
+    json (2.6.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     listen (3.0.7)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
-    lumberjack (1.0.13)
-    method_source (0.9.0)
-    multipart-post (2.1.1)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    multipart-post (2.2.3)
     nap (1.1.0)
     nenv (0.3.0)
     no_proxy_fix (0.1.2)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.18.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    oga (2.15)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    oga (3.4)
       ast
       ruby-ll (~> 2.1)
     open4 (1.3.4)
-    parallel (1.12.1)
-    parser (2.5.1.2)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (4.0.6)
-    rainbow (2.2.2)
-      rake
-    rake (13.0.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    parallel (1.22.1)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (5.0.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     rchardet (1.8.0)
-    rexml (3.2.5)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    regexp_parser (2.5.0)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.49.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.35.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
     ruby-ll (2.1.2)
       ansi
       ast
-    ruby-progressbar (1.10.0)
-    sawyer (0.8.2)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     shellany (0.0.1)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.0)
-    unicode-display_width (1.7.0)
-    yard (0.9.20)
+    strscan (3.1.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.1)
+    unicode-display_width (2.2.0)
+    yard (0.9.36)
 
 PLATFORMS
   ruby
@@ -148,4 +178,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.5
+   1.17.2

data/README.md

@@ -42,6 +42,8 @@ Defaults to "Warning".
 `filtering` - Enable filtering
 Only show messages within changed files.
 
+Additionally, you can further filter to only the modified lines by setting the `filtering_lines` parameter to `true`.
+
 `skip_gradle_task` - Skip gradle task
 
 

data/lib/kotlin_detekt/gem_version.rb

@@ -1,3 +1,3 @@
 module KotlinDetekt
-  VERSION = "0.0.4".freeze
+  VERSION = "0.0.5".freeze
 end

data/lib/kotlin_detekt/plugin.rb

@@ -55,6 +55,9 @@ module Danger
     # Skip gradle task
     attr_accessor :skip_gradle_task
 
+    # Only shows messages for the modified lines.
+    attr_accessor :filtering_lines
+
     # Calls Detekt task of your gradle project.
     # It fails if `gradlew` cannot be found inside current directory.
     # It fails if `severity` level is not a valid option.
@@ -138,10 +141,14 @@ module Danger
       results.each do |r|
         location = r.parent
         filename = location.get("name").gsub(dir, "")
-        next unless !filtering || (target_files.include? filename)
-        line = r.get("line") || "N/A"
+        next unless (!filtering && !filtering_lines) || (target_files.include? filename)
+        line = r.get("line").to_i || "N/A"
         reason = r.get("message")
         rule = r.get("source")
+        if filtering_lines
+          added_lines = parse_added_line_numbers(git.diff[filename].patch)
+          next unless added_lines.include? line
+        end
         count += 1
         message << "`#{filename}` | #{line} | #{reason} | #{rule} \n"
       end
@@ -167,11 +174,49 @@ module Danger
         filtered.each do |r|
           location = r.parent
           filename = location.get("name").gsub(dir, "")
-          next unless !filtering || (target_files.include? filename)
+          next unless (!filtering && !filtering_lines) || (target_files.include? filename)
           line = (r.get("line") || "0").to_i
-          send(level == "warning" ? "warn" : "fail", r.get("message"), file: filename, line: line)
+          if filtering_lines
+            added_lines = parse_added_line_numbers(git.diff[filename].patch)
+            next unless added_lines.include? line
+          end
+          reason = r.get("message")
+          rule = r.get("source")
+
+          message = "**Issue:** #{reason}".dup
+          message << "\n"
+          message << "**Rule:** #{rule}" 
+          message << "\n"
+          message << "**File:** `#{filename}:#{line}`" # file:line for quick search 
+
+          send(level == "warning" ? "warn" : "fail", message, file: filename, line: line)
+        end
+      end
+    end
+
+    # Parses git diff of a file and retuns an array of added line numbers.
+    def parse_added_line_numbers(diff)
+      current_line_number = nil
+      added_line_numbers = []
+      diff_lines = diff.strip.split("\n")
+      diff_lines.each_with_index do |line, index|
+        if m = /\+(\d+)(?:,\d+)? @@/.match(line)
+          # (e.g. @@ -32,10 +32,7 @@)
+          current_line_number = Integer(m[1])
+        else
+          unless current_line_number.nil?
+            if line.start_with?("+")
+              # added line
+              added_line_numbers.push current_line_number
+              current_line_number += 1
+            elsif !line.start_with?("-")
+              # unmodified line
+              current_line_number += 1
+            end
+          end
         end
       end
+      added_line_numbers
     end
 
     def gradlew_exists?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-detekt-instacart
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nicolas Fesquet
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A longer description of danger-kotlin_detekt.  This is a forked version to