danger-android_lint 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,4 @@
 ---
-SHA256:
-  metadata.gz: 9ada934a0418e182a4f33db8040b2ac2686b51062d9298bcafeec2641333c794
-  data.tar.gz: f083ac782badad37b3013f29326723662c6e30fa87d1f553e9049edb0d4308b0
 SHA512:
-  metadata.gz: 9ad11c214c69b8705766e879b6bd37c436b9ab5f5c812a5f0defedcbdd14c8d1cc012f16b16461a1426eedbd5659bd6c89aa85c4b3dcb2162984831e369ddaaa
-  data.tar.gz: cca847253edd672cd61da0142cabdb6fb768315cf5fa44a824b0471f9f335df47700452f0b8deabe5a4fee80cec109bbfe4f8d193b695f56f8e30bedcd259460
+  metadata.gz: ee6bc1e76ca2a7d11670cf1d0d50438a05aa62e93c6d81b289b48e4b2c2709181a234d6f6664439dc1aa531e5b1467722aa71752934662495cf992188227381c
+  data.tar.gz: 0f0e99183aea7bbbda95cddeb56c29d9f939d948f627e8da60b2bf2711dd0d8a794d7349c534cf9c5fa3d6e940abbc7c1ef38e6c599792f4ee8ee5b2689b2643

data/.ruby-version

@@ -1 +1 @@
-2.3.5
+3.0.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.10
+
+- Fix `filtering_lines` parameter to also apply to when `inline_mode` is `false` ([@petitJAM](https://github.com/petitJAM))
+
 # 0.0.9
 - Add `filtering_lines` parameter, to show lint issues only on modified lines ([@ShivamPokhriyal](https://github.com/ShivamPokhriyal))
 

data/Gemfile.lock

@@ -146,6 +146,7 @@ GEM
 
 PLATFORMS
   universal-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   bundler (>= 2.2.10)

data/README.md

@@ -85,6 +85,13 @@ android_lint.filtering = true
 android_lint.lint
 ```
 
+Additionally, you can further filter to only the modified lines by setting the `filtering_lines` parameter to `true`.
+
+```rb
+android_lint.filtering_lines = true
+android_lint.lint
+```
+
 #### Make Danger comment directly on the line instead of printing a Markdown table (GitHub only)
 
 ```rb

data/lib/android_lint/gem_version.rb

@@ -1,3 +1,3 @@
 module AndroidLint
-  VERSION = "0.0.9".freeze
+  VERSION = "0.0.10".freeze
 end

data/lib/android_lint/plugin.rb

@@ -169,9 +169,13 @@ module Danger
       results.each do |r|
         location = r.xpath('location').first
         filename = location.get('file').gsub(dir, "")
-        next unless !filtering || (target_files.include? filename)
-        line = location.get('line') || 'N/A'
+        next unless (!filtering && !filtering_lines) || (target_files.include? filename)
+        line = location.get('line').to_i || 'N/A'
         reason = r.get('message')
+        if filtering_lines
+          added_lines = parse_added_line_numbers(git.diff[filename].patch)
+          next unless added_lines.include? line
+        end
         count = count + 1
         message << "`#{filename}` | #{line} | #{reason} \n"
       end
@@ -189,7 +193,7 @@ module Danger
     # Send inline comment with danger's warn or fail method
     #
     # @return [void]
-    def send_inline_comment (issues)
+    def send_inline_comment(issues)
       target_files = (git.modified_files - git.deleted_files) + git.added_files
       dir = "#{Dir.pwd}/"
       SEVERITY_LEVELS.reverse.each do |level|
@@ -201,7 +205,7 @@ module Danger
           next unless (!filtering && !filtering_lines) || (target_files.include? filename)
           line = (location.get('line') || "0").to_i
           if filtering_lines
-            added_lines = parseDiff(git.diff[filename].patch)
+            added_lines = parse_added_line_numbers(git.diff[filename].patch)
             next unless added_lines.include? line
           end
           send(level === "Warning" ? "warn" : "fail", r.get('message'), file: filename, line: line)
@@ -209,10 +213,10 @@ module Danger
       end
     end
 
-    # parses git diff of a file and retuns an array of added line numbers.
-    def parseDiff(diff)
+    # 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_lines = []
+      added_line_numbers = []
       diff_lines = diff.strip.split("\n")
       diff_lines.each_with_index do |line, index|
         if m = /\+(\d+)(?:,\d+)? @@/.match(line)
@@ -222,7 +226,7 @@ module Danger
           if !current_line_number.nil?
             if line.start_with?('+')
               # added line
-              added_lines.push current_line_number
+              added_line_numbers.push current_line_number
               current_line_number += 1
             elsif !line.start_with?('-')
               # unmodified line
@@ -231,7 +235,7 @@ module Danger
           end
         end
       end
-      added_lines
+      added_line_numbers
     end
 
     def gradlew_exists?

data/spec/android_lint_spec.rb

@@ -193,7 +193,7 @@ module Danger
             allow(Dir).to receive(:pwd).and_return("/Users/shivampokhriyal/Documents/projects/Commcare/commcare-android")
 
             allow(@android_lint.git).to receive(:modified_files).and_return([
-            "app/build.gradle",
+              "app/build.gradle",
             ])
 
             fake_patch = File.read("spec/fixtures/pr-diff.diff")
@@ -207,28 +207,57 @@ module Danger
             allow(File).to receive(:open).with(@android_lint.report_file).and_return(fake_result)
           end
 
-          it 'with filtering_lines, only show issues in modified lines' do
-            @android_lint.filtering_lines = true
-            @android_lint.lint inline_mode: true
+          context 'when inline_mode: true' do
+            it 'with filtering_lines, only show issues in modified lines' do
+              @android_lint.filtering_lines = true
+              @android_lint.lint inline_mode: true
 
-            error = @android_lint.status_report[:errors]
-            expect(error).to include("fake message three")
+              error = @android_lint.status_report[:errors]
+              expect(error).to include("fake message three")
 
-            expect(error).not_to include("fake message one")
-            expect(error).not_to include("fake message two")
-            expect(error).not_to include("fake message in unmodified file")
+              expect(error).not_to include("fake message one")
+              expect(error).not_to include("fake message two")
+              expect(error).not_to include("fake message in unmodified file")
+            end
+
+            it 'with filtering, show all issues in modified files' do
+              @android_lint.filtering = true
+              @android_lint.lint inline_mode: true
+
+              error = @android_lint.status_report[:errors]
+              expect(error).to include("fake message one")
+              expect(error).to include("fake message two")
+              expect(error).to include("fake message three")
+
+              expect(error).not_to include("fake message in unmodified file")
+            end
           end
 
-          it 'with filtering, show all issues in modified files' do
-            @android_lint.filtering = true
-            @android_lint.lint inline_mode: true
+          context 'when inline_mode: false' do
+            it 'with filtering_lines, only show issues in modified lines' do
+              @android_lint.filtering_lines = true
+              @android_lint.lint inline_mode: false
+
+              puts @android_lint.status_report[:markdowns]
+              message = @android_lint.status_report[:markdowns][0].to_s
+              expect(message).to include("fake message three")
+
+              expect(message).not_to include("fake message one")
+              expect(message).not_to include("fake message two")
+              expect(message).not_to include("fake message in unmodified file")
+            end
+
+            it 'with filtering, show all issues in modified files' do
+              @android_lint.filtering = true
+              @android_lint.lint inline_mode: false
 
-            error = @android_lint.status_report[:errors]
-            expect(error).to include("fake message one")
-            expect(error).to include("fake message two")
-            expect(error).to include("fake message three")
+              message = @android_lint.status_report[:markdowns][0].to_s
+              expect(message).to include("fake message one")
+              expect(message).to include("fake message two")
+              expect(message).to include("fake message three")
 
-            expect(error).not_to include("fake message in unmodified file")
+              expect(message).not_to include("fake message in unmodified file")
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-android_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Gustavo Barbosa
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -200,7 +200,7 @@ homepage: https://github.com/loadsmart/danger-android_lint
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,8 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Lint files of a gradle based Android project. This is done using the Android's
   Lint tool. Results are passed out as tables in markdown.