danger-swiftlint 0.26.0 → 0.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a7648f0b4b4bf523d4617687df847500fcdc2f846425dfadffb7f8c768319d8
-  data.tar.gz: 26b3d3507b659380c23b46828be7874faf949016fd54d1366436de8ce348b518
+  metadata.gz: d720b57c16c8aff2cce79424d89a1842fa8b75429b76ffd9ec8996dbad156165
+  data.tar.gz: f31202cd4c98f1060bbe1ea0e533f4dc97796ec6eff28f27baf806f77fa1944a
 SHA512:
-  metadata.gz: 1f912b6332e39539cc16f6a09b9d7e31875409a3357db1d6e2e6160a807138bceb743a7e6580539844e45595dbd3e9932ccda66bb0bfaa5c10a2740d7997021d
-  data.tar.gz: 84801ec026c062c9e9f30d3bca88759cde4c73a4e70b72b0fb8f112f567585ce5468ec695c5b858919d642998047cc8b1fce8419bce8e617705fb399132595f3
+  metadata.gz: ca97ce0a8f2c819dd0dda81b68bb7ef7244ac0f454b9f7769eb927c9ed85944c185cfb641d8b3517c0b0b7972991de058cf953fc450404c2d37532b47ddcf1fe
+  data.tar.gz: 6ed0689373d2fe221abbd1f9be170d1b8a1e8087e53640a3b157273c9b63ca391125b40241b5e17e27c4217531424e0759ff562ad934e57097f67d2001d0e0df

data/ext/swiftlint/Rakefile

@@ -12,14 +12,10 @@ namespace :swiftlint do
     ASSET = 'portable_swiftlint.zip'
     URL = "#{REPO}/releases/download/#{VERSION}/#{ASSET}"
     DESTINATION = File.expand_path(File.join(File.dirname(__FILE__), 'bin'))
+    SWIFTLINT_MD5_HASH = DangerSwiftlint::SWIFTLINT_HASH
 
     puts "Downloading swiftlint@#{VERSION}"
-    sh [
-      "mkdir -p '#{DESTINATION}'",
-      "curl -s -L #{URL} -o #{ASSET}",
-      "unzip -q #{ASSET} -d '#{DESTINATION}'",
-      "rm #{ASSET}"
-    ].join(' && ')
+    sh "sh downloadSwiftlint.sh -u #{URL} -d #{DESTINATION} -a #{ASSET} -dh #{SWIFTLINT_MD5_HASH}"
   end
 end
 

data/lib/danger_plugin.rb

@@ -210,11 +210,13 @@ module Danger
     # @return [Array] swift files
     def find_swift_files(dir_selected, files = nil, excluded_paths = [], included_paths = [])
       # Assign files to lint
-      files = if files.nil?
-                (git.modified_files - git.deleted_files) + git.added_files
-              else
-                Dir.glob(files)
-              end
+      if files.nil?
+        renamed_files_hash = git.renamed_files.map { |rename| [rename[:before], rename[:after]] }.to_h
+        post_rename_modified_files = git.modified_files.map { |modified_file| renamed_files_hash[modified_file] || modified_file }
+        files = (post_rename_modified_files - git.deleted_files) + git.added_files
+      else
+        files = Dir.glob(files)
+      end
       # Filter files to lint
       excluded_paths_list = Find.find(*excluded_paths).to_a
       included_paths_list = Find.find(*included_paths).to_a

data/lib/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.26.0'
-  SWIFTLINT_VERSION = '0.41.0'
+  VERSION = '0.29.1'
+  SWIFTLINT_VERSION = '0.43.1'
+  SWIFTLINT_HASH = '4eaeabbb43b308975d16e3d9869880dc'
 end

data/spec/danger_plugin_spec.rb

@@ -143,6 +143,7 @@ module Danger
         it 'uses git diff when files are not provided' do
           allow(@swiftlint.git).to receive(:modified_files).and_return(['spec/fixtures/SwiftFile.swift'])
           allow(@swiftlint.git).to receive(:added_files).and_return([])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
           allow_any_instance_of(Swiftlint).to receive(:lint)
             .with(anything, '',
               { 'SCRIPT_INPUT_FILE_COUNT' => '1',
@@ -187,6 +188,7 @@ module Danger
                                                                          'spec/fixtures/some_dir/SwiftFile.swift',
                                                                          'spec/fixtures/SwiftFile.swift'
                                                                        ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .with(anything, '',
@@ -212,10 +214,29 @@ module Danger
           # JSON object.
 
           allow_any_instance_of(Swiftlint).to receive(:lint).and_return('')
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
 
           expect { @swiftlint.lint_files }.not_to raise_error
         end
 
+        it 'crashes if renamed_files is not configured properly' do
+          allow(@swiftlint.git).to receive(:modified_files).and_return([
+                                                                         'spec/fixtures/SwiftFileThatWasRenamedToSomethingElse.swift'
+                                                                       ])
+          expect { @swiftlint.lint_files }.to raise_error(NoMethodError)
+        end
+
+        it 'does not crash if a modified file was renamed' do
+          allow(@swiftlint.git).to receive(:modified_files).and_return([
+                                                                         'spec/fixtures/SwiftFileThatWasRenamedToSomethingElse.swift'
+                                                                       ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([
+                                                                        { before: 'spec/fixtures/SwiftFileThatWasRenamedToSomethingElse.swift',
+                                                                          after: 'spec/fixtures/SwiftFile.swift' }
+                                                                      ])
+          expect { @swiftlint.lint_files }.not_to raise_error
+        end
+
         it 'does not lint files in the excluded paths' do
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
@@ -223,7 +244,7 @@ module Danger
                                                                          'spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift',
                                                                          'spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift'
                                                                        ])
-
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .with(anything, '',
               { 'SCRIPT_INPUT_FILE_COUNT' => '1',
@@ -241,6 +262,7 @@ module Danger
                                                                          'spec/fixtures/SwiftFile.swift',
                                                                          'spec/fixtures/some_dir/SwiftFile.swift'
                                                                        ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .with(anything, '',
@@ -259,6 +281,7 @@ module Danger
                                                                          'spec/fixtures/SwiftFile.swift',
                                                                          'spec/fixtures/some_dir/SwiftFile.swift'
                                                                        ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .with(anything, '',
@@ -277,6 +300,7 @@ module Danger
           allow(@swiftlint.git).to receive(:modified_files).and_return([
                                                                          'spec/fixtures/SwiftFile.swift'
                                                                        ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .once
@@ -291,6 +315,7 @@ module Danger
           allow(@swiftlint.git).to receive(:modified_files).and_return([
                                                                          'spec/fixtures/SwiftFile.swift'
                                                                        ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .once
@@ -305,6 +330,7 @@ module Danger
           allow(@swiftlint.git).to receive(:modified_files).and_return([
                                                                          'spec/fixtures/SwiftFile.swift'
                                                                        ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .with(hash_including(config: nil), '', anything)
@@ -319,6 +345,7 @@ module Danger
           allow(@swiftlint.git).to receive(:modified_files).and_return([
                                                                          'spec/fixtures/SwiftFile.swift'
                                                                        ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .with(hash_including(config: 'spec/fixtures/some_config.yml'), '', anything)
@@ -342,6 +369,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([])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .with(anything, '',
@@ -578,6 +606,7 @@ module Danger
                                                                          'spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift',
                                                                          'spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift'
                                                                        ])
+          allow(@swiftlint.git).to receive(:renamed_files).and_return([])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
             .once

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.29.1
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.