rubocop 1.34.0 → 1.35.1

data/lib/rubocop/feature_loader.rb

@@ -30,14 +30,20 @@ module RuboCop
     end
 
     def load
-      ::Kernel.require(target)
+      # Don't use `::Kernel.require(target)` to prevent the following error:
+      # https://github.com/rubocop/rubocop/issues/10893
+      require(target)
     rescue ::LoadError => e
       raise if e.path != target
 
       begin
-        ::Kernel.require(namespaced_target)
+        # Don't use `::Kernel.require(target)` to prevent the following error:
+        # https://github.com/rubocop/rubocop/issues/10893
+        require(namespaced_target)
       rescue ::LoadError => error_for_namespaced_target
-        raise e if error_for_namespaced_target.path == namespaced_target
+        # NOTE: This wrap is necessary due to JRuby 9.3.4.0 incompatibility:
+        # https://github.com/jruby/jruby/issues/7316
+        raise LoadError, e if error_for_namespaced_target.path == namespaced_target
 
         raise error_for_namespaced_target
       end

data/lib/rubocop/formatter/html_formatter.rb

@@ -93,12 +93,12 @@ module RuboCop
 
         def highlighted_source_line(offense)
           source_before_highlight(offense) +
-            hightlight_source_tag(offense) +
+            highlight_source_tag(offense) +
             source_after_highlight(offense) +
             possible_ellipses(offense.location)
         end
 
-        def hightlight_source_tag(offense)
+        def highlight_source_tag(offense)
           "<span class=\"highlight #{offense.severity}\">" \
             "#{escape(offense.highlighted_area.source)}" \
             '</span>'

data/lib/rubocop/server/cache.rb

@@ -62,17 +62,20 @@ module RuboCop
             # `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
+            require 'erb'
+            file_contents = File.read(config_path)
+            yaml_code = ERB.new(file_contents).result
+
+            config_yaml = YAML.safe_load(yaml_code, permitted_classes: [Regexp, Symbol])
+
+            # For compatibility with Ruby 3.0 or lower.
+            if Gem::Version.new(Psych::VERSION) < Gem::Version.new('4.0.0')
+              config_yaml == false ? nil : config_yaml
+            end
 
-            config_yaml.dig('AllCops', 'CacheRootDirectory')
+            config_yaml&.dig('AllCops', 'CacheRootDirectory')
           end
         end
 

data/lib/rubocop/version.rb

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

data/lib/rubocop.rb

@@ -48,6 +48,7 @@ require_relative 'rubocop/cop/severity'
 require_relative 'rubocop/cop/generator'
 require_relative 'rubocop/cop/generator/configuration_injector'
 require_relative 'rubocop/cop/generator/require_file_injector'
+require_relative 'rubocop/magic_comment'
 
 require_relative 'rubocop/cop/variable_force'
 require_relative 'rubocop/cop/variable_force/branch'
@@ -529,6 +530,7 @@ require_relative 'rubocop/cop/style/keyword_parameters_order'
 require_relative 'rubocop/cop/style/lambda'
 require_relative 'rubocop/cop/style/lambda_call'
 require_relative 'rubocop/cop/style/line_end_concatenation'
+require_relative 'rubocop/cop/style/magic_comment_format'
 require_relative 'rubocop/cop/style/map_to_hash'
 require_relative 'rubocop/cop/style/method_call_without_args_parentheses'
 require_relative 'rubocop/cop/style/method_call_with_args_parentheses'
@@ -695,14 +697,13 @@ require_relative 'rubocop/lockfile'
 require_relative 'rubocop/target_finder'
 require_relative 'rubocop/directive_comment'
 require_relative 'rubocop/comment_config'
-require_relative 'rubocop/magic_comment'
 require_relative 'rubocop/result_cache'
 require_relative 'rubocop/runner'
 require_relative 'rubocop/cli'
 require_relative 'rubocop/cli/command'
 require_relative 'rubocop/cli/environment'
 require_relative 'rubocop/cli/command/base'
-require_relative 'rubocop/cli/command/auto_genenerate_config'
+require_relative 'rubocop/cli/command/auto_generate_config'
 require_relative 'rubocop/cli/command/execute_runner'
 require_relative 'rubocop/cli/command/init_dotfile'
 require_relative 'rubocop/cli/command/show_cops'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.34.0
+  version: 1.35.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -120,7 +120,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.20.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.20.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -212,7 +212,7 @@ files:
 - lib/rubocop/cached_data.rb
 - lib/rubocop/cli.rb
 - lib/rubocop/cli/command.rb
-- lib/rubocop/cli/command/auto_genenerate_config.rb
+- lib/rubocop/cli/command/auto_generate_config.rb
 - lib/rubocop/cli/command/base.rb
 - lib/rubocop/cli/command/execute_runner.rb
 - lib/rubocop/cli/command/init_dotfile.rb
@@ -293,6 +293,7 @@ files:
 - lib/rubocop/cop/internal_affairs/node_destructuring.rb
 - lib/rubocop/cop/internal_affairs/node_matcher_directive.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/redundant_context_config_parameter.rb
 - lib/rubocop/cop/internal_affairs/redundant_described_class_as_subject.rb
@@ -748,6 +749,7 @@ files:
 - lib/rubocop/cop/style/lambda.rb
 - lib/rubocop/cop/style/lambda_call.rb
 - lib/rubocop/cop/style/line_end_concatenation.rb
+- lib/rubocop/cop/style/magic_comment_format.rb
 - lib/rubocop/cop/style/map_compact_with_conditional_block.rb
 - lib/rubocop/cop/style/map_to_hash.rb
 - lib/rubocop/cop/style/method_call_with_args_parentheses.rb
@@ -975,7 +977,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.34/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.35/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
   rubygems_mfa_required: 'true'
 post_install_message: 
@@ -993,7 +995,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Automatic Ruby code style checking tool.