danger-rubocop 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c59cd45d4ce8230e467669d6b3a3ffdfe3c1e7f9
-  data.tar.gz: f151f971948bba931f159166bc01cc4ad00d21c6
+SHA256:
+  metadata.gz: 541340d181c21fb3a3c0f3ca5274df9a89610380ecf1572453cfbfd480e07f4a
+  data.tar.gz: 740f0a0e8da3d6c77c62a888984ec5636eddca707806c09674366bcc89aafe24
 SHA512:
-  metadata.gz: e10b05bfaf61a28f2d36208ca1bd1136fcad1106b8114586fc8cfc6e5a2282782fe9a30a07e962a12df3856791bdab2eb340a818e5689b1a372fedc468c35b5e
-  data.tar.gz: f742ec5a40f95ad439a01d9026216ca14643fd3ffec8b2f836c792f7e83da7939fbf3c10e0aca42f83cf08f46a8622b4041b493815066d0293752db21c5c1feb
+  metadata.gz: 2bde76c6fa48ecc75aa06805c5d04ed84504d15def8685e05ffd62cb1e50aa417fb55e536c621cb2cff0af1e93222652436462d7719f5d5aa39a5b2e4e8d32de
+  data.tar.gz: 909df7927367d9fc75389ffdfef64764ae38165828c82e40500667f167912d408000c03fcf6eb21241ec08c92add6dc4235ccfd4589b88fe1267925d9b335e2e

data/Gemfile.lock

@@ -1,39 +1,40 @@
 PATH
   remote: .
   specs:
-    danger-rubocop (0.3.0)
+    danger-rubocop (0.6.0)
       danger
       rubocop
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     bacon (1.2.0)
-    claide (1.0.1)
+    claide (1.0.2)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
     coderay (1.1.1)
-    colored (1.2)
-    cork (0.2.0)
-      colored (~> 1.2)
-    danger (4.0.2)
+    colored2 (3.1.2)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    danger (5.5.5)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (~> 0.9)
       faraday-http-cache (~> 1.0)
       git (~> 1)
       kramdown (~> 1.5)
-      octokit (~> 4.2)
+      no_proxy_fix
+      octokit (~> 4.7)
       terminal-table (~> 1)
     diff-lcs (1.2.5)
-    faraday (0.10.0)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (1.3.1)
       faraday (~> 0.8)
@@ -54,7 +55,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    kramdown (1.13.1)
+    kramdown (1.16.2)
     listen (3.0.7)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
@@ -68,14 +69,16 @@ GEM
     multipart-post (2.0.0)
     nap (1.1.0)
     nenv (0.3.0)
+    no_proxy_fix (0.1.2)
     notiffany (0.1.0)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.6.2)
+    octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    parser (2.3.3.1)
-      ast (~> 2.2)
+    parallel (1.12.1)
+    parser (2.4.0.2)
+      ast (~> 2.3)
     powerpack (0.1.1)
     prettybacon (0.0.2)
       bacon (~> 1.2)
@@ -83,8 +86,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.4)
-    rainbow (2.1.0)
+    public_suffix (3.0.1)
+    rainbow (3.0.0)
     rake (10.5.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
@@ -102,23 +105,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
+    rubocop (0.52.0)
+      parallel (~> 1.10)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     shellany (0.0.1)
     slop (3.6.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.1)
-    unicode-display_width (1.1.1)
-    yard (0.9.5)
+    unicode-display_width (1.3.0)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
@@ -142,4 +146,4 @@ RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.13.6
+   1.15.4

data/README.md

@@ -42,11 +42,12 @@ The following keys are supported:
 
 * `files`: array of file names or glob patterns to determine files to lint
 * `force_exclusion`: pass `true` to pass `--force-exclusion` argument to Rubocop.
-* `inline_comment`: pass `true` to comment inline of the diffs.
-* `report_danger`: pass true to report errors to Danger, and break CI.
-  
   (this option will instruct rubocop to ignore the files that your rubocop config ignores,
   despite the plugin providing the list of files explicitely)
+* `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.
+
 
 Passing `files` as only argument is also supported for backward compatibility.
 

data/lib/danger_plugin.rb

@@ -33,6 +33,7 @@ module Danger
 
       report_danger = config[:report_danger] || false
       inline_comment = config[:inline_comment] || false
+      fail_on_inline_comment = config[:fail_on_inline_comment] || false
 
       files_to_lint = fetch_files_to_lint(files)
       files_to_report = rubocop(files_to_lint, force_exclusion)
@@ -41,7 +42,7 @@ module Danger
       return report_failures files_to_report if report_danger
 
       if inline_comment
-        warn_each_line(files_to_report)
+        add_violation_for_each_line(files_to_report, fail_on_inline_comment)
       else
         markdown offenses_message(files_to_report)
       end
@@ -86,10 +87,21 @@ module Danger
       end
     end
 
-    def warn_each_line(offending_files)
+    def add_violation_for_each_line(offending_files, fail_on_inline_comment)
       offending_files.flat_map do |file|
         file['offenses'].map do |offense|
-          warn(offense['message'], file: file['path'], line: offense['location']['line'])
+          arguments = [
+            offense['message'],
+            {
+              file: file['path'],
+              line: offense['location']['line']
+            }
+          ]
+          if fail_on_inline_comment
+            fail(*arguments)
+          else
+            warn(*arguments)
+          end
         end
       end
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module DangerRubocop
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/spec/danger_plugin_spec.rb

@@ -130,18 +130,38 @@ EOS
           expect(@rubocop).not_to receive(:fail)
         end
 
-        it 'is reported as line by line' do
-          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).to receive(:`)
-            .with('bundle exec rubocop -f json spec/fixtures/ruby_file.rb')
-            .and_return(response_ruby_file)
+        context 'with inline_comment option' do
+          context 'without fail_on_inline_comment option' do
+            it 'reports violations as line by line warnings' do
+              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).to receive(:`)
+                .with('bundle exec rubocop -f json 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 }")
+            end
+          end
 
-          @rubocop.lint(inline_comment: true)
+          context 'with fail_on_inline_comment option' do
+            it 'reports violations as line by line failures' do
+              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).to receive(:`)
+                .with('bundle exec rubocop -f json spec/fixtures/ruby_file.rb')
+                .and_return(response_ruby_file)
 
-          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 }")
+              @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 }")
+            end
+          end
         end
 
         describe 'a filename with special characters' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-rubocop
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ash Furrow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Danger plugin for running Ruby files through Rubocop.