rubocop 1.12.0 → 1.13.0

data/lib/rubocop/config_obsoletion/cop_rule.rb

@@ -17,8 +17,7 @@ module RuboCop
       end
 
       def message
-        rule_message + "\n(obsolete configuration found in " \
-                       "#{smart_loaded_path}, please update it)"
+        rule_message + "\n(obsolete configuration found in #{smart_loaded_path}, please update it)"
       end
 
       # Cop rules currently can only be failures, not warnings

data/lib/rubocop/config_store.rb

@@ -27,8 +27,7 @@ module RuboCop
 
     def options_config=(options_config)
       loaded_config = ConfigLoader.load_file(options_config)
-      @options_config = ConfigLoader.merge_with_default(loaded_config,
-                                                        options_config)
+      @options_config = ConfigLoader.merge_with_default(loaded_config, options_config)
     end
 
     def force_default_config!

data/lib/rubocop/config_validator.rb

@@ -9,8 +9,7 @@ module RuboCop
     extend Forwardable
 
     # @api private
-    COMMON_PARAMS = %w[Exclude Include Severity inherit_mode
-                       AutoCorrect StyleGuide Details].freeze
+    COMMON_PARAMS = %w[Exclude Include Severity inherit_mode AutoCorrect StyleGuide Details].freeze
     # @api private
     INTERNAL_PARAMS = %w[Description StyleGuide
                          VersionAdded VersionChanged VersionRemoved
@@ -60,8 +59,7 @@ module RuboCop
     def validate_section_presence(name)
       return unless @config.key?(name) && @config[name].nil?
 
-      raise ValidationError,
-            "empty section #{name} found in #{smart_loaded_path}"
+      raise ValidationError, "empty section #{name} found in #{smart_loaded_path}"
     end
 
     private
@@ -123,8 +121,7 @@ module RuboCop
       syntax_config = @config['Lint/Syntax']
       default_config = ConfigLoader.default_configuration['Lint/Syntax']
 
-      return unless syntax_config &&
-                    default_config.merge(syntax_config) != default_config
+      return unless syntax_config && default_config.merge(syntax_config) != default_config
 
       raise ValidationError,
             "configuration for Syntax cop found in #{smart_loaded_path}\n" \
@@ -133,8 +130,7 @@ module RuboCop
 
     def validate_new_cops_parameter
       new_cop_parameter = @config.for_all_cops['NewCops']
-      return if new_cop_parameter.nil? ||
-                NEW_COPS_VALUES.include?(new_cop_parameter)
+      return if new_cop_parameter.nil? || NEW_COPS_VALUES.include?(new_cop_parameter)
 
       message = "invalid #{new_cop_parameter} for `NewCops` found in" \
                 "#{smart_loaded_path}\n" \
@@ -208,8 +204,7 @@ module RuboCop
     def reject_conflicting_safe_settings
       @config.each do |name, cop_config|
         next unless cop_config.is_a?(Hash)
-        next unless cop_config['Safe'] == false &&
-                    cop_config['SafeAutoCorrect'] == true
+        next unless cop_config['Safe'] == false && cop_config['SafeAutoCorrect'] == true
 
         msg = 'Unsafe cops cannot have a safe auto-correction ' \
               "(section #{name} in #{smart_loaded_path})"

data/lib/rubocop/cop/autocorrect_logic.rb

@@ -21,8 +21,7 @@ module RuboCop
       end
 
       def safe_autocorrect?
-        cop_config.fetch('Safe', true) &&
-          cop_config.fetch('SafeAutoCorrect', true)
+        cop_config.fetch('Safe', true) && cop_config.fetch('SafeAutoCorrect', true)
       end
 
       def autocorrect_enabled?
@@ -68,9 +67,7 @@ module RuboCop
         begin_of_first_line = range.begin_pos - range.column
         end_of_first_line = begin_of_first_line + range.source_line.length
 
-        Parser::Source::Range.new(range.source_buffer,
-                                  begin_of_first_line,
-                                  end_of_first_line)
+        Parser::Source::Range.new(range.source_buffer, begin_of_first_line, end_of_first_line)
       end
 
       # Expand the given range to include all of any lines it covers. Does not
@@ -82,9 +79,7 @@ module RuboCop
         last_line_offset = last_line.length - range.last_column
         end_of_last_line = range.end_pos + last_line_offset
 
-        Parser::Source::Range.new(range.source_buffer,
-                                  begin_of_first_line,
-                                  end_of_last_line)
+        Parser::Source::Range.new(range.source_buffer, begin_of_first_line, end_of_last_line)
       end
 
       def max_line_length

data/lib/rubocop/cop/badge.rb

@@ -38,8 +38,7 @@ module RuboCop
       end
 
       def match?(other)
-        cop_name == other.cop_name &&
-          (!qualified? || department == other.department)
+        cop_name == other.cop_name && (!qualified? || department == other.department)
       end
 
       def to_s

data/lib/rubocop/cop/base.rb

@@ -187,8 +187,7 @@ module RuboCop
       def self.match?(given_names)
         return false unless given_names
 
-        given_names.include?(cop_name) ||
-          given_names.include?(department.to_s)
+        given_names.include?(cop_name) || given_names.include?(department.to_s)
       end
 
       def cop_name
@@ -206,13 +205,11 @@ module RuboCop
       end
 
       def config_to_allow_offenses
-        Formatter::DisabledConfigFormatter
-          .config_to_allow_offenses[cop_name] ||= {}
+        Formatter::DisabledConfigFormatter.config_to_allow_offenses[cop_name] ||= {}
       end
 
       def config_to_allow_offenses=(hash)
-        Formatter::DisabledConfigFormatter.config_to_allow_offenses[cop_name] =
-          hash
+        Formatter::DisabledConfigFormatter.config_to_allow_offenses[cop_name] = hash
       end
 
       def target_ruby_version
@@ -233,6 +230,11 @@ module RuboCop
         !relevant_file?(file)
       end
 
+      # There should be very limited reasons for a Cop to do it's own parsing
+      def parse(source, path = nil)
+        ProcessedSource.new(source, target_ruby_version, path)
+      end
+
       ### Persistence
 
       # Override if your cop should be called repeatedly for multiple investigations

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

@@ -83,8 +83,7 @@ module RuboCop
 
         def register_offense(node, gem_name, line_of_first_occurrence)
           line_range = node.loc.column...node.loc.last_column
-          offense_location =
-            source_range(processed_source.buffer, node.first_line, line_range)
+          offense_location = source_range(processed_source.buffer, node.first_line, line_range)
           message = format(
             MSG,
             gem_name: gem_name,

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

@@ -3,15 +3,24 @@
 module RuboCop
   module Cop
     module Bundler
-      # Add a comment describing each gem in your Gemfile.
+      # Each gem in the Gemfile should have a comment explaining
+      # its purpose in the project, or the reason for its version
+      # or source.
       #
-      # Optionally, the "OnlyFor" configuration
+      # The optional "OnlyFor" configuration array
       # can be used to only register offenses when the gems
       # use certain options or have version specifiers.
-      # Add "version_specifiers" and/or the gem option names
-      # you want to check.
       #
-      # A useful use-case is to enforce a comment when using
+      # When "version_specifiers" is included, a comment
+      # will be enforced if the gem has any version specifier.
+      #
+      # When "restrictive_version_specifiers" is included, a comment
+      # will be enforced if the gem has a version specifier that
+      # holds back the version of the gem.
+      #
+      # For any other value in the array, a comment will be enforced for
+      # a gem if an option by the same name is present.
+      # A useful use case is to enforce a comment when using
       # options that change the source of a gem:
       #
       # - `bitbucket`
@@ -21,7 +30,8 @@ module RuboCop
       # - `source`
       #
       # For a full list of options supported by bundler,
-      # you can check the https://bundler.io/man/gemfile.5.html[official documentation].
+      # see https://bundler.io/man/gemfile.5.html
+      # .
       #
       # @example OnlyFor: [] (default)
       #   # bad
@@ -43,6 +53,18 @@ module RuboCop
       #   # Version 2.1 introduces breaking change baz
       #   gem 'foo', '< 2.1'
       #
+      # @example OnlyFor: ['restrictive_version_specifiers']
+      #   # bad
+      #
+      #   gem 'foo', '< 2.1'
+      #
+      #   # good
+      #
+      #   gem 'foo', '>= 1.0'
+      #
+      #   # Version 2.1 introduces breaking change baz
+      #   gem 'foo', '< 2.1'
+      #
       # @example OnlyFor: ['version_specifiers', 'github']
       #   # bad
       #
@@ -64,6 +86,8 @@ module RuboCop
         MSG = 'Missing gem description comment.'
         CHECKED_OPTIONS_CONFIG = 'OnlyFor'
         VERSION_SPECIFIERS_OPTION = 'version_specifiers'
+        RESTRICTIVE_VERSION_SPECIFIERS_OPTION = 'restrictive_version_specifiers'
+        RESTRICTIVE_VERSION_PATTERN = /<|~>/.freeze
         RESTRICT_ON_SEND = %i[gem].freeze
 
         # @!method gem_declaration?(node)
@@ -102,8 +126,7 @@ module RuboCop
         end
 
         def preceding_comment?(node1, node2)
-          node1 && node2 && precede?(node2, node1) &&
-            comment_line?(node2.loc.expression.source)
+          node1 && node2 && precede?(node2, node1) && comment_line?(node2.loc.expression.source)
         end
 
         def ignored_gem?(node)
@@ -114,6 +137,8 @@ module RuboCop
         def checked_options_present?(node)
           (cop_config[CHECKED_OPTIONS_CONFIG].include?(VERSION_SPECIFIERS_OPTION) &&
             version_specified_gem?(node)) ||
+            (cop_config[CHECKED_OPTIONS_CONFIG].include?(RESTRICTIVE_VERSION_SPECIFIERS_OPTION) &&
+              restrictive_version_specified_gem?(node)) ||
             contains_checked_options?(node)
         end
 
@@ -124,6 +149,15 @@ module RuboCop
           node.arguments[1]&.str_type?
         end
 
+        # Version specifications that restrict all updates going forward. This excludes versions
+        # like ">= 1.0" or "!= 2.0.3".
+        def restrictive_version_specified_gem?(node)
+          return unless version_specified_gem?(node)
+
+          node.arguments
+              .any? { |arg| arg&.str_type? && RESTRICTIVE_VERSION_PATTERN.match?(arg.to_s) }
+        end
+
         def contains_checked_options?(node)
           (Array(cop_config[CHECKED_OPTIONS_CONFIG]) & gem_options(node).map(&:to_s)).any?
         end

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

@@ -38,10 +38,7 @@ module RuboCop
           gem_declarations(processed_source.ast)
             .each_cons(2) do |previous, current|
             next unless consecutive_lines(previous, current)
-            next unless case_insensitive_out_of_order?(
-              gem_name(current),
-              gem_name(previous)
-            )
+            next unless case_insensitive_out_of_order?(gem_name(current), gem_name(previous))
 
             register_offense(previous, current)
           end

data/lib/rubocop/cop/commissioner.rb

@@ -143,20 +143,14 @@ module RuboCop
         map = {}
         callbacks&.select! do |cop|
           restrictions = cop.class.send :restrict_on_send
-          restrictions.each do |name|
-            (map[name] ||= []) << cop
-          end
+          restrictions.each { |name| (map[name] ||= []) << cop }
           restrictions.empty?
         end
         map
       end
 
       def invoke(callback, cops, *args)
-        cops.each do |cop|
-          with_cop_error_handling(cop) do
-            cop.send(callback, *args)
-          end
-        end
+        cops.each { |cop| with_cop_error_handling(cop) { cop.send(callback, *args) } }
       end
 
       # Allow blind rescues here, since we're absorbing and packaging or

data/lib/rubocop/cop/cop.rb

@@ -18,9 +18,7 @@ module RuboCop
         def call(corrector)
           lambda.call(corrector)
         rescue StandardError => e
-          raise ErrorWithAnalyzedFileLocation.new(
-            cause: e, node: node, cop: cop
-          )
+          raise ErrorWithAnalyzedFileLocation.new(cause: e, node: node, cop: cop)
         end
       end
 
@@ -55,9 +53,7 @@ module RuboCop
         return unless method_defined?(:join_force?)
 
         cop = new
-        Force.all.select do |force_class|
-          cop.join_force?(force_class)
-        end
+        Force.all.select { |force_class| cop.join_force?(force_class) }
       end
 
       # @deprecated
@@ -97,12 +93,6 @@ module RuboCop
         Registry.qualified_cop_name(name, origin)
       end
 
-      # @deprecated
-      # Open issue if there's a valid use case to include this in Base
-      def parse(source, path = nil)
-        ProcessedSource.new(source, target_ruby_version, path)
-      end
-
       private
 
       def begin_investigation(processed_source)
@@ -130,17 +120,13 @@ module RuboCop
 
         return unless lambda
 
-        suppress_clobbering do
-          lambda.call(corrector)
-        end
+        suppress_clobbering { lambda.call(corrector) }
       end
 
       def correction_lambda
         return unless support_autocorrect?
 
-        dedup_on_node(@v0_argument) do
-          autocorrect(@v0_argument)
-        end
+        dedup_on_node(@v0_argument) { autocorrect(@v0_argument) }
       end
 
       def dedup_on_node(node)

data/lib/rubocop/cop/corrector.rb

@@ -36,10 +36,7 @@ module RuboCop
       # @param [Integer] size
       def remove_preceding(node_or_range, size)
         range = to_range(node_or_range)
-        to_remove = range.with(
-          begin_pos: range.begin_pos - size,
-          end_pos:   range.begin_pos
-        )
+        to_remove = range.with(begin_pos: range.begin_pos - size, end_pos: range.begin_pos)
         remove(to_remove)
       end
 

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

@@ -54,8 +54,7 @@ module RuboCop
         def inside_string_ranges(node)
           return [] unless node.is_a?(Parser::AST::Node)
 
-          node.each_node(:str, :dstr, :xstr).map { |n| inside_string_range(n) }
-              .compact
+          node.each_node(:str, :dstr, :xstr).map { |n| inside_string_range(n) }.compact
         end
 
         def inside_string_range(node)
@@ -76,8 +75,7 @@ module RuboCop
         def delimited_string_literal?(node)
           loc = node.location
 
-          loc.respond_to?(:begin) && loc.begin &&
-            loc.respond_to?(:end) && loc.end
+          loc.respond_to?(:begin) && loc.begin && loc.respond_to?(:end) && loc.end
         end
 
         def block_comment_within?(expr)
@@ -89,8 +87,7 @@ module RuboCop
         def calculate_range(expr, line_begin_pos, column_delta)
           return range_between(line_begin_pos, line_begin_pos) if column_delta.positive?
 
-          starts_with_space =
-            expr.source_buffer.source[line_begin_pos].start_with?(' ')
+          starts_with_space = expr.source_buffer.source[line_begin_pos].start_with?(' ')
 
           if starts_with_space
             range_between(line_begin_pos, line_begin_pos + column_delta.abs)

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

@@ -6,8 +6,7 @@ module RuboCop
     class EachToForCorrector
       extend NodePattern::Macros
 
-      CORRECTION_WITH_ARGUMENTS =
-        'for %<variables>s in %<collection>s do'
+      CORRECTION_WITH_ARGUMENTS = 'for %<variables>s in %<collection>s do'
       CORRECTION_WITHOUT_ARGUMENTS = 'for _ in %<enumerable>s do'
 
       def initialize(block_node)
@@ -30,8 +29,7 @@ module RuboCop
                  collection: collection_node.source,
                  variables: argument_node.children.first.source)
         else
-          format(CORRECTION_WITHOUT_ARGUMENTS,
-                 enumerable: collection_node.source)
+          format(CORRECTION_WITHOUT_ARGUMENTS, enumerable: collection_node.source)
         end
       end
 

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

@@ -23,8 +23,7 @@ module RuboCop
       attr_reader :for_node, :variable_node, :collection_node
 
       def correction
-        format(CORRECTION, collection: collection_source,
-                           argument: variable_node.source)
+        format(CORRECTION, collection: collection_source, argument: variable_node.source)
       end
 
       def collection_source

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

@@ -20,8 +20,7 @@ module RuboCop
 
           break_line_before(range: range, node: node, corrector: corrector,
                             configured_width: configured_width)
-          move_comment(eol_comment: eol_comment, node: node,
-                       corrector: corrector)
+          move_comment(eol_comment: eol_comment, node: node, corrector: corrector)
           remove_semicolon(node, corrector)
         end
 
@@ -29,8 +28,7 @@ module RuboCop
                               indent_steps: 1)
           corrector.insert_before(
             range,
-            "\n#{' ' * (node.loc.keyword.column +
-                          indent_steps * configured_width)}"
+            "\n#{' ' * (node.loc.keyword.column + indent_steps * configured_width)}"
           )
         end
 
@@ -38,8 +36,7 @@ module RuboCop
           return unless eol_comment
 
           text = eol_comment.loc.expression.source
-          corrector.insert_before(node,
-                                  "#{text}\n#{' ' * node.loc.keyword.column}")
+          corrector.insert_before(node, "#{text}\n#{' ' * node.loc.keyword.column}")
           corrector.remove(eol_comment)
         end