danger-swiftlint 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6e30637e9b9981efedc2a18d8acdf8f9957a0f813f714b131601f43dce07ec0d
-  data.tar.gz: b0c6033a1291893cc3b871cfd3f7d6fb631d89431ca3724d0f187e5ef69bdfc0
+SHA1:
+  metadata.gz: c86940adc167f7b4863e444266b96770155c2ab8
+  data.tar.gz: c398255b1c603ed1e979426afba4a9a4c73f3a40
 SHA512:
-  metadata.gz: 1417540992b6d0b2ccd7a1b9dacd57235f66e3e495ef826af54168e0686434efaf80eb552a35f212091cd5f8d297b6252810c0be1074214d4b19c2c7c680a992
-  data.tar.gz: aef461f9368041b4c0f8e9d30d64e3eb42e4110578cf009660234d05e6c1e026d1a3c09f1a80fa88e96bee7602f0cb5d9e9c2822add4c4dea554c04e8bbf67c5
+  metadata.gz: 71f4b0e1f6e4fb1238d3934d58feefe9f1a113bcb640bc2a8f3fd6089565c73cb6f8d23e2023e0af1efdfb4fb59d996ac14cd329c5f3cccbca5e84186868ef65
+  data.tar.gz: 18ecfda87f5bc8cc1cd3bb2670530505550b95a938d5e4c62d2566838a3c114cde4f4c6651a73a97b309402feef4ff457275484ab3a5f5f415dd86d0d7057c55

data/lib/danger_plugin.rb

@@ -50,6 +50,9 @@ module Danger
     # All issues found
     attr_accessor :issues
 
+    # Whether all issues or ones in PR Diff to be reported
+    attr_accessor :filter_issues_in_diff
+
     # Lints Swift files. Will fail if `swiftlint` cannot be installed correctly.
     # Generates a `markdown` list of warnings for the prose in a corpus of
     # .markdown and .md files.
@@ -109,6 +112,11 @@ module Danger
         issues = run_swiftlint_for_each(files, options, additional_swiftlint_args)
       end
 
+      if filter_issues_in_diff
+        # Filter issues related to changes in PR Diff
+        issues = filter_git_diff_issues(issues)
+      end
+
       @issues = issues
       other_issues_count = 0
       unless @max_num_violations.nil? || no_comment
@@ -308,5 +316,53 @@ module Danger
     def log(text)
       puts(text) if @verbose
     end
+
+    # Filters issues reported against changes in the modified files
+    #
+    # @return [Array] swiftlint issues
+    def filter_git_diff_issues(issues)
+      modified_files_info = git_modified_files_info()
+      return issues.select { |i| 
+           modified_files_info["#{i['file']}"] != nil && modified_files_info["#{i['file']}"].include?(i['line'].to_i) 
+        }
+    end
+
+    # Finds modified files and added files, creates array of files with modified line numbers
+    #
+    # @return [Array] Git diff changes for each file
+    def git_modified_files_info()
+        modified_files_info = Hash.new
+        updated_files = (git.modified_files - git.deleted_files) + git.added_files
+        updated_files.each {|file|
+            modified_lines = git_modified_lines(file)
+            modified_files_info[File.expand_path(file)] = modified_lines
+        }
+        modified_files_info
+    end
+
+    # Gets git patch info and finds modified line numbers, excludes removed lines
+    #
+    # @return [Array] Modified line numbers i
+    def git_modified_lines(file)
+      git_range_info_line_regex = /^@@ .+\+(?<line_number>\d+),/ 
+      git_modified_line_regex = /^\+(?!\+|\+)/
+      git_removed_line_regex = /^[-]/
+      git_not_removed_line_regex = /^[^-]/
+      file_info = git.diff_for_file(file)
+      line_number = 0
+      lines = []
+      file_info.patch.split("\n").each do |line|
+          starting_line_number = 0
+          case line
+          when git_range_info_line_regex
+              starting_line_number = Regexp.last_match[:line_number].to_i
+          when git_modified_line_regex
+              lines << line_number
+          end
+          line_number += 1 if line_number > 0
+          line_number = starting_line_number if line_number == 0 && starting_line_number > 0
+      end
+      lines
+    end
   end
 end

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.21.1'
-  SWIFTLINT_VERSION = '0.31.0'
+  VERSION = '0.22.0'
+  SWIFTLINT_VERSION = '0.33.1'
 end

data/spec/danger_plugin_spec.rb

@@ -348,6 +348,63 @@ module Danger
           expect(status[:errors]).to be_empty
         end
 
+        it 'Get git modified file line numbers' do
+          git_diff = File.read("spec/fixtures/SwiftFile.diff")
+          allow(@swiftlint.git).to receive(:diff_for_file).and_return(git_diff)
+          allow(@swiftlint.git.diff_for_file).to receive(:patch).and_return(git_diff)
+          modified_lines = @swiftlint.git_modified_lines("spec/fixtures/SwiftFile.swift")
+          expect(modified_lines).to_not be_empty
+          expect(modified_lines.length).to eql(23)
+        end
+
+        it 'Get git modified files info' do
+          allow(@swiftlint.git).to receive(:added_files).and_return([])
+          allow(@swiftlint.git).to receive(:modified_files).and_return([
+                                                                         'spec/fixtures/SwiftFile.swift',
+                                                                         'spec/fixtures/DeletedFile.swift'
+                                                                       ])
+          allow(@swiftlint.git).to receive(:deleted_files).and_return([
+                                                                        'spec/fixtures/DeletedFile.swift'
+                                                                      ])
+          git_diff = File.read("spec/fixtures/SwiftFile.diff")
+          allow(@swiftlint.git).to receive(:diff_for_file).and_return(git_diff)
+          allow(@swiftlint.git.diff_for_file).to receive(:patch).and_return(git_diff)
+          modified_files_info = @swiftlint.git_modified_files_info
+          expect(modified_files_info).to_not be_empty
+          expect(modified_files_info.length).to eql(1)
+        end
+
+        it 'filters lint issues to return issues in modified files based on git diff patch info' do
+          allow(@swiftlint.git).to receive(:added_files).and_return([])
+          allow(@swiftlint.git).to receive(:modified_files).and_return([
+                                                                         'spec/fixtures/SwiftFile.swift',
+                                                                         'spec/fixtures/DeletedFile.swift'
+                                                                       ])
+          allow(@swiftlint.git).to receive(:deleted_files).and_return([
+                                                                        'spec/fixtures/DeletedFile.swift'
+                                                                      ])
+          git_diff = File.read("spec/fixtures/SwiftFile.diff")
+          allow(@swiftlint.git).to receive(:diff_for_file).and_return(git_diff)
+          allow(@swiftlint.git.diff_for_file).to receive(:patch).and_return(git_diff)
+
+          swiftlint_violations_response = '[{ "rule_id" : "force_cast", "reason" : "Force casts should be avoided.", "character" : 19, "file" : "/Users/me/this_repo/spec/fixtures/SwiftFile.swift", "severity" : "Error", "type" : "Force Cast", "line" : 14 },
+                                                 { "rule_id" : "force_cast", "reason" : "Force casts should be avoided.", "character" : 10, "file" : "/Users/me/this_repo/spec/fixtures/SwiftFile.swift", "severity" : "Error", "type" : "Force Cast", "line" : 16 }]'
+          
+          violations_json = JSON.parse(swiftlint_violations_response)
+          violations_json[0][:file] = File.expand_path('spec/fixtures/SwiftFile.swift')
+          violations_json[1][:file] = File.expand_path('spec/fixtures/SwiftFile.swift')
+          swiftlint_violations_response= violations_json.to_json
+          allow_any_instance_of(Swiftlint).to receive(:lint)
+          .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+          .and_return(swiftlint_violations_response)
+          
+          @swiftlint.filter_issues_in_diff = true
+          @swiftlint.lint_files('spec/fixtures/*.swift', inline_mode: true, fail_on_error: false, additional_swiftlint_args: '')
+
+          status = @swiftlint.status_report
+          expect(status[:warnings]).to eql(["Force casts should be avoided.\n`force_cast` `SwiftFile.swift:16`"])
+        end
+
         context '#strict' do
           before(:each) do
             allow_any_instance_of(Swiftlint).to receive(:lint)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.