danger-rubocop 0.8.1 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb5d7eb8397ac2e653dbb40f1d36578709c9167d1c58edcf03755317bae9a1d9
-  data.tar.gz: 29663b37df5566b315562381f690738a96fde57537be19a3aaa2c6ac9d227519
+  metadata.gz: 5363c39a9497dd46bb7268c9c8e1161604c90c5795cb790cd6affcd74a71c8aa
+  data.tar.gz: 4c9db849c7b8439aba6a5b7761daf57e7d871e18fd42a02f3a461e5ea23e80ff
 SHA512:
-  metadata.gz: 7786b81d1acd3476b3a64c672c9a1164bda1f427c29e1379a84bed948a6d46eb1dfe506d7b1316246d61c4a710508e1c15b5378fbaa51de111fd9aba78b6a0dc
-  data.tar.gz: e7e7aa14b45ad941d1be7a1e39f070a1f01e124c97e3eb2c099cd8934ca113018a834a5e51fa71b765a82807b3cbda1e6a25f4a7111cc50f89138be17df1048e
+  metadata.gz: 02de948e9d1f6049d4b1516152e86b265106d715c48168412b9b2610a338b8f29c5d37d410a055caa5139ea634a2c226f62dc2caf72cc8083306e4d7d8012400
+  data.tar.gz: bdf55e66ef3307c0422acd50ff56691d303be15518667059e2bc8d9e0a14aeb060250f6ed878f2deca16594db4b0df6b21e0e7f4937e21f4a93901bc19b50429

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '>= 2.0'
+ruby '>= 2.6.0'
 
 gemspec
 

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    danger-rubocop (0.8.1)
+    danger-rubocop (0.9.4)
       danger
-      rubocop
+      rubocop (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   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.0.4)
+    danger (8.2.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -29,112 +29,115 @@ GEM
       faraday (>= 0.9.0, < 2.0)
       faraday-http-cache (~> 2.0)
       git (~> 1.7)
-      kramdown (~> 2.0)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
-      terminal-table (~> 1)
-    diff-lcs (1.2.5)
-    faraday (1.0.1)
+      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 (>= 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.18.0)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    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)
-    public_suffix (4.0.5)
+    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 (1.7.1)
-    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 (0.89.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.14.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    ruby-progressbar (1.10.1)
+      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
@@ -155,7 +158,7 @@ DEPENDENCIES
   yard
 
 RUBY VERSION
-   ruby 2.3.1p112
+   ruby 2.6.0p0
 
 BUNDLED WITH
    1.17.3

data/README.md

@@ -46,10 +46,10 @@ Runs Ruby files through Rubocop. Generates a `markdown` list of warnings.
 This method accepts a configuration hash.
 The following keys are supported:
 
-* `files`: array of file names or glob patterns to determine files to lint
+* `files`: array of file names or glob patterns to determine files to lint. If omitted, this will lint only the files changed in the pull request. To lint all files every time, pass an empty string; this is the equivalent of typing `rubocop` without specifying any files, and will follow the rules in your `.rubocop.yml`.
 * `force_exclusion`: pass `true` to pass `--force-exclusion` argument to Rubocop.
   (this option will instruct rubocop to ignore the files that your rubocop config ignores,
-  despite the plugin providing the list of files explicitely)
+  despite the plugin providing the list of files explicitly)
 * `inline_comment`: pass `true` to comment inline of the diffs.
 * `fail_on_inline_comment`: pass `true` to use `fail` instead of `warn` on inline comment.
 * `report_danger`: pass true to report errors to Danger, and break CI.

data/danger-rubocop.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'danger'
-  spec.add_dependency 'rubocop'
+  spec.add_dependency 'rubocop', '~> 1.0'
 
   # General ruby development
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/danger_plugin.rb

@@ -53,7 +53,7 @@ module Danger
     private
 
     def rubocop(files_to_lint, force_exclusion, only_report_new_offenses, config_path: nil)
-      base_command = ['rubocop', '-f', 'json']
+      base_command = ['rubocop', '-f', 'json', '--only-recognized-file-types']
       base_command.concat(['--force-exclusion']) if force_exclusion
       base_command.concat(['--config', config_path.shellescape]) unless config_path.nil?
 
@@ -78,14 +78,17 @@ module Danger
     end
 
     def added_lines(path)
-      git.diff_for_file(path)
+      diff_for_file = git.diff_for_file(path)
+      return [] if diff_for_file.nil?
+
+      diff_for_file
          .patch
          .split("\n@@")
          .tap(&:shift)
          .flat_map do |chunk|
            first_line, *diff = chunk.split("\n")
            # Get start from diff.
-           lineno = first_line.match(/\+(\d+),(\d+)/).captures.first.to_i
+           lineno = first_line.match(/\+(\d+),?(\d?)/).captures.first.to_i
            diff.each_with_object([]) do |current_line, added_lines|
              added_lines << lineno if current_line.start_with?('+')
              lineno += 1 unless current_line.start_with?('-')
@@ -142,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.8.1'.freeze
+  VERSION = '0.9.4'.freeze
 end

data/spec/danger_plugin_spec.rb

@@ -107,6 +107,36 @@ module Danger
         it 'handles git diff' do
           expect(@rubocop.send(:added_lines, 'SAMPLE')).to eq([1, 2])
         end
+
+        context "single line added to a new file" do
+          before do
+            allow(@rubocop.git).to receive(:diff_for_file).with('SAMPLE') do
+              instance_double('Git::Diff::DiffFile', patch: <<~DIFF)
+              diff --git a/SAMPLE b/SAMPLE
+              new file mode 100644
+              index 0000000..7bba8c8
+              --- /dev/null
+              +++ b/SAMPLE
+              @@ -0,0 +1 @@
+              +line 1
+              DIFF
+            end
+          end
+
+          it 'handles git diff' do
+            expect(@rubocop.send(:added_lines, 'SAMPLE')).to eq([1])
+          end
+        end
+
+        context 'no such file' do
+          before do
+            allow(@rubocop.git).to receive(:diff_for_file).with('SAMPLE').and_return(nil)
+          end
+
+          it 'return empty array' do
+            expect(@rubocop.send(:added_lines, 'SAMPLE')).to eq([])
+          end
+        end
       end
 
       describe :lint_files do
@@ -146,7 +176,7 @@ module Danger
 
         it 'handles a rubocop report for specified files' do
           allow(@rubocop).to receive(:`)
-            .with('bundle exec rubocop -f json --config path/to/rubocop.yml spec/fixtures/ruby_file.rb')
+            .with('bundle exec rubocop -f json --only-recognized-file-types --config path/to/rubocop.yml spec/fixtures/ruby_file.rb')
             .and_return(response_ruby_file)
 
           # Do it
@@ -162,7 +192,7 @@ module Danger
 
         it 'includes cop names when include_cop_names is set' do
           allow(@rubocop).to receive(:`)
-            .with('bundle exec rubocop -f json --config path/to/rubocop.yml spec/fixtures/ruby_file.rb')
+            .with('bundle exec rubocop -f json --only-recognized-file-types --config path/to/rubocop.yml spec/fixtures/ruby_file.rb')
             .and_return(response_ruby_file)
 
           # Do it
@@ -178,7 +208,7 @@ module Danger
 
         it 'handles a rubocop report for specified files (legacy)' do
           allow(@rubocop).to receive(:`)
-            .with('bundle exec rubocop -f json spec/fixtures/ruby_file.rb')
+            .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/ruby_file.rb')
             .and_return(response_ruby_file)
 
           # Do it
@@ -194,7 +224,7 @@ module Danger
 
         it 'appends --force-exclusion argument when force_exclusion is set' do
           allow(@rubocop).to receive(:`)
-            .with('bundle exec rubocop -f json --force-exclusion spec/fixtures/ruby_file.rb')
+            .with('bundle exec rubocop -f json --only-recognized-file-types --force-exclusion spec/fixtures/ruby_file.rb')
             .and_return(response_ruby_file)
 
           # Do it
@@ -211,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 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
@@ -229,8 +261,9 @@ 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 spec/fixtures/ruby_file.rb')
+            .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/ruby_file.rb')
             .and_return(response_ruby_file)
 
           @rubocop.lint
@@ -251,8 +284,9 @@ 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 spec/fixtures/ruby_file.rb')
+                .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/ruby_file.rb')
                 .and_return(response_ruby_file)
 
               @rubocop.lint(inline_comment: true)
@@ -267,8 +301,9 @@ 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 spec/fixtures/ruby_file.rb')
+                .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/ruby_file.rb')
                 .and_return(response_ruby_file)
 
               @rubocop.lint(fail_on_inline_comment: true, inline_comment: true)
@@ -289,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
@@ -300,8 +336,9 @@ 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 spec/fixtures/ruby_file.rb')
+              .with('bundle exec rubocop -f json --only-recognized-file-types spec/fixtures/ruby_file.rb')
               .and_return(response_ruby_file)
 
             expect(@rubocop).to receive(:fail).with(fail_msg)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.4
 platform: ruby
 authors:
 - Ash Furrow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -28,16 +28,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +177,7 @@ homepage: https://github.com/ashfurrow/danger-rubocop
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,8 +192,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.0.2
+signing_key:
 specification_version: 4
 summary: A Danger plugin for running Ruby files through Rubocop.
 test_files: