rubocop 1.36.0 → 1.40.0

data/lib/rubocop/server/core.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'socket'
 require 'securerandom'
+require 'socket'
 
 #
 # This code is based on https://github.com/fohte/rubocop-daemon.
@@ -17,6 +17,8 @@ module RuboCop
     # The core of server process. It starts TCP server and perform socket communication.
     # @api private
     class Core
+      JSON_FORMATS = %w[json j].freeze
+
       def self.token
         @token ||= SecureRandom.hex(4)
       end
@@ -41,6 +43,7 @@ module RuboCop
 
         pid = fork do
           Process.daemon(true)
+          $stderr.reopen(Cache.stderr_path, 'w')
           Cache.write_pid_file do
             read_socket(@server.accept) until @server.closed?
           end
@@ -56,7 +59,12 @@ module RuboCop
       def start_server(host, port)
         @server = TCPServer.open(host, port)
 
-        puts "RuboCop server starting on #{@server.addr[3]}:#{@server.addr[1]}."
+        # JSON format does not expected output message when IDE integration with server mode.
+        # See: https://github.com/rubocop/rubocop/issues/11164
+        return if use_json_format?
+
+        output_stream = ARGV.include?('--stderr') ? $stderr : $stdout
+        output_stream.puts "RuboCop server starting on #{@server.addr[3]}:#{@server.addr[1]}."
       end
 
       def read_socket(socket)
@@ -74,6 +82,15 @@ module RuboCop
       ensure
         socket.close
       end
+
+      def use_json_format?
+        return true if ARGV.include?('--format=json') || ARGV.include?('--format=j')
+        return false unless (index = ARGV.index('--format'))
+
+        format = ARGV[index + 1]
+
+        JSON_FORMATS.include?(format)
+      end
     end
   end
 end

data/lib/rubocop/server/socket_reader.rb

@@ -24,13 +24,17 @@ module RuboCop
       def read!
         request = parse_request(@socket.read)
 
+        stderr = StringIO.new
         Helper.redirect(
           stdin: StringIO.new(request.body),
           stdout: @socket,
-          stderr: @socket
+          stderr: stderr
         ) do
           create_command_instance(request).run
         end
+      ensure
+        Cache.stderr_path.write(stderr.string)
+        @socket.close
       end
 
       private

data/lib/rubocop/server.rb

@@ -33,7 +33,7 @@ module RuboCop
       def running?
         return false unless support_server? # Never running.
 
-        Cache.dir.exist? && Cache.pid_path.file? && Cache.pid_running?
+        Cache.pid_running?
       end
 
       def wait_for_running_status!(expected)

data/lib/rubocop/target_ruby.rb

@@ -84,7 +84,7 @@ module RuboCop
     # @api private
     class ToolVersionsFile < RubyVersionFile
       TOOL_VERSIONS_FILENAME = '.tool-versions'
-      TOOL_VERSIONS_PATTERN = /\Aruby (?:ruby-)?(?<version>\d+\.\d+)/.freeze
+      TOOL_VERSIONS_PATTERN = /^(?:ruby )(?<version>\d+\.\d+)/.freeze
 
       def name
         "`#{TOOL_VERSIONS_FILENAME}`"

data/lib/rubocop/version.rb

@@ -3,11 +3,11 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.36.0'
+    STRING = '1.40.0'
 
     MSG = '%<version>s (using Parser %<parser_version>s, ' \
           'rubocop-ast %<rubocop_ast_version>s, ' \
-          'running on %<ruby_engine>s %<ruby_version>s)%<server>s [%<ruby_platform>s]'
+          'running on %<ruby_engine>s %<ruby_version>s)%<server_mode>s [%<ruby_platform>s]'
 
     CANONICAL_FEATURE_NAMES = { 'Rspec' => 'RSpec', 'Graphql' => 'GraphQL', 'Md' => 'Markdown',
                                 'Thread_safety' => 'ThreadSafety' }.freeze
@@ -19,7 +19,7 @@ module RuboCop
         verbose_version = format(MSG, version: STRING, parser_version: Parser::VERSION,
                                       rubocop_ast_version: RuboCop::AST::Version::STRING,
                                       ruby_engine: RUBY_ENGINE, ruby_version: RUBY_VERSION,
-                                      server: Server.running? ? ' +server' : '',
+                                      server_mode: server_mode,
                                       ruby_platform: RUBY_PLATFORM)
         return verbose_version unless env
 
@@ -89,5 +89,10 @@ module RuboCop
     def self.document_version
       STRING.match('\d+\.\d+').to_s
     end
+
+    # @api private
+    def self.server_mode
+      RuboCop.const_defined?(:Server) && Server.running? ? ' +server' : ''
+    end
   end
 end

data/lib/rubocop.rb

@@ -4,9 +4,9 @@ require 'English'
 before_us = $LOADED_FEATURES.dup
 require 'rainbow'
 
-require 'set'
 require 'forwardable'
 require 'regexp_parser'
+require 'set'
 require 'unicode/display_width'
 
 # we have to require RuboCop's version, before rubocop-ast's
@@ -14,21 +14,24 @@ require_relative 'rubocop/version'
 require 'rubocop-ast'
 
 require_relative 'rubocop/ast_aliases'
+require_relative 'rubocop/ext/range'
 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'
 
-require_relative 'rubocop/path_util'
+require_relative 'rubocop/error'
 require_relative 'rubocop/file_finder'
-require_relative 'rubocop/platform'
 require_relative 'rubocop/name_similarity'
+require_relative 'rubocop/optimized_patterns'
+require_relative 'rubocop/path_util'
+require_relative 'rubocop/platform'
 require_relative 'rubocop/string_interpreter'
-require_relative 'rubocop/error'
-require_relative 'rubocop/warning'
 require_relative 'rubocop/util'
+require_relative 'rubocop/warning'
+
+# rubocop:disable Style/RequireOrder
 
 require_relative 'rubocop/cop/util'
 require_relative 'rubocop/cop/offense'
@@ -292,6 +295,7 @@ require_relative 'rubocop/cop/lint/duplicate_branch'
 require_relative 'rubocop/cop/lint/duplicate_case_condition'
 require_relative 'rubocop/cop/lint/duplicate_elsif_condition'
 require_relative 'rubocop/cop/lint/duplicate_hash_key'
+require_relative 'rubocop/cop/lint/duplicate_magic_comment'
 require_relative 'rubocop/cop/lint/duplicate_methods'
 require_relative 'rubocop/cop/lint/duplicate_regexp_character_class_element'
 require_relative 'rubocop/cop/lint/duplicate_require'
@@ -439,6 +443,7 @@ require_relative 'rubocop/cop/style/alias'
 require_relative 'rubocop/cop/style/and_or'
 require_relative 'rubocop/cop/style/arguments_forwarding'
 require_relative 'rubocop/cop/style/array_coercion'
+require_relative 'rubocop/cop/style/array_intersect'
 require_relative 'rubocop/cop/style/array_join'
 require_relative 'rubocop/cop/style/ascii_comments'
 require_relative 'rubocop/cop/style/attr'
@@ -537,12 +542,16 @@ require_relative 'rubocop/cop/style/method_call_with_args_parentheses'
 require_relative 'rubocop/cop/style/multiline_in_pattern_then'
 require_relative 'rubocop/cop/style/numbered_parameters'
 require_relative 'rubocop/cop/style/open_struct_use'
+require_relative 'rubocop/cop/style/operator_method_call'
 require_relative 'rubocop/cop/style/redundant_assignment'
+require_relative 'rubocop/cop/style/redundant_constant_base'
+require_relative 'rubocop/cop/style/redundant_each'
 require_relative 'rubocop/cop/style/redundant_fetch_block'
 require_relative 'rubocop/cop/style/redundant_file_extension_in_require'
 require_relative 'rubocop/cop/style/redundant_initialize'
 require_relative 'rubocop/cop/style/redundant_self_assignment'
 require_relative 'rubocop/cop/style/redundant_self_assignment_branch'
+require_relative 'rubocop/cop/style/require_order'
 require_relative 'rubocop/cop/style/sole_nested_conditional'
 require_relative 'rubocop/cop/style/static_class'
 require_relative 'rubocop/cop/style/map_compact_with_conditional_block'
@@ -612,6 +621,7 @@ require_relative 'rubocop/cop/style/redundant_return'
 require_relative 'rubocop/cop/style/redundant_self'
 require_relative 'rubocop/cop/style/redundant_sort'
 require_relative 'rubocop/cop/style/redundant_sort_by'
+require_relative 'rubocop/cop/style/redundant_string_escape'
 require_relative 'rubocop/cop/style/regexp_literal'
 require_relative 'rubocop/cop/style/rescue_modifier'
 require_relative 'rubocop/cop/style/rescue_standard_error'
@@ -716,6 +726,8 @@ require_relative 'rubocop/remote_config'
 require_relative 'rubocop/target_ruby'
 require_relative 'rubocop/yaml_duplication_checker'
 
+# rubocop:enable Style/RequireOrder
+
 unless File.exist?("#{__dir__}/../rubocop.gemspec") # Check if we are a gem
   RuboCop::ResultCache.rubocop_required_features = $LOADED_FEATURES - before_us
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 1.40.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-12-08 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.1
+        version: 1.23.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.1
+        version: 1.23.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -207,6 +207,8 @@ files:
 - config/obsoletion.yml
 - exe/rubocop
 - lib/rubocop.rb
+- lib/rubocop/arguments_env.rb
+- lib/rubocop/arguments_file.rb
 - lib/rubocop/ast_aliases.rb
 - lib/rubocop/cache_config.rb
 - lib/rubocop/cached_data.rb
@@ -284,9 +286,12 @@ files:
 - lib/rubocop/cop/ignored_node.rb
 - lib/rubocop/cop/internal_affairs.rb
 - lib/rubocop/cop/internal_affairs/cop_description.rb
+- lib/rubocop/cop/internal_affairs/create_empty_file.rb
 - lib/rubocop/cop/internal_affairs/empty_line_between_expect_offense_and_correction.rb
 - lib/rubocop/cop/internal_affairs/example_description.rb
+- lib/rubocop/cop/internal_affairs/example_heredoc_delimiter.rb
 - lib/rubocop/cop/internal_affairs/inherit_deprecated_cop_class.rb
+- lib/rubocop/cop/internal_affairs/lambda_or_proc.rb
 - lib/rubocop/cop/internal_affairs/location_line_equality_comparison.rb
 - lib/rubocop/cop/internal_affairs/method_name_end_with.rb
 - lib/rubocop/cop/internal_affairs/method_name_equal.rb
@@ -430,6 +435,7 @@ files:
 - lib/rubocop/cop/lint/duplicate_case_condition.rb
 - lib/rubocop/cop/lint/duplicate_elsif_condition.rb
 - lib/rubocop/cop/lint/duplicate_hash_key.rb
+- lib/rubocop/cop/lint/duplicate_magic_comment.rb
 - lib/rubocop/cop/lint/duplicate_methods.rb
 - lib/rubocop/cop/lint/duplicate_regexp_character_class_element.rb
 - lib/rubocop/cop/lint/duplicate_require.rb
@@ -657,6 +663,7 @@ files:
 - lib/rubocop/cop/style/and_or.rb
 - lib/rubocop/cop/style/arguments_forwarding.rb
 - lib/rubocop/cop/style/array_coercion.rb
+- lib/rubocop/cop/style/array_intersect.rb
 - lib/rubocop/cop/style/array_join.rb
 - lib/rubocop/cop/style/ascii_comments.rb
 - lib/rubocop/cop/style/attr.rb
@@ -795,6 +802,7 @@ files:
 - lib/rubocop/cop/style/object_then.rb
 - lib/rubocop/cop/style/one_line_conditional.rb
 - lib/rubocop/cop/style/open_struct_use.rb
+- lib/rubocop/cop/style/operator_method_call.rb
 - lib/rubocop/cop/style/option_hash.rb
 - lib/rubocop/cop/style/optional_arguments.rb
 - lib/rubocop/cop/style/optional_boolean_parameter.rb
@@ -815,6 +823,8 @@ files:
 - lib/rubocop/cop/style/redundant_capital_w.rb
 - lib/rubocop/cop/style/redundant_condition.rb
 - lib/rubocop/cop/style/redundant_conditional.rb
+- lib/rubocop/cop/style/redundant_constant_base.rb
+- lib/rubocop/cop/style/redundant_each.rb
 - lib/rubocop/cop/style/redundant_exception.rb
 - lib/rubocop/cop/style/redundant_fetch_block.rb
 - lib/rubocop/cop/style/redundant_file_extension_in_require.rb
@@ -831,7 +841,9 @@ files:
 - lib/rubocop/cop/style/redundant_self_assignment_branch.rb
 - lib/rubocop/cop/style/redundant_sort.rb
 - lib/rubocop/cop/style/redundant_sort_by.rb
+- lib/rubocop/cop/style/redundant_string_escape.rb
 - lib/rubocop/cop/style/regexp_literal.rb
+- lib/rubocop/cop/style/require_order.rb
 - lib/rubocop/cop/style/rescue_modifier.rb
 - lib/rubocop/cop/style/rescue_standard_error.rb
 - lib/rubocop/cop/style/return_nil.rb
@@ -932,6 +944,7 @@ files:
 - lib/rubocop/lockfile.rb
 - lib/rubocop/magic_comment.rb
 - lib/rubocop/name_similarity.rb
+- lib/rubocop/optimized_patterns.rb
 - lib/rubocop/options.rb
 - lib/rubocop/path_util.rb
 - lib/rubocop/platform.rb
@@ -977,7 +990,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.36/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.40/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
   rubygems_mfa_required: 'true'
 post_install_message: