danger-swiftlint 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24ffc13551a8fc301e52e246257e507939190185
-  data.tar.gz: f194d6b75fc9dd688cd624a6dd61bac56cf691d8
+  metadata.gz: 40757cebea3dbc6624dba8273588487d0cdde1f7
+  data.tar.gz: 6c95846be51abaeec3ee99ed87eeb3c082fdd70a
 SHA512:
-  metadata.gz: 4029424658ca97f7548a22a01b57c587b74c6a2448eb7ece889d79b433e47d398f490f922995d071e90b1c419f6ea7a613099338eda60588b110af19745f5b1e
-  data.tar.gz: 0b5b53d7fb22979333e2ad1ced741e39e017ab7b89ddddee47c41ddac716523185e4c1c2dde69b31e4d884081f77611b24ffb768071f15e95baf6ea9f24c54f1
+  metadata.gz: 736318a6287be021e6d95a537cb4d067a15892e9e884ee0ca4a607626f75200b68d68258a9f47de55f65977268f9e87052597f45ac689fb0da7a7843abf8bebc
+  data.tar.gz: d22f58da0bec13124cfbb29b142ed2b0dcfac6a25ebcd3a88fcd21768e781c18dd87d8279e185ccd623ee5158b8b8c18202775abb4377928b11264dc37cdee6e

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.4

data/Changelog.md

@@ -2,6 +2,12 @@
 
 ## Current Master
 
+- Nothing yet!
+
+## 0.5.1
+
+- Fixed excluded files containing characters that need escaping. See [#40](https://github.com/ashfurrow/danger-swiftlint/pull/40).
+
 ## 0.5.0
 
 - Bump managed SwiftLint version to 0.18.1

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     danger-swiftlint (0.5.0)
       danger
-      rake (~> 10.0)
+      rake (> 10)
       thor (~> 0.19)
 
 GEM
@@ -21,7 +21,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.1.0)
+    danger (5.2.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -81,7 +81,7 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
-    rake (10.5.0)
+    rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
@@ -103,10 +103,10 @@ GEM
       faraday (~> 0.8, < 1.0)
     shellany (0.0.1)
     slop (3.6.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.2.1)
 
 PLATFORMS
   ruby

data/danger-swiftlint.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'danger'
   spec.add_dependency 'thor', '~> 0.19'
-  spec.add_dependency 'rake', '~> 10.0'
+  spec.add_dependency 'rake', '> 10'
 
   # General ruby development
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/danger_plugin.rb

@@ -90,7 +90,7 @@ module Danger
     # If files are not provided it will use git modifield and added files
     #
     # @return [Array] swift files
-    def find_swift_files(files=nil, excluded_files=[])
+    def find_swift_files(files=nil, excluded_paths=[])
       # Assign files to lint
       files = files ? Dir.glob(files) : (git.modified_files - git.deleted_files) + git.added_files
 
@@ -105,7 +105,11 @@ module Danger
         map { |file| File.expand_path(file) }.
         # Reject files excluded on configuration
         reject { |file|
-          excluded_files.any? { |excluded| Find.find(excluded).include?(file) }
+          excluded_paths.any? { |excluded_path|
+            Find.find(excluded_path).
+              map { |excluded_file| Shellwords.escape(excluded_file) }.
+              include?(file)
+          }
         }
     end
 

data/lib/version.rb

@@ -1,4 +1,4 @@
 module DangerSwiftlint
-  VERSION = "0.5.0".freeze
+  VERSION = "0.5.1".freeze
   SWIFTLINT_VERSION = "0.18.1".freeze
 end

data/spec/danger_plugin_spec.rb

@@ -91,7 +91,8 @@ module Danger
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
             'spec/fixtures/SwiftFile.swift',
-            'spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift'
+            'spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift',
+            'spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift'
           ])
 
           expect(Swiftlint).to receive(:lint)

data/spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift

@@ -0,0 +1 @@
+// This file intentionally left blank-ish.

data/spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift

@@ -1 +1 @@
-// This file intentional left blank-ish.
+// This file intentionally left blank-ish.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -46,16 +46,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ files:
 - spec/danger_plugin_spec.rb
 - spec/fixtures/SwiftFile.swift
 - spec/fixtures/empty_excluded.yml
+- spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift
 - spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift
 - spec/fixtures/some_config.yml
 - spec/spec_helper.rb
@@ -203,6 +204,7 @@ test_files:
 - spec/danger_plugin_spec.rb
 - spec/fixtures/SwiftFile.swift
 - spec/fixtures/empty_excluded.yml
+- spec/fixtures/excluded_dir/SwiftFile WithEscaped+CharactersThatShouldNotBeIncluded.swift
 - spec/fixtures/excluded_dir/SwiftFileThatShouldNotBeIncluded.swift
 - spec/fixtures/some_config.yml
 - spec/spec_helper.rb