danger-swiftformat 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4725bb4b3e493d619b7bcc38c909823aa6d014a31fe938341f8488a40690e8ce
-  data.tar.gz: 7ea2c85afac6d489fc255f0618e0e02002feba04e59f50df23374cab5c6e2a3b
+  metadata.gz: 7c9b3279bd74c07c0484451302265163c566fb8cf833ee02f11d19c718452a08
+  data.tar.gz: b36e4a5b90fff935710634fa63d743b9a538b60830df7fd7b0bdf854dc3b461f
 SHA512:
-  metadata.gz: fb8be55f45b39b9b2a7f7adee5a1f4cfbfb87b029cf36a6cc2ca69a27885ce1a3c9009d9de687202e4e071dd8174f1ee623c3725570401c949add0f841ce162a
-  data.tar.gz: 8d78eb43d9e124cdd39b70521ac0b7583e17fa32851928cd72aeb9ab3d40bd3a6fb96536d797585e68d4ebfc8dfb657f949490502fb04e6d75dd8868419bf1a8
+  metadata.gz: 040feb0a05ffa56ac333620d1a162cfdc660743e0ff3dc26ba6223a437e4fab52b218c23d89c3bc6ff889793887ced05dc45e1f68b411f4184d2df698f58aacf
+  data.tar.gz: 44ab68d8cbd5b545bab694b4463c2232c269a5ab1bb6e5295c59f82d98f9f15445b3993bd96e4323babde11c1acc6b8b160ff44d7b33cf48b013c0b67f22c324

data/.rubocop.yml

@@ -3,7 +3,7 @@
 # If you don't like these settings, just delete this file :)
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
@@ -23,7 +23,7 @@ Lint/UselessAssignment:
     - '**/spec/**/*'
 
 # We could potentially enable the 2 below:
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   Enabled: false
 
 Layout/AlignHash:
@@ -37,6 +37,9 @@ Layout/DotPosition:
 Style/DoubleNegation:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 # Cop supports --auto-correct.
 Lint/UnusedBlockArgument:
   Enabled: false

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    danger-swiftformat (0.5.0)
+    danger-swiftformat (0.6.0)
       danger-plugin-api (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     claide (1.0.2)
@@ -19,13 +19,13 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (6.0.6)
+    danger (6.0.9)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
-      faraday-http-cache (~> 1.0)
+      faraday-http-cache (~> 2.0)
       git (~> 1.5)
       kramdown (~> 2.0)
       kramdown-parser-gfm (~> 1.0)
@@ -37,9 +37,9 @@ GEM
     diff-lcs (1.3)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (1.3.1)
+    faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.10.0)
+    ffi (1.11.1)
     formatador (0.2.5)
     git (1.5.0)
     guard (2.15.0)
@@ -56,9 +56,9 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    jaro_winkler (1.5.2)
+    jaro_winkler (1.5.3)
     kramdown (2.1.0)
-    kramdown-parser-gfm (1.0.1)
+    kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -66,7 +66,7 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.2)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nap (1.1.0)
     nenv (0.3.0)
     no_proxy_fix (0.1.2)
@@ -77,15 +77,14 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     parallel (1.17.0)
-    parser (2.6.2.1)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    psych (3.1.0)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -93,34 +92,33 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.67.2)
+    rspec-support (3.8.2)
+    rubocop (0.73.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     shellany (0.0.1)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
-    unicode-display_width (1.5.0)
-    yard (0.9.19)
+    unicode-display_width (1.6.0)
+    yard (0.9.20)
 
 PLATFORMS
   ruby

data/lib/swiftformat/gem_version.rb

@@ -1,3 +1,3 @@
 module Swiftformat
-  VERSION = "0.5.0".freeze
+  VERSION = "0.6.0".freeze
 end

data/lib/swiftformat/plugin.rb

@@ -74,7 +74,12 @@ module Danger
     #
     # @return [Array<String]
     def find_swift_files
-      files = (git.modified_files - git.deleted_files) + git.added_files
+      renamed_files_hash = git.renamed_files.map { |rename| [rename[:before], rename[:after]] }.to_h
+
+      post_rename_modified_files = git.modified_files
+        .map { |modified_file| renamed_files_hash[modified_file] || modified_file }
+
+      files = (post_rename_modified_files - git.deleted_files) + git.added_files
 
       @exclude = %w() if @exclude.nil?
 

data/spec/swiftformat/plugin_spec.rb

@@ -39,6 +39,7 @@ module Danger
           allow(@sut.git).to receive(:added_files).and_return(["Added.swift"])
           allow(@sut.git).to receive(:modified_files).and_return(["Modified.swift"])
           allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+          allow(@sut.git).to receive(:renamed_files).and_return([{}])
           allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
           allow_any_instance_of(SwiftFormat).to receive(:check_format)
             .with(%w(Added.swift Modified.swift), additional_args)
@@ -62,6 +63,7 @@ module Danger
           allow(@sut.git).to receive(:added_files).and_return(["Added.swift"])
           allow(@sut.git).to receive(:modified_files).and_return(["Modified.swift"])
           allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+          allow(@sut.git).to receive(:renamed_files).and_return([{}])
           allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
           allow_any_instance_of(SwiftFormat).to receive(:check_format).with(%w(Added.swift Modified.swift), nil).and_return(error_output)
           @sut.additional_message = additional_message
@@ -81,6 +83,7 @@ module Danger
           allow(@sut.git).to receive(:added_files).and_return(%w(Added.swift Pods/Test.swift Carthage/SQLite.swift Sources/Module/JSONParsing_autogenerated.swift))
           allow(@sut.git).to receive(:modified_files).and_return(["Source/Modified.swift"])
           allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+          allow(@sut.git).to receive(:renamed_files).and_return([{}])
           allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
           allow_any_instance_of(SwiftFormat).to receive(:check_format)
             .with(%w(Added.swift), nil)
@@ -96,6 +99,30 @@ module Danger
         end
       end
 
+      context "with renamed files" do
+        let(:additional_args) { "--indent tab --self insert" }
+        let(:success_output) { { errors: [], stats: { run_time: "0.08s" } } }
+
+        it "should use the post-rename filename" do
+          allow(@sut.git).to receive(:added_files).and_return(["Added.swift"])
+          allow(@sut.git).to receive(:modified_files).and_return(["ModifiedBefore.swift"])
+          allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+          allow(@sut.git).to receive(:renamed_files).and_return([{ before: "ModifiedBefore.swift", after: "ModifiedAfter.swift" }])
+          allow_any_instance_of(SwiftFormat).to receive(:installed?).and_return(true)
+          allow_any_instance_of(SwiftFormat).to receive(:check_format)
+            .with(%w(Added.swift ModifiedAfter.swift), additional_args)
+            .and_return(success_output)
+
+          @sut.additional_args = additional_args
+
+          @sut.check_format(fail_on_error: true)
+
+          status = @sut.status_report
+          expect(status[:errors]).to be_empty
+          expect(status[:markdowns]).to be_empty
+        end
+      end
+
       describe "#check_format" do
         let(:success_output) { { errors: [], stats: { run_time: "0.08s" } } }
         let(:error_output) { { errors: [{ file: "Modified.swift", rules: %w(firstRule secondRule) }], stats: { run_time: "0.16s" } } }
@@ -106,6 +133,7 @@ module Danger
             allow(@sut.git).to receive(:added_files).and_return(["Added.m"])
             allow(@sut.git).to receive(:modified_files).and_return(["Modified.m"])
             allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.m"])
+            allow(@sut.git).to receive(:renamed_files).and_return([{}])
           end
 
           it "should not do anything" do
@@ -123,6 +151,7 @@ module Danger
             allow(@sut.git).to receive(:added_files).and_return(["Added.swift"])
             allow(@sut.git).to receive(:modified_files).and_return(["Modified.swift"])
             allow(@sut.git).to receive(:deleted_files).and_return(["Deleted.swift"])
+            allow(@sut.git).to receive(:renamed_files).and_return([{}])
           end
 
           context "when swiftformat does not find any errors" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-swiftformat
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Vincent Garrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A danger plugin for checking Swift formatting using SwiftFormat.