danger-swiftlint 0.24.2 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482dc2edd6a4f700400f2c4d09462df5228f0ab2a3d61a17eea5a552a78cd241
-  data.tar.gz: 9bdb741852c40ac8d268334190f413d01f9d17613ec718b989292664dbcb317c
+  metadata.gz: 0a7648f0b4b4bf523d4617687df847500fcdc2f846425dfadffb7f8c768319d8
+  data.tar.gz: 26b3d3507b659380c23b46828be7874faf949016fd54d1366436de8ce348b518
 SHA512:
-  metadata.gz: 940f20bab43a72603c98afbe43199556fd006abcae65598e0eca8fc1b8631bef6666ed81dfbecdbe5ec6b483864881986b6f0a4999b26dac448c90703cf41cdc
-  data.tar.gz: 16c654ae13cae9bcd4bb339fa0e2020ea3f35ea9f16be1ee29e5cfb74acf12f84d48147bde9f4eaa782e3842c851b9b4cfb83ec89a0678ab0e93537f0cbb3648
+  metadata.gz: 1f912b6332e39539cc16f6a09b9d7e31875409a3357db1d6e2e6160a807138bceb743a7e6580539844e45595dbd3e9932ccda66bb0bfaa5c10a2740d7997021d
+  data.tar.gz: 84801ec026c062c9e9f30d3bca88759cde4c73a4e70b72b0fb8f112f567585ce5468ec695c5b858919d642998047cc8b1fce8419bce8e617705fb399132595f3

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

@@ -46,7 +46,7 @@ module Danger
 
     # Errors found
     attr_accessor :errors
-    
+
     # All issues found
     attr_accessor :issues
 
@@ -67,12 +67,12 @@ module Danger
       # Fails if swiftlint isn't installed
       raise 'swiftlint is not installed' unless swiftlint.installed?
 
-      config_file_path = if config_file
-                           config_file
-                         elsif File.file?('.swiftlint.yml')
-                           File.expand_path('.swiftlint.yml')
-                         end
-      log "Using config file: #{config_file_path}"
+      config_file_path = config_file
+      if config_file_path
+        log "Using config file: #{config_file_path}"
+      else
+        log 'Config file was not specified.'
+      end
 
       dir_selected = directory ? File.expand_path(directory) : Dir.pwd
       log "Swiftlint will be run from #{dir_selected}"
@@ -124,7 +124,7 @@ module Danger
         issues = issues.take(@max_num_violations)
       end
       log "Received from Swiftlint: #{issues}"
-      
+
       # filter out any unwanted violations with the passed in select_block
       if select_block && !no_comment
         issues = issues.select { |issue| select_block.call(issue) }
@@ -133,7 +133,7 @@ module Danger
       # Filter warnings and errors
       @warnings = issues.select { |issue| issue['severity'] == 'Warning' }
       @errors = issues.select { |issue| issue['severity'] == 'Error' }
-      
+
       # Early exit so we don't comment
       return if no_comment
 
@@ -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.2'
-  SWIFTLINT_VERSION = '0.39.1'
+  VERSION = '0.26.0'
+  SWIFTLINT_VERSION = '0.41.0'
 end

data/spec/danger_plugin_spec.rb

@@ -314,24 +314,6 @@ module Danger
           @swiftlint.lint_files
         end
 
-        it 'expands default config file (if present) to absolute path' do
-          allow(@swiftlint.git).to receive(:added_files).and_return([])
-          allow(@swiftlint.git).to receive(:modified_files).and_return([
-                                                                         'spec/fixtures/SwiftFile.swift'
-                                                                       ])
-          expect(File).to receive(:file?).and_return(true)
-          expect(File).to receive(:exist?).and_return(true)
-          expect(File).to receive(:open).and_return(StringIO.new)
-          expect(YAML).to receive(:safe_load).and_return({})
-
-          expect_any_instance_of(Swiftlint).to receive(:lint)
-            .with(hash_including(config: File.expand_path('.swiftlint.yml')), '', anything)
-            .once
-            .and_return(@swiftlint_response)
-
-          @swiftlint.lint_files
-        end
-
         it 'expands specified config file to absolute path' do
           allow(@swiftlint.git).to receive(:added_files).and_return([])
           allow(@swiftlint.git).to receive(:modified_files).and_return([
@@ -419,7 +401,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.2
+  version: 0.26.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-03-10 00:00:00.000000000 Z
+date: 2021-03-31 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,8 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.2
+signing_key:
 specification_version: 4
 summary: A Danger plugin for linting Swift with SwiftLint.
 test_files: