danger-swiftlint 0.24.5 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35b57008bbb1fa32b8b8c156bacc1b6610c0148c9c608287d6cf7f42d172792
-  data.tar.gz: c430570ca1990bb89e90d8b6c9fcb38e557d40e3307b4e7dc331e173bc68d2ac
+  metadata.gz: ed42295ae38914afa20f0e0cb218bab68041937b967bdeac37a44d68b020d062
+  data.tar.gz: 8d4df36e091935dc287809571ce41317ae155bfebff4ffe2d6432b9c6b637bc6
 SHA512:
-  metadata.gz: a276e2b26378e2b8ac740e6af1afc7430d622a3e02fda4f25eff08875149d51ee38887d30b58ff03b1356a55b0563041af2dfb7211599876023b8a56d72ffd14
-  data.tar.gz: 601e1a6e0b8ed52863740aef8aadda2427ac10a456a3c47b8472451b4c6d7ea9710148bfd2d63770c1f8637d09372875fcce04a7fa0b843d49ce26e8f03efb51
+  metadata.gz: 29d8b6d7f3091dc5019148a2342575ab00ebc7160cab39c91205b26daeeba08c2d44015a87eb2a6758989e4b4520d2411b2bdbd0259211e36d1cebe08f0a71eb
+  data.tar.gz: 501f8cf1841ce33ae57dedbe1b3bc5c2723ecde16a7398893c67e3e0a3731da31aa54acea6f9491f42f9985c40ff19856465eaf93744e08447c4a57f27cee56c

data/ext/swiftlint/swiftlint.rb

@@ -8,14 +8,21 @@ class Swiftlint
 
   # Runs swiftlint
   def run(cmd = 'lint', additional_swiftlint_args = '', options = {}, env = nil)
-    # change pwd before run swiftlint
-    Dir.chdir options.delete(:pwd) if options.key? :pwd
+    # allow for temporary change to pwd before running swiftlint
+    pwd = options.delete(:pwd)
+    command = "#{swiftlint_path} #{cmd} #{swiftlint_arguments(options, additional_swiftlint_args)}"
 
     # Add `env` to environment
     update_env(env)
     begin
       # run swiftlint with provided options
-      `#{swiftlint_path} #{cmd} #{swiftlint_arguments(options, additional_swiftlint_args)}`
+      if pwd
+        Dir.chdir(pwd) do 
+          `#{command}`
+        end
+      else
+        `#{command}`
+      end
     ensure
       # Remove any ENV variables we might have added
       restore_env()

data/lib/danger_plugin.rb

@@ -46,7 +46,7 @@ module Danger
 
     # Errors found
     attr_accessor :errors
-    
+
     # All issues found
     attr_accessor :issues
 
@@ -67,12 +67,12 @@ module Danger
       # Fails if swiftlint isn't installed
       raise 'swiftlint is not installed' unless swiftlint.installed?
 
-      config_file_path = if config_file
-                           config_file
-                         elsif !lint_all_files && File.file?('.swiftlint.yml')
-                           File.expand_path('.swiftlint.yml')
-                         end
-      log "Using config file: #{config_file_path}"
+      config_file_path = config_file
+      if config_file_path
+        log "Using config file: #{config_file_path}"
+      else
+        log 'Config file was not specified.'
+      end
 
       dir_selected = directory ? File.expand_path(directory) : Dir.pwd
       log "Swiftlint will be run from #{dir_selected}"
@@ -124,7 +124,7 @@ module Danger
         issues = issues.take(@max_num_violations)
       end
       log "Received from Swiftlint: #{issues}"
-      
+
       # filter out any unwanted violations with the passed in select_block
       if select_block && !no_comment
         issues = issues.select { |issue| select_block.call(issue) }
@@ -133,7 +133,7 @@ module Danger
       # Filter warnings and errors
       @warnings = issues.select { |issue| issue['severity'] == 'Warning' }
       @errors = issues.select { |issue| issue['severity'] == 'Error' }
-      
+
       # Early exit so we don't comment
       return if no_comment
 
@@ -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,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.24.5'
-  SWIFTLINT_VERSION = '0.41.0'
+  VERSION = '0.28.0'
+  SWIFTLINT_VERSION = '0.43.1'
 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)
@@ -314,29 +340,12 @@ module Danger
           @swiftlint.lint_files
         end
 
-        it 'expands default config file (if present) to absolute path' do
-          allow(@swiftlint.git).to receive(:added_files).and_return([])
-          allow(@swiftlint.git).to receive(:modified_files).and_return([
-                                                                         'spec/fixtures/SwiftFile.swift'
-                                                                       ])
-          expect(File).to receive(:file?).and_return(true)
-          expect(File).to receive(:exist?).and_return(true)
-          expect(File).to receive(:open).and_return(StringIO.new)
-          expect(YAML).to receive(:safe_load).and_return({})
-
-          expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(config: File.expand_path('.swiftlint.yml')), '', anything)
-            .once
-            .and_return(@swiftlint_response)
-
-          @swiftlint.lint_files
-        end
-
         it 'expands specified config file to absolute path' do
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           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)
@@ -360,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, '',
@@ -596,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

data/spec/swiftlint_spec.rb

@@ -25,9 +25,23 @@ describe Swiftlint do
     end
   end
 
+  it 'changes directory when a pwd option is specified' do
+    expect(Dir).to receive(:chdir) do |*args, &block|
+      expect(args).to match_array([Dir.pwd])
+      expect(block).not_to be_nil
+    end
+    swiftlint.run('lint', '', pwd: Dir.pwd)
+  end
+
+  it 'does not change directory when no pwd option is specified' do
+    allow(swiftlint).to receive(:`)
+    expect(Dir).not_to receive(:chdir)
+    swiftlint.run('lint', '')
+  end
+
   it 'runs lint by default with options being optional' do
     expect(swiftlint).to receive(:`).with(including('swiftlint lint'))
-    swiftlint.run
+    swiftlint.run('lint', '')
   end
 
   it 'runs accepting symbolized options' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.24.5
+  version: 0.28.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 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.3
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.