danger-swiftlint 0.24.5 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35b57008bbb1fa32b8b8c156bacc1b6610c0148c9c608287d6cf7f42d172792
-  data.tar.gz: c430570ca1990bb89e90d8b6c9fcb38e557d40e3307b4e7dc331e173bc68d2ac
+  metadata.gz: 2acb2fde07b59fcb04f29d9e82eb3a9d195ab4af4116defcde1ea77c8ba1df26
+  data.tar.gz: 89ee290c7e49090017c7f74b2a618ffd970a41f57fe470682de55fd7ad39b2da
 SHA512:
-  metadata.gz: a276e2b26378e2b8ac740e6af1afc7430d622a3e02fda4f25eff08875149d51ee38887d30b58ff03b1356a55b0563041af2dfb7211599876023b8a56d72ffd14
-  data.tar.gz: 601e1a6e0b8ed52863740aef8aadda2427ac10a456a3c47b8472451b4c6d7ea9710148bfd2d63770c1f8637d09372875fcce04a7fa0b843d49ce26e8f03efb51
+  metadata.gz: e5460d0a048ea06577fffc36b312811a0e545fd661706b322fa7a0f9e35900388b975363d1e7b2d54175e8f333c84e1254f5d1ecc7b436ceb2e9491713af48ca
+  data.tar.gz: 5f6791e6f7a700c7a1be573b032615d8db75acb313d9c775296048e30a4e0aadec6e39c12533c7ccd1bb1d1d802b2a590c5ef2c005a6aa3a335177f3b3d497ba

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/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.24.5'
+  VERSION = '0.25.0'
   SWIFTLINT_VERSION = '0.41.0'
 end

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.25.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-03-30 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.1.2
 signing_key:
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.