danger-rubocop 0.7.2 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc7db75b5f4eff3caf643f1c9cc45c5d9014e8361351b8868fb79a2082618507
-  data.tar.gz: 0bbc72b3cd32ad873d8137717ea82a0ed5fd630dbda61d46433c5cd4b5bf50a6
+  metadata.gz: b8b4d92dd5ddd493b1d27553041631f01e18d822778ff653d6efbede8c9df7b9
+  data.tar.gz: d925de6ae7e157a46ebdaa8194666d1bc0347f8c6c5fd964dd910b5a9151d934
 SHA512:
-  metadata.gz: 272cbd2cdefced6ef5a1f0de44251ec358bbd37522c73035104294d320a0c0defdd95598bec5ce3973435c006b4583121a01f562e693dc699ed1c427ea5fbd18
-  data.tar.gz: 78750720159477b7db8d97a6d963f0443b16839785387682597aa4058e75a692132a09674516f02a561c6f228c4d21760498a4eb193dd53137a2eafc820db530
+  metadata.gz: 52c59f565ea64473fccfb198c570949a781f54c34bb063f6db0627133ce83d4e928990d93c7d5dc53e8a9936f7c50e5ab5f7d2c3a06577cc07a53d3a073753a3
+  data.tar.gz: ffb3de2dbead86c8a1fd98974cac247c96dcc639e6d510cd3c377ada6fca2857246664e6e4a41e4728ddf0f7e06449611abd7377b65572328269291269eddea7

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-rubocop (0.7.0)
+    danger-rubocop (0.8.0)
       danger
       rubocop
 
@@ -10,7 +10,7 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
+    ast (2.4.1)
     bacon (1.2.0)
     claide (1.0.3)
     claide-plugins (0.9.2)
@@ -21,27 +21,28 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (6.0.9)
+    danger (8.0.1)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (~> 0.9)
+      faraday (>= 0.9.0, < 2.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.5)
+      git (~> 1.7)
       kramdown (~> 2.0)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
     diff-lcs (1.2.5)
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday-http-cache (2.0.0)
-      faraday (~> 0.8)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
     ffi (1.9.10)
     formatador (0.2.5)
-    git (1.5.0)
+    git (1.7.0)
+      rchardet (~> 1.8)
     guard (2.14.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -56,8 +57,8 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    jaro_winkler (1.5.3)
-    kramdown (2.1.0)
+    kramdown (2.3.0)
+      rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     listen (3.0.7)
@@ -77,11 +78,12 @@ GEM
     notiffany (0.1.0)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.14.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    parallel (1.17.0)
-    parser (2.6.4.1)
+    parallel (1.19.1)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
     prettybacon (0.0.2)
       bacon (~> 1.2)
@@ -89,12 +91,15 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (4.0.1)
+    public_suffix (4.0.5)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.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)
@@ -108,13 +113,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.85.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 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)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
@@ -124,7 +133,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
     yard (0.9.20)
 
 PLATFORMS
@@ -146,7 +155,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', '~> 0.83'
 
   # 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?('-')

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DangerRubocop
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.9.2'.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
@@ -214,7 +244,7 @@ module Danger
             .and_return(["spec/fixtures/another_ruby_file.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/another_ruby_file.rb')
             .and_return(response_another_ruby_file)
 
           @rubocop.lint
@@ -230,7 +260,7 @@ module Danger
             .and_return(['spec/fixtures/ruby_file.rb'])
           allow(@rubocop.git).to receive(:added_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
@@ -252,13 +282,13 @@ EOS
                 .and_return(['spec/fixtures/ruby_file.rb'])
               allow(@rubocop.git).to receive(:added_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)
 
               expect(@rubocop.violation_report[:warnings].first.to_s)
-                .to eq("Violation Don't do that! { sticky: false, file: spec/fixtures/ruby_file.rb, line: 13 }")
+                .to eq("Violation Don't do that! { sticky: false, file: spec/fixtures/ruby_file.rb, line: 13, type: warning }")
             end
           end
 
@@ -268,13 +298,13 @@ EOS
                 .and_return(['spec/fixtures/ruby_file.rb'])
               allow(@rubocop.git).to receive(:added_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)
 
               expect(@rubocop.violation_report[:errors].first.to_s)
-                .to eq("Violation Don't do that! { sticky: false, file: spec/fixtures/ruby_file.rb, line: 13 }")
+                .to eq("Violation Don't do that! { sticky: false, file: spec/fixtures/ruby_file.rb, line: 13, type: error }")
             end
           end
         end
@@ -301,7 +331,7 @@ EOS
               .and_return(['spec/fixtures/ruby_file.rb'])
             allow(@rubocop.git).to receive(:added_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.7.2
+  version: 0.9.2
 platform: ruby
 authors:
 - Ash Furrow
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-11-23 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: '0.83'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.83'
 - !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.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A Danger plugin for running Ruby files through Rubocop.
 test_files: