danger-swiftlint 0.24.1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5e0ae1a58601a02041afbbc49b06015411d234ad6ff0f541832af053b860a18
-  data.tar.gz: b13fa389a8c0e4de1d70cf4e87e6347577199aff4f4d338092436fb66217122f
+  metadata.gz: 2acb2fde07b59fcb04f29d9e82eb3a9d195ab4af4116defcde1ea77c8ba1df26
+  data.tar.gz: 89ee290c7e49090017c7f74b2a618ffd970a41f57fe470682de55fd7ad39b2da
 SHA512:
-  metadata.gz: fea1c7af5a3e04955357c7f485fe8965509193df5152dbf6da935ffe3ca02de352790df418055d029b93c6f5b226c5bb1f06d4657313b98e244e47d8d1ef9116
-  data.tar.gz: 78db4cb509956091213c021025be9399e99734e47e9d51f700a93a18249c21f9acc296b7ab7a00e219ed5664355dc5ba43e2e602cf292829831be4320a3a9e47
+  metadata.gz: e5460d0a048ea06577fffc36b312811a0e545fd661706b322fa7a0f9e35900388b975363d1e7b2d54175e8f333c84e1254f5d1ecc7b436ceb2e9491713af48ca
+  data.tar.gz: 5f6791e6f7a700c7a1be573b032615d8db75acb313d9c775296048e30a4e0aadec6e39c12533c7ccd1bb1d1d802b2a590c5ef2c005a6aa3a335177f3b3d497ba

data/ext/swiftlint/swiftlint.rb

@@ -8,14 +8,21 @@ class Swiftlint
 
   # Runs swiftlint
   def run(cmd = 'lint', additional_swiftlint_args = '', options = {}, env = nil)
-    # change pwd before run swiftlint
-    Dir.chdir options.delete(:pwd) if options.key? :pwd
+    # allow for temporary change to pwd before running swiftlint
+    pwd = options.delete(:pwd)
+    command = "#{swiftlint_path} #{cmd} #{swiftlint_arguments(options, additional_swiftlint_args)}"
 
     # Add `env` to environment
     update_env(env)
     begin
       # run swiftlint with provided options
-      `#{swiftlint_path} #{cmd} #{swiftlint_arguments(options, additional_swiftlint_args)}`
+      if pwd
+        Dir.chdir(pwd) do 
+          `#{command}`
+        end
+      else
+        `#{command}`
+      end
     ensure
       # Remove any ENV variables we might have added
       restore_env()

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}"
@@ -354,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 = []
@@ -367,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.1'
-  SWIFTLINT_VERSION = '0.38.0'
+  VERSION = '0.25.0'
+  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

data/spec/swiftlint_spec.rb

@@ -25,9 +25,23 @@ describe Swiftlint do
     end
   end
 
+  it 'changes directory when a pwd option is specified' do
+    expect(Dir).to receive(:chdir) do |*args, &block|
+      expect(args).to match_array([Dir.pwd])
+      expect(block).not_to be_nil
+    end
+    swiftlint.run('lint', '', pwd: Dir.pwd)
+  end
+
+  it 'does not change directory when no pwd option is specified' do
+    allow(swiftlint).to receive(:`)
+    expect(Dir).not_to receive(:chdir)
+    swiftlint.run('lint', '')
+  end
+
   it 'runs lint by default with options being optional' do
     expect(swiftlint).to receive(:`).with(including('swiftlint lint'))
-    swiftlint.run
+    swiftlint.run('lint', '')
   end
 
   it 'runs accepting symbolized options' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftlint
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Ash Furrow
@@ -9,10 +9,10 @@ authors:
 - Orta Therox
 - Thiago Felix
 - Giovanni Lodi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2021-03-30 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
@@ -180,9 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.
 test_files: