rubocop 0.32.0 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f00678bddd0c2dc00390310b217cec58ec200d5
-  data.tar.gz: b0b294dae0580562e4ff6225e8f7543777c927fc
+  metadata.gz: ce6b65d33cc2aafc8810c0ff7dd711bfd4f1ce3d
+  data.tar.gz: 619b13298973e7c421fa8cc804a9a8c8671c508d
 SHA512:
-  metadata.gz: 86a0015fe3ff0021b1968662f9212898245754d97bbb02e73dd6f33f338a09c445f749068d1686199a5ec334f61cb5fa584d3271dd9a026926c5efff97677b40
-  data.tar.gz: 31af47e5133c430f1f63f0ed44a8e45224a2c78314c00ba447c9a2048796b872f5504acde692fd4ef3ba1a3de5cb269dce1c8c67d1570013c12fbcdf0d8267df
+  metadata.gz: 00cd718d6abd4ab32394abbb2c0768d27ffcaeecf368ff406c5dac3b73d687dc5ad7610464bba315477620e22d8e6eec0a48f6518e1bb7d43331ef75c38e06c2
+  data.tar.gz: f4ec724f81671c10cfc980b2cd99ad39c59f40d41ea3ce8f6267020f01a3f2918b35725a46c0ac84b778e3590d4026a5cfd9fa773c03b69fdaaa297d8dabe86d

data/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 ## master (unreleased)
 
+## 0.32.1 (24/06/2015)
+
+### New features
+
+* `Debugger` cop now checks catches methods called with arguments. ([@crazydog115][])
+
+### Bugs fixed
+
+* Make it possible to disable `Lint/UnneededDisable`. ([@jonas054][])
+* [#1958](https://github.com/bbatsov/rubocop/issues/1958): Show name of `Lint/UnneededDisable` when `-D/--display-cop-names` is given. ([@jonas054][])
+* Do not show `Style/NonNilCheck` offenses as corrected when the source code is not modified. ([@rrosenblum][])
+* Fix auto-correct in `Style/RedundantReturn` when `return` has no arguments. ([@lumeet][])
+* [#1955](https://github.com/bbatsov/rubocop/issues/1955): Fix false positive for `Style/TrailingComma` cop. ([@mattjmcnaughton][])
+* [#1928](https://github.com/bbatsov/rubocop/issues/1928): Avoid auto-correcting two alignment offenses in the same area at the same time. ([@jonas054][])
+* [#1964](https://github.com/bbatsov/rubocop/issues/1964): Fix `RedundantBegin` auto-correct issue with comments by doing a smaller correction. ([@jonas054][])
+* [#1978](https://github.com/bbatsov/rubocop/pull/1978): Don't count disabled offences if fail-level is autocorrect. ([@sch1zo][])
+* [#1986](https://github.com/bbatsov/rubocop/pull/1986): Fix Date false positives on variables. ([@palkan][])
+
+### Changes
+
+* [#1708](https://github.com/bbatsov/rubocop/issues/1708): Improve message for `FirstParameterIndentation`. ([@tejasbubane][])
+* [#1959](https://github.com/bbatsov/rubocop/issues/1959): Allow `Lint/UnneededDisable` to be inline disabled. ([@rrosenblum][])
+
 ## 0.32.0 (06/06/2015)
 
 ### New features
@@ -1443,3 +1466,4 @@
 [@panthomakos]: https://github.com/panthomakos
 [@matugm]: https://github.com/matugm
 [@m1foley]: https://github.com/m1foley
+[@tejasbubane]: https://github.com/tejasbubane

data/lib/rubocop/comment_config.rb

@@ -4,6 +4,7 @@ module RuboCop
   # This class parses the special `rubocop:disable` comments in a source
   # and provides a way to check if each cop is enabled at arbitrary line.
   class CommentConfig
+    UNNEEDED_DISABLE = 'Lint/UnneededDisable'
     COMMENT_DIRECTIVE_REGEXP = Regexp.new(
       '\A# rubocop : ((?:dis|en)able)\b ((?:[\w/]+,? )+)'.gsub(' ', '\s*')
     )
@@ -73,7 +74,9 @@ module RuboCop
     end
 
     def all_cop_names
-      @all_cop_names ||= Cop::Cop.all.map(&:cop_name)
+      @all_cop_names ||= Cop::Cop.all.map(&:cop_name).reject do |cop_name|
+        cop_name == UNNEEDED_DISABLE
+      end
     end
 
     def comment_only_line?(line_number)

data/lib/rubocop/cop/lint/debugger.rb

@@ -62,7 +62,9 @@ module RuboCop
         ]
 
         def on_send(node)
-          return unless DEBUGGER_NODES.include?(node)
+          receiver, method_name, *_args = *node
+          node_without_args = self.class.s(:send, receiver, method_name)
+          return unless DEBUGGER_NODES.include? node_without_args
           add_offense(node,
                       :expression,
                       format(MSG, node.loc.expression.source))

data/lib/rubocop/cop/lint/unneeded_disable.rb

@@ -15,16 +15,21 @@ module RuboCop
       class UnneededDisable < Cop
         COP_NAME = 'Lint/UnneededDisable'
 
-        def check(file, offenses, cop_disabled_line_ranges, comments)
+        def check(offenses, cop_disabled_line_ranges, comments)
           unneeded_cops = {}
+          disabled_ranges = cop_disabled_line_ranges[COP_NAME] || [0..0]
 
-          cop_disabled_line_ranges[file].each do |cop, line_ranges|
+          cop_disabled_line_ranges.each do |cop, line_ranges|
             cop_offenses = offenses.select { |o| o.cop_name == cop }
             line_ranges.each do |line_range|
-              comment =
-                comments[file].find { |c| c.loc.line == line_range.begin }
+              comment = comments.find { |c| c.loc.line == line_range.begin }
               unneeded_cop = find_unneeded(comment, offenses, cop, cop_offenses,
                                            line_range)
+
+              unless all_disabled?(comment)
+                next if ignore_offense?(disabled_ranges, line_range)
+              end
+
               if unneeded_cop
                 unneeded_cops[comment.loc.expression] ||= Set.new
                 unneeded_cops[comment.loc.expression].add(unneeded_cop)
@@ -32,21 +37,35 @@ module RuboCop
             end
           end
 
-          unneeded_cops.each do |range, cops|
-            add_offense(range, range,
-                        "Unnecessary disabling of #{cops.sort.join(', ')}.")
-          end
+          add_offenses(unneeded_cops)
         end
 
         private
 
         def find_unneeded(comment, offenses, cop, cop_offenses, line_range)
-          if comment.loc.expression.source =~ /rubocop:disable\s+all\b/
+          if all_disabled?(comment)
             'all cops' if offenses.none? { |o| line_range.include?(o.line) }
           elsif cop_offenses.none? { |o| line_range.include?(o.line) }
             cop
           end
         end
+
+        def all_disabled?(comment)
+          comment.loc.expression.source =~ /rubocop:disable\s+all\b/
+        end
+
+        def ignore_offense?(disabled_ranges, line_range)
+          disabled_ranges.any? do |range|
+            range.include?(line_range.min) && range.include?(line_range.max)
+          end
+        end
+
+        def add_offenses(unneeded_cops)
+          unneeded_cops.each do |range, cops|
+            add_offense(range, range,
+                        "Unnecessary disabling of #{cops.sort.join(', ')}.")
+          end
+        end
       end
     end
   end

data/lib/rubocop/cop/mixin/autocorrect_alignment.rb

@@ -16,7 +16,19 @@ module RuboCop
         items.each do |current|
           if current.loc.line > prev_line && start_of_line?(current.loc)
             @column_delta = base_column - current.loc.column
-            add_offense(current, :expression) if @column_delta != 0
+            if @column_delta != 0
+              expr = current.loc.expression
+              if offenses.any? { |o| within?(expr, o.location) }
+                # If this offense is within a line range that is already being
+                # realigned by autocorrect, we report the offense without
+                # autocorrecting it. Two rewrites in the same area by the same
+                # cop can not be handled. The next iteration will find the
+                # offense again and correct it.
+                add_offense(nil, expr)
+              else
+                add_offense(current, :expression)
+              end
+            end
           end
           prev_line = current.loc.line
         end
@@ -27,6 +39,8 @@ module RuboCop
       end
 
       def autocorrect(arg)
+        return unless arg
+
         heredoc_ranges = heredoc_ranges(arg)
         expr = arg.respond_to?(:loc) ? arg.loc.expression : arg
 

data/lib/rubocop/cop/rails/date.rb

@@ -54,8 +54,8 @@ module RuboCop
         end
 
         def on_send(node)
-          method_name = extract_method(node)
-          return unless bad_methods.include?(method_name)
+          receiver, method_name, *_args = *node
+          return unless receiver && bad_methods.include?(method_name)
 
           add_offense(node, :selector,
                       format(MSG_SEND,

data/lib/rubocop/cop/style/first_parameter_indentation.rb

@@ -44,9 +44,9 @@ module RuboCop
           base = if text !~ /\n/ && special_inner_call_indentation?(send_node)
                    "`#{text}`"
                  elsif text.lines.reverse_each.first =~ /^\s*#/
-                   'the previous line (not counting the comment)'
+                   'the start of the previous line (not counting the comment)'
                  else
-                   'the previous line'
+                   'the start of the previous line'
                  end
           format('Indent the first parameter one step more than %s.', base)
         end

data/lib/rubocop/cop/style/non_nil_check.rb

@@ -84,15 +84,19 @@ module RuboCop
         end
 
         def autocorrect_comparison(node)
+          expr = node.loc.expression.source
+
+          new_code =
+            if include_semantic_changes?
+              expr.sub(/\s*!=\s*nil/, '')
+            else
+              expr.sub(/^(\S*)\s*!=\s*nil/, '!\1.nil?')
+            end
+
+          return if expr == new_code
+
           lambda do |corrector|
-            expr = node.loc.expression
-            new_code =
-              if include_semantic_changes?
-                expr.source.sub(/\s*!=\s*nil/, '')
-              else
-                expr.source.sub(/^(\S*)\s*!=\s*nil/, '!\1.nil?')
-              end
-            corrector.replace(expr, new_code)
+            corrector.replace(node.loc.expression, new_code)
           end
         end
 

data/lib/rubocop/cop/style/redundant_begin.rb

@@ -37,19 +37,8 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            child = node.children.first
-
-            begin_indent = node.loc.column
-            child_indent = child.loc.column
-
-            indent_diff = child_indent - begin_indent
-
-            corrector.replace(
-              range_with_surrounding_space(node.loc.expression),
-              range_with_surrounding_space(
-                child.loc.expression
-              ).source.gsub(/^[ \t]{#{indent_diff}}/, '')
-            )
+            corrector.remove(node.loc.begin)
+            corrector.remove(node.loc.end)
           end
         end
       end

data/lib/rubocop/cop/style/redundant_return.rb

@@ -29,6 +29,11 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
+            unless arguments?(node.children)
+              corrector.replace(node.loc.expression, 'nil')
+              next
+            end
+
             if node.children.size > 1
               kids = node.children.map { |child| child.loc.expression }
               corrector.insert_before(kids.first, '[')
@@ -39,6 +44,13 @@ module RuboCop
           end
         end
 
+        def arguments?(args)
+          return false if args.empty?
+          return true if args.size > 1
+
+          !args.first.begin_type? || !args.first.children.empty?
+        end
+
         def on_method_def(_node, _method_name, _args, body)
           return unless body
 

data/lib/rubocop/cop/style/trailing_comma.rb

@@ -71,6 +71,7 @@ module RuboCop
         # rubocop:disable Metrics/MethodLength
         def check(node, items, kind, begin_pos, end_pos)
           sb = items.first.loc.expression.source_buffer
+
           after_last_item = Parser::Source::Range.new(sb, begin_pos, end_pos)
 
           return if heredoc?(after_last_item.source)
@@ -123,6 +124,12 @@ module RuboCop
                      else
                        node.children
                      end
+
+          # Without this check, Foo.new({}) is considered multiline, which
+          # it should not be. Essentially, if there are no elements, the
+          # expression can not be multiline.
+          return if elements.empty?
+
           items = elements.map { |e| e.loc.expression }
           if style == :consistent_comma
             items.each_cons(2).any? { |a, b| !on_same_line?(a, b) }

data/lib/rubocop/formatter/formatter_set.rb

@@ -30,24 +30,26 @@ module RuboCop
       end
 
       def file_started(file, options)
-        @cop_disabled_line_ranges ||= {}
-        @cop_disabled_line_ranges[file] = options[:cop_disabled_line_ranges]
-        @comments ||= {}
-        @comments[file] = options[:comments]
-        @excepted_cops = options[:excepted_cops] || []
-        @only_cops = options[:only_cops] || []
+        @cop_disabled_line_ranges = options[:cop_disabled_line_ranges]
+        @comments = options[:comments]
+        @options = options[:cli_options]
+        @config_store = options[:config_store]
         each { |f| f.file_started(file, options) }
       end
 
       def file_finished(file, offenses)
-        if @cop_disabled_line_ranges[file].any? &&
+        if @cop_disabled_line_ranges.any? &&
            # Don't check unneeded disable if --only or --except option is
            # given, because these options override configuration.
-           @excepted_cops.empty? && @only_cops.empty?
-          cop = Cop::Lint::UnneededDisable.new
-          cop.check(file, offenses, @cop_disabled_line_ranges, @comments)
-          offenses += cop.offenses
+           (@options[:except] || []).empty? && (@options[:only] || []).empty?
+          config = @config_store.for(file)
+          if config['Lint/UnneededDisable']['Enabled']
+            cop = Cop::Lint::UnneededDisable.new(config, @options)
+            cop.check(offenses, @cop_disabled_line_ranges, @comments)
+            offenses += cop.offenses
+          end
         end
+
         offenses = offenses.sort.reject(&:disabled?)
         each { |f| f.file_finished(file, offenses) }
       end

data/lib/rubocop/runner.rb

@@ -69,8 +69,8 @@ module RuboCop
       file_info = {
         cop_disabled_line_ranges: processed_source.disabled_line_ranges,
         comments: processed_source.comments,
-        only_cops: @options[:only],
-        excepted_cops: @options[:except]
+        cli_options: @options,
+        config_store: @config_store
       }
 
       formatter_set.file_started(file, file_info)
@@ -196,10 +196,10 @@ module RuboCop
 
     def considered_failure?(offense)
       # For :autocorrect level, any offense - corrected or not - is a failure.
-      return true if @options[:fail_level] == :autocorrect
-
       return false if offense.disabled?
 
+      return true if @options[:fail_level] == :autocorrect
+
       !offense.corrected? && offense.severity >= minimum_severity_to_fail
     end
 

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.32.0'
+    STRING = '0.32.1'
 
     MSG = '%s (using Parser %s, running on %s %s %s)'
 

data/relnotes/v0.32.1.md

@@ -0,0 +1,122 @@
+### New features
+
+* `Debugger` cop now checks catches methods called with arguments. ([@crazydog115][])
+
+### Bugs fixed
+
+* Make it possible to disable `Lint/UnneededDisable`. ([@jonas054][])
+* [#1958](https://github.com/bbatsov/rubocop/issues/1958): Show name of `Lint/UnneededDisable` when `-D/--display-cop-names` is given. ([@jonas054][])
+* Do not show `Style/NonNilCheck` offenses as corrected when the source code is not modified. ([@rrosenblum][])
+* Fix auto-correct in `Style/RedundantReturn` when `return` has no arguments. ([@lumeet][])
+* [#1955](https://github.com/bbatsov/rubocop/issues/1955): Fix false positive for `Style/TrailingComma` cop. ([@mattjmcnaughton][])
+* [#1928](https://github.com/bbatsov/rubocop/issues/1928): Avoid auto-correcting two alignment offenses in the same area at the same time. ([@jonas054][])
+* [#1964](https://github.com/bbatsov/rubocop/issues/1964): Fix `RedundantBegin` auto-correct issue with comments by doing a smaller correction. ([@jonas054][])
+* [#1978](https://github.com/bbatsov/rubocop/pull/1978): Don't count disabled offences if fail-level is autocorrect. ([@sch1zo][])
+* [#1986](https://github.com/bbatsov/rubocop/pull/1986): Fix Date false positives on variables. ([@palkan][])
+
+### Changes
+
+* [#1708](https://github.com/bbatsov/rubocop/issues/1708): Improve message for `FirstParameterIndentation`. ([@tejasbubane][])
+* [#1959](https://github.com/bbatsov/rubocop/issues/1959): Allow `Lint/UnneededDisable` to be inline disabled. ([@rrosenblum][])
+
+[@bbatsov]: https://github.com/bbatsov
+[@jonas054]: https://github.com/jonas054
+[@yujinakayama]: https://github.com/yujinakayama
+[@dblock]: https://github.com/dblock
+[@nevir]: https://github.com/nevir
+[@daviddavis]: https://github.com/daviddavis
+[@sds]: https://github.com/sds
+[@fancyremarker]: https://github.com/fancyremarker
+[@sinisterchipmunk]: https://github.com/sinisterchipmunk
+[@vonTronje]: https://github.com/vonTronje
+[@agrimm]: https://github.com/agrimm
+[@pmenglund]: https://github.com/pmenglund
+[@chulkilee]: https://github.com/chulkilee
+[@codez]: https://github.com/codez
+[@emou]: https://github.com/emou
+[@skanev]: http://github.com/skanev
+[@claco]: http://github.com/claco
+[@rifraf]: http://github.com/rifraf
+[@scottmatthewman]: https://github.com/scottmatthewman
+[@ma2gedev]: http://github.com/ma2gedev
+[@jeremyolliver]: https://github.com/jeremyolliver
+[@hannestyden]: https://github.com/hannestyden
+[@geniou]: https://github.com/geniou
+[@jkogara]: https://github.com/jkogara
+[@tmorris-fiksu]: https://github.com/tmorris-fiksu
+[@mockdeep]: https://github.com/mockdeep
+[@hiroponz]: https://github.com/hiroponz
+[@tamird]: https://github.com/tamird
+[@fshowalter]: https://github.com/fshowalter
+[@cschramm]: https://github.com/cschramm
+[@bquorning]: https://github.com/bquorning
+[@bcobb]: https://github.com/bcobb
+[@irrationalfab]: https://github.com/irrationalfab
+[@tommeier]: https://github.com/tommeier
+[@sfeldon]: https://github.com/sfeldon
+[@biinari]: https://github.com/biinari
+[@barunio]: https://github.com/barunio
+[@molawson]: https://github.com/molawson
+[@wndhydrnt]: https://github.com/wndhydrnt
+[@ggilder]: https://github.com/ggilder
+[@salbertson]: https://github.com/salbertson
+[@camilleldn]: https://github.com/camilleldn
+[@mcls]: https://github.com/mcls
+[@yous]: https://github.com/yous
+[@vrthra]: https://github.com/vrthra
+[@SkuliOskarsson]: https://github.com/SkuliOskarsson
+[@jspanjers]: https://github.com/jspanjers
+[@sch1zo]: https://github.com/sch1zo
+[@smangelsdorf]: https://github.com/smangelsdorf
+[@mvz]: https://github.com/mvz
+[@jfelchner]: https://github.com/jfelchner
+[@janraasch]: https://github.com/janraasch
+[@jcarbo]: https://github.com/jcarbo
+[@oneamtu]: https://github.com/oneamtu
+[@toy]: https://github.com/toy
+[@Koronen]: https://github.com/Koronen
+[@blainesch]: https://github.com/blainesch
+[@marxarelli]: https://github.com/marxarelli
+[@katieschilling]: https://github.com/katieschilling
+[@kakutani]: https://github.com/kakutani
+[@rrosenblum]: https://github.com/rrosenblum
+[@mattjmcnaughton]: https://github.com/mattjmcnaughton
+[@huerlisi]: https://github.com/huerlisi
+[@volkert]: https://github.com/volkert
+[@lumeet]: https://github.com/lumeet
+[@mmozuras]: https://github.com/mmozuras
+[@d4rk5eed]: https://github.com/d4rk5eed
+[@cshaffer]: https://github.com/cshaffer
+[@eitoball]: https://github.com/eitoball
+[@iainbeeston]: https://github.com/iainbeeston
+[@pimterry]: https://github.com/pimterry
+[@palkan]: https://github.com/palkan
+[@jdoconnor]: https://github.com/jdoconnor
+[@meganemura]: https://github.com/meganemura
+[@zvkemp]: https://github.com/zvkemp
+[@vassilevsky]: https://github.com/vassilevsky
+[@gerry3]: https://github.com/gerry3
+[@ypresto]: https://github.com/ypresto
+[@clowder]: https://github.com/clowder
+[@mudge]: https://github.com/mudge
+[@mzp]: https://github.com/mzp
+[@bankair]: https://github.com/bankair
+[@crimsonknave]: https://github.com/crimsonknave
+[@renuo]: https://github.com/renuo
+[@sdeframond]: https://github.com/sdeframond
+[@til]: https://github.com/til
+[@carhartl]: https://github.com/carhartl
+[@dylandavidson]: https://github.com/dylandavidson
+[@tmr08c]: https://github.com/tmr08c
+[@hbd225]: https://github.com/hbd225
+[@l8nite]: https://github.com/l8nite
+[@sumeet]: https://github.com/sumeet
+[@ojab]: https://github.com/ojab
+[@chastell]: https://github.com/chastell
+[@glasnt]: https://github.com/glasnt
+[@crazydog115]: https://github.com/crazydog115
+[@RGBD]: https://github.com/RGBD
+[@panthomakos]: https://github.com/panthomakos
+[@matugm]: https://github.com/matugm
+[@m1foley]: https://github.com/m1foley
+[@tejasbubane]: https://github.com/tejasbubane

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.32.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-06 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -514,6 +514,7 @@ files:
 - relnotes/v0.30.1.md
 - relnotes/v0.31.0.md
 - relnotes/v0.32.0.md
+- relnotes/v0.32.1.md
 - rubocop.gemspec
 homepage: http://github.com/bbatsov/rubocop
 licenses: