danger-swiftlint 0.37.0 → 0.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 987b2a3150cb10aa455265b5cca6967137700eb895a4798f20288b127017b353
-  data.tar.gz: 7430c06da63ec29bd90d43a9deb30d5b7b87ef6ab2f413f88c50e617ea4b0e83
+  metadata.gz: ff11fd5cb49834d9d5495ea2e86c06dc2438d099034c9f3eb2882f6c07e096cb
+  data.tar.gz: 5a3fa5e6a9f73b0795b2f9468b2b48b2d11e5e0290bc48b793a0a62644bbf212
 SHA512:
-  metadata.gz: b9ea2c1233ab1bf566a0a882102a20b2f45302c841ab12df2b4f83b89b8d466775abe71a0a72e7dafce16e684579984a2c7aef10fd1af6080180e3f50011aea0
-  data.tar.gz: f74c8b96027314efa6c8d8696ff44eba19fe7b0e40b5bdb034aa19ff3493e8a9d82d673d549fb968ae3fe99b45719a2584ae259a5cacfb0f563cebcb2780e8b5
+  metadata.gz: ae7534cc07aaee284fe90a84abbe13ae21b63cb14a9daacd2e2a56cf91b0d3e127babaf4147c2622575043736236df80e52c9ec5b6c76330dd1aaf74f0fe9632
+  data.tar.gz: ab63d18d2253be8fce920b92095c2e863250edeabfc0cabf35d58cefd91061808465a057f8bb743237f6415da4fc34864c89c7ce2b255e2b915f8169b178bb1f

data/lib/danger_plugin.rb

@@ -332,7 +332,7 @@ module Danger
     # @return [Array] swiftlint issues
     def filter_git_diff_issues(issues)
       modified_files_info = git_modified_files_info()
-      return issues.select { |i| 
+      return issues.select { |i|
            modified_files_info["#{i['file']}"] != nil && modified_files_info["#{i['file']}"].include?(i['line'].to_i) 
         }
     end
@@ -347,6 +347,13 @@ module Danger
             modified_lines = git_modified_lines(file)
             modified_files_info[File.expand_path(file)] = modified_lines
         }
+        git.renamed_files.each { |pair|
+            before_file = pair[:before]
+            after_file = pair[:after]
+            modified_lines = git_modified_lines(before_file)
+            modified_files_info[File.expand_path(after_file)] = modified_lines
+        }
+
         modified_files_info
     end
 

data/lib/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.37.0'
+  VERSION = '0.37.1'
   SWIFTLINT_VERSION = '0.57.0'
   SWIFTLINT_HASH = '100b4379098dc6760ef83424c2c2093b'
 end

data/spec/danger_plugin_spec.rb

@@ -444,6 +444,7 @@ module Danger
           allow(@swiftlint.git).to receive(:deleted_files).and_return([
                                                                         'spec/fixtures/DeletedFile.swift'
                                                                       ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
           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)
@@ -461,6 +462,7 @@ module Danger
           allow(@swiftlint.git).to receive(:deleted_files).and_return([
                                                                         'spec/fixtures/DeletedFile.swift'
                                                                       ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
           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)
@@ -485,6 +487,39 @@ module Danger
           expect(status[:warnings]).to eql(["Force casts should be avoided.\n`force_cast` `SwiftFile.swift:16`"])
         end
 
+        it 'issues violations in renamed_files' do
+          allow(@swiftlint.git).to receive(:added_files).and_return([])
+          allow(@swiftlint.git).to receive(:modified_files).and_return([])
+          allow(@swiftlint.git).to receive(:deleted_files).and_return([])
+          renamed_info = {
+            before: "spec/fixtures/BeforeRenamedSwiftFile.swift",
+            after: "spec/fixtures/SwiftFile.swift"
+          }
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([renamed_info])
+          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(anything, '',
+                                                      { 'SCRIPT_INPUT_FILE_COUNT' => '1',
+                                                        'SCRIPT_INPUT_FILE_0' => a_string_ending_with('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.37.0
+  version: 0.37.1
 platform: ruby
 authors:
 - Ash Furrow
@@ -9,10 +9,10 @@ authors:
 - Orta Therox
 - Thiago Felix
 - Giovanni Lodi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -166,7 +166,7 @@ homepage: https://github.com/ashfurrow/danger-ruby-swiftlint
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,8 +181,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.21
+signing_key:
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.
 test_files: