rubocop 0.48.1 → 0.49.0

data/lib/rubocop/ast/node/case_node.rb

@@ -57,7 +57,7 @@ module RuboCop
       #
       # @return [Array<Node>] the different parts of the `case` statement
       def node_parts
-        [*self]
+        to_a
       end
     end
   end

data/lib/rubocop/ast/node/ensure_node.rb

@@ -18,7 +18,7 @@ module RuboCop
       #
       # @return [Array<Node>] the different parts of the `ensure` statement
       def node_parts
-        [*self]
+        to_a
       end
     end
   end

data/lib/rubocop/ast/node/for_node.rb

@@ -46,7 +46,7 @@ module RuboCop
       #
       # @return [Array<Node>] the different parts of the `until` statement
       def node_parts
-        [*self]
+        to_a
       end
     end
   end

data/lib/rubocop/ast/node/if_node.rb

@@ -36,7 +36,7 @@ module RuboCop
       # Checks whether the `if` node has an `else` clause.
       #
       # @note This returns `true` for nodes containing an `elsif` clause.
-      #       This is legacy behaviour, and many cops rely on it.
+      #       This is legacy behavior, and many cops rely on it.
       #
       # @return [Boolean] whether the node has an `else` clause
       def else?

data/lib/rubocop/ast/node/mixin/parameterized_node.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # Common functionality for nodes that are parameterized:
+    # `send`, `super`, `zsuper` ...
+    module ParameterizedNode
+      # Checks whether this super invocation's arguments are wrapped in
+      # parentheses.
+      #
+      # @return [Boolean] whether this super invocation's arguments are
+      #                   wrapped in parentheses
+      def parenthesized?
+        loc.end && loc.end.is?(')')
+      end
+
+      # A shorthand for getting the first argument of the method invocation.
+      # Equivalent to `arguments.first`.
+      #
+      # @return [Node, nil] the first argument of the method invocation,
+      #                     or `nil` if there are no arguments
+      def first_argument
+        arguments[0]
+      end
+
+      # A shorthand for getting the last argument of the method invocation.
+      # Equivalent to `arguments.last`.
+      #
+      # @return [Node, nil] the last argument of the method invocation,
+      #                     or `nil` if there are no arguments
+      def last_argument
+        arguments[-1]
+      end
+
+      # Checks whether this method was invoked with arguments.
+      #
+      # @return [Boolean] whether this method was invoked with arguments
+      def arguments?
+        !arguments.empty?
+      end
+
+      # Checks whether any argument of the method invocation is a splat
+      # argument, i.e. `*splat`.
+      #
+      # @return [Boolean] whether the invoked method is a splat argument
+      def splat_argument?
+        arguments? && arguments.any?(&:splat_type?)
+      end
+
+      # Whether the last argument of the method invocation is a block pass,
+      # i.e. `&block`.
+      #
+      # @return [Boolean] whether the invoked method is a block pass
+      def block_argument?
+        arguments? && last_argument.block_pass_type?
+      end
+
+      # Whether this method invocation has an explicit block.
+      #
+      # @return [Boolean] whether the invoked method has a block
+      def block_literal?
+        parent && parent.block_type? && eql?(parent.send_node)
+      end
+
+      # The block node associated with this method call, if any.
+      #
+      # @return [BlockNode, nil] the `block` node associated with this method
+      #                          call or `nil`
+      def block_node
+        parent if block_literal?
+      end
+    end
+  end
+end

data/lib/rubocop/ast/node/or_node.rb

@@ -30,7 +30,7 @@ module RuboCop
       #
       # @return [Array<Node>] the different parts of the `or` predicate
       def node_parts
-        [*self]
+        to_a
       end
     end
   end

data/lib/rubocop/ast/node/pair_node.rb

@@ -57,7 +57,7 @@ module RuboCop
       #
       # @return [Array<Node>] the different parts of the `pair`
       def node_parts
-        [*self]
+        to_a
       end
     end
   end

data/lib/rubocop/ast/node/resbody_node.rb

@@ -18,7 +18,7 @@ module RuboCop
       #
       # @return [Array<Node>] the different parts of the `resbody` statement
       def node_parts
-        [*self]
+        to_a
       end
     end
   end

data/lib/rubocop/ast/node/send_node.rb

@@ -6,6 +6,13 @@ module RuboCop
     # node when the builder constructs the AST, making its methods available
     # to all `send` nodes within RuboCop.
     class SendNode < Node
+      include ParameterizedNode
+
+      ENUMERATOR_METHODS = %i[collect collect_concat detect downto each
+                              find find_all find_index inject loop map!
+                              map reduce reject reject! reverse_each select
+                              select! times upto].freeze
+
       # The receiving node of the method invocation.
       #
       # @return [Node, nil] the receiver of the invoked method or `nil`
@@ -20,6 +27,13 @@ module RuboCop
         node_parts[1]
       end
 
+      # An array containing the arguments of the method invocation.
+      #
+      # @return [Array<Node>] the arguments of the method invocation or `nil`
+      def arguments
+        node_parts[2..-1]
+      end
+
       # Checks whether the method name matches the argument.
       #
       # @param [Symbol, String] name the method name to check for
@@ -48,59 +62,40 @@ module RuboCop
         !receiver && method?(name)
       end
 
-      # An array containing the arguments of the method invocation.
-      #
-      # @return [Array<Node>] the arguments of the method invocation or `nil`
-      def arguments
-        node_parts[2..-1]
-      end
-
-      # A shorthand for getting the first argument of the method invocation.
-      # Equivalent to `arguments.first`.
-      #
-      # @return [Node, nil] the first argument of the method invocation,
-      #                     or `nil` if there are no arguments
-      def first_argument
-        arguments[0]
-      end
-
-      # A shorthand for getting the last argument of the method invocation.
-      # Equivalent to `arguments.last`.
+      # Checks whether the invoked method is a setter method.
       #
-      # @return [Node, nil] the last argument of the method invocation,
-      #                     or `nil` if there are no arguments
-      def last_argument
-        arguments[-1]
+      # @return [Boolean] whether the invoked method is a setter
+      def setter_method?
+        loc.operator
       end
 
-      # Checks whether this method was invoked with arguments.
+      # Checks whether the invoked method is an operator method.
       #
-      # @return [Boolean] whether this method was invoked with arguments
-      def arguments?
-        !arguments.empty?
+      # @return [Boolean] whether the invoked method is an operator
+      def operator_method?
+        RuboCop::Cop::Util::OPERATOR_METHODS.include?(method_name)
       end
 
-      # Checks whether this method invocation's arguments are wrapped in
-      # parentheses.
+      # Checks whether the invoked method is a comparison method.
       #
-      # @return [Boolean] whether this method invocation's arguments are
-      #                   wrapped in parentheses
-      def parenthesized?
-        loc.end && loc.end.is?(')')
+      # @return [Boolean] whether the involed method is a comparison
+      def comparison_method?
+        COMPARISON_OPERATORS.include?(method_name)
       end
 
-      # Checks whether the invoked method is a setter method.
+      # Checks whether the invoked method is an assignment method.
       #
-      # @return [Boolean] whether the invoked method is a setter
-      def setter_method?
-        loc.operator
+      # @return [Boolean] whether the invoked method is an assignment.
+      def assignment_method?
+        !comparison_method? && method_name.to_s.end_with?('=')
       end
 
-      # Checks whether the invoked method is an operator method.
+      # Checks whether the invoked method is an enumerator method.
       #
-      # @return [Boolean] whether the invoked method is an operator
-      def operator_method?
-        RuboCop::Cop::Util::OPERATOR_METHODS.include?(method_name)
+      # @return [Boolean] whether the invoked method is an enumerator.
+      def enumerator_method?
+        ENUMERATOR_METHODS.include?(method_name) ||
+          method_name.to_s.start_with?('each_')
       end
 
       # Checks whether the method call uses a dot to connect the receiver and
@@ -160,28 +155,12 @@ module RuboCop
         method_name.to_s =~ /\A[A-Z]/
       end
 
-      # Whether the last argument of the method invocation is a block pass,
-      # i.e. `&block`.
-      #
-      # @return [Boolean] whether the invoked method is a block pass
-      def block_argument?
-        arguments? && last_argument.block_pass_type?
-      end
-
-      # Checks whether any argument of the method invocation is a splat
-      # argument, i.e. `*splat`.
-      #
-      # @return [Boolean] whether the invoked method is a splat argument
-      def splat_argument?
-        arguments? && arguments.any?(&:splat_type?)
-      end
-
       # Custom destructuring method. This can be used to normalize
       # destructuring for different variations of the node.
       #
       # @return [Array] the different parts of the `send` node
       def node_parts
-        [*self]
+        to_a
       end
 
       private

data/lib/rubocop/ast/node/super_node.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module AST
+    # A node extension for `super`- and `zsuper` nodes. This will be used in
+    # place of a plain node when the builder constructs the AST, making its
+    # methods available to all `super`- and `zsuper` nodes within RuboCop.
+    class SuperNode < Node
+      include ParameterizedNode
+
+      # The method name of this `super` node. Always `:super`.
+      #
+      # @return [Symbol] the method name of `super`
+      def method_name
+        :super
+      end
+
+      # An array containing the arguments of the super invocation.
+      #
+      # @return [Array<Node>] the arguments of the super invocation
+      def arguments
+        node_parts
+      end
+
+      # Checks whether the method name matches the argument.
+      #
+      # @param [Symbol, String] name the method name to check for
+      # @return [Boolean] whether the method name matches the argument
+      def method?(name)
+        method_name == name.to_sym
+      end
+
+      # Custom destructuring method. This can be used to normalize
+      # destructuring for different variations of the node.
+      #
+      # @return [Array] the different parts of the `block` node
+      def node_parts
+        to_a
+      end
+    end
+  end
+end

data/lib/rubocop/ast/node/until_node.rb

@@ -36,7 +36,7 @@ module RuboCop
       #
       # @return [Array<Node>] the different parts of the `until` statement
       def node_parts
-        [*self]
+        to_a
       end
     end
   end

data/lib/rubocop/ast/node/when_node.rb

@@ -54,7 +54,7 @@ module RuboCop
       #
       # @return [Array<Node>] the different parts of the `until` statement
       def node_parts
-        [*self]
+        to_a
       end
     end
   end

data/lib/rubocop/ast/node/while_node.rb

@@ -36,7 +36,7 @@ module RuboCop
       #
       # @return [Array<Node>] the different parts of the `while` statement
       def node_parts
-        [*self]
+        to_a
       end
     end
   end

data/lib/rubocop/cli.rb

@@ -21,6 +21,7 @@ module RuboCop
     # @return [Integer] UNIX exit code
     def run(args = ARGV)
       @options, paths = Options.new.parse(args)
+      validate_options_vs_config
       act_on_options
       apply_default_formatter
 
@@ -47,6 +48,15 @@ module RuboCop
 
     private
 
+    def validate_options_vs_config
+      if @options[:parallel] &&
+         !@config_store.for(Dir.pwd).for_all_cops['UseCache']
+        raise ArgumentError, '-P/--parallel uses caching to speed up ' \
+                             'execution, so combining with AllCops: ' \
+                             'UseCache: false is not allowed.'
+      end
+    end
+
     def act_on_options
       handle_exiting_options
 

data/lib/rubocop/config.rb

@@ -28,25 +28,41 @@ module RuboCop
         'The `Rails/DefaultScope` cop no longer exists.',
       'Style/SingleSpaceBeforeFirstArg' =>
         'The `Style/SingleSpaceBeforeFirstArg` cop has been renamed to ' \
-        '`Style/SpaceBeforeFirstArg`.',
+        '`Layout/SpaceBeforeFirstArg`.',
       'Lint/SpaceBeforeFirstArg' =>
         'The `Lint/SpaceBeforeFirstArg` cop has been removed, since it was a ' \
-        'duplicate of `Style/SpaceBeforeFirstArg`. Please use ' \
-        '`Style/SpaceBeforeFirstArg` instead.',
+        'duplicate of `Layout/SpaceBeforeFirstArg`. Please use ' \
+        '`Layout/SpaceBeforeFirstArg` instead.',
+      'Layout/SpaceAfterControlKeyword' =>
+        'The `Layout/SpaceAfterControlKeyword` cop has been removed. Please ' \
+        'use `Layout/SpaceAroundKeyword` instead.',
+      'Layout/SpaceBeforeModifierKeyword' =>
+        'The `Layout/SpaceBeforeModifierKeyword` cop has been removed. ' \
+        'Please use `Layout/SpaceAroundKeyword` instead.',
       'Style/SpaceAfterControlKeyword' =>
         'The `Style/SpaceAfterControlKeyword` cop has been removed. Please ' \
-        'use `Style/SpaceAroundKeyword` instead.',
+        'use `Layout/SpaceAroundKeyword` instead.',
       'Style/SpaceBeforeModifierKeyword' =>
         'The `Style/SpaceBeforeModifierKeyword` cop has been removed. Please ' \
-        'use `Style/SpaceAroundKeyword` instead.',
+        'use `Layout/SpaceAroundKeyword` instead.',
       'Style/MethodCallParentheses' =>
         'The `Style/MethodCallParentheses` cop has been renamed to ' \
           '`Style/MethodCallWithoutArgsParentheses`.',
       'Lint/Eval' =>
-        'The `Lint/Eval` cop has been renamed to `Security/Eval`.'
+        'The `Lint/Eval` cop has been renamed to `Security/Eval`.',
+      'Style/DeprecatedHashMethods' =>
+        'The `Style/DeprecatedHashMethods` cop has been renamed to ' \
+          '`Style/PreferredHashMethods`.'
     }.freeze
 
     OBSOLETE_PARAMETERS = [
+      {
+        cop: 'Layout/SpaceAroundOperators',
+        parameter: 'MultiSpaceAllowedForOperators',
+        alternative: 'If your intention was to allow extra spaces ' \
+                     'for alignment, please use AllowForAlignment: ' \
+                     'true instead.'
+      },
       {
         cop: 'Style/SpaceAroundOperators',
         parameter: 'MultiSpaceAllowedForOperators',
@@ -61,7 +77,7 @@ module RuboCop
                      "Rails:\n  Enabled: true"
       },
       {
-        cop: 'Style/CaseIndentation',
+        cop: 'Layout/CaseIndentation',
         parameter: 'IndentWhenRelativeTo',
         alternative: '`IndentWhenRelativeTo` has been renamed to ' \
                      '`EnforcedStyle`'

data/lib/rubocop/config_loader.rb

@@ -147,9 +147,7 @@ module RuboCop
         end
 
         if disabled_by_default
-          config = transform(config) do |params|
-            { 'Enabled' => true }.merge(params) # Set true if not set.
-          end
+          config = handle_disabled_by_default(config, default_configuration)
         end
 
         Config.new(merge(default_configuration, config), config_file)
@@ -164,6 +162,24 @@ module RuboCop
 
       private
 
+      def handle_disabled_by_default(config, new_default_configuration)
+        department_config = config.to_hash.reject { |cop| cop.include?('/') }
+        department_config.each do |dept, dept_params|
+          next unless dept_params['Enabled']
+
+          new_default_configuration.each do |cop, params|
+            next unless cop.start_with?(dept + '/')
+
+            # Retain original default configuration for cops in the department.
+            params['Enabled'] = default_configuration[cop]['Enabled']
+          end
+        end
+
+        transform(config) do |params|
+          { 'Enabled' => true }.merge(params) # Set true if not set.
+        end
+      end
+
       # Returns a new hash where the parameters of the given config hash have
       # been replaced by parameters returned by the given block.
       def transform(config)