danger-swiftlint 0.24.4 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683d845df224c2d9d4739b53011fa985ec25808d941781d82329761e9a5f4a08
-  data.tar.gz: bf54a06f76d88406230b451440aae8b42bbca2c2b517140e3fb20b533826be75
+  metadata.gz: 4a979dbfbd991937d41dad406c1dd157e2110af61cf3854cdf6cf16da24b4c01
+  data.tar.gz: d1f7c58afd46ed7202b33e11f59e56f00c5f50e8ffc1a37254695c87bcda6b3a
 SHA512:
-  metadata.gz: cf25410d65d64ca8bc7e55a6482ab06d1e2d50b7ab30ef8ab6a3fc0951bd689948169e3b9d5f33ddd2dd4bbb8224f4a8290927fe8042a1e63c5437c49699f46a
-  data.tar.gz: 43a48cd8e46d7fd0474047252f5c8ac75a50de2647922d6251f1ba57f820af083234583b89465b0bda957a86208a96078c8c6d94b0d665b9d193ad1aadb428a0
+  metadata.gz: 0753bc62476184adb833077774cf266e5c2fec07931edb4cb3b633ae960d3454200172fcf1cb9720ea6cecdde6df3d33faa726afba03e73122401a274dd57d1a
+  data.tar.gz: 2e46137121434ea0ae42ec6c27b7f345e20ec65ae65494670b45764a70db87284d41e3a78f7b52942dd22a25fd2d9993623df729408a9b4381dec385f1e9b68e

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 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
 

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.24.4'
-  SWIFTLINT_VERSION = '0.40.1'
+  VERSION = '0.27.0'
+  SWIFTLINT_VERSION = '0.43.1'
 end

data/spec/danger_plugin_spec.rb

@@ -314,24 +314,6 @@ 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([

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.4
+  version: 0.27.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -9,10 +9,10 @@ authors:
 - Orta Therox
 - Thiago Felix
 - Giovanni Lodi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -165,7 +165,7 @@ homepage: https://github.com/ashfurrow/danger-ruby-swiftlint
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,8 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.20
+signing_key:
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.
 test_files: