rubocop 1.70.0 → 1.71.1

data/lib/rubocop/result_cache.rb

@@ -25,16 +25,16 @@ module RuboCop
     # cleaning should be done relatively seldom, since there is a slight risk
     # that some other RuboCop process was just about to read the file, when
     # there's parallel execution and the cache is shared.
-    def self.cleanup(config_store, verbose, cache_root = nil)
+    def self.cleanup(config_store, verbose, cache_root_override = nil)
       return if inhibit_cleanup # OPTIMIZE: For faster testing
 
-      cache_root ||= cache_root(config_store)
-      return unless File.exist?(cache_root)
+      rubocop_cache_dir = cache_root(config_store, cache_root_override)
+      return unless File.exist?(rubocop_cache_dir)
 
-      files, dirs = Find.find(cache_root).partition { |path| File.file?(path) }
+      files, dirs = Find.find(rubocop_cache_dir).partition { |path| File.file?(path) }
       return unless requires_file_removal?(files.length, config_store)
 
-      remove_oldest_files(files, dirs, cache_root, verbose)
+      remove_oldest_files(files, dirs, rubocop_cache_dir, verbose)
     end
 
     class << self
@@ -49,11 +49,11 @@ module RuboCop
         file_count > 1 && file_count > config_store.for_pwd.for_all_cops['MaxFilesInCache']
       end
 
-      def remove_oldest_files(files, dirs, cache_root, verbose)
+      def remove_oldest_files(files, dirs, rubocop_cache_dir, verbose)
         # Add 1 to half the number of files, so that we remove the file if
         # there's only 1 left.
         remove_count = (files.length / 2) + 1
-        puts "Removing the #{remove_count} oldest files from #{cache_root}" if verbose
+        puts "Removing the #{remove_count} oldest files from #{rubocop_cache_dir}" if verbose
         sorted = files.sort_by { |path| File.mtime(path) }
         remove_files(sorted, dirs, remove_count)
       rescue Errno::ENOENT
@@ -72,9 +72,9 @@ module RuboCop
       end
     end
 
-    def self.cache_root(config_store)
+    def self.cache_root(config_store, cache_root_override = nil)
       CacheConfig.root_dir do
-        config_store.for_pwd.for_all_cops['CacheRootDirectory']
+        cache_root_override || config_store.for_pwd.for_all_cops['CacheRootDirectory']
       end
     end
 
@@ -84,12 +84,12 @@ module RuboCop
 
     attr_reader :path
 
-    def initialize(file, team, options, config_store, cache_root = nil)
-      cache_root ||= File.join(options[:cache_root], 'rubocop_cache') if options[:cache_root]
-      cache_root ||= ResultCache.cache_root(config_store)
+    def initialize(file, team, options, config_store, cache_root_override = nil)
+      cache_root_override ||= options[:cache_root] if options[:cache_root]
+      rubocop_cache_dir = ResultCache.cache_root(config_store, cache_root_override)
       @allow_symlinks_in_cache_location =
         ResultCache.allow_symlinks_in_cache_location?(config_store)
-      @path = File.join(cache_root,
+      @path = File.join(rubocop_cache_dir,
                         rubocop_checksum,
                         context_checksum(team, options),
                         file_checksum(file, config_store))

data/lib/rubocop/rspec/expect_offense.rb

@@ -190,7 +190,10 @@ module RuboCop
       def expect_no_offenses(source, file = nil)
         offenses = inspect_source(source, file)
 
-        expected_annotations = AnnotatedSource.parse(source)
+        # Since source given `expect_no_offenses` does not have annotations, we do not need to parse
+        # for them, and can just build an `AnnotatedSource` object from the source lines.
+        # This also prevents treating source lines that begin with a caret as an annotation.
+        expected_annotations = AnnotatedSource.new(source.each_line.to_a, [])
         actual_annotations = expected_annotations.with_offense_annotations(offenses)
         expect(actual_annotations.to_s).to eq(source)
       end
@@ -221,7 +224,8 @@ module RuboCop
 
       # Parsed representation of code annotated with the `^^^ Message` style
       class AnnotatedSource
-        ANNOTATION_PATTERN = /\A\s*(\^+|\^{}) ?/.freeze
+        # Ignore escaped carets, don't treat as annotations
+        ANNOTATION_PATTERN = /\A\s*((?<!\\)\^+|\^{}) ?/.freeze
         ABBREV = "[...]\n"
 
         # @param annotated_source [String] string passed to the matchers

data/lib/rubocop/rspec/support.rb

@@ -4,13 +4,12 @@
 
 require_relative 'cop_helper'
 require_relative 'expect_offense'
-require_relative 'host_environment_simulation_helper'
 require_relative 'parallel_formatter'
 require_relative 'shared_contexts'
 
 RSpec.configure do |config|
   config.include CopHelper
-  config.include HostEnvironmentSimulatorHelper
+  config.include RuboCop::RSpec::ExpectOffense
   config.include_context 'config', :config
   config.include_context 'isolated environment', :isolated_environment
   config.include_context 'isolated bundler', :isolated_bundler

data/lib/rubocop/target_finder.rb

@@ -127,6 +127,7 @@ module RuboCop
       if mode == :only_recognized_file_types || force_exclusion?
         files.select! { |file| included_file?(file) }
       end
+      files.reject! { |file| FileTest.directory?(file) }
 
       force_exclusion? ? without_excluded(files) : files
     end

data/lib/rubocop/version.rb

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

data/lib/rubocop.rb

@@ -100,6 +100,7 @@ require_relative 'rubocop/cop/mixin/frozen_string_literal'
 require_relative 'rubocop/cop/mixin/gem_declaration'
 require_relative 'rubocop/cop/mixin/gemspec_help'
 require_relative 'rubocop/cop/mixin/hash_alignment_styles'
+require_relative 'rubocop/cop/mixin/hash_subset'
 require_relative 'rubocop/cop/mixin/hash_transform_method'
 require_relative 'rubocop/cop/mixin/integer_node'
 require_relative 'rubocop/cop/mixin/interpolation'
@@ -293,6 +294,7 @@ require_relative 'rubocop/cop/lint/ambiguous_operator'
 require_relative 'rubocop/cop/lint/ambiguous_operator_precedence'
 require_relative 'rubocop/cop/lint/ambiguous_range'
 require_relative 'rubocop/cop/lint/ambiguous_regexp_literal'
+require_relative 'rubocop/cop/lint/array_literal_in_regexp'
 require_relative 'rubocop/cop/lint/assignment_in_condition'
 require_relative 'rubocop/cop/lint/big_decimal_new'
 require_relative 'rubocop/cop/lint/binary_operator_with_identical_operands'
@@ -559,6 +561,7 @@ require_relative 'rubocop/cop/style/hash_conversion'
 require_relative 'rubocop/cop/style/hash_each_methods'
 require_relative 'rubocop/cop/style/hash_except'
 require_relative 'rubocop/cop/style/hash_like_case'
+require_relative 'rubocop/cop/style/hash_slice'
 require_relative 'rubocop/cop/style/hash_syntax'
 require_relative 'rubocop/cop/style/hash_transform_keys'
 require_relative 'rubocop/cop/style/hash_transform_values'

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.70.0
+  version: 1.71.1
 platform: ruby
 authors:
 - Bozhidar Batsov
 - Jonas Arvidsson
 - Yuji Nakayama
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-01-10 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -114,7 +113,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.36.2
+        version: 1.38.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -124,7 +123,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.36.2
+        version: 1.38.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -280,9 +279,14 @@ files:
 - lib/rubocop/cop/internal_affairs/node_destructuring.rb
 - lib/rubocop/cop/internal_affairs/node_first_or_last_argument.rb
 - lib/rubocop/cop/internal_affairs/node_matcher_directive.rb
+- lib/rubocop/cop/internal_affairs/node_pattern_groups.rb
+- lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_processor.rb
+- lib/rubocop/cop/internal_affairs/node_pattern_groups/ast_walker.rb
+- lib/rubocop/cop/internal_affairs/node_type_multiple_predicates.rb
 - lib/rubocop/cop/internal_affairs/node_type_predicate.rb
 - lib/rubocop/cop/internal_affairs/numblock_handler.rb
 - lib/rubocop/cop/internal_affairs/offense_location_keyword.rb
+- lib/rubocop/cop/internal_affairs/on_send_without_on_csend.rb
 - lib/rubocop/cop/internal_affairs/operator_keyword.rb
 - lib/rubocop/cop/internal_affairs/processed_source_buffer_name.rb
 - lib/rubocop/cop/internal_affairs/redundant_context_config_parameter.rb
@@ -405,6 +409,7 @@ files:
 - lib/rubocop/cop/lint/ambiguous_operator_precedence.rb
 - lib/rubocop/cop/lint/ambiguous_range.rb
 - lib/rubocop/cop/lint/ambiguous_regexp_literal.rb
+- lib/rubocop/cop/lint/array_literal_in_regexp.rb
 - lib/rubocop/cop/lint/assignment_in_condition.rb
 - lib/rubocop/cop/lint/big_decimal_new.rb
 - lib/rubocop/cop/lint/binary_operator_with_identical_operands.rb
@@ -595,6 +600,7 @@ files:
 - lib/rubocop/cop/mixin/gemspec_help.rb
 - lib/rubocop/cop/mixin/hash_alignment_styles.rb
 - lib/rubocop/cop/mixin/hash_shorthand_syntax.rb
+- lib/rubocop/cop/mixin/hash_subset.rb
 - lib/rubocop/cop/mixin/hash_transform_method.rb
 - lib/rubocop/cop/mixin/heredoc.rb
 - lib/rubocop/cop/mixin/integer_node.rb
@@ -757,6 +763,7 @@ files:
 - lib/rubocop/cop/style/hash_each_methods.rb
 - lib/rubocop/cop/style/hash_except.rb
 - lib/rubocop/cop/style/hash_like_case.rb
+- lib/rubocop/cop/style/hash_slice.rb
 - lib/rubocop/cop/style/hash_syntax.rb
 - lib/rubocop/cop/style/hash_transform_keys.rb
 - lib/rubocop/cop/style/hash_transform_values.rb
@@ -1006,7 +1013,6 @@ files:
 - lib/rubocop/result_cache.rb
 - lib/rubocop/rspec/cop_helper.rb
 - lib/rubocop/rspec/expect_offense.rb
-- lib/rubocop/rspec/host_environment_simulation_helper.rb
 - lib/rubocop/rspec/parallel_formatter.rb
 - lib/rubocop/rspec/shared_contexts.rb
 - lib/rubocop/rspec/support.rb
@@ -1043,12 +1049,11 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://rubocop.org/
-  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.70.0
+  changelog_uri: https://github.com/rubocop/rubocop/releases/tag/v1.71.1
   source_code_uri: https://github.com/rubocop/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.70/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.71/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1063,8 +1068,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Automatic Ruby code style checking tool.
 test_files: []

data/lib/rubocop/rspec/host_environment_simulation_helper.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-# RuboCop can be run in contexts where unexpected other libraries are included,
-# which may interfere with its normal behavior. In order to test those
-# situations, it may be necessary to require another library for the duration
-# of one spec
-module HostEnvironmentSimulatorHelper
-  def in_its_own_process_with(*files)
-    if ::Process.respond_to?(:fork)
-      pid = ::Process.fork do
-        # Need to write coverage result under different name
-        if defined?(SimpleCov)
-          SimpleCov.command_name "rspec-fork-#{Process.pid}"
-          SimpleCov.pid = Process.pid
-        end
-
-        files.each { |file| require file }
-        yield
-      end
-      ::Process.wait(pid)
-
-      # assert that the block did not fail
-      expect($CHILD_STATUS).to be_success
-    else
-      warn 'Process.fork is not available.'
-    end
-  end
-end