danger-swiftlint 0.18.2 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c0b4923083394fe45f7ee1eb9414639bcfc2bfa5fda1becc73022ade36dcd7
-  data.tar.gz: f5f68fcf0e044494561231f3725160c41419fc94ae1aa32907732cf801147ecf
+  metadata.gz: 5f03db994724833541ddc2d5739357d6f5f47d6fc73a38814e2d86e146b3471c
+  data.tar.gz: f8b967bdc04517e881f45e0b582f1fcab79a3f2c376ce0f81e6e9192b0108cb7
 SHA512:
-  metadata.gz: e7a3ecc77e594072fa0e7b34b5725c8d1748fb375cfa6b492d7f7011a53af2601e011c6117f4eb17a9ffe5d920e81bb73ae5e4c3fcf3d7ce25a41e7ca41bb25f
-  data.tar.gz: f1c31d69887736f1fef1308bcc3a6d6539f5682969e84049e9cf1146cc25289b2f372e8f285ea3024b26c696f978455b78e57e5f4306cc3b6aeafa9af11bb690
+  metadata.gz: 48e1cd28d5cddba7200822c51690017f6b7fe765f13e69e89176ff9aa9fcccbe6af5651f7e8823290722cce8589b605854678bb48abe4986aaf8c57011a2e642
+  data.tar.gz: 49dcd564a26a78499985c14e5474704704d2fbd29520e6ae4cc1a454e6e41a0ee272582e9e13af4d0f71deab3c9bec31f0073dac1e08ab0ebbfc52fdbc094f98

data/lib/danger_plugin.rb

@@ -234,8 +234,9 @@ module Danger
         filename = r['file'].split('/').last
         line = r['line']
         reason = r['reason']
-
-        message << "#{filename} | #{line} | #{reason} \n"
+        rule = r['rule_id']
+        # Other available properties can be found int SwiftLint/…/JSONReporter.swift
+        message << "#{filename} | #{line} | #{reason} (#{rule})\n"
       end
 
       message
@@ -247,8 +248,16 @@ 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'])
+        github_filename = r['file'].gsub(dir, '')
+        message = "#{r['reason']}".dup
+
+        # extended content here
+        filename = r['file'].split('/').last
+        message << "\n"
+        message << "`#{r['rule_id']}`" # helps writing exceptions // swiftlint:disable:this rule_id
+        message << " `#{filename}:#{r['line']}`" # file:line for pasting into Xcode Quick Open
+        
+        send(method, message, file: github_filename, line: r['line'])
       end
     end
 

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.18.2'
+  VERSION = '0.19.0'
   SWIFTLINT_VERSION = '0.28.1'
 end

data/spec/danger_plugin_spec.rb

@@ -57,7 +57,7 @@ module Danger
 
           output = @swiftlint.status_report[:markdowns].first.to_s
           expect(output).to include('SwiftLint found issues')
-          expect(output).to include('SwiftFile.swift | 13 | Force casts should be avoided.')
+          expect(output).to include('SwiftFile.swift | 13 | Force casts should be avoided. (force_cast)')
         end
 
         it 'accept files as arguments' do
@@ -69,7 +69,7 @@ module Danger
 
           output = @swiftlint.status_report[:markdowns].first.to_s
           expect(output).to include('SwiftLint found issues')
-          expect(output).to include('SwiftFile.swift | 13 | Force casts should be avoided.')
+          expect(output).to include('SwiftFile.swift | 13 | Force casts should be avoided. (force_cast)')
         end
 
         it 'sets maxium number of violations' do
@@ -83,9 +83,9 @@ module Danger
 
           output = @swiftlint.status_report[:markdowns].first.to_s
           expect(output).to include('SwiftLint found issues')
-          expect(output).to include('SwiftFile.swift | 13 | Force casts should be avoided.')
+          expect(output).to include('SwiftFile.swift | 13 | Force casts should be avoided. (force_cast)')
           expect(output).to include('SwiftLint also found 1 more violation with this PR.')
-          expect(output).to_not include('SwiftFile.swift | 14 | Force casts should be avoided.')
+          expect(output).to_not include('SwiftFile.swift | 14 | Force casts should be avoided. (force_cast)')
         end
 
         it 'accepts additional cli arguments' do
@@ -312,6 +312,17 @@ module Danger
           expect(status[:markdowns]).to be_empty
         end
 
+        it 'renders rule_id and file:line indicators in inline mode' do
+          allow_any_instance_of(Swiftlint).to receive(:lint)
+            .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+            .and_return(@swiftlint_response)
+
+          @swiftlint.lint_files('spec/fixtures/*.swift', inline_mode: true, additional_swiftlint_args: '')
+
+          status = @swiftlint.status_report          
+          expect(status[:warnings]).to eql(["Force casts should be avoided.\n`force_cast` `SwiftFile.swift:13`"])
+        end
+
         it 'generate errors in inline_mode when fail_on_error' do
           allow_any_instance_of(Swiftlint).to receive(:lint)
             .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger