danger-swiftlint 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dbb13219873521a9e81041978b5800a85229b02
-  data.tar.gz: 6386a741dfb3e982e21374514e019b5b13fee35b
+  metadata.gz: b690ceed1ab30f9d77d77b4381819f85873324a4
+  data.tar.gz: f74150df221117b74ff2a12d968e9ef1b9593027
 SHA512:
-  metadata.gz: 426c76446fd6ca7f595dfd4f99e97e3f33897e281b0dc983c1f0dc704be1a67950621071bacf643a84eb1907506d59872a0d1117a12a30921c43cf6dfeae3a63
-  data.tar.gz: 68fda7d7df9f604994f0451534fb96d9c686b4e9503bf4ca58c8a97cb68af049a69566be52cbb1940433c3db7b1eb3c8a89d8d709794ba5ec75ea20cf107f400
+  metadata.gz: 9f0a240500772bd1c3b92b4a92baabf663222ba7c6f85ccdcb9ee6412d55a056f8c2a9a4198f513c5f3a252675ad12c68b4cdc7cae86adb56f42629d6f89ec61
+  data.tar.gz: 5490dcabc7c0a31355c1bb0cb5083b0293a03d2a52658e9f74ec9193586d7a11b0a3ec7b8a4600f4c5dcd3f3455fcb0004dbe85e1492d95cf82f85b052064181

data/.ruby-version

@@ -1 +1 @@
-2.3.4
+2.4.1

data/Changelog.md

@@ -4,6 +4,10 @@
 
 - Nothing yet!
 
+## 0.10.0
+
+- Adds `additional_swiftlint_args` option. See[#57](https://github.com/ashfurrow/danger-swiftlint/issues/57).
+
 ## 0.9.0
 
 - Fixes linting of superfluous files in subdirectories. See [#53](https://github.com/ashfurrow/danger-swiftlint/pull/53).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-swiftlint (0.7.0)
+    danger-swiftlint (0.9.0)
       danger
       rake (> 10)
       thor (~> 0.19)
@@ -9,8 +9,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     bacon (1.2.0)
     claide (1.0.2)
     claide-plugins (0.9.2)
@@ -21,7 +21,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.3.3)
+    danger (5.5.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -30,10 +30,11 @@ GEM
       faraday-http-cache (~> 1.0)
       git (~> 1)
       kramdown (~> 1.5)
+      no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     diff-lcs (1.3)
-    faraday (0.12.1)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
@@ -54,7 +55,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    kramdown (1.14.0)
+    kramdown (1.15.0)
     listen (3.0.7)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
@@ -68,6 +69,7 @@ GEM
     multipart-post (2.0.0)
     nap (1.1.0)
     nenv (0.3.0)
+    no_proxy_fix (0.1.1)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -80,8 +82,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.5)
-    rake (12.0.0)
+    public_suffix (3.0.0)
+    rake (12.1.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
@@ -125,4 +127,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   1.15.0
+   1.15.1

data/README.md

@@ -42,6 +42,12 @@ If you want lint errors to fail Danger, you can use `fail_on_error` option.
 swiftlint.lint_files fail_on_error: true
 ```
 
+If you need to specify options for `swiftlint` that can _only_ be specified by command line arguments, use the `additional_swiftlint_args` option.
+
+```rb
+swiftlint.lint_files additional_swiftlint_args: '--lenient'
+```
+
 You can use the `SWIFTLINT_VERSION` environment variable to override the default version installed via the `rake install` task.
 
 ## Attribution

data/ext/swiftlint/swiftlint.rb

@@ -5,19 +5,19 @@ class Swiftlint
   end
 
   # Runs swiftlint
-  def run(cmd='lint', options={})
+  def run(cmd='lint', additional_swiftlint_args='', options={})
     # change pwd before run swiftlint
     if options.has_key? :pwd
       Dir.chdir options.delete(:pwd)
     end
 
     # run swiftlint with provided options
-    `#{swiftlint_path} #{cmd} #{swiftlint_arguments(options)}`
+    `#{swiftlint_path} #{cmd} #{swiftlint_arguments(options, additional_swiftlint_args)}`
   end
 
   # Shortcut for running the lint command
-  def lint(options)
-    run('lint', options)
+  def lint(options, additional_swiftlint_args)
+    run('lint', additional_swiftlint_args, options)
   end
 
   # Return true if swiftlint is installed or false otherwise
@@ -35,8 +35,8 @@ class Swiftlint
   # Parse options into shell arguments how swift expect it to be
   # more information: https://github.com/Carthage/Commandant
   # @param options (Hash) hash containing swiftlint options
-  def swiftlint_arguments options
-    options.
+  def swiftlint_arguments (options, additional_swiftlint_args)
+    (options.
       # filter not null
       select {|key, value| !value.nil?}.
       # map booleans arguments equal true
@@ -48,7 +48,8 @@ class Swiftlint
       # prepend '--' into the argument
       map { |key, value| ["--#{key}", value] }.
       # reduce everything into a single string
-      reduce('') { |args, option| "#{args} #{option[0]} #{option[1]}" }.
+      reduce('') { |args, option| "#{args} #{option[0]} #{option[1]}"} + 
+      " #{additional_swiftlint_args}").
       # strip leading spaces
       strip
   end

data/lib/danger_plugin.rb

@@ -36,7 +36,7 @@ module Danger
     #          if nil, modified and added files from the diff will be used.
     # @return  [void]
     #
-    def lint_files(files=nil, inline_mode: false, fail_on_error: false)
+    def lint_files(files=nil, inline_mode: false, fail_on_error: false, additional_swiftlint_args: "")
       # Fails if swiftlint isn't installed
       raise "swiftlint is not installed" unless swiftlint.is_installed?
 
@@ -65,7 +65,7 @@ module Danger
       }
 
       # Lint each file and collect the results
-      issues = run_swiftlint(files, options)
+      issues = run_swiftlint(files, options, additional_swiftlint_args)
 
       # Filter warnings and errors
       warnings = issues.select { |issue| issue['severity'] == 'Warning' }
@@ -94,10 +94,10 @@ module Danger
     # Run swiftlint on each file and aggregate collect the issues
     #
     # @return [Array] swiftlint issues
-    def run_swiftlint(files, options)
+    def run_swiftlint(files, options, additional_swiftlint_args)
       files
         .map { |file| options.merge({path: file})}
-        .map { |full_options| swiftlint.lint(full_options)}
+        .map { |full_options| swiftlint.lint(full_options, additional_swiftlint_args)}
         .reject { |s| s == '' }
         .map { |s| JSON.parse(s).flatten }
         .flatten

data/lib/version.rb

@@ -1,4 +1,4 @@
 module DangerSwiftlint
-  VERSION = "0.9.0".freeze
+  VERSION = "0.10.0".freeze
   SWIFTLINT_VERSION = "0.20.1".freeze
 end

data/spec/danger_plugin_spec.rb

@@ -44,7 +44,7 @@ module Danger
 
         it 'accept files as arguments' do
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')))
+            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .and_return(@swiftlint_response)
 
           @swiftlint.lint_files("spec/fixtures/*.swift")
@@ -54,11 +54,19 @@ module Danger
           expect(output).to include("SwiftFile.swift | 13 | Force casts should be avoided.")
         end
 
+        it 'accepts additional cli arguments' do
+          expect_any_instance_of(Swiftlint).to receive(:lint)
+            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '--lenient')
+            .and_return(@swiftlint_response)
+
+          @swiftlint.lint_files("spec/fixtures/*.swift", additional_swiftlint_args: '--lenient')
+        end
+
         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_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')))
+            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .and_return(@swiftlint_response)
 
           @swiftlint.lint_files
@@ -71,7 +79,7 @@ module Danger
           @swiftlint.directory = 'spec/fixtures/some_dir'
 
           allow_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:pwd => File.expand_path(@swiftlint.directory)))
+            .with(hash_including(:pwd => File.expand_path(@swiftlint.directory)), '')
             .and_return(@swiftlint_response)
 
           @swiftlint.lint_files(["spec/fixtures/some_dir/SwiftFile.swift"])
@@ -91,7 +99,7 @@ module Danger
           ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-          .with(hash_including(:path => File.expand_path('spec/fixtures/some_dir/SwiftFile.swift')))
+          .with(hash_including(:path => File.expand_path('spec/fixtures/some_dir/SwiftFile.swift')), '')
           .once
           .and_return(@swiftlint_response)
 
@@ -125,7 +133,7 @@ module Danger
           ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')))
+            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .once
             .and_return(@swiftlint_response)
 
@@ -140,7 +148,7 @@ module Danger
           ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')))
+            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .once
             .and_return(@swiftlint_response)
 
@@ -163,7 +171,7 @@ module Danger
           ])
 
           expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')))
+            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .once
             .and_return(@swiftlint_response)
 
@@ -172,10 +180,10 @@ module Danger
 
         it 'generates errors instead of markdown when use inline mode' do
           allow_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')))
+            .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')), '')
             .and_return(@swiftlint_response)
 
-          @swiftlint.lint_files("spec/fixtures/*.swift", inline_mode: true, fail_on_error: false)
+          @swiftlint.lint_files("spec/fixtures/*.swift", inline_mode: true, fail_on_error: false, additional_swiftlint_args: '')
 
           status = @swiftlint.status_report
           expect(status[:errors]).to_not be_empty

data/spec/swiftlint_spec.rb

@@ -33,9 +33,11 @@ describe Swiftlint do
     expect(swiftlint).to receive(:`).with(including(cmd))
 
     swiftlint.run('lint',
+                  '',
                   use_stdin: false,
                   cache_path: '/path',
-                  enable_all_rules: true)
+                  enable_all_rules: true
+                  )
   end
 end
 

metadata

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