danger-swiftlint 0.24.0 → 0.24.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bd5ffb51afbb7836e76cfc8bd0c6a0df09f8344ad5bacd69bba455c8ab73513
-  data.tar.gz: 1df24c142a6c18201aa6acc6f01a00bea3d0bec6b34082101a466ec7427bf903
+  metadata.gz: a35b57008bbb1fa32b8b8c156bacc1b6610c0148c9c608287d6cf7f42d172792
+  data.tar.gz: c430570ca1990bb89e90d8b6c9fcb38e557d40e3307b4e7dc331e173bc68d2ac
 SHA512:
-  metadata.gz: 55da087dc9bdace268e2ec965f3bbda84e8ae0af891b05f4404ca53e69056a44c257e03546c776dce379fcf451926905df9d17060cd8d59de51e00433ce24ac7
-  data.tar.gz: fe2140a9eaed8f7a335241fde6eaa8d83895476d430f1541f4046a32f4e9bb23b31bfe8d783c41862b1d7add1812fcb123f6cd4ac01cecd25c94b14e78a996f1
+  metadata.gz: a276e2b26378e2b8ac740e6af1afc7430d622a3e02fda4f25eff08875149d51ee38887d30b58ff03b1356a55b0563041af2dfb7211599876023b8a56d72ffd14
+  data.tar.gz: 601e1a6e0b8ed52863740aef8aadda2427ac10a456a3c47b8472451b4c6d7ea9710148bfd2d63770c1f8637d09372875fcce04a7fa0b843d49ce26e8f03efb51

data/lib/danger_plugin.rb

@@ -69,7 +69,7 @@ module Danger
 
       config_file_path = if config_file
                            config_file
-                         elsif File.file?('.swiftlint.yml')
+                         elsif !lint_all_files && File.file?('.swiftlint.yml')
                            File.expand_path('.swiftlint.yml')
                          end
       log "Using config file: #{config_file_path}"
@@ -216,6 +216,8 @@ module Danger
                 Dir.glob(files)
               end
       # Filter files to lint
+      excluded_paths_list = Find.find(*excluded_paths).to_a
+      included_paths_list = Find.find(*included_paths).to_a
       files.
         # Ensure only swift files are selected
         select { |file| file.end_with?('.swift') }.
@@ -226,12 +228,12 @@ module Danger
         # Ensure only files in the selected directory
         select { |file| file.start_with?(dir_selected) }.
         # Reject files excluded on configuration
-        reject { |file| file_exists?(excluded_paths, file) }.
+        reject { |file| excluded_paths_list.include?(file) }.
         # Accept files included on configuration
         select do |file|
-        next true if included_paths.empty?
-        file_exists?(included_paths, file)
-      end
+          next true if included_paths.empty?
+          included_paths_list.include?(file)
+        end
     end
 
     # Get the configuration file
@@ -256,16 +258,6 @@ module Danger
       end
     end
 
-    # Return whether the file exists within a specified collection of paths
-    #
-    # @return [Bool] file exists within specified collection of paths
-    def file_exists?(paths, file)
-      paths.any? do |path|
-        Find.find(path)
-            .include?(file)
-      end
-    end
-
     # Parses the configuration file and return the specified files in path
     #
     # @return [Array] list of files specified in path
@@ -362,8 +354,7 @@ module Danger
     def git_modified_lines(file)
       git_range_info_line_regex = /^@@ .+\+(?<line_number>\d+),/ 
       git_modified_line_regex = /^\+(?!\+|\+)/
-      git_removed_line_regex = /^[-]/
-      git_not_removed_line_regex = /^[^-]/
+      git_removed_line_regex = /^\-(?!\-|\-)/
       file_info = git.diff_for_file(file)
       line_number = 0
       lines = []
@@ -375,7 +366,7 @@ module Danger
           when git_modified_line_regex
               lines << line_number
           end
-          line_number += 1 if line_number > 0
+          line_number += 1 if line_number > 0 && !git_removed_line_regex.match?(line)
           line_number = starting_line_number if line_number == 0 && starting_line_number > 0
       end
       lines

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerSwiftlint
-  VERSION = '0.24.0'
-  SWIFTLINT_VERSION = '0.38.0'
+  VERSION = '0.24.5'
+  SWIFTLINT_VERSION = '0.41.0'
 end

data/spec/danger_plugin_spec.rb

@@ -419,7 +419,8 @@ module Danger
           allow(@swiftlint.git.diff_for_file).to receive(:patch).and_return(git_diff)
           modified_lines = @swiftlint.git_modified_lines("spec/fixtures/SwiftFile.swift")
           expect(modified_lines).to_not be_empty
-          expect(modified_lines.length).to eql(23)
+          expect(modified_lines.length).to eql(24)
+          expect(modified_lines).to eql([15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 42])
         end
 
         it 'Get git modified files info' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.5
 platform: ruby
 authors:
 - Ash Furrow
@@ -9,10 +9,10 @@ authors:
 - Orta Therox
 - Thiago Felix
 - Giovanni Lodi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -165,7 +165,7 @@ homepage: https://github.com/ashfurrow/danger-ruby-swiftlint
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.
 test_files: