RubyGems - rubocop - Versions diffs - 0.22.0 → 0.23.0 - Mend

rubocop 0.22.0 → 0.23.0

Potentially problematic release.

This version of rubocop might be problematic. Click here for more details.

Files changed (484) hide show

data/lib/rubocop/cop/style/space_around_operators.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks that operators have space around them, except for **

data/lib/rubocop/cop/style/space_before_block_braces.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks that block braces have or don't have a space before the opening
@@ -15,7 +15,8 @@ module Rubocop
           # those braces will be changed to do..end by the user or by
           # auto-correct, so reporting space issues is not useful, and it
           # creates auto-correct conflicts.
-          if config.for_cop('Blocks')['Enabled'] && Util.block_length(node) > 0
+          if config.for_cop('Style/Blocks')['Enabled'] &&
+              Util.block_length(node) > 0
             return
           end

data/lib/rubocop/cop/style/space_before_comment.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for missing space between a token and a comment on the

data/lib/rubocop/cop/style/space_before_modifier_keyword.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Here we check if modifier keywords are preceded by a space.

data/lib/rubocop/cop/style/space_inside_block_braces.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks that block braces have or don't have surrounding space inside
@@ -18,7 +18,8 @@ module Rubocop
           # those braces will be changed to do..end by the user or by
           # auto-correct, so reporting space issues is not useful, and it
           # creates auto-correct conflicts.
-          if config.for_cop('Blocks')['Enabled'] && Util.block_length(node) > 0
+          if config.for_cop('Style/Blocks')['Enabled'] &&
+              Util.block_length(node) > 0
             return
           end

data/lib/rubocop/cop/style/space_inside_brackets.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks for spaces inside square brackets.

data/lib/rubocop/cop/style/space_inside_hash_literal_braces.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks that braces used for hash literals have or don't have

data/lib/rubocop/cop/style/space_inside_parens.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks for spaces inside ordinary round parentheses.

data/lib/rubocop/cop/style/special_global_vars.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop looks for uses of Perl-style global variables.

data/lib/rubocop/cop/style/string_literals.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks if uses of quotes match the configured preference.

data/lib/rubocop/cop/style/symbol_array.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for array literals made up of symbols

data/lib/rubocop/cop/style/tab.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for tabs inside the source code.

data/lib/rubocop/cop/style/trailing_blank_lines.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop looks for trailing blank lines and a final newline in the

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for trailing comma in parameter lists and literals.
@@ -73,9 +73,22 @@ module Rubocop
         end
         # Returns true if the round/square/curly brackets of the given node are
-        # on different lines.
+        # on different lines, and each item within is on its own line, and the
+        # closing bracket is on its own line.
         def multiline?(node)
-          [node.loc.begin, node.loc.end].map(&:line).uniq.size > 1
+          elements = if node.type == :send
+                       _receiver, _method_name, *args = *node
+                       args
+                     else
+                       node.children
+                     end
+          items = [*elements.map { |e| e.loc.expression }, node.loc.end]
+          items.each_cons(2) { |a, b| return false if on_same_line?(a, b) }
+          true
+        end
+        def on_same_line?(a, b)
+          [a, b].map(&:line).uniq.size == 1
         end
         def avoid_comma(kind, comma_begin_pos, sb)

data/lib/rubocop/cop/style/trailing_whitespace.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop looks for trailing whitespace in the source code.

data/lib/rubocop/cop/style/trivial_accessors.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop looks for trivial reader/writer methods, that could
@@ -89,21 +89,52 @@ module Rubocop
           method_name.to_s.chomp('=') == ivar_name[1..-1]
         end
+        def trivial_accessor_kind(method_name, args, body)
+          if trivial_writer?(method_name, args, body) &&
+            !dsl_writer?(method_name)
+            'writer'
+          elsif trivial_reader?(method_name, args, body)
+            'reader'
+          end
+        end
+        def accessor(kind, method_name)
+          "attr_#{kind} :#{method_name.to_s.chomp('=')}"
+        end
         def autocorrect(node)
+          if node.type == :def
+            autocorrect_instance(node)
+          elsif node.type == :defs && node.children.first.type == :self
+            autocorrect_class(node)
+          end
+        end
+        def autocorrect_instance(node)
           method_name, args, body = *node
-          return unless node.type == :def
           return unless names_match?(method_name, body)
-          kind = if trivial_writer?(method_name, args, body)
-                   return if dsl_writer?(method_name)
-                   'writer'
-                 elsif trivial_reader?(method_name, args, body)
-                   'reader'
-                 end
+          return unless (kind = trivial_accessor_kind(method_name, args, body))
+          @corrections << lambda do |corrector|
+            corrector.replace(
+              node.loc.expression,
+              accessor(kind, method_name)
+            )
+          end
+        end
+        def autocorrect_class(node)
+          _, method_name, args, body = *node
+          return unless names_match?(method_name, body)
+          return unless (kind = trivial_accessor_kind(method_name, args, body))
           @corrections << lambda do |corrector|
+            indent = ' ' * node.loc.column
             corrector.replace(
               node.loc.expression,
-              "attr_#{kind} :#{method_name.to_s.chomp('=')}"
+              ['class << self',
+               "#{indent}  #{accessor(kind, method_name)}",
+               "#{indent}end"].join("\n")
             )
           end
         end

data/lib/rubocop/cop/style/unless_else.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop looks for *unless* expressions with *else* clauses.

data/lib/rubocop/cop/style/unneeded_capital_w.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for usage of the %W() syntax when %w() would do.

data/lib/rubocop/cop/style/unneeded_percent_x.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for usage of the %x() syntax when `` would do.

data/lib/rubocop/cop/style/variable_interpolation.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for variable interpolation (like "#@ivar").

data/lib/rubocop/cop/style/variable_name.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop makes sure that all variables use the configured style,

data/lib/rubocop/cop/style/when_then.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for *when;* uses in *case* expressions.

data/lib/rubocop/cop/style/while_until_do.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks for uses of `do` in multi-line `while/until` statements.

data/lib/rubocop/cop/style/while_until_modifier.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # Checks for while and until statements that would fit on one line

data/lib/rubocop/cop/style/word_array.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     module Style
       # This cop checks for array literals made up of word-like

data/lib/rubocop/cop/team.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # FIXME
     class Team
@@ -74,8 +74,18 @@ module Rubocop
         corrector = Corrector.new(buffer, corrections)
         new_source = begin
-                       corrector.rewrite
+                       # Corrector#rewrite can raise RangeError or RuntimeError
+                       # for various error conditions including clobbering.
+                       s = corrector.rewrite
+                       # We raise RuntimeError ourselves if the rewritten code
+                       # is not parsable ruby. We don't want to write that code
+                       # to file.
+                       fail unless SourceParser.parse(s).valid_syntax?
+                       s
                      rescue RangeError, RuntimeError
+                       # Handle all errors by limiting the changes to one
+                       # cop. The caller will parse the source again when the
+                       # file has been updated.
                        autocorrect_one_cop(buffer, cops)
                      end

data/lib/rubocop/cop/util.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # This module contains a collection of useful utility methods.
     module Util

data/lib/rubocop/cop/variable_force.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     # This force provides a way to track local variables and scopes of Ruby.
     # Cops intertact with this force need to override some of the hook methods.
@@ -22,7 +22,7 @@ module Rubocop
     #
     #     def after_declaring_variable(variable, variable_table)
     #     end
-    class VariableForce < Force # rubocop:disable ClassLength
+    class VariableForce < Force # rubocop:disable Style/ClassLength
       VARIABLE_ASSIGNMENT_TYPE = :lvasgn
       REGEXP_NAMED_CAPTURE_TYPE = :match_with_lvasgn
       VARIABLE_ASSIGNMENT_TYPES =
@@ -102,7 +102,7 @@ module Rubocop
         throw :skip_children
       end
-      # rubocop:disable MethodLength, CyclomaticComplexity
+      # rubocop:disable Style/MethodLength, Style/CyclomaticComplexity
       def dispatch_node(node)
         case node.type
         when *DECLARATION_TYPES
@@ -127,7 +127,7 @@ module Rubocop
           process_scope(node)
         end
       end
-      # rubocop:enable MethodLength, CyclomaticComplexity
+      # rubocop:enable Style/MethodLength, Style/CyclomaticComplexity
       def process_variable_declaration(node)
         # restarg would have no name:

data/lib/rubocop/cop/variable_force/assignment.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     class VariableForce
       # This class represents each assignment of a variable.

data/lib/rubocop/cop/variable_force/locatable.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     class VariableForce
       # This module provides a way to locate the conditional branch the node is

data/lib/rubocop/cop/variable_force/reference.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     class VariableForce
       # This class represents each reference of a variable.

data/lib/rubocop/cop/variable_force/scope.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     class VariableForce
       # A Scope represents a context of local variable visibility.

data/lib/rubocop/cop/variable_force/variable.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     class VariableForce
       # A Variable represents existance of a local variable.

data/lib/rubocop/cop/variable_force/variable_table.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
-module Rubocop
+module RuboCop
   module Cop
     class VariableForce
       # A VariableTable manages the lifetime of all scopes and local variables