rubocop 0.59.2 → 0.60.0

data/lib/rubocop.rb

@@ -330,6 +330,7 @@ require_relative 'rubocop/cop/lint/void'
 
 require_relative 'rubocop/cop/metrics/cyclomatic_complexity'
 # relies on cyclomatic_complexity
+require_relative 'rubocop/cop/metrics/utils/abc_size_calculator'
 require_relative 'rubocop/cop/metrics/abc_size'
 require_relative 'rubocop/cop/metrics/block_length'
 require_relative 'rubocop/cop/metrics/block_nesting'

data/lib/rubocop/ast/builder.rb

@@ -15,37 +15,37 @@ module RuboCop
     #   root_node = parser.parse(buffer)
     class Builder < Parser::Builders::Default
       NODE_MAP = {
-        and:        AndNode,
-        args:       ArgsNode,
-        array:      ArrayNode,
-        block:      BlockNode,
-        case:       CaseNode,
-        def:        DefNode,
-        defined?:   DefinedNode,
-        defs:       DefNode,
-        ensure:     EnsureNode,
-        for:        ForNode,
-        hash:       HashNode,
-        if:         IfNode,
-        kwsplat:    KeywordSplatNode,
-        or:         OrNode,
-        pair:       PairNode,
-        regexp:     RegexpNode,
-        resbody:    ResbodyNode,
-        csend:      SendNode,
-        send:       SendNode,
-        str:        StrNode,
-        dstr:       StrNode,
-        xstr:       StrNode,
-        super:      SuperNode,
-        zsuper:     SuperNode,
-        sym:        SymbolNode,
-        until:      UntilNode,
+        and: AndNode,
+        args: ArgsNode,
+        array: ArrayNode,
+        block: BlockNode,
+        case: CaseNode,
+        def: DefNode,
+        defined?: DefinedNode,
+        defs: DefNode,
+        ensure: EnsureNode,
+        for: ForNode,
+        hash: HashNode,
+        if: IfNode,
+        kwsplat: KeywordSplatNode,
+        or: OrNode,
+        pair: PairNode,
+        regexp: RegexpNode,
+        resbody: ResbodyNode,
+        csend: SendNode,
+        send: SendNode,
+        str: StrNode,
+        dstr: StrNode,
+        xstr: StrNode,
+        super: SuperNode,
+        zsuper: SuperNode,
+        sym: SymbolNode,
+        until: UntilNode,
         until_post: UntilNode,
-        when:       WhenNode,
-        while:      WhileNode,
+        when: WhenNode,
+        while: WhileNode,
         while_post: WhileNode,
-        yield:      YieldNode
+        yield: YieldNode
       }.freeze
 
       # Generates {Node} from the given information.

data/lib/rubocop/ast/node.rb

@@ -33,9 +33,17 @@ module RuboCop
       COMPOSITE_LITERALS = %i[dstr xstr dsym array hash irange
                               erange regexp].freeze
       BASIC_LITERALS = (LITERALS - COMPOSITE_LITERALS).freeze
-      MUTABLE_LITERALS = %i[str dstr xstr array hash].freeze
+      MUTABLE_LITERALS = %i[str dstr xstr array hash
+                            regexp irange erange].freeze
       IMMUTABLE_LITERALS = (LITERALS - MUTABLE_LITERALS).freeze
 
+      EQUALS_ASSIGNMENTS = %i[lvasgn ivasgn cvasgn gvasgn
+                              casgn masgn].freeze
+      SHORTHAND_ASSIGNMENTS = %i[op_asgn or_asgn and_asgn].freeze
+      ASSIGNMENTS = (EQUALS_ASSIGNMENTS + SHORTHAND_ASSIGNMENTS).freeze
+
+      BASIC_CONDITIONALS = %i[if while until].freeze
+      CONDITIONALS = [*BASIC_CONDITIONALS, :case].freeze
       VARIABLES = %i[ivar gvar cvar lvar].freeze
       REFERENCES = %i[nth_ref back_ref].freeze
       KEYWORDS = %i[alias and break case class def defs defined?
@@ -358,16 +366,6 @@ module RuboCop
         source_length.zero?
       end
 
-      def_node_matcher :equals_asgn?, <<-PATTERN
-        {lvasgn ivasgn cvasgn gvasgn casgn masgn}
-      PATTERN
-
-      def_node_matcher :shorthand_asgn?, '{op_asgn or_asgn and_asgn}'
-
-      def_node_matcher :assignment?, <<-PATTERN
-        {equals_asgn? shorthand_asgn?}
-      PATTERN
-
       # Some cops treat the shovel operator as a kind of assignment.
       def_node_matcher :assignment_or_similar?, <<-PATTERN
         {assignment? (send _recv :<< ...)}
@@ -422,6 +420,26 @@ module RuboCop
         REFERENCES.include?(type)
       end
 
+      def equals_asgn?
+        EQUALS_ASSIGNMENTS.include?(type)
+      end
+
+      def shorthand_asgn?
+        SHORTHAND_ASSIGNMENTS.include?(type)
+      end
+
+      def assignment?
+        ASSIGNMENTS.include?(type)
+      end
+
+      def basic_conditional?
+        BASIC_CONDITIONALS.include?(type)
+      end
+
+      def conditional?
+        CONDITIONALS.include?(type)
+      end
+
       def keyword?
         return true if special_keyword? || send_type? && prefix_not?
         return false unless KEYWORDS.include?(type)
@@ -437,20 +455,6 @@ module RuboCop
         OPERATOR_KEYWORDS.include?(type)
       end
 
-      def unary_operation?
-        return false unless loc.respond_to?(:selector) && loc.selector
-
-        Cop::Util.operator?(loc.selector.source.to_sym) &&
-          source_range.begin_pos == loc.selector.begin_pos
-      end
-
-      def binary_operation?
-        return false unless loc.respond_to?(:selector) && loc.selector
-
-        Cop::Util.operator?(method_name) &&
-          source_range.begin_pos != loc.selector.begin_pos
-      end
-
       def parenthesized_call?
         loc.respond_to?(:begin) && loc.begin && loc.begin.is?('(')
       end

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

@@ -8,7 +8,7 @@ module RuboCop
     class ArgsNode < Node
       include CollectionNode
 
-      # It returns true if arguments are empty, and delimiters do not exist.
+      # It returns true if arguments are empty and delimiters do not exist.
       # @example:
       #   # true
       #   def x; end

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

@@ -31,7 +31,7 @@ module RuboCop
         rhs = rhs.children.first if rhs.begin_type?
 
         [lhs, rhs].each_with_object([]) do |side, collection|
-          if AST::Node::OPERATOR_KEYWORDS.include?(side.type)
+          if side.operator_keyword?
             collection.concat(side.conditions)
           else
             collection << side

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

@@ -182,6 +182,32 @@ module RuboCop
         block_literal? && loc.expression && loc.expression.source == '->'
       end
 
+      # Checks whether this is a unary operation.
+      #
+      # @example
+      #
+      #   -foo
+      #
+      # @return [Boolean] whether this method is a unary operation
+      def unary_operation?
+        return false unless loc.selector
+
+        operator_method? && loc.expression.begin_pos == loc.selector.begin_pos
+      end
+
+      # Checks whether this is a binary operation.
+      #
+      # @example
+      #
+      #   foo + bar
+      #
+      # @return [Bookean] whether this method is a binary operation
+      def binary_operation?
+        return false unless loc.selector
+
+        operator_method? && loc.expression.begin_pos != loc.selector.begin_pos
+      end
+
       private
 
       def_node_matcher :macro_scope?, <<-PATTERN

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

@@ -12,6 +12,10 @@ module RuboCop
                               map reduce reject reject! reverse_each select
                               select! times upto].freeze
 
+      # http://phrogz.net/programmingruby/language.html#table_18.4
+      OPERATOR_METHODS = %i[| ^ & <=> == === =~ > >= < <= << >> + - * /
+                            % ** ~ +@ -@ !@ ~@ [] []= ! != !~ `].freeze
+
       # Checks whether the method name matches the argument.
       #
       # @param [Symbol, String] name the method name to check for
@@ -24,7 +28,7 @@ module RuboCop
       #
       # @return [Boolean] whether the method is an operator
       def operator_method?
-        RuboCop::Cop::Util::OPERATOR_METHODS.include?(method_name)
+        OPERATOR_METHODS.include?(method_name)
       end
 
       # Checks whether the method is a comparison method.

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

@@ -28,7 +28,7 @@ module RuboCop
       end
 
       # Returns the delimiter of the `pair` as a string. Returns `=>` for a
-      # colon delimited `pair`, and `:` for a hash rocket delimited `pair`.
+      # colon delimited `pair` and `:` for a hash rocket delimited `pair`.
       #
       # @param [Boolean] with_spacing whether to include spacing
       # @return [String] the delimiter of the `pair`
@@ -51,6 +51,13 @@ module RuboCop
           hash_rocket? ? COLON : HASH_ROCKET
         end
       end
+
+      # Checks whether the value starts on its own line.
+      #
+      # @return [Boolean] whether the value in the `pair` starts its own line
+      def value_on_new_line?
+        key.loc.line != value.loc.line
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@
 
 module RuboCop
   module AST
-    # A node extension for `str`, `dstr` and `xstr` nodes. This will be used
+    # A node extension for `str`, `dstr`, and `xstr` nodes. This will be used
     # in place of a plain node when the builder constructs the AST, making
     # its methods available to all `str` nodes within RuboCop.
     class StrNode < Node

data/lib/rubocop/cached_data.rb

@@ -29,9 +29,9 @@ module RuboCop
           begin_pos: offense.location.begin_pos,
           end_pos: offense.location.end_pos
         },
-        message:  message(offense),
+        message: message(offense),
         cop_name: offense.cop_name,
-        status:   offense.status
+        status: :uncorrected
       }
     end
 

data/lib/rubocop/config.rb

@@ -18,7 +18,7 @@ module RuboCop
                        AutoCorrect StyleGuide Details].freeze
     # 2.2 is the oldest officially supported Ruby version.
     DEFAULT_RUBY_VERSION = 2.2
-    KNOWN_RUBIES = [2.2, 2.3, 2.4, 2.5].freeze
+    KNOWN_RUBIES = [2.2, 2.3, 2.4, 2.5, 2.6].freeze
     OBSOLETE_RUBIES = { 1.9 => '0.50', 2.0 => '0.50', 2.1 => '0.58' }.freeze
     RUBY_VERSION_FILENAME = '.ruby-version'.freeze
     DEFAULT_RAILS_VERSION = 5.0

data/lib/rubocop/config_loader.rb

@@ -181,6 +181,14 @@ module RuboCop
         if defined?(SafeYAML) && SafeYAML.respond_to?(:load)
           SafeYAML.load(yaml_code, filename,
                         whitelisted_tags: %w[!ruby/regexp])
+        elsif RUBY_VERSION >= '2.6'
+          YAML.safe_load(
+            yaml_code,
+            whitelist_classes: [Regexp, Symbol],
+            whitelist_symbols: [],
+            aliases: false,
+            filename: filename
+          )
         else
           YAML.safe_load(yaml_code, [Regexp, Symbol], [], false, filename)
         end

data/lib/rubocop/cop/autocorrect_logic.rb

@@ -20,7 +20,13 @@ module RuboCop
         # allow turning off autocorrect on a cop by cop basis
         return true unless cop_config
 
-        cop_config['AutoCorrect'] != false
+        return false if cop_config['AutoCorrect'] == false
+
+        if @options.fetch(:safe_auto_correct, false)
+          return cop_config.fetch('SafeAutoCorrect', true)
+        end
+
+        true
       end
     end
   end

data/lib/rubocop/cop/bundler/insecure_protocol_source.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Bundler
-      # The symbol argument `:gemcutter`, `:rubygems` and `:rubyforge`
+      # The symbol argument `:gemcutter`, `:rubygems`, and `:rubyforge`
       # are deprecated. So please change your source to URL string that
       # 'https://rubygems.org' if possible, or 'http://rubygems.org' if not.
       #

data/lib/rubocop/cop/correctors/alignment_corrector.rb

@@ -69,7 +69,8 @@ module RuboCop
         end
 
         def calculate_range(expr, line_begin_pos, column_delta)
-          starts_with_space = expr.source_buffer.source[line_begin_pos] =~ / /
+          starts_with_space =
+            expr.source_buffer.source[line_begin_pos].start_with?(' ')
           pos_to_remove = if column_delta > 0 || starts_with_space
                             line_begin_pos
                           else

data/lib/rubocop/cop/gemspec/duplicated_assignment.rb

@@ -8,7 +8,7 @@ module RuboCop
       #
       # Assigning to an attribute with the same name using `spec.foo =` will be
       # an unintended usage. On the other hand, duplication of methods such
-      # as `spec.requirements`, `spec.add_runtime_dependency` and others are
+      # as `spec.requirements`, `spec.add_runtime_dependency`, and others are
       # permitted because it is the intended use of appending values.
       #
       # @example

data/lib/rubocop/cop/generator.rb

@@ -122,12 +122,13 @@ module RuboCop
         ).inject
       end
 
-      def inject_config(config_file_path: 'config/enabled.yml')
+      def inject_config(config_file_path: 'config/default.yml')
         config = File.readlines(config_file_path)
         content = <<-YAML.strip_indent
           #{badge}:
             Description: 'TODO: Write a description of the cop.'
             Enabled: true
+            VersionAdded: #{bump_minor_version}
 
         YAML
         target_line = config.find.with_index(1) do |line, index|
@@ -138,7 +139,7 @@ module RuboCop
         File.write(config_file_path, config.join)
         output.puts <<-MESSAGE.strip_indent
           [modify] A configuration for the cop is added into #{config_file_path}.
-                   If you want to disable the cop by default, move the added config to config/disabled.yml
+                   If you want to disable the cop by default, set `Enabled` option to false.
         MESSAGE
       end
 
@@ -147,7 +148,7 @@ module RuboCop
           Do 3 steps:
             1. Add an entry to the "New features" section in CHANGELOG.md,
                e.g. "Add new `#{badge}` cop. ([@#{github_user}][])"
-            2. Modify the description of #{badge} in config/enabled.yml
+            2. Modify the description of #{badge} in config/default.yml
             3. Implement your new cop in the generated file!
         TODO
       end
@@ -209,6 +210,12 @@ module RuboCop
           .gsub(/([A-Z])([A-Z][^A-Z\d]+)/, '\1_\2')
           .downcase
       end
+
+      def bump_minor_version
+        versions = RuboCop::Version::STRING.split('.')
+
+        "#{versions[0]}.#{versions[1].succ}"
+      end
     end
   end
 end

data/lib/rubocop/cop/generator/require_file_injector.rb

@@ -7,7 +7,7 @@ module RuboCop
       # It looks for other directives that require files in the same (cop)
       # namespace and injects the provided one in alpha
       class RequireFileInjector
-        REQUIRE_PATH = /require_relative ['"](.+)['"]/
+        REQUIRE_PATH = /require_relative ['"](.+)['"]/.freeze
 
         def initialize(source_path:, root_file_path:, output: $stdout)
           @source_path = Pathname(source_path)

data/lib/rubocop/cop/internal_affairs/node_destructuring.rb

@@ -22,7 +22,7 @@ module RuboCop
       #   # good
       #   method_name = send_node.method_name
       class NodeDestructuring < Cop
-        MSG = 'Use the methods provided with the node extensions, or ' \
+        MSG = 'Use the methods provided with the node extensions or ' \
               'destructure the node using `*`.'.freeze
 
         def_node_matcher :node_children_destructuring?, <<-PATTERN

data/lib/rubocop/cop/layout/align_hash.rb

@@ -7,7 +7,7 @@ module RuboCop
       # literal are aligned according to configuration. The configuration
       # options are:
       #
-      #   - key (left align keys)
+      #   - key (left align keys, one space before hash rockets and values)
       #   - separator (align hash rockets and colons, right align keys)
       #   - table (left align keys, hash rockets, and values)
       #
@@ -25,6 +25,10 @@ module RuboCop
       #     :foo => bar,
       #      :ba => baz
       #   }
+      #   {
+      #     :foo => bar,
+      #     :ba  => baz
+      #   }
       #
       #   # good
       #   {
@@ -68,6 +72,10 @@ module RuboCop
       #     foo: bar,
       #      ba: baz
       #   }
+      #   {
+      #     foo: bar,
+      #     ba:  baz
+      #   }
       #
       #   # good
       #   {

data/lib/rubocop/cop/layout/block_end_newline.rb

@@ -33,12 +33,10 @@ module RuboCop
         def on_block(node)
           return if node.single_line?
 
-          end_loc = node.loc.end
-
           # If the end is on its own line, there is no offense
-          return if end_loc.source_line =~ /^\s*#{end_loc.source}/
+          return if begins_its_line?(node.loc.end)
 
-          add_offense(node, location: end_loc)
+          add_offense(node, location: :end)
         end
 
         def autocorrect(node)