danger-swiftlint 0.19.2 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e454d76dbacac01e067ad464c69c2996cf698432ebf7ea7bf8cf02f5006ed12e
-  data.tar.gz: 24d2c962266a42183681377f188ee912fbabff22d82c1e9a73d4e2505bcad87b
+  metadata.gz: 8a64dedaa81fb282247ffe2cbc5e13f5dc6f3d5e9ce9ab61e897d005aca35102
+  data.tar.gz: 3eeaafa30861ae658cbeee4201f24460046a2a7d0d150e847318ff4919f5679e
 SHA512:
-  metadata.gz: 96c6c495b5405ef4b67e1bf7fb3bc1de7275b45eff99739157a2d9ca3c3f4a0ea41127f3a36c722bfdd61f6a41c32201bb8db0155cf5bda8319499cec5a35fc5
-  data.tar.gz: b6f532d0b70508dd7493984adfc49285b9f43f8a6c57a63c36672457fb3c35e13367fa5373eb648732b811d3ea4a2149e6c7914c425b02e817c446fc55a4ca57
+  metadata.gz: 5f6b2f29d79a17c03762310ead3ed2d4ab70d8cd68684d98711fb2d256737495e9ff4309f47469cab5edf8a1d6950bb8a188cd770c53c9aa4a8261dd20df22ad
+  data.tar.gz: 9b6c2fbc47d8d75e637d2e205d644c36831237731ee6d3b4291811786039157584cf61dab01bda6d94a40a463fe2766a409b5eb38bfaab5801fa6da7b8f9bf3f

data/lib/danger_plugin.rb

@@ -48,7 +48,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, additional_swiftlint_args: '')
+    def lint_files(files = nil, inline_mode: false, fail_on_error: false, additional_swiftlint_args: '', &select_block)
       # Fails if swiftlint isn't installed
       raise 'swiftlint is not installed' unless swiftlint.installed?
 
@@ -98,6 +98,11 @@ module Danger
         issues = issues.take(@max_num_violations)
       end
       log "Received from Swiftlint: #{issues}"
+      
+      # filter out any unwanted violations with the passed in select_block
+      if select_block
+        issues.select! { |issue| select_block.call(issue) }
+      end
 
       # Filter warnings and errors
       warnings = issues.select { |issue| issue['severity'] == 'Warning' }

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.19.2'
+  VERSION = '0.20.0'
   SWIFTLINT_VERSION = '0.31.0'
 end

data/spec/danger_plugin_spec.rb

@@ -42,6 +42,8 @@ module Danger
           allow(@swiftlint.git).to receive(:modified_files).and_return([])
 
           @swiftlint_response = '[{ "rule_id" : "force_cast", "reason" : "Force casts should be avoided.", "character" : 19, "file" : "/Users/me/this_repo/spec//fixtures/SwiftFile.swift", "severity" : "Error", "type" : "Force Cast", "line" : 13 }]'
+          @swiftlint_multiviolation_response = '[{ "rule_id" : "force_cast", "reason" : "Force casts should be avoided.", "character" : 19, "file" : "/Users/me/this_repo/spec//fixtures/SwiftFile.swift", "severity" : "Error", "type" : "Force Cast", "line" : 13 },
+                                                 { "rule_id" : "force_cast", "reason" : "Force casts should be avoided.", "character" : 10, "file" : "/Users/me/this_repo/spec//fixtures/SwiftFile.swift", "severity" : "Error", "type" : "Force Cast", "line" : 16 }]'
         end
 
         after(:each) do
@@ -380,6 +382,28 @@ module Danger
           @swiftlint.lint_all_files = true
           @swiftlint.lint_files
         end
+        
+        it 'filters violations based on select block' do
+          allow_any_instance_of(Swiftlint).to receive(:lint)
+            .with(hash_including(pwd: File.expand_path('.')), '')
+            .and_return(@swiftlint_multiviolation_response)
+
+          @swiftlint.lint_files(['spec/fixtures/some\ dir/SwiftFile.swift'], inline_mode: true) { |violation| 
+            violation["line"] != 16
+          }
+          status = @swiftlint.status_report
+          expect(status[:warnings]).to eql(["Force casts should be avoided.\n`force_cast` `SwiftFile.swift:13`"])
+        end
+        
+        it 'filters nothing out if not passed a select block' do
+            allow_any_instance_of(Swiftlint).to receive(:lint)
+              .with(hash_including(pwd: File.expand_path('.')), '')
+              .and_return(@swiftlint_multiviolation_response)
+  
+            @swiftlint.lint_files(['spec/fixtures/some\ dir/SwiftFile.swift'], inline_mode: true)
+            status = @swiftlint.status_report
+            expect(status[:warnings].length).to eql(2)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.20.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger