danger-swiftlint 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed68d0e1ec0a4a39d786ae12d422503c7f875bcd
-  data.tar.gz: 6b2b17fa94ec942717d81b531088604ced20d889
+  metadata.gz: f3b820ec6ebe7d24aa08c97887544ab8616e1bd0
+  data.tar.gz: 114dd0c769d754f3d93be4bcc0f30785d018694d
 SHA512:
-  metadata.gz: d08daff295c07b77d94cae9d3c5f8b91706daf29b44693e49ec6c741c57d003ed6ec874d231fa20aeb10837684f7a0d3038d25d80f4b7707de97a79c74a2fdca
-  data.tar.gz: 6ad1e948574373e337e481a6cc3bc3ddeef34708f2707572107c3dadedd20abe045eb7593277b0035dee9c35ebd6340ee14cee4fab036875ef928b54202536f9
+  metadata.gz: 774bbbdbed22fe7159db897f198df1eed4b381369b837108260d6dfa2838168e6fc1f216c8ad4d858803f0b312d620b782a116ca9f6cfd460fda62edb8aea2aa
+  data.tar.gz: 4e85ea6784227a0e1a714b6aa3373b8dc197fee3f62e4ec042160815b3676026bd327116f7159270962ef166ffef9fafe6cf9140ee0ed407170dd62091f3d34d

data/Changelog.md

@@ -4,6 +4,12 @@
 
 - Nothing yet!
 
+## 0.8.0
+
+- Fixes Directory not found error. See [#51](https://github.com/ashfurrow/danger-swiftlint/pull/51).
+- Fixes issue with missing `.swiftlint.yml` file. See [#52](https://github.com/ashfurrow/danger-swiftlint/pull/52).
+- Adds `fail_on_error` option. See [#55](https://github.com/ashfurrow/danger-swiftlint/pull/55)
+
 ## 0.7.0
 
 - Bump managed SwiftLint version to 0.20.1

data/README.md

@@ -36,6 +36,12 @@ If you want the lint result shows in diff instead of comment, you can use `inlin
 swiftlint.lint_files inline_mode: true
 ```
 
+If you want lint errors to fail Danger, you can use `fail_on_error` option.
+
+```rb
+swiftlint.lint_files fail_on_error: true
+```
+
 You can use the `SWIFTLINT_VERSION` environment variable to override the default version installed via the `rake install` task.
 
 ## Attribution

data/lib/danger_plugin.rb

@@ -36,22 +36,30 @@ module Danger
     #          if nil, modified and added files from the diff will be used.
     # @return  [void]
     #
-    def lint_files(files=nil, inline_mode: false)
+    def lint_files(files=nil, inline_mode: false, fail_on_error: false)
       # Fails if swiftlint isn't installed
       raise "swiftlint is not installed" unless swiftlint.is_installed?
 
+      config = if config_file
+        config_file
+      elsif File.file?('.swiftlint.yml')
+        '.swiftlint.yml'
+      else
+        nil
+      end
+
       # Extract excluded paths
-      excluded_paths = excluded_files_from_config(config_file)
+      excluded_paths = excluded_files_from_config(config)
 
       # Extract swift files (ignoring excluded ones)
       files = find_swift_files(files, excluded_paths)
 
       # Prepare swiftlint options
       options = {
-        config: config_file,
+        config: config,
         reporter: 'json',
         quiet: true,
-        pwd: directory || Dir.pwd
+        pwd: directory ? File.expand_path(directory) : Dir.pwd
       }
 
       # Lint each file and collect the results
@@ -72,6 +80,11 @@ module Danger
           message << markdown_issues(warnings, 'Warnings') unless warnings.empty?
           message << markdown_issues(errors, 'Errors') unless errors.empty?
           markdown message
+
+	  # Fail Danger on errors
+	  if fail_on_error && errors.count > 0
+	    fail "Failed due to SwiftLint errors"
+	  end
         end
       end
     end
@@ -120,7 +133,7 @@ module Danger
     # @return [Array] list of files excluded
     def excluded_files_from_config(filepath)
       config = if filepath
-        YAML.load_file(config_file)
+        YAML.load_file(filepath)
       else
         {"excluded" => []}
       end
@@ -129,7 +142,7 @@ module Danger
 
       # Extract excluded paths
       return excluded_paths.
-        map { |path| File.join(File.dirname(config_file), path) }.
+        map { |path| File.join(File.dirname(filepath), path) }.
         map { |path| File.expand_path(path) }.
         select { |path| File.exists?(path) || Dir.exists?(path) }
     end

data/lib/version.rb

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

data/spec/danger_plugin_spec.rb

@@ -71,7 +71,7 @@ module Danger
           @swiftlint.directory = 'some_dir'
 
           allow_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(:pwd => @swiftlint.directory))
+            .with(hash_including(:pwd => File.expand_path(@swiftlint.directory)))
             .and_return(@swiftlint_response)
 
           @swiftlint.lint_files("spec/fixtures/*.swift")
@@ -157,7 +157,7 @@ module Danger
             .with(hash_including(:path => File.expand_path('spec/fixtures/SwiftFile.swift')))
             .and_return(@swiftlint_response)
 
-          @swiftlint.lint_files("spec/fixtures/*.swift", inline_mode: true)
+          @swiftlint.lint_files("spec/fixtures/*.swift", inline_mode: true, fail_on_error: false)
 
           status = @swiftlint.status_report
           expect(status[:errors]).to_not be_empty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.