danger-rubocop 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91b32a9db886ba98a9bb29e11e6fdec8b0aae1b344ef3bb41e281094e7cf2d4
-  data.tar.gz: 6ce1784637f6ffd0de37de4aac28ff81c27154cbcf9b3e20ac46dab5c0ca0665
+  metadata.gz: 5363c39a9497dd46bb7268c9c8e1161604c90c5795cb790cd6affcd74a71c8aa
+  data.tar.gz: 4c9db849c7b8439aba6a5b7761daf57e7d871e18fd42a02f3a461e5ea23e80ff
 SHA512:
-  metadata.gz: 560ace4a9f693783d80041b1ad88d4fe2dc3b4bcf946fced8195e30ce8f89ebc3cec698e9bdf09a9c3e377b7a7e7055f25710433ca4d1219583eb78e18ea513b
-  data.tar.gz: b5f5ae9d8d821e75c95dbccaaf22858b7c8f1b790ec020711f55c0374dc8020d28393376c07337d500aaf87874234f9d6db6532447a7ac1bb7327d910da08def
+  metadata.gz: 02de948e9d1f6049d4b1516152e86b265106d715c48168412b9b2610a338b8f29c5d37d410a055caa5139ea634a2c226f62dc2caf72cc8083306e4d7d8012400
+  data.tar.gz: bdf55e66ef3307c0422acd50ff56691d303be15518667059e2bc8d9e0a14aeb060250f6ed878f2deca16594db4b0df6b21e0e7f4937e21f4a93901bc19b50429

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-rubocop (0.9.1)
+    danger-rubocop (0.9.4)
       danger
       rubocop (~> 1.0)
 
@@ -10,18 +10,18 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     bacon (1.2.0)
     claide (1.0.3)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    coderay (1.1.1)
+    coderay (1.1.3)
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.2.1)
+    danger (8.2.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -33,110 +33,111 @@ GEM
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
-      terminal-table (~> 1)
-    diff-lcs (1.2.5)
-    faraday (1.1.0)
+      terminal-table (>= 1, < 4)
+    diff-lcs (1.4.4)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
-    ffi (1.9.10)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    ffi (1.15.0)
     formatador (0.2.5)
-    git (1.7.0)
+    git (1.8.1)
       rchardet (~> 1.8)
-    guard (2.14.0)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.7.2)
+    guard-rspec (4.7.3)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    kramdown (2.3.0)
+    kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     listen (3.0.7)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
-    lumberjack (1.0.10)
-    metaclass (0.0.4)
-    method_source (0.8.2)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    mocha-on-bacon (0.2.2)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    mocha (1.12.0)
+    mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
     multipart-post (2.1.1)
     nap (1.1.0)
     nenv (0.3.0)
     no_proxy_fix (0.1.2)
-    notiffany (0.1.0)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.19.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     prettybacon (0.0.2)
       bacon (~> 1.2)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
+    rake (13.0.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     rchardet (1.8.0)
-    regexp_parser (2.0.0)
-    rexml (3.2.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (1.5.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.14.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     shellany (0.0.1)
-    slop (3.6.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.19.1)
-    unicode-display_width (1.7.0)
-    yard (0.9.20)
+    terminal-table (1.6.0)
+    thor (1.1.0)
+    unicode-display_width (2.0.0)
+    yard (0.9.26)
 
 PLATFORMS
   ruby

data/lib/danger_plugin.rb

@@ -145,7 +145,13 @@ module Danger
     end
 
     def fetch_files_to_lint(files = nil)
-      to_lint = (files ? Dir.glob(files) : (git.modified_files + git.added_files))
+      to_lint = if files.nil?
+        # when files are renamed, git.modified_files contains the old name not the new one, so we need to do the convertion
+        renaming_map = (git.renamed_files || []).map { |e| [e[:before], e[:after]] }.to_h
+        (git.modified_files.map { |f| renaming_map[f] || f }) + git.added_files
+      else
+        Dir.glob(files)
+      end
       Shellwords.join(to_lint)
     end
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DangerRubocop
-  VERSION = '0.9.3'.freeze
+  VERSION = '0.9.4'.freeze
 end

data/spec/danger_plugin_spec.rb

@@ -241,10 +241,12 @@ module Danger
         it 'handles a rubocop report for files changed in the PR' do
           allow(@rubocop.git).to receive(:added_files).and_return([])
           allow(@rubocop.git).to receive(:modified_files)
-            .and_return(["spec/fixtures/another_ruby_file.rb"])
+            .and_return(["spec/fixtures/old_file_name.rb", "spec/fixtures/another_ruby_file.rb"])
+          allow(@rubocop.git).to receive(:renamed_files)
+            .and_return([{before: "spec/fixtures/old_file_name.rb", after: "spec/fixtures/new_file_name.rb"}])
 
           allow(@rubocop).to receive(:`)
-            .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/another_ruby_file.rb')
+            .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/new_file_name.rb spec/fixtures/another_ruby_file.rb')
             .and_return(response_another_ruby_file)
 
           @rubocop.lint
@@ -259,6 +261,7 @@ module Danger
           allow(@rubocop.git).to receive(:modified_files)
             .and_return(['spec/fixtures/ruby_file.rb'])
           allow(@rubocop.git).to receive(:added_files).and_return([])
+          allow(@rubocop.git).to receive(:renamed_files).and_return([])
           allow(@rubocop).to receive(:`)
             .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/ruby_file.rb')
             .and_return(response_ruby_file)
@@ -281,6 +284,7 @@ EOS
               allow(@rubocop.git).to receive(:modified_files)
                 .and_return(['spec/fixtures/ruby_file.rb'])
               allow(@rubocop.git).to receive(:added_files).and_return([])
+              allow(@rubocop.git).to receive(:renamed_files).and_return([])
               allow(@rubocop).to receive(:`)
                 .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/ruby_file.rb')
                 .and_return(response_ruby_file)
@@ -297,6 +301,7 @@ EOS
               allow(@rubocop.git).to receive(:modified_files)
                 .and_return(['spec/fixtures/ruby_file.rb'])
               allow(@rubocop.git).to receive(:added_files).and_return([])
+              allow(@rubocop.git).to receive(:renamed_files).and_return([])
               allow(@rubocop).to receive(:`)
                 .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/ruby_file.rb')
                 .and_return(response_ruby_file)
@@ -319,6 +324,7 @@ EOS
             allow(@rubocop.git).to receive(:modified_files)
               .and_return(modified_files)
             allow(@rubocop.git).to receive(:added_files).and_return([])
+            allow(@rubocop.git).to receive(:renamed_files).and_return([])
 
             expect { @rubocop.lint }.not_to raise_error
           end
@@ -330,6 +336,7 @@ EOS
             allow(@rubocop.git).to receive(:modified_files)
               .and_return(['spec/fixtures/ruby_file.rb'])
             allow(@rubocop.git).to receive(:added_files).and_return([])
+            allow(@rubocop.git).to receive(:renamed_files).and_return([])
             allow(@rubocop).to receive(:`)
               .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/ruby_file.rb')
               .and_return(response_ruby_file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Ash Furrow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.2
 signing_key:
 specification_version: 4
 summary: A Danger plugin for running Ruby files through Rubocop.