rubocop 0.59.2 → 0.60.0

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

@@ -34,11 +34,21 @@ module RuboCop
         private
 
         def immutable_literal?(node)
+          node = strip_parenthesis(node)
+
           return true if node.immutable_literal?
 
           FROZEN_STRING_LITERAL_TYPES.include?(node.type) &&
             frozen_string_literals_enabled?
         end
+
+        def strip_parenthesis(node)
+          if node.begin_type? && node.children.first
+            node.children.first
+          else
+            node
+          end
+        end
       end
     end
   end

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

@@ -108,8 +108,8 @@ module RuboCop
         def check_unary(begin_node, node)
           return if begin_node.chained?
 
-          # parens are not redundant in `(!recv.method arg)`
-          node = node.children.first while node.unary_operation?
+          node = node.children.first while suspect_unary?(node)
+
           if node.send_type?
             return unless method_call_with_redundant_parentheses?(node)
           end
@@ -121,6 +121,10 @@ module RuboCop
           add_offense(node, message: "Don't use parentheses around #{msg}.")
         end
 
+        def suspect_unary?(node)
+          node.send_type? && node.unary_operation? && !node.prefix_not?
+        end
+
         def keyword_ancestor?(node)
           node.parent && node.parent.keyword?
         end

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

@@ -121,7 +121,7 @@ module RuboCop
         end
 
         def regular_method_call?(node)
-          !(operator?(node.method_name) ||
+          !(node.operator_method? ||
             keyword?(node.method_name) ||
             node.camel_case_method? ||
             node.setter_method? ||

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

@@ -60,7 +60,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
 
         MSG_BOTH = 'Prefer `%<prefer>s` from the stdlib \'English\' ' \
-        'module (don\'t forget to require it), or `%<regular>s` over ' \
+        'module (don\'t forget to require it) or `%<regular>s` over ' \
         '`%<global>s`.'.freeze
         MSG_ENGLISH = 'Prefer `%<prefer>s` from the stdlib \'English\' ' \
         'module (don\'t forget to require it) over `%<global>s`.'.freeze

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

@@ -5,7 +5,7 @@ module RuboCop
     module Style
       # This cop identifies places where `$stderr.puts` can be replaced by
       # `warn`. The latter has the advantage of easily being disabled by,
-      # e.g. the -W0 interpreter flag, or setting $VERBOSE to nil.
+      # the `-W0` interpreter flag or setting `$VERBOSE` to `nil`.
       #
       # @example
       #   # bad

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

@@ -155,12 +155,13 @@ module RuboCop
 
         def unparenthesized_method_call?(child)
           argument = method_call_argument(child)
-          argument && argument !~ /^\(/
+
+          argument && !argument.parenthesized?
         end
 
         def_node_matcher :method_call_argument, <<-PATTERN
-          {(:defined? $...)
-           (send {_ nil?} _ $(send nil? _)...)}
+          {(:defined? $(send nil? _) ...)
+           (send {_ nil?} _ $(send nil? _) ...)}
         PATTERN
 
         def correct_parenthesized(condition)

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

@@ -90,8 +90,8 @@ module RuboCop
         end
 
         def else_source(else_branch)
-          wrap_else = MODIFIER_NODES.include?(else_branch.type) &&
-                      else_branch.modifier_form?
+          wrap_else =
+            else_branch.basic_conditional? && else_branch.modifier_form?
           wrap_else ? "(#{else_branch.source})" : else_branch.source
         end
 

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

@@ -27,8 +27,8 @@ module RuboCop
         EMPTY = ''.freeze
         PERCENT_Q = '%q'.freeze
         PERCENT_CAPITAL_Q = '%Q'.freeze
-        STRING_INTERPOLATION_REGEXP = /#\{.+}/
-        ESCAPED_NON_BACKSLASH = /\\[^\\]/
+        STRING_INTERPOLATION_REGEXP = /#\{.+}/.freeze
+        ESCAPED_NON_BACKSLASH = /\\[^\\]/.freeze
 
         def on_dstr(node)
           return unless string_literal?(node)

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

@@ -36,7 +36,7 @@ module RuboCop
           unpack_and_first_element?(node) do |unpack_call, unpack_arg|
             range = first_element_range(node, unpack_call)
             message = format(MSG,
-                             receiver:  unpack_call.receiver.source,
+                             receiver: unpack_call.receiver.source,
                              format: unpack_arg.source,
                              method: range.source)
             add_offense(node, message: message)

data/lib/rubocop/cop/team.rb

@@ -45,8 +45,9 @@ module RuboCop
       end
 
       def cops
-        only_options = @options.fetch(:only, [])
-        @cops ||= @cop_classes.enabled(@config, only_options).map do |cop_class|
+        only = @options.fetch(:only, [])
+        safe = @options.fetch(:safe, false)
+        @cops ||= @cop_classes.enabled(@config, only, safe).map do |cop_class|
           cop_class.new(@config, @options)
         end
       end

data/lib/rubocop/cop/util.rb

@@ -5,34 +5,14 @@ module RuboCop
     # This module contains a collection of useful utility methods.
     module Util
       include PathUtil
-      extend RuboCop::AST::Sexp
-
-      EQUALS_ASGN_NODES = %i[lvasgn ivasgn cvasgn gvasgn
-                             casgn masgn].freeze
-      SHORTHAND_ASGN_NODES = %i[op_asgn or_asgn and_asgn].freeze
-      ASGN_NODES = (EQUALS_ASGN_NODES + SHORTHAND_ASGN_NODES).freeze
-
-      MODIFIER_NODES = %i[if while until].freeze
-      CONDITIONAL_NODES = (MODIFIER_NODES + [:case]).freeze
-      LOGICAL_OPERATOR_NODES = %i[and or].freeze
-
-      # http://phrogz.net/programmingruby/language.html#table_18.4
-      # Backtick is added last just to help editors parse this code.
-      OPERATOR_METHODS = %w(
-        | ^ & <=> == === =~ > >= < <= << >>
-        + - * / % ** ~ +@ -@ !@ ~@ [] []= ! != !~
-      ).map(&:to_sym).push(:'`').freeze
 
       # Match literal regex characters, not including anchors, character
       # classes, alternatives, groups, repetitions, references, etc
-      LITERAL_REGEX = /[\w\s\-,"'!#%&<>=;:`~]|\\[^AbBdDgGhHkpPRwWXsSzZ0-9]/
+      LITERAL_REGEX =
+        /[\w\s\-,"'!#%&<>=;:`~]|\\[^AbBdDgGhHkpPRwWXsSzZ0-9]/.freeze
 
       module_function
 
-      def operator?(symbol)
-        OPERATOR_METHODS.include?(symbol)
-      end
-
       def comment_line?(line_source)
         line_source =~ /^\s*#/
       end

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

@@ -8,11 +8,11 @@ module RuboCop
       # A scope instance holds a scope node and variable entries.
       class Scope
         OUTER_SCOPE_CHILD_INDICES = {
-          defs:   0..0,
+          defs: 0..0,
           module: 0..0,
-          class:  0..1,
+          class: 0..1,
           sclass: 0..0,
-          block:  0..0
+          block: 0..0
         }.freeze
 
         attr_reader :node, :variables, :naked_top_level

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

@@ -4,8 +4,7 @@ module RuboCop
   module Cop
     class VariableForce
       # A Variable represents existence of a local variable.
-      # This holds a variable declaration node,
-      # and some states of the variable.
+      # This holds a variable declaration node and some states of the variable.
       class Variable
         VARIABLE_DECLARATION_TYPES =
           (VARIABLE_ASSIGNMENT_TYPES + ARGUMENT_DECLARATION_TYPES).freeze
@@ -67,8 +66,8 @@ module RuboCop
         # For more precise usage check, refer Assignment#used?.
         #
         # Once the variable is captured by a block, we have no idea
-        # when, where and how many times the block would be invoked
-        # and it means we cannot track the usage of the variable.
+        # when, where, and how many times the block would be invoked.
+        # This means we cannot track the usage of the variable.
         # So we consider it's used to suppress false positive offenses.
         def used?
           @captured_by_block || referenced?

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

@@ -5,8 +5,8 @@ module RuboCop
     class VariableForce
       # A VariableTable manages the lifetime of all scopes and local variables
       # in a program.
-      # This holds scopes as stack structure, and provides a way to add local
-      # variables to current scope and find local variables by considering
+      # This holds scopes as stack structure, provides a way to add local
+      # variables to current scope, and find local variables by considering
       # variable visibility of the current scope.
       class VariableTable
         def initialize(hook_receiver = nil)

data/lib/rubocop/formatter/base_formatter.rb

@@ -9,7 +9,7 @@ module RuboCop
     # ## Creating Custom Formatter
     #
     # You can create a custom formatter by subclassing
-    # `RuboCop::Formatter::BaseFormatter` and overriding some methods,
+    # `RuboCop::Formatter::BaseFormatter` and overriding some methods
     # or by implementing all the methods by duck typing.
     #
     # ## Using Custom Formatter in Command Line
@@ -25,7 +25,7 @@ module RuboCop
     # `Kernel.require`.
     # If your custom formatter file is not in `$LOAD_PATH`,
     # you need to specify the path as relative path prefixed with `./`
-    # explicitly, or absolute path.
+    # explicitly or absolute path.
     #
     # ## Method Invocation Order
     #
@@ -109,7 +109,7 @@ module RuboCop
 
       # @api public
       #
-      # Invoked after all files are inspected, or interrupted by user.
+      # Invoked after all files are inspected or interrupted by user.
       #
       # @param inspected_files [Array(String)]
       #   the inspected file paths.

data/lib/rubocop/formatter/disabled_config_formatter.rb

@@ -85,6 +85,7 @@ module RuboCop
       def output_cop(cop_name, offense_count)
         output.puts
         cfg = self.class.config_to_allow_offenses[cop_name] || {}
+        set_max(cfg, offense_count)
 
         # To avoid malformed YAML when potentially reading the config in
         # #excludes, we use an output buffer and append it to the actual output
@@ -95,6 +96,19 @@ module RuboCop
         output.puts(output_buffer.string)
       end
 
+      def set_max(cfg, offense_count)
+        return unless cfg[:exclude_limit]
+
+        # In case auto_gen_only_exclude is set, only modify the maximum if the
+        # files are not excluded one by one.
+        if !@options[:auto_gen_only_exclude] || offense_count > @exclude_limit
+          cfg.merge! cfg[:exclude_limit]
+        end
+
+        # Remove already used exclude_limit.
+        cfg.reject! { |key| key == :exclude_limit }
+      end
+
       def output_cop_comments(output_buffer, cfg, cop_name, offense_count)
         if @show_offense_counts
           output_buffer.puts "# Offense count: #{offense_count}"
@@ -116,7 +130,8 @@ module RuboCop
 
       def cop_config_params(default_cfg, cfg)
         default_cfg.keys -
-          %w[Description StyleGuide Reference Enabled Exclude] -
+          %w[Description StyleGuide Reference Enabled Exclude Safe
+             SafeAutoCorrect VersionAdded VersionChanged VersionRemoved] -
           cfg.keys
       end
 

data/lib/rubocop/formatter/formatter_set.rb

@@ -9,20 +9,20 @@ module RuboCop
     # which invoke same method of each formatters.
     class FormatterSet < Array
       BUILTIN_FORMATTERS_FOR_KEYS = {
-        'progress'     => ProgressFormatter,
-        'simple'       => SimpleTextFormatter,
-        'clang'        => ClangStyleFormatter,
-        'fuubar'       => FuubarStyleFormatter,
-        'emacs'        => EmacsStyleFormatter,
-        'json'         => JSONFormatter,
-        'html'         => HTMLFormatter,
-        'files'        => FileListFormatter,
-        'offenses'     => OffenseCountFormatter,
-        'disabled'     => DisabledLinesFormatter,
-        'worst'        => WorstOffendersFormatter,
-        'tap'          => TapFormatter,
-        'quiet'        => QuietFormatter,
-        'autogenconf'  => AutoGenConfigFormatter
+        'progress' => ProgressFormatter,
+        'simple' => SimpleTextFormatter,
+        'clang' => ClangStyleFormatter,
+        'fuubar' => FuubarStyleFormatter,
+        'emacs' => EmacsStyleFormatter,
+        'json' => JSONFormatter,
+        'html' => HTMLFormatter,
+        'files' => FileListFormatter,
+        'offenses' => OffenseCountFormatter,
+        'disabled' => DisabledLinesFormatter,
+        'worst' => WorstOffendersFormatter,
+        'tap' => TapFormatter,
+        'quiet' => QuietFormatter,
+        'autogenconf' => AutoGenConfigFormatter
       }.freeze
 
       FORMATTER_APIS = %i[started finished].freeze

data/lib/rubocop/formatter/html_formatter.rb

@@ -72,11 +72,11 @@ module RuboCop
         include TextUtil
 
         SEVERITY_COLORS = {
-          refactor:   Color.new(0xED, 0x9C, 0x28, 1.0),
+          refactor: Color.new(0xED, 0x9C, 0x28, 1.0),
           convention: Color.new(0xED, 0x9C, 0x28, 1.0),
-          warning:    Color.new(0x96, 0x28, 0xEF, 1.0),
-          error:      Color.new(0xD2, 0x32, 0x2D, 1.0),
-          fatal:      Color.new(0xD2, 0x32, 0x2D, 1.0)
+          warning: Color.new(0x96, 0x28, 0xEF, 1.0),
+          error: Color.new(0xD2, 0x32, 0x2D, 1.0),
+          fatal: Color.new(0xD2, 0x32, 0x2D, 1.0)
         }.freeze
 
         LOGO_IMAGE_PATH =

data/lib/rubocop/formatter/json_formatter.rb

@@ -15,8 +15,8 @@ module RuboCop
         super
         @output_hash = {
           metadata: metadata_hash,
-          files:    [],
-          summary:  { offense_count: 0 }
+          files: [],
+          summary: { offense_count: 0 }
         }
       end
 
@@ -37,16 +37,16 @@ module RuboCop
       def metadata_hash
         {
           rubocop_version: RuboCop::Version::STRING,
-          ruby_engine:     RUBY_ENGINE,
-          ruby_version:    RUBY_VERSION,
+          ruby_engine: RUBY_ENGINE,
+          ruby_version: RUBY_VERSION,
           ruby_patchlevel: RUBY_PATCHLEVEL.to_s,
-          ruby_platform:   RUBY_PLATFORM
+          ruby_platform: RUBY_PLATFORM
         }
       end
 
       def hash_for_file(file, offenses)
         {
-          path:     smart_path(file),
+          path: smart_path(file),
           offenses: offenses.map { |o| hash_for_offense(o) }
         }
       end
@@ -54,7 +54,7 @@ module RuboCop
       def hash_for_offense(offense)
         {
           severity: offense.severity.name,
-          message:  offense.message,
+          message: offense.message,
           cop_name: offense.cop_name,
           corrected: offense.corrected?,
           location: hash_for_location(offense)
@@ -64,15 +64,15 @@ module RuboCop
       # TODO: Consider better solution for Offense#real_column.
       def hash_for_location(offense)
         {
-          start_line:        offense.line,
-          start_column:      offense.real_column,
-          last_line:   offense.last_line,
+          start_line: offense.line,
+          start_column: offense.real_column,
+          last_line: offense.last_line,
           last_column: offense.last_column,
-          length:      offense.location.length,
+          length: offense.location.length,
           # `line` and `column` exist for compatibility.
           # Use `start_line` and `start_column` instead.
-          line:        offense.line,
-          column:      offense.real_column
+          line: offense.line,
+          column: offense.real_column
         }
       end
     end

data/lib/rubocop/formatter/simple_text_formatter.rb

@@ -13,11 +13,11 @@ module RuboCop
       include PathUtil
 
       COLOR_FOR_SEVERITY = {
-        refactor:   :yellow,
+        refactor: :yellow,
         convention: :yellow,
-        warning:    :magenta,
-        error:      :red,
-        fatal:      :red
+        warning: :magenta,
+        error: :red,
+        fatal: :red
       }.freeze
 
       def started(_target_files)

data/lib/rubocop/magic_comment.rb

@@ -6,7 +6,7 @@ module RuboCop
   # @abstract parent of three different magic comment handlers
   class MagicComment
     # @see https://git.io/vMC1C IRB's pattern for matching magic comment tokens
-    TOKEN = /[[:alnum:]\-_]+/
+    TOKEN = /[[:alnum:]\-_]+/.freeze
 
     # Detect magic comment format and pass it to the appropriate wrapper.
     #
@@ -129,7 +129,7 @@ module RuboCop
     # @see https://www.gnu.org/software/emacs/manual/html_node/emacs/Specify-Coding.html
     # @see https://git.io/vMCXh Emacs handling in Ruby's parse.y
     class EmacsComment < EditorComment
-      FORMAT    = /\-\*\-(.+)\-\*\-/
+      FORMAT    = /\-\*\-(.+)\-\*\-/.freeze
       SEPARATOR = ';'.freeze
       OPERATOR  = ':'.freeze
 
@@ -140,7 +140,7 @@ module RuboCop
       private
 
       def extract_frozen_string_literal
-        match('frozen_string_literal')
+        match('frozen[_-]string[_-]literal')
       end
     end
 
@@ -153,7 +153,7 @@ module RuboCop
     #
     #   comment.encoding # => 'ascii-8bit'
     class VimComment < EditorComment
-      FORMAT    = /#\s*vim:\s*(.+)/
+      FORMAT    = /#\s*vim:\s*(.+)/.freeze
       SEPARATOR = ', '.freeze
       OPERATOR  = '='.freeze