danger-swiftlint 0.23.0 → 0.24.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d124a22a2db51e5527b4a8032d543ed75904a0fcf01fc539686bddceaddb25c2
-  data.tar.gz: fbd279ea07e0ee226252862b25bb459babe781da4e7466654b4361376d72fefc
+  metadata.gz: 683d845df224c2d9d4739b53011fa985ec25808d941781d82329761e9a5f4a08
+  data.tar.gz: bf54a06f76d88406230b451440aae8b42bbca2c2b517140e3fb20b533826be75
 SHA512:
-  metadata.gz: 6cc159309e6692bc75cb8f55b81b5baa5fc01c8942d5b7738d3ea51b41e402cf01ffa9d4a1f0fce2b5a53210609f9d2d4e044dbbf901dec7d360922d1e0c9a6f
-  data.tar.gz: 372946ca17a1f473a699833c103946aec9a47b8eda7b5d400fc26547358becef01ac7c2a85536911ec7f7ecd7835071938df70c7ffc3db7faec505116c533892
+  metadata.gz: cf25410d65d64ca8bc7e55a6482ab06d1e2d50b7ab30ef8ab6a3fc0951bd689948169e3b9d5f33ddd2dd4bbb8224f4a8290927fe8042a1e63c5437c49699f46a
+  data.tar.gz: 43a48cd8e46d7fd0474047252f5c8ac75a50de2647922d6251f1ba57f820af083234583b89465b0bda957a86208a96078c8c6d94b0d665b9d193ad1aadb428a0

data/lib/danger_plugin.rb

@@ -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.23.0'
-  SWIFTLINT_VERSION = '0.33.1'
+  VERSION = '0.24.4'
+  SWIFTLINT_VERSION = '0.40.1'
 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.23.0
+  version: 0.24.4
 platform: ruby
 authors:
 - Ash Furrow
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -180,8 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.