danger-swiftlint 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26d3f63d751dffc66d02244fe0312606f209cf92f6741e5b4f269e3ded5786a5
-  data.tar.gz: 5c4ffed861fc7de303abd515c45c4897f8d65456e603bc8f00a02ec1a4fd4ec9
+  metadata.gz: 4c683ebc4b9a3a612c68eee9889d766458b4e1a4517b7f2022d3107175adad46
+  data.tar.gz: dacd9783690561139fb4f4fd5ce1d100dbb82e49c881a64e5c454962abee046e
 SHA512:
-  metadata.gz: da2ad63e66231b7468d89b7cb68f1e0bb24a17d83d0b1b02318d2b546b9d7c70f3c2be9fa351dde769444f211f2be46c84c49dbe1958c83499c2a31b4297c822
-  data.tar.gz: cb093d04e518bbb499240bb99abb0ce42cafa55fa6984769adddda3360c7c97239f818469d6095b01816e1f1df49cb2c15bce4da392d43c0963e653e0d9e439a
+  metadata.gz: 72a01b3969c23207a994a932d0829fc9f1954c5dc37a1686e44d9496ee885cc15be1cfa4fafbbe42a6b08507c638f6055043455692d03af2c54fcd559e417c7c
+  data.tar.gz: d4e0b33363e8cced89e749e954e59d1ad3afb5e20fd788677436b1bebeb9ba7404f4db7cbd54647068bbf0579a02fbe6ccec9b1995ab791065f195b14063f245

data/lib/danger_plugin.rb

@@ -46,6 +46,9 @@ module Danger
 
     # Errors found
     attr_accessor :errors
+    
+    # All issues found
+    attr_accessor :issues
 
     # Lints Swift files. Will fail if `swiftlint` cannot be installed correctly.
     # Generates a `markdown` list of warnings for the prose in a corpus of
@@ -57,7 +60,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: '', &select_block)
+    def lint_files(files = nil, inline_mode: false, fail_on_error: false, additional_swiftlint_args: '', no_comment: false, &select_block)
       # Fails if swiftlint isn't installed
       raise 'swiftlint is not installed' unless swiftlint.installed?
 
@@ -101,21 +104,25 @@ module Danger
 
       # Lint each file and collect the results
       issues = run_swiftlint(files, lint_all_files, options, additional_swiftlint_args)
+      @issues = issues
       other_issues_count = 0
-      unless @max_num_violations.nil?
+      unless @max_num_violations.nil? || no_comment
         other_issues_count = issues.count - @max_num_violations if issues.count > @max_num_violations
         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) }
+      if select_block && !no_comment
+        issues = issues.select { |issue| select_block.call(issue) }
       end
 
       # Filter warnings and errors
       @warnings = issues.select { |issue| issue['severity'] == 'Warning' }
       @errors = issues.select { |issue| issue['severity'] == 'Error' }
+      
+      # Early exit so we don't comment
+      return if no_comment
 
       if inline_mode
         # Report with inline comment

data/lib/version.rb

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

data/spec/danger_plugin_spec.rb

@@ -410,6 +410,58 @@ module Danger
             end
           end
         end
+          
+        context 'when no_comment is enabled' do
+          
+          it 'does not create comments' 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, no_comment: true)
+            status = @swiftlint.status_report
+            expect(status[:warnings]).to eql([])
+            expect(status[:errors]).to eql([])
+            expect(status[:markdown]).to be_nil
+          end
+          
+          it 'does not filter with max_violations' do
+            allow_any_instance_of(Swiftlint).to receive(:lint)
+              .with(hash_including(pwd: File.expand_path('.')), '')
+              .and_return(@swiftlint_multiviolation_response)
+
+            @swiftlint.max_num_violations = 1
+            @swiftlint.lint_files(['spec/fixtures/some\ dir/SwiftFile.swift'], no_comment: true)
+            issues = @swiftlint.issues
+            expect(issues.length).to eql(2)
+          end
+          
+          it 'does not filter with select_block' do
+            allow_any_instance_of(Swiftlint).to receive(:lint)
+              .with(hash_including(pwd: File.expand_path('.')), '')
+              .and_return(@swiftlint_multiviolation_response)
+
+            @swiftlint.max_num_violations = 1
+            @swiftlint.lint_files(['spec/fixtures/some\ dir/SwiftFile.swift'], no_comment: true) { |v|
+              false
+            }
+            issues = @swiftlint.issues
+            expect(issues.length).to eql(2)
+          end
+          
+          it 'correctly sets issues, warnings, and errors accessors' 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'], no_comment: true)
+            issues = @swiftlint.issues
+            warnings = @swiftlint.warnings
+            errors = @swiftlint.errors
+            expect(issues.length).to eql(warnings.length + errors.length)
+          end
+        end
+        
 
         it 'parses environment variables set within the swiftlint config' do
           ENV['ENVIRONMENT_EXAMPLE'] = 'excluded_dir'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.