danger-android_lint 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6fb3bbc5b97d33a9495f3c3811b6a3dbe6932dcc
-  data.tar.gz: 2c2d08a45644d86fbd60364fc80ec2bbfbe8eac9
+SHA256:
+  metadata.gz: 9ada934a0418e182a4f33db8040b2ac2686b51062d9298bcafeec2641333c794
+  data.tar.gz: f083ac782badad37b3013f29326723662c6e30fa87d1f553e9049edb0d4308b0
 SHA512:
-  metadata.gz: 6fb633fd0c8c48391c4097103e0779ca0d8eff4d6bfcb6824c9400f1a0911c00c5b06d4c122fefcb6eb59745e7155411d5f77f5844ef17103835a61a9465f94c
-  data.tar.gz: 4a10c53f60ebb6db842c88e08c3121bd42c95811f0c639578c73dbc12e7e32cab1763ba24e3b007ffc23d6651038c206af76ddeb9d07c140dbd2bf8faf23faea
+  metadata.gz: 9ad11c214c69b8705766e879b6bd37c436b9ab5f5c812a5f0defedcbdd14c8d1cc012f16b16461a1426eedbd5659bd6c89aa85c4b3dcb2162984831e369ddaaa
+  data.tar.gz: cca847253edd672cd61da0142cabdb6fb768315cf5fa44a824b0471f9f335df47700452f0b8deabe5a4fee80cec109bbfe4f8d193b695f56f8e30bedcd259460

data/.circleci/config.yml

@@ -0,0 +1,13 @@
+version: 2.1
+orbs:
+  ruby: circleci/ruby@1.0
+
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.7
+    steps:
+      - checkout
+      - run: gem install bundler:2.2.10
+      - run: bundle install
+      - run: bundle exec rake spec

data/.github/CODEOWNERS

@@ -1 +1 @@
-*	@loadsmart/mobile
+*	@barbosa

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.0.9
+- Add `filtering_lines` parameter, to show lint issues only on modified lines ([@ShivamPokhriyal](https://github.com/ShivamPokhriyal))
+
 # 0.0.8
 - Fix security issues ([@barbosa](https://github.com/barbosa))
 - Expose report message ([@adamstrange])(https://github.com/adamstrange))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-android_lint (0.0.6)
+    danger-android_lint (0.0.9)
       danger-plugin-api (~> 1.0)
       oga
 
@@ -11,40 +11,52 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    ast (2.4.0)
+    ast (2.4.2)
     claide (1.0.3)
     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 (6.1.0)
+    danger (8.2.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (~> 0.9)
+      faraday (>= 0.9.0, < 2.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.5)
-      kramdown (~> 2.0)
+      git (~> 1.7)
+      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 (0.17.1)
+    diff-lcs (1.4.4)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.0.0)
-      faraday (~> 0.8)
-    ffi (1.11.3)
-    formatador (0.2.5)
-    git (1.5.0)
-    guard (2.16.1)
+      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.2.0)
+      faraday (>= 0.8)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    ffi (1.15.3)
+    formatador (0.3.0)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -58,14 +70,15 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    kramdown (2.1.0)
+    kramdown (2.3.1)
+      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.2)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
     multipart-post (2.1.1)
     nap (1.1.0)
     nenv (0.3.0)
@@ -73,39 +86,42 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.14.0)
+    octokit (4.21.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oga (3.0)
+    oga (3.3)
       ast
       ruby-ll (~> 2.1)
     open4 (1.3.4)
-    parallel (1.19.1)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (4.0.1)
+    parallel (1.20.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    powerpack (0.1.3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
     rainbow (2.2.2)
       rake
-    rake (10.5.0)
-    rb-fsevent (0.10.3)
+    rake (13.0.3)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rchardet (1.8.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -116,31 +132,32 @@ GEM
     ruby-ll (2.1.2)
       ansi
       ast
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     shellany (0.0.1)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.0.1)
-    unicode-display_width (1.6.0)
-    yard (0.9.20)
+    terminal-table (3.0.1)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.1.0)
+    unicode-display_width (1.7.0)
+    yard (0.9.26)
 
 PLATFORMS
-  ruby
+  universal-darwin-20
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler (>= 2.2.10)
   danger-android_lint!
   guard (~> 2.14)
   guard-rspec (~> 4.7)
   listen (= 3.0.7)
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.4)
   rubocop (~> 0.49.0)
   yard (~> 0.9.11)
 
 BUNDLED WITH
-   1.17.3
+   2.2.10

data/Rakefile

@@ -8,7 +8,7 @@ task default: :specs
 
 task :spec do
   Rake::Task['specs'].invoke
-  Rake::Task['rubocop'].invoke
+  # Rake::Task['rubocop'].invoke
   Rake::Task['spec_docs'].invoke
 end
 

data/atlantis.yaml

@@ -0,0 +1,5 @@
+version: 3
+projects:
+  - dir: .
+    autoplan:
+      enabled: false

data/danger-android_lint.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
 
   # General ruby development
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '>= 2.2.10'
+  spec.add_development_dependency 'rake', '~> 13.0'
 
   # Testing support
   spec.add_development_dependency 'rspec', '~> 3.4'

data/lib/android_lint/gem_version.rb

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

data/lib/android_lint/plugin.rb

@@ -84,6 +84,9 @@ module Danger
     # Only show messages within changed files.
     attr_accessor :filtering
 
+    # Only shows messages for the modified lines.
+    attr_accessor :filtering_lines
+
     # Calls lint 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.
@@ -113,7 +116,7 @@ module Danger
       filtered_issues = filter_issues_by_severity(issues)
 
       message = ""
-      
+
       if inline_mode
         # Report with inline comment
         send_inline_comment(filtered_issues)
@@ -121,7 +124,7 @@ module Danger
         message = message_for_issues(filtered_issues)
         markdown("### AndroidLint found issues\n\n" + message) unless message.to_s.empty?
       end
-      
+
       message
     end
 
@@ -195,13 +198,42 @@ module Danger
         filtered.each do |r|
           location = r.xpath('location').first
           filename = location.get('file').gsub(dir, "")
-          next unless !filtering || (target_files.include? filename)
+          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)
+            next unless added_lines.include? line
+          end
           send(level === "Warning" ? "warn" : "fail", r.get('message'), file: filename, line: line)
         end
       end
     end
 
+    # parses git diff of a file and retuns an array of added line numbers.
+    def parseDiff(diff)
+      current_line_number = nil
+      added_lines = []
+      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
+          if !current_line_number.nil?
+            if line.start_with?('+')
+              # added line
+              added_lines.push current_line_number
+              current_line_number += 1
+            elsif !line.start_with?('-')
+              # unmodified line
+              current_line_number += 1
+            end
+          end
+        end
+      end
+      added_lines
+    end
+
     def gradlew_exists?
       `ls gradlew`.strip.empty? == false
     end

data/spec/android_lint_spec.rb

@@ -188,8 +188,50 @@ module Danger
           expect(warn).not_to include("Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead")
         end
 
+        describe "for a modified file" do
+          before do
+            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",
+            ])
+
+            fake_patch = File.read("spec/fixtures/pr-diff.diff")
+            diff = [OpenStruct.new(type: "modified", path: "app/build.gradle")]
+            allow(@android_lint.git).to receive(:diff).and_return(diff)
+            diff_for_file = OpenStruct.new(insertions: 3)
+            allow(diff).to receive(:[]).with("app/build.gradle").and_return(diff_for_file)
+            allow(diff_for_file).to receive(:patch).and_return(fake_patch)
+
+            fake_result = File.open("spec/fixtures/lint-result-for-pr.xml")
+            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
+
+            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")
+          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
       end
-
     end
   end
 end

data/spec/fixtures/lint-result-for-pr.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 4.0.0">
+    <issue
+        id="DuplicatePlatformClasses"
+        severity="Error"
+        message="fake message one"
+        category="Correctness"
+        priority="8"
+        summary="Duplicate Platform Classes"
+        explanation="There are a number of libraries that duplicate not just functionality of the Android platform but using the exact same class names as the ones provided in Android -- for example the apache http classes. This can lead to unexpected crashes.&#xA;&#xA;To solve this, you need to either find a newer version of the library which no longer has this problem, or to repackage the library (and all of its dependencies) using something like the `jarjar` tool, or finally, rewriting the code to use different APIs (for example, for http code, consider using `HttpUrlConnection` or a library like `okhttp`).">
+        <location
+            file="/Users/shivampokhriyal/Documents/projects/Commcare/commcare-android/app/build.gradle"/>
+    </issue>
+
+    <issue
+        id="DuplicatePlatformClasses"
+        severity="Error"
+        message="fake message two"
+        category="Correctness"
+        priority="8"
+        summary="Duplicate Platform Classes"
+        explanation="There are a number of libraries that duplicate not just functionality of the Android platform but using the exact same class names as the ones provided in Android -- for example the apache http classes. This can lead to unexpected crashes.&#xA;&#xA;To solve this, you need to either find a newer version of the library which no longer has this problem, or to repackage the library (and all of its dependencies) using something like the `jarjar` tool, or finally, rewriting the code to use different APIs (for example, for http code, consider using `HttpUrlConnection` or a library like `okhttp`)."
+        errorLine1="    testImplementation &apos;org.json:json:20140107&apos;"
+        errorLine2="                        ~~~~~~~~~~~~~">
+        <location
+            file="/Users/shivampokhriyal/Documents/projects/Commcare/commcare-android/app/build.gradle"
+            line="52"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="FakeId"
+        severity="Error"
+        message="fake message three"
+        category="Correctness"
+        priority="8"
+        summary="Fake summary"
+        explanation="Fake explanation."
+        errorLine1="// debugImplementation because LeakCanary should only run in debug builds."
+        errorLine2="                        ~~~~~~~~~~~~~">
+        <location
+            file="/Users/shivampokhriyal/Documents/projects/Commcare/commcare-android/app/build.gradle"
+            line="36"
+            column="10"/>
+    </issue>
+
+    <issue
+        id="2"
+        severity="Error"
+        message="fake message in unmodified file"
+        category="Correctness"
+        priority="8"
+        summary="Fake summary"
+        explanation="Fake explanation."
+        errorLine1="// debugImplementation because LeakCanary should only run in debug builds."
+        errorLine2="                        ~~~~~~~~~~~~~">
+        <location
+            file="/Users/shivampokhriyal/Documents/projects/Commcare/commcare-android/app/AndroidManifest.xml"
+            line="36"
+            column="10"/>
+    </issue>
+</issues>

data/spec/fixtures/pr-diff.diff

@@ -0,0 +1,14 @@
+diff --git a/app/build.gradle b/app/build.gradle
+index 6dcc647b8..a1365bd75 100644
+--- a/app/build.gradle
++++ b/app/build.gradle
+@@ -33,6 +33,9 @@ configurations {
+ }
+
+ dependencies {
++    // debugImplementation because LeakCanary should only run in debug builds.
++    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
++
+     testImplementation 'junit:junit:4.12'
+     testImplementation('org.robolectric:robolectric:4.3.1') {
+         exclude(group: 'org.bouncycastle', module: 'bcprov-jdk15on')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-android_lint
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Gustavo Barbosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".github/CODEOWNERS"
 - ".gitignore"
 - ".ruby-version"
@@ -181,6 +182,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- atlantis.yaml
 - danger-android_lint.gemspec
 - lib/android_lint/gem_version.rb
 - lib/android_lint/plugin.rb
@@ -188,9 +190,11 @@ files:
 - lib/danger_plugin.rb
 - spec/android_lint_spec.rb
 - spec/fixtures/lint-result-empty.xml
+- spec/fixtures/lint-result-for-pr.xml
 - spec/fixtures/lint-result-with-everything.xml
 - spec/fixtures/lint-result-with-special-chars.xml
 - spec/fixtures/lint-result-without-fatal.xml
+- spec/fixtures/pr-diff.diff
 - spec/spec_helper.rb
 homepage: https://github.com/loadsmart/danger-android_lint
 licenses:
@@ -211,8 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Lint files of a gradle based Android project. This is done using the Android's
@@ -220,7 +223,9 @@ summary: Lint files of a gradle based Android project. This is done using the An
 test_files:
 - spec/android_lint_spec.rb
 - spec/fixtures/lint-result-empty.xml
+- spec/fixtures/lint-result-for-pr.xml
 - spec/fixtures/lint-result-with-everything.xml
 - spec/fixtures/lint-result-with-special-chars.xml
 - spec/fixtures/lint-result-without-fatal.xml
+- spec/fixtures/pr-diff.diff
 - spec/spec_helper.rb