danger-swiftlint 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a64dedaa81fb282247ffe2cbc5e13f5dc6f3d5e9ce9ab61e897d005aca35102
-  data.tar.gz: 3eeaafa30861ae658cbeee4201f24460046a2a7d0d150e847318ff4919f5679e
+  metadata.gz: 26d3f63d751dffc66d02244fe0312606f209cf92f6741e5b4f269e3ded5786a5
+  data.tar.gz: 5c4ffed861fc7de303abd515c45c4897f8d65456e603bc8f00a02ec1a4fd4ec9
 SHA512:
-  metadata.gz: 5f6b2f29d79a17c03762310ead3ed2d4ab70d8cd68684d98711fb2d256737495e9ff4309f47469cab5edf8a1d6950bb8a188cd770c53c9aa4a8261dd20df22ad
-  data.tar.gz: 9b6c2fbc47d8d75e637d2e205d644c36831237731ee6d3b4291811786039157584cf61dab01bda6d94a40a463fe2766a409b5eb38bfaab5801fa6da7b8f9bf3f
+  metadata.gz: da2ad63e66231b7468d89b7cb68f1e0bb24a17d83d0b1b02318d2b546b9d7c70f3c2be9fa351dde769444f211f2be46c84c49dbe1958c83499c2a31b4297c822
+  data.tar.gz: cb093d04e518bbb499240bb99abb0ce42cafa55fa6984769adddda3360c7c97239f818469d6095b01816e1f1df49cb2c15bce4da392d43c0963e653e0d9e439a

data/lib/danger_plugin.rb

@@ -38,6 +38,15 @@ module Danger
     # Whether all files should be linted in one pass
     attr_accessor :lint_all_files
 
+    # Whether we should fail on warnings
+    attr_accessor :strict
+
+    # Warnings found
+    attr_accessor :warnings
+
+    # Errors found
+    attr_accessor :errors
+
     # 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.
@@ -105,13 +114,13 @@ module Danger
       end
 
       # Filter warnings and errors
-      warnings = issues.select { |issue| issue['severity'] == 'Warning' }
-      errors = issues.select { |issue| issue['severity'] == 'Error' }
+      @warnings = issues.select { |issue| issue['severity'] == 'Warning' }
+      @errors = issues.select { |issue| issue['severity'] == 'Error' }
 
       if inline_mode
         # Report with inline comment
-        send_inline_comment(warnings, :warn)
-        send_inline_comment(errors, fail_on_error ? :fail : :warn)
+        send_inline_comment(warnings, strict ? :fail : :warn)
+        send_inline_comment(errors, (fail_on_error || strict) ? :fail : :warn)
         warn other_issues_message(other_issues_count) if other_issues_count > 0
       elsif warnings.count > 0 || errors.count > 0
         # Report if any warning or error
@@ -121,8 +130,11 @@ module Danger
         message << "\n#{other_issues_message(other_issues_count)}" if other_issues_count > 0
         markdown message
 
-        # Fail Danger on errors
-        if fail_on_error && errors.count > 0
+        # Fail danger on errors
+        should_fail_by_errors = fail_on_error && errors.count > 0
+        # Fail danger if any warnings or errors and we are strict
+        should_fail_by_strict = strict && (errors.count > 0 || warnings.count > 0)
+        if should_fail_by_errors || should_fail_by_strict
           fail 'Failed due to SwiftLint errors'
         end
       end

data/lib/version.rb

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

data/spec/danger_plugin_spec.rb

@@ -348,6 +348,69 @@ module Danger
           expect(status[:errors]).to be_empty
         end
 
+        context '#strict' do
+          before(:each) do
+            allow_any_instance_of(Swiftlint).to receive(:lint)
+              .with(hash_including(path: File.expand_path('spec/fixtures/SwiftFile.swift')), '')
+              .and_return(swiftlint_response)
+          end
+
+          context 'when not strict' do
+            # Response without any errors and a single warning
+            let(:swiftlint_response) { '[{ "rule_id" : "force_cast", "reason" : "Force casts should be avoided.", "character" : 19, "file" : "/Users/me/this_repo/spec//fixtures/SwiftFile.swift", "severity" : "Warning", "type" : "Force Cast", "line" : 13 }]' }
+
+            it 'does not fail on warnings if inline' do
+              @swiftlint.lint_files('spec/fixtures/*.swift', inline_mode: true, fail_on_error: false, additional_swiftlint_args: '')
+
+              expect(@swiftlint.failed?).to_not be true
+            end
+
+            it 'does not fail on warnings if not inline' do
+              @swiftlint.lint_files('spec/fixtures/*.swift', inline_mode: false, fail_on_error: false, additional_swiftlint_args: '')
+
+              expect(@swiftlint.failed?).to_not be true
+            end
+          end
+
+          context 'when strict is enabled' do
+            # Response without any errors and a single warning
+            let(:swiftlint_response) { '[{ "rule_id" : "force_cast", "reason" : "Force casts should be avoided.", "character" : 19, "file" : "/Users/me/this_repo/spec//fixtures/SwiftFile.swift", "severity" : "Warning", "type" : "Force Cast", "line" : 13 }]' }
+
+            before(:each) do
+              @swiftlint.strict = true
+            end
+
+            it 'fails on warnings if inline' do
+              @swiftlint.lint_files('spec/fixtures/*.swift', inline_mode: true, fail_on_error: false, additional_swiftlint_args: '')
+
+              expect(@swiftlint.failed?).to be true
+            end
+
+            it 'fails on warnings if not inline' do
+              @swiftlint.lint_files('spec/fixtures/*.swift', inline_mode: false, fail_on_error: false, additional_swiftlint_args: '')
+
+              expect(@swiftlint.failed?).to be true
+            end
+
+            context 'with errors' do
+              # Response with an error
+              let(:swiftlint_response) { @swiftlint_response }
+
+              it 'fails if inline' do
+                @swiftlint.lint_files('spec/fixtures/*.swift', inline_mode: true, fail_on_error: false, additional_swiftlint_args: '')
+
+                expect(@swiftlint.failed?).to be true
+              end
+
+              it 'fails if not inline' do
+                @swiftlint.lint_files('spec/fixtures/*.swift', inline_mode: false, fail_on_error: false, additional_swiftlint_args: '')
+
+                expect(@swiftlint.failed?).to be true
+              end
+            end
+          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.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger