danger-swiftlint 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3e7ed119f894d13115a6147e512b018678edd8e
-  data.tar.gz: 9ead229790970463d5f2e7c8afcf03067a6decad
+  metadata.gz: 801ca7331651b5d31e403630ca6e5a7770da6e49
+  data.tar.gz: ad870c7c8b02c63f5ce0a51030ccb9eef85b346e
 SHA512:
-  metadata.gz: 36d6752da9448acccea5208d1eb5453163cc1b5b17308a2c230840ae4bce72c3bd70681c83f71f2f7f2aef156edd570eeb37e50ff37b779b83685fffce5d2cd1
-  data.tar.gz: b4eae3d9a68e20dc5c1551862fd154f626edad9af58af3a2ad5d5e3adfebdf8ca14fdd0a501fc4a05ecb753bcb2fe04bd78da60bd878a20cd5a77c653a2f05dc
+  metadata.gz: 724d304989202a0703445c167377db51e6307261cf9d8939a9aaeac19da08f539b90e8deecdef7f959cb6e009fccbf820972fd7df367fad24f6135a8b78a8a5f
+  data.tar.gz: 65deb8b5a903315562c330aa156d87ac6a244f1220f6dbaeeb2979012099742b8ea2f99da6fdf7010be64d281344205c430a1e987082723a46b20432728c3269

data/lib/danger_plugin.rb

@@ -50,13 +50,13 @@ module Danger
       raise 'swiftlint is not installed' unless swiftlint.installed?
 
       config = if config_file
-                 File.expand_path(config_file)
+                 config_file
                elsif File.file?('.swiftlint.yml')
                  File.expand_path('.swiftlint.yml')
                end
       log "Using config file: #{config}"
 
-      dir_selected = directory ? File.expand_path(directory) : Shellwords.escape(Dir.pwd)
+      dir_selected = directory ? File.expand_path(directory) : Dir.pwd
       log "Swiftlint will be run from #{dir_selected}"
 
       # Extract excluded paths
@@ -68,7 +68,8 @@ module Danger
 
       # Prepare swiftlint options
       options = {
-        config: config,
+        # Make sure we don't fail when config path has spaces
+        config: config ? Shellwords.escape(config) : nil,
         reporter: 'json',
         quiet: true,
         pwd: dir_selected
@@ -125,22 +126,23 @@ module Danger
     #
     # @return [Array] swift files
     def find_swift_files(dir_selected, files = nil, excluded_paths = [])
+      # Needs to be escaped before comparsion with escaped file paths
+      dir_selected = Shellwords.escape(dir_selected)
+
       # Assign files to lint
       files = if files.nil?
                 (git.modified_files - git.deleted_files) + git.added_files
               else
                 Dir.glob(files)
               end
-
       # Filter files to lint
       files.
         # Ensure only swift files are selected
         select { |file| file.end_with?('.swift') }.
         # Make sure we don't fail when paths have spaces
-        map { |file| Shellwords.escape(file) }.
+        map { |file| Shellwords.escape(File.expand_path(file)) }.
         # Remove dups
-        uniq
-           .map { |file| File.expand_path(file) }.
+        uniq.
         # Ensure only files in the selected directory
         select { |file| file.start_with?(dir_selected) }.
         # Reject files excluded on configuration

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
   SWIFTLINT_VERSION = '0.20.1'
 end

data/spec/danger_plugin_spec.rb

@@ -221,7 +221,7 @@ module Danger
                                                                        ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(config: File.expand_path('spec/fixtures/some_config.yml')), '')
+            .with(hash_including(config: 'spec/fixtures/some_config.yml'), '')
             .once
             .and_return(@swiftlint_response)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger