danger-rubocop 0.9.0 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3abbdb817a34c89263a3e43389e0ad1c241eceb220da6ff60d4171dbd82724b
-  data.tar.gz: 7790b03ff4cffe993a9e21ada5831169e55af7811bb06b2b6dc800ee0eab72c4
+  metadata.gz: 14d031b9e478c7bff00e541dd0637352a01888939c18ddf48a738525f0954b08
+  data.tar.gz: 4894183f30dbfc5a1b615d93e6361a7ed1f3b828a86a67e0f47abfd2e1dd8f6f
 SHA512:
-  metadata.gz: a6532f9058d5f6f5db6fd27c1197b84966ef5e786fd9213c24974d618477c5f7eabfadb8f072585a3e6c413f08d2f67aa94610486c599e91fc8fc528e2a2d36e
-  data.tar.gz: c678e3db688d226c8d25c43bc895f046519b14751bb0b3b670b124ca8a90f884d9695b2fb936c98cd38ad7899127b4539d8eb3b9e4a39d622a23f758f9e27c34
+  metadata.gz: 01a34d01243770479c10ce9442655cd00b53ad8cceb3b832afd6ff081de84bb817a0996a083098909da41089de3b63af11eeaba51b6ab81ff075ed5a86fb7afd
+  data.tar.gz: c7e02e4b2389c7d35c33f93b9175a30d9a4ab05a7636e4bf80cd4851e164e039130af6abbd360778ff35ce638492a88cb5742c9ccb0b8cce47ec36e115f5a5e2

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    danger-rubocop (0.8.0)
+    danger-rubocop (0.9.5)
       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.1)
+    danger (8.2.3)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -29,112 +29,120 @@ 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.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      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-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    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.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    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.85.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.16.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.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.0.3)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.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 (3.0.1)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.1.0)
+    unicode-display_width (2.0.0)
+    yard (0.9.26)
 
 PLATFORMS
   ruby

data/README.md

@@ -2,7 +2,7 @@
 
 # Danger Rubocop
 
-A [Danger](https://github.com/danger/danger) plugin for [Rubocop](https://github.com/bbatsov/rubocop).
+A [Danger](https://github.com/danger/danger) plugin for [Rubocop](https://github.com/bbatsov/rubocop) (and compatible wrappers such as [Standard](https://github.com/testdouble/standard/)).
 
 ## Installation
 
@@ -37,6 +37,12 @@ github.dismiss_out_of_range_messages
 rubocop.lint inline_comment: true
 ```
 
+> Format using `standardrb` instead of Rubocop
+
+```ruby
+rubocop.lint rubocop_cmd: 'standardrb'
+```
+
 #### Methods
 
 `lint(config: Hash)`
@@ -46,10 +52,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.
@@ -57,6 +63,7 @@ The following keys are supported:
 * `only_report_new_offenses`: pass `true` to only report offenses that are in current user's scope.
    Note that this won't mark offenses for _Metrics/XXXLength_ if you add lines to an already existing scope.
 * `include_cop_names`: Prepends cop names to the output messages. Example: "Layout/EmptyLinesAroundBlockBody: Extra empty line detected at block body end."
+* `rubocop_cmd`: Allows you to change the rubocop executable that's invoked. This is used to support rubocop wrappers like [Standard](https://github.com/testdouble/standard/) by passing `standardrb` as the value.
 
 
 Passing `files` as only argument is also supported for backward compatibility.

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', '~> 0.83'
+  spec.add_dependency 'rubocop', '~> 1.0'
 
   # General ruby development
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/danger_plugin.rb

@@ -36,9 +36,10 @@ module Danger
       inline_comment = config[:inline_comment] || false
       fail_on_inline_comment = config[:fail_on_inline_comment] || false
       include_cop_names = config[:include_cop_names] || false
+      rubocop_cmd = config[:rubocop_cmd] || 'rubocop'
 
       files_to_lint = fetch_files_to_lint(files)
-      files_to_report = rubocop(files_to_lint, force_exclusion, only_report_new_offenses, config_path: config_path)
+      files_to_report = rubocop(files_to_lint, force_exclusion, only_report_new_offenses, cmd: rubocop_cmd, config_path: config_path)
 
       return if files_to_report.empty?
       return report_failures files_to_report if report_danger
@@ -52,8 +53,8 @@ module Danger
 
     private
 
-    def rubocop(files_to_lint, force_exclusion, only_report_new_offenses, config_path: nil)
-      base_command = ['rubocop', '-f', 'json', '--only-recognized-file-types']
+    def rubocop(files_to_lint, force_exclusion, only_report_new_offenses, cmd: 'rubocop', config_path: nil)
+      base_command = [cmd, '-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 +79,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 +146,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.0'.freeze
+  VERSION = '0.9.5'.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
@@ -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 --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
@@ -229,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)
@@ -251,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)
@@ -267,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)
@@ -277,6 +312,17 @@ EOS
                 .to eq("Violation Don't do that! { sticky: false, file: spec/fixtures/ruby_file.rb, line: 13, type: error }")
             end
           end
+
+          context 'using standardrb cmd' do
+            it 'executes using the standardrb cmd' do
+              allow(@rubocop).to receive(:`)
+                .with('bundle exec standardrb -f json --only-recognized-file-types --config path/to/rubocop.yml spec/fixtures/ruby_file.rb')
+                .and_return(response_ruby_file)
+
+              # Do it
+              @rubocop.lint(files: 'spec/fixtures/ruby*.rb', rubocop_cmd: 'standardrb', config: 'path/to/rubocop.yml')
+            end
+          end
         end
 
         describe 'a filename with special characters' do
@@ -289,6 +335,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,6 +347,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.0
+  version: 0.9.5
 platform: ruby
 authors:
 - Ash Furrow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.83'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.83'
+        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: