danger-swiftlint 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b690ceed1ab30f9d77d77b4381819f85873324a4
-  data.tar.gz: f74150df221117b74ff2a12d968e9ef1b9593027
+  metadata.gz: f71b06256f2784921e22fbdc37355c02c0e254b3
+  data.tar.gz: c1ea5e23bfb6ad68c56a00df4576c5d0b10298a3
 SHA512:
-  metadata.gz: 9f0a240500772bd1c3b92b4a92baabf663222ba7c6f85ccdcb9ee6412d55a056f8c2a9a4198f513c5f3a252675ad12c68b4cdc7cae86adb56f42629d6f89ec61
-  data.tar.gz: 5490dcabc7c0a31355c1bb0cb5083b0293a03d2a52658e9f74ec9193586d7a11b0a3ec7b8a4600f4c5dcd3f3455fcb0004dbe85e1492d95cf82f85b052064181
+  metadata.gz: bb46882114d80a100b1c4a5cc932c923becc6540c3f893378df3a5c0120b5ae3f5bfcdc29653f19064145a8c0f2fb480764058b61a3fc1c81202159c19aeb403
+  data.tar.gz: 260ae84694e2b4193376b4df088048f53d0c830f94d66c3bf408fe5efe7bfa727bde836c360db6765af3e699b5c1d648fc7719b0d1c6a5234783df318fce8443

data/Changelog.md

@@ -4,6 +4,11 @@
 
 - Nothing yet!
 
+## 0.10.1
+
+- Expands config paths to be absolute when passed to `swiftlint`.
+- Adds verbose logging option.
+
 ## 0.10.0
 
 - Adds `additional_swiftlint_args` option. See[#57](https://github.com/ashfurrow/danger-swiftlint/issues/57).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-swiftlint (0.9.0)
+    danger-swiftlint (0.10.0)
       danger
       rake (> 10)
       thor (~> 0.19)
@@ -21,7 +21,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.5.1)
+    danger (5.5.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)

data/README.md

@@ -50,6 +50,8 @@ 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.
 
+Finally, if something's not working correctly, you can debug this plugin by using setting `swiftlint.verbose = true`.
+
 ## Attribution
 
 Original structure, sequence, and organization of repo taken from [danger-prose](https://github.com/dbgrandi/danger-prose) by [David Grandinetti](https://github.com/dbgrandi/).

data/lib/danger_plugin.rb

@@ -28,6 +28,9 @@ module Danger
     # Allows you to specify a directory from where swiftlint will be run.
     attr_accessor :directory
 
+    # Provides additional logging diagnostic information.
+    attr_accessor :verbose
+
     # Lints Swift files. Will fail if `swiftlint` cannot be installed correctly.
     # Generates a `markdown` list of warnings for the prose in a corpus of .markdown and .md files.
     #
@@ -41,20 +44,23 @@ module Danger
       raise "swiftlint is not installed" unless swiftlint.is_installed?
 
       config = if config_file
-        config_file
+        File.expand_path(config_file)
       elsif File.file?('.swiftlint.yml')
-        '.swiftlint.yml'
+        File.expand_path('.swiftlint.yml')
       else
         nil
       end
+      log "Using config file: #{config}"
       
       dir_selected = directory ? File.expand_path(directory) : Dir.pwd
+      log "Swiftlint will be run from #{dir_selected}"
 
       # Extract excluded paths
       excluded_paths = excluded_files_from_config(config)
 
       # Extract swift files (ignoring excluded ones)
       files = find_swift_files(files, excluded_paths, dir_selected)
+      log "Swiftlint will lint the following files: #{files.join(', ')}"
 
       # Prepare swiftlint options
       options = {
@@ -63,9 +69,11 @@ module Danger
         quiet: true,
         pwd: dir_selected
       }
+      log "linting with options: #{options}"
 
       # Lint each file and collect the results
       issues = run_swiftlint(files, options, additional_swiftlint_args)
+      log "Received from Swiftlint: #{issues}"
 
       # Filter warnings and errors
       warnings = issues.select { |issue| issue['severity'] == 'Warning' }
@@ -83,10 +91,10 @@ module Danger
           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
+          # Fail Danger on errors
+          if fail_on_error && errors.count > 0
+            fail "Failed due to SwiftLint errors"
+          end
         end
       end
     end
@@ -177,8 +185,8 @@ module Danger
     def send_inline_comment (results, method)
       dir = "#{Dir.pwd}/"
       results.each do |r|
-	filename = r['file'].gsub(dir, "")
-	send(method, r['reason'], file: filename, line: r['line'])
+      filename = r['file'].gsub(dir, "")
+      send(method, r['reason'], file: filename, line: r['line'])
       end
     end
 
@@ -188,5 +196,9 @@ module Danger
     def swiftlint
       Swiftlint.new(binary_path)
     end
+
+    def log(text)
+      puts(text) if @verbose
+    end
   end
 end

data/lib/version.rb

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

data/spec/danger_plugin_spec.rb

@@ -156,6 +156,51 @@ module Danger
           @swiftlint.lint_files
         end
 
+        it 'default config is nil, unspecified' do
+          allow(@swiftlint.git).to receive(:added_files).and_return([])
+          allow(@swiftlint.git).to receive(:modified_files).and_return([
+            'spec/fixtures/SwiftFile.swift',
+          ])
+
+          expect_any_instance_of(Swiftlint).to receive(:lint)
+            .with(hash_including(:config => nil), '')
+            .once
+            .and_return(@swiftlint_response)
+
+          @swiftlint.lint_files
+        end
+
+        it 'expands default config file (if present) to absolute path' do
+          allow(@swiftlint.git).to receive(:added_files).and_return([])
+          allow(@swiftlint.git).to receive(:modified_files).and_return([
+            'spec/fixtures/SwiftFile.swift',
+          ])
+          expect(File).to receive(:file?).and_return(true)
+          expect(YAML).to receive(:load_file).and_return({})
+
+          expect_any_instance_of(Swiftlint).to receive(:lint)
+            .with(hash_including(:config => File.expand_path('.swiftlint.yml')), '')
+            .once
+            .and_return(@swiftlint_response)
+
+          @swiftlint.lint_files
+        end
+
+        it 'expands specified config file to absolute path' do
+          allow(@swiftlint.git).to receive(:added_files).and_return([])
+          allow(@swiftlint.git).to receive(:modified_files).and_return([
+            'spec/fixtures/SwiftFile.swift',
+          ])
+
+          expect_any_instance_of(Swiftlint).to receive(:lint)
+            .with(hash_including(:config => File.expand_path('spec/fixtures/some_config.yml')), '')
+            .once
+            .and_return(@swiftlint_response)
+
+          @swiftlint.config_file = 'spec/fixtures/some_config.yml'
+          @swiftlint.lint_files
+        end
+
         it 'does not lint deleted files paths' do
           # Danger (4.3.0 at the time of writing) returns deleted files in the
           # modified fiels array, which kinda makes sense.

metadata

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