rubocop 1.32.0 → 1.34.1

data/lib/rubocop/server/cache.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'pathname'
+require_relative '../cache_config'
+require_relative '../config_finder'
 
 #
 # This code is based on https://github.com/fohte/rubocop-daemon.
@@ -19,6 +21,8 @@ module RuboCop
       GEMFILE_NAMES = %w[Gemfile gems.rb].freeze
 
       class << self
+        attr_accessor :cache_root_path
+
         # Searches for Gemfile or gems.rb in the current dir or any parent dirs
         def project_dir
           current_dir = Dir.pwd
@@ -38,12 +42,40 @@ module RuboCop
         end
 
         def dir
-          cache_path = File.expand_path('~/.cache/rubocop_cache/server')
           Pathname.new(File.join(cache_path, project_dir_cache_key)).tap do |d|
             d.mkpath unless d.exist?
           end
         end
 
+        def cache_path
+          cache_root_dir = if cache_root_path
+                             File.join(cache_root_path, 'rubocop_cache')
+                           else
+                             cache_root_dir_from_config
+                           end
+
+          File.expand_path(File.join(cache_root_dir, 'server'))
+        end
+
+        def cache_root_dir_from_config
+          CacheConfig.root_dir do
+            # `RuboCop::ConfigStore` has heavy dependencies, this is a lightweight implementation
+            # so that only the necessary `CacheRootDirectory` can be obtained.
+            require 'yaml'
+
+            config_path = ConfigFinder.find_config_path(Dir.pwd)
+
+            # Ruby 3.1+
+            config_yaml = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('4.0.0')
+                            YAML.safe_load_file(config_path, permitted_classes: [Regexp, Symbol])
+                          else
+                            YAML.load_file(config_path)
+                          end
+
+            config_yaml.dig('AllCops', 'CacheRootDirectory')
+          end
+        end
+
         def port_path
           dir.join('port')
         end

data/lib/rubocop/server/cli.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'optparse'
 require 'rainbow'
 
 #
@@ -30,6 +29,7 @@ module RuboCop
         @exit = false
       end
 
+      # rubocop:disable Metrics/MethodLength
       def run(argv = ARGV)
         unless Server.support_server?
           return error('RuboCop server is not supported by this Ruby.') if use_server_option?(argv)
@@ -37,6 +37,7 @@ module RuboCop
           return STATUS_SUCCESS
         end
 
+        Cache.cache_root_path = fetch_cache_root_path_from(argv)
         deleted_server_arguments = delete_server_argument_from(argv)
 
         if deleted_server_arguments.size >= 2
@@ -45,7 +46,7 @@ module RuboCop
 
         server_command = deleted_server_arguments.first
 
-        if EXCLUSIVE_OPTIONS.include?(server_command) && argv.count >= 2
+        if EXCLUSIVE_OPTIONS.include?(server_command) && argv.count > allowed_option_count
           return error("#{server_command} cannot be combined with other options.")
         end
 
@@ -53,6 +54,7 @@ module RuboCop
 
         STATUS_SUCCESS
       end
+      # rubocop:enable Metrics/MethodLength
 
       def exit?
         @exit
@@ -83,6 +85,17 @@ module RuboCop
       end
       # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength:
 
+      def fetch_cache_root_path_from(arguments)
+        cache_root = arguments.detect { |argument| argument.start_with?('--cache-root') }
+        return unless cache_root
+
+        if cache_root.start_with?('--cache-root=')
+          cache_root.split('=')[1]
+        else
+          arguments[arguments.index(cache_root) + 1]
+        end
+      end
+
       def delete_server_argument_from(all_arguments)
         SERVER_OPTIONS.each_with_object([]) do |server_option, server_arguments|
           server_arguments << all_arguments.delete(server_option)
@@ -93,6 +106,10 @@ module RuboCop
         (argv & SERVER_OPTIONS).any?
       end
 
+      def allowed_option_count
+        Cache.cache_root_path ? 2 : 1
+      end
+
       def error(message)
         @exit = true
         warn Rainbow(message).red

data/lib/rubocop/version.rb

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

data/lib/rubocop.rb

@@ -16,6 +16,7 @@ require 'rubocop-ast'
 require_relative 'rubocop/ast_aliases'
 require_relative 'rubocop/ext/regexp_node'
 require_relative 'rubocop/ext/regexp_parser'
+require_relative 'rubocop/ext/range'
 
 require_relative 'rubocop/core_ext/string'
 require_relative 'rubocop/ext/processed_source'
@@ -86,7 +87,6 @@ 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_transform_method'
-require_relative 'rubocop/cop/mixin/ignored_methods'
 require_relative 'rubocop/cop/mixin/integer_node'
 require_relative 'rubocop/cop/mixin/interpolation'
 require_relative 'rubocop/cop/mixin/line_length_help'
@@ -690,6 +690,7 @@ require_relative 'rubocop/config_obsoletion/split_cop'
 require_relative 'rubocop/config_obsoletion'
 require_relative 'rubocop/config_store'
 require_relative 'rubocop/config_validator'
+require_relative 'rubocop/feature_loader'
 require_relative 'rubocop/lockfile'
 require_relative 'rubocop/target_finder'
 require_relative 'rubocop/directive_comment'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.32.0
+  version: 1.34.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -46,14 +46,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0.0
+        version: 3.1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0.0
+        version: 3.1.2.1
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 1.20.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.19.1
+        version: 1.20.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -208,6 +208,7 @@ files:
 - exe/rubocop
 - lib/rubocop.rb
 - lib/rubocop/ast_aliases.rb
+- lib/rubocop/cache_config.rb
 - lib/rubocop/cached_data.rb
 - lib/rubocop/cli.rb
 - lib/rubocop/cli/command.rb
@@ -222,6 +223,7 @@ files:
 - lib/rubocop/cli/environment.rb
 - lib/rubocop/comment_config.rb
 - lib/rubocop/config.rb
+- lib/rubocop/config_finder.rb
 - lib/rubocop/config_loader.rb
 - lib/rubocop/config_loader_resolver.rb
 - lib/rubocop/config_obsoletion.rb
@@ -298,6 +300,7 @@ files:
 - lib/rubocop/cop/internal_affairs/redundant_location_argument.rb
 - lib/rubocop/cop/internal_affairs/redundant_message_argument.rb
 - lib/rubocop/cop/internal_affairs/redundant_method_dispatch_node.rb
+- lib/rubocop/cop/internal_affairs/single_line_comparison.rb
 - lib/rubocop/cop/internal_affairs/style_detected_api_use.rb
 - lib/rubocop/cop/internal_affairs/undefined_config.rb
 - lib/rubocop/cop/internal_affairs/useless_message_assertion.rb
@@ -581,7 +584,6 @@ files:
 - lib/rubocop/cop/mixin/hash_shorthand_syntax.rb
 - lib/rubocop/cop/mixin/hash_transform_method.rb
 - lib/rubocop/cop/mixin/heredoc.rb
-- lib/rubocop/cop/mixin/ignored_methods.rb
 - lib/rubocop/cop/mixin/integer_node.rb
 - lib/rubocop/cop/mixin/interpolation.rb
 - lib/rubocop/cop/mixin/line_length_help.rb
@@ -897,8 +899,10 @@ files:
 - lib/rubocop/directive_comment.rb
 - lib/rubocop/error.rb
 - lib/rubocop/ext/processed_source.rb
+- lib/rubocop/ext/range.rb
 - lib/rubocop/ext/regexp_node.rb
 - lib/rubocop/ext/regexp_parser.rb
+- lib/rubocop/feature_loader.rb
 - lib/rubocop/file_finder.rb
 - lib/rubocop/formatter.rb
 - lib/rubocop/formatter/auto_gen_config_formatter.rb
@@ -971,7 +975,7 @@ metadata:
   homepage_uri: https://rubocop.org/
   changelog_uri: https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.32/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.34/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
   rubygems_mfa_required: 'true'
 post_install_message: 
@@ -989,7 +993,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Automatic Ruby code style checking tool.

data/lib/rubocop/cop/mixin/ignored_methods.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    # This module encapsulates the ability to ignore certain methods when
-    # parsing.
-    # Cops that use `IgnoredMethods` can accept either strings or regexes to match
-    # against.
-    module IgnoredMethods
-      # Configuration for IgnoredMethods. It is added to classes that include
-      # the module so that configuration can be set using the `ignored_methods`
-      # class macro.
-      module Config
-        attr_accessor :deprecated_key
-
-        def ignored_methods(**config)
-          self.deprecated_key = config[:deprecated_key]
-        end
-      end
-
-      def self.included(base)
-        base.extend(Config)
-      end
-
-      def ignored_method?(name)
-        ignored_methods.any? do |value|
-          case value
-          when Regexp
-            value.match? String(name)
-          else
-            value == String(name)
-          end
-        end
-      end
-
-      def ignored_methods
-        keys = %w[IgnoredMethods]
-        keys << deprecated_key if deprecated_key
-
-        cop_config.slice(*keys).values.reduce(&:concat)
-      end
-
-      private
-
-      def deprecated_key
-        return unless self.class.respond_to?(:deprecated_key)
-
-        self.class.deprecated_key&.to_s
-      end
-    end
-  end
-end