danger-swiftlint 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c683ebc4b9a3a612c68eee9889d766458b4e1a4517b7f2022d3107175adad46
-  data.tar.gz: dacd9783690561139fb4f4fd5ce1d100dbb82e49c881a64e5c454962abee046e
+  metadata.gz: 6e30637e9b9981efedc2a18d8acdf8f9957a0f813f714b131601f43dce07ec0d
+  data.tar.gz: b0c6033a1291893cc3b871cfd3f7d6fb631d89431ca3724d0f187e5ef69bdfc0
 SHA512:
-  metadata.gz: 72a01b3969c23207a994a932d0829fc9f1954c5dc37a1686e44d9496ee885cc15be1cfa4fafbbe42a6b08507c638f6055043455692d03af2c54fcd559e417c7c
-  data.tar.gz: d4e0b33363e8cced89e749e954e59d1ad3afb5e20fd788677436b1bebeb9ba7404f4db7cbd54647068bbf0579a02fbe6ccec9b1995ab791065f195b14063f245
+  metadata.gz: 1417540992b6d0b2ccd7a1b9dacd57235f66e3e495ef826af54168e0686434efaf80eb552a35f212091cd5f8d297b6252810c0be1074214d4b19c2c7c680a992
+  data.tar.gz: aef461f9368041b4c0f8e9d30d64e3eb42e4110578cf009660234d05e6c1e026d1a3c09f1a80fa88e96bee7602f0cb5d9e9c2822add4c4dea554c04e8bbf67c5

data/lib/danger_plugin.rb

@@ -87,10 +87,6 @@ module Danger
 
       log "Swiftlint includes the following paths: #{included_paths}"
 
-      # Extract swift files (ignoring excluded ones)
-      files = find_swift_files(dir_selected, files, excluded_paths, included_paths)
-      log "Swiftlint will lint the following files: #{files.join(', ')}"
-
       # Prepare swiftlint options
       options = {
         # Make sure we don't fail when config path has spaces
@@ -102,8 +98,17 @@ module Danger
       }
       log "linting with options: #{options}"
 
-      # Lint each file and collect the results
-      issues = run_swiftlint(files, lint_all_files, options, additional_swiftlint_args)
+      if lint_all_files
+        issues = run_swiftlint(options, additional_swiftlint_args)
+      else
+        # Extract swift files (ignoring excluded ones)
+        files = find_swift_files(dir_selected, files, excluded_paths, included_paths)
+        log "Swiftlint will lint the following files: #{files.join(', ')}"
+
+        # Lint each file and collect the results
+        issues = run_swiftlint_for_each(files, options, additional_swiftlint_args)
+      end
+
       @issues = issues
       other_issues_count = 0
       unless @max_num_violations.nil? || no_comment
@@ -147,27 +152,30 @@ module Danger
       end
     end
 
-    # Run swiftlint on each file and aggregate collect the issues
+    # Run swiftlint on all files and returns the issues
     #
     # @return [Array] swiftlint issues
-    def run_swiftlint(files, lint_all_files, options, additional_swiftlint_args)
-      if lint_all_files
-        result = swiftlint.lint(options, additional_swiftlint_args)
-        if result == ''
-          {}
-        else
-          JSON.parse(result).flatten
-        end
+    def run_swiftlint(options, additional_swiftlint_args)
+      result = swiftlint.lint(options, additional_swiftlint_args)
+      if result == ''
+        {}
       else
-        files
-          .map { |file| options.merge(path: file) }
-          .map { |full_options| swiftlint.lint(full_options, additional_swiftlint_args) }
-          .reject { |s| s == '' }
-          .map { |s| JSON.parse(s).flatten }
-          .flatten
+        JSON.parse(result).flatten
       end
     end
 
+    # Run swiftlint on each file and aggregate collect the issues
+    #
+    # @return [Array] swiftlint issues
+    def run_swiftlint_for_each(files, options, additional_swiftlint_args)
+      files
+        .map { |file| options.merge(path: file) }
+        .map { |full_options| swiftlint.lint(full_options, additional_swiftlint_args) }
+        .reject { |s| s == '' }
+        .map { |s| JSON.parse(s).flatten }
+        .flatten
+    end
+
     # Find swift files from the files glob
     # If files are not provided it will use git modifield and added files
     #

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-21 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.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.