rubocop 1.66.0 → 1.66.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 694e2b2b4a391c38f0afd3667beaf252adcf2fe68374a544cf14748cfc97dd80
-  data.tar.gz: ad3c46e7dbeaf3c94d16c7427458d2079e28ef58d08463af37ae2a1f6561b345
+  metadata.gz: 8a10568527197e80492a28c5b524fa524dbce965513daff4f47e260e03b49d98
+  data.tar.gz: 8ea447437cbd36aa805b3941cf51b07eecc9dc538ed6a4584f09a1335e21cb48
 SHA512:
-  metadata.gz: 8df7fd7e62c55adac6725b1d60e071c0021eed0434a84c40b86b9a32b27b3a5e9cd3debe9d3edd21fec732c0065553a7a8299f7810ffffde2d010f5231b657e5
-  data.tar.gz: 24192e071f881b02ac9c766b3d0847e8fa77d9e4ff5942c9a2cc72dd0f4d77412c13337a1b76bcd7e250e5a7b737ddf613764c0dccbb49b09fdc0f27b6a8c732
+  metadata.gz: 1f292c70ffac1cb186e5be899582c4849a29866722c87ab92a60a723dd16fe86fdf12073c8a7190bba197d246eae3b25ba3cdc6b586b28061cef39ac22b3b438
+  data.tar.gz: 2dbfc28779854fae0d28fd266ba269b92cb0e3b5c26200aa250df02ff9810804b7b1fcc289a43bac1913dc04c79f788487f9351444f7242cbcdad6854a821d69

data/lib/rubocop/comment_config.rb

@@ -4,6 +4,8 @@ module RuboCop
   # This class parses the special `rubocop:disable` comments in a source
   # and provides a way to check if each cop is enabled at arbitrary line.
   class CommentConfig
+    extend SimpleForwardable
+
     CONFIG_DISABLED_LINE_RANGE_MIN = -Float::INFINITY
 
     # This class provides an API compatible with RuboCop::DirectiveComment
@@ -27,19 +29,13 @@ module RuboCop
 
     attr_reader :processed_source
 
+    def_delegators :@processed_source, :config, :registry
+
     def initialize(processed_source)
       @processed_source = processed_source
       @no_directives = !processed_source.raw_source.include?('rubocop')
     end
 
-    def config
-      @processed_source.config
-    end
-
-    def registry
-      @processed_source.registry
-    end
-
     def cop_enabled_at_line?(cop, line_number)
       cop = cop.cop_name if cop.respond_to?(:cop_name)
       disabled_line_ranges = cop_disabled_line_ranges[cop]

data/lib/rubocop/config.rb

@@ -12,6 +12,7 @@ module RuboCop
   class Config
     include PathUtil
     include FileFinder
+    extend SimpleForwardable
 
     CopConfig = Struct.new(:name, :metadata)
 
@@ -59,22 +60,9 @@ module RuboCop
       self
     end
 
-    %i[[] []= delete dig each key? keys each_key fetch map merge replace to_h to_hash
-       transform_values].each do |method|
-      class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-        def #{method}(...)     # def key?(...)
-          @hash.#{method}(...) #   @hash.key?(...)
-        end                    # end
-      RUBY
-    end
-
-    def validate(...)
-      @validator.validate(...)
-    end
-
-    def target_ruby_version
-      @validator.target_ruby_version
-    end
+    def_delegators :@hash, :[], :[]=, :delete, :dig, :each, :key?, :keys, :each_key,
+                   :fetch, :map, :merge, :replace, :to_h, :to_hash, :transform_values
+    def_delegators :@validator, :validate, :target_ruby_version
 
     def to_s
       @to_s ||= @hash.to_s

data/lib/rubocop/config_loader.rb

@@ -67,8 +67,8 @@ module RuboCop
       def load_yaml_configuration(absolute_path)
         file_contents = read_file(absolute_path)
         yaml_code = Dir.chdir(File.dirname(absolute_path)) { ERB.new(file_contents).result }
-        check_duplication(yaml_code, absolute_path)
-        hash = yaml_safe_load(yaml_code, absolute_path) || {}
+        yaml_tree = check_duplication(yaml_code, absolute_path)
+        hash = yaml_tree_to_hash(yaml_tree) || {}
 
         puts "configuration from #{absolute_path}" if debug?
 
@@ -235,8 +235,8 @@ module RuboCop
         raise ConfigNotFoundError, "Configuration file not found: #{absolute_path}"
       end
 
-      def yaml_safe_load(yaml_code, filename)
-        yaml_safe_load!(yaml_code, filename)
+      def yaml_tree_to_hash(yaml_tree)
+        yaml_tree_to_hash!(yaml_tree)
       rescue ::StandardError
         if defined?(::SafeYAML)
           raise 'SafeYAML is unmaintained, no longer needed and should be removed'
@@ -245,10 +245,16 @@ module RuboCop
         raise
       end
 
-      def yaml_safe_load!(yaml_code, filename)
-        YAML.safe_load(
-          yaml_code, permitted_classes: [Regexp, Symbol], aliases: true, filename: filename
-        )
+      def yaml_tree_to_hash!(yaml_tree)
+        return nil unless yaml_tree
+
+        # Optimization: Because we checked for duplicate keys, we already have the
+        # yaml tree and don't need to parse it again.
+        # Also see https://github.com/ruby/psych/blob/v5.1.2/lib/psych.rb#L322-L336
+        class_loader = YAML::ClassLoader::Restricted.new(%w[Regexp Symbol], [])
+        scanner = YAML::ScalarScanner.new(class_loader)
+        visitor = YAML::Visitors::ToRuby.new(scanner, class_loader)
+        visitor.accept(yaml_tree)
       end
     end
 

data/lib/rubocop/config_validator.rb

@@ -3,7 +3,9 @@
 module RuboCop
   # Handles validation of configuration, for example cop names, parameter
   # names, and Ruby versions.
-  class ConfigValidator # rubocop:disable Metrics/ClassLength
+  class ConfigValidator
+    extend SimpleForwardable
+
     # @api private
     COMMON_PARAMS = %w[Exclude Include Severity inherit_mode AutoCorrect StyleGuide Details].freeze
     # @api private
@@ -19,20 +21,14 @@ module RuboCop
     CONFIG_CHECK_AUTOCORRECTS = %w[always contextual disabled].freeze
     private_constant :CONFIG_CHECK_KEYS, :CONFIG_CHECK_DEPARTMENTS
 
+    def_delegators :@config, :smart_loaded_path, :for_all_cops
+
     def initialize(config)
       @config = config
       @config_obsoletion = ConfigObsoletion.new(config)
       @target_ruby = TargetRuby.new(config)
     end
 
-    def smart_loaded_path
-      @config.smart_loaded_path
-    end
-
-    def for_all_cops
-      @config.for_all_cops
-    end
-
     def validate
       check_cop_config_value(@config)
       reject_conflicting_safe_settings

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

@@ -45,7 +45,7 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return if node.arguments.none?
+          return unless node.arguments.count == 2
           return unless valid_method_name?(node)
 
           actual_name = node.first_argument.value.to_s

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

@@ -179,6 +179,7 @@ module RuboCop
 
         def comment_in_else?(node)
           node = node.parent while node.if_type? && node.elsif?
+          return false unless node.else?
 
           processed_source.contains_comment?(node.loc.else.join(node.source_range.end))
         end

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

@@ -34,7 +34,7 @@ module RuboCop
         def_node_matcher :array_node, '(send (const {nil? cbase} :Array) :new (array)?)'
 
         # @!method hash_node(node)
-        def_node_matcher :hash_node, '(send (const {nil? cbase} :Hash) :new (array)?)'
+        def_node_matcher :hash_node, '(send (const {nil? cbase} :Hash) :new)'
 
         # @!method str_node(node)
         def_node_matcher :str_node, '(send (const {nil? cbase} :String) :new)'

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

@@ -36,10 +36,12 @@ module RuboCop
 
         private
 
+        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def message(node)
           template = if node.if_branch&.begin_type?
                        MSG_NEWLINE
-                     elsif node.else_branch&.if_type? || node.else_branch&.begin_type?
+                     elsif node.else_branch&.if_type? || node.else_branch&.begin_type? ||
+                           use_block_in_branches?(node)
                        MSG_IF_ELSE
                      else
                        MSG_TERNARY
@@ -47,15 +49,20 @@ module RuboCop
 
           format(template, expr: node.condition.source)
         end
+        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         def autocorrect(corrector, node)
-          if node.if_branch&.begin_type? || node.else_branch&.begin_type?
+          if node.branches.compact.any?(&:begin_type?) || use_block_in_branches?(node)
             corrector.replace(node.loc.begin, "\n")
           else
             corrector.replace(node, replacement(node))
           end
         end
 
+        def use_block_in_branches?(node)
+          node.branches.compact.any? { |branch| branch.block_type? || branch.numblock_type? }
+        end
+
         def replacement(node)
           return correct_elsif(node) if node.else_branch&.if_type?
 

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

@@ -105,26 +105,21 @@ module RuboCop
 
         # Value object to extract source ranges for the different parts of a magic comment
         class CommentRange
+          extend SimpleForwardable
+
           DIRECTIVE_REGEXP = Regexp.union(MagicComment::KEYWORDS.map do |_, v|
             Regexp.new(v, Regexp::IGNORECASE)
           end).freeze
 
           VALUE_REGEXP = Regexp.new("(?:#{DIRECTIVE_REGEXP}:\s*)(.*?)(?=;|$)")
 
+          def_delegators :@comment, :text, :loc
           attr_reader :comment
 
           def initialize(comment)
             @comment = comment
           end
 
-          def text
-            @comment.text
-          end
-
-          def loc
-            @comment.loc
-          end
-
           # A magic comment can contain one directive (normal style) or
           # multiple directives (emacs style)
           def directives

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

@@ -147,10 +147,8 @@ module RuboCop
             false
           when :begin, :kwbegin
             !node.right_sibling && return_value_used?(parent)
-          when :block, :numblock
-            !parent.void_context?
           else
-            true
+            !parent.respond_to?(:void_context?) || !parent.void_context?
           end
         end
 

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

@@ -16,7 +16,7 @@ module RuboCop
       #   "#{foo} bar".dup
       #
       #   # good
-      #  "#{foo} bar"
+      #   "#{foo} bar"
       #
       class RedundantInterpolationUnfreeze < Base
         include FrozenStringLiteral

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.66.0'
+    STRING = '1.66.1'
 
     MSG = '%<version>s (using %<parser_version>s, ' \
           'rubocop-ast %<rubocop_ast_version>s, ' \

data/lib/rubocop/yaml_duplication_checker.rb

@@ -16,6 +16,7 @@ module RuboCop
       return unless tree
 
       traverse(tree, &on_duplicated)
+      tree
     end
 
     def self.traverse(tree, &on_duplicated)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.66.0
+  version: 1.66.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.32.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -124,7 +124,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.32.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -1017,7 +1017,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://rubocop.org/
-  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.66.0
+  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.66.1
   source_code_uri: https://github.com/rubocop/rubocop/
   documentation_uri: https://docs.rubocop.org/rubocop/1.66/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues