rubocop 1.11.0 → 1.15.0

data/lib/rubocop/path_util.rb

@@ -77,9 +77,7 @@ module RuboCop
     end
 
     def hidden_dir?(path)
-      File.dirname(path).split(File::SEPARATOR).any? do |dir|
-        dir.start_with?('.')
-      end
+      File.dirname(path).split(File::SEPARATOR).any? { |dir| dir.start_with?('.') }
     end
   end
 end

data/lib/rubocop/rake_task.rb

@@ -68,6 +68,9 @@ module RuboCop
           RakeFileUtils.verbose(verbose) do
             yield(*[self, task_args].slice(0, task_block.arity)) if task_block
             options = full_options.unshift('--auto-correct-all')
+            # `parallel` will automatically be removed from the options internally.
+            # This is a nice to have to suppress the warning message
+            # about parallel and auto-corrent not being compatible.
             options.delete('--parallel')
             run_cli(verbose, options)
           end

data/lib/rubocop/remote_config.rb

@@ -46,11 +46,9 @@ module RuboCop
       http.use_ssl = uri.instance_of?(URI::HTTPS)
 
       generate_request(uri) do |request|
-        begin
-          handle_response(http.request(request), limit, &block)
-        rescue SocketError => e
-          handle_response(e, limit, &block)
-        end
+        handle_response(http.request(request), limit, &block)
+      rescue SocketError => e
+        handle_response(e, limit, &block)
       end
     end
 
@@ -72,8 +70,7 @@ module RuboCop
         begin
           response.error!
         rescue StandardError => e
-          message = "#{e.message} while downloading remote config"\
-            " file #{uri}"
+          message = "#{e.message} while downloading remote config file #{uri}"
           raise e, message
         end
       end

data/lib/rubocop/result_cache.rb

@@ -39,8 +39,7 @@ module RuboCop
       private
 
       def requires_file_removal?(file_count, config_store)
-        file_count > 1 &&
-          file_count > config_store.for_pwd.for_all_cops['MaxFilesInCache']
+        file_count > 1 && file_count > config_store.for_pwd.for_all_cops['MaxFilesInCache']
       end
 
       def remove_oldest_files(files, dirs, cache_root, verbose)
@@ -108,7 +107,7 @@ module RuboCop
 
     def load
       puts "Loading cache from #{@path}" if debug?
-      @cached_data.from_json(IO.read(@path, encoding: Encoding::UTF_8))
+      @cached_data.from_json(File.read(@path, encoding: Encoding::UTF_8))
     end
 
     def save(offenses)
@@ -117,8 +116,7 @@ module RuboCop
       begin
         FileUtils.mkdir_p(dir)
       rescue Errno::EACCES, Errno::EROFS => e
-        warn "Couldn't create cache directory. Continuing without cache."\
-             "\n  #{e.message}"
+        warn "Couldn't create cache directory. Continuing without cache.\n  #{e.message}"
         return
       end
 
@@ -159,9 +157,7 @@ module RuboCop
     def file_checksum(file, config_store)
       digester = Digest::SHA1.new
       mode = File.stat(file).mode
-      digester.update(
-        "#{file}#{mode}#{config_store.for_file(file).signature}"
-      )
+      digester.update("#{file}#{mode}#{config_store.for_file(file).signature}")
       digester.file(file)
       digester.hexdigest
     rescue Errno::ENOENT
@@ -224,10 +220,7 @@ module RuboCop
     # This context is for anything that's not (1) the RuboCop executable
     # checksum or (2) the inspected file checksum.
     def context_checksum(team, options)
-      Digest::SHA1.hexdigest([
-        team_checksum(team),
-        relevant_options_digest(options)
-      ].join)
+      Digest::SHA1.hexdigest([team_checksum(team), relevant_options_digest(options)].join)
     end
   end
 end

data/lib/rubocop/rspec/cop_helper.rb

@@ -6,7 +6,7 @@ require 'tempfile'
 module CopHelper
   extend RSpec::SharedContext
 
-  let(:ruby_version) { 2.4 }
+  let(:ruby_version) { 2.5 }
   let(:rails_version) { false }
 
   def inspect_source(source, file = nil)

data/lib/rubocop/rspec/expect_offense.rb

@@ -118,8 +118,7 @@ module RuboCop
 
         @processed_source = parse_processed_source(source, file)
         @offenses = _investigate(cop, @processed_source)
-        actual_annotations =
-          expected_annotations.with_offense_annotations(@offenses)
+        actual_annotations = expected_annotations.with_offense_annotations(@offenses)
 
         expect(actual_annotations).to eq(expected_annotations), ''
         expect(@offenses.map(&:severity).uniq).to eq([severity]) if severity
@@ -152,8 +151,7 @@ module RuboCop
           end
 
           # Prepare for next loop
-          @processed_source = parse_source(corrected_source,
-                                           @processed_source.path)
+          @processed_source = parse_source(corrected_source, @processed_source.path)
           _investigate(cop, @processed_source)
         end
 
@@ -178,8 +176,7 @@ module RuboCop
         offenses = inspect_source(source, file)
 
         expected_annotations = AnnotatedSource.parse(source)
-        actual_annotations =
-          expected_annotations.with_offense_annotations(offenses)
+        actual_annotations = expected_annotations.with_offense_annotations(offenses)
         expect(actual_annotations.to_s).to eq(source)
       end
 
@@ -246,9 +243,7 @@ module RuboCop
         end
 
         def ==(other)
-          other.is_a?(self.class) &&
-            other.lines == lines &&
-            match_annotations?(other)
+          other.is_a?(self.class) && other.lines == lines && match_annotations?(other)
         end
 
         # Dirty hack: expectations with [...] are rewritten when they match

data/lib/rubocop/rspec/shared_contexts.rb

@@ -27,9 +27,7 @@ RSpec.shared_context 'isolated environment', :isolated_environment do
       begin
         FileUtils.mkdir_p(working_dir)
 
-        Dir.chdir(working_dir) do
-          example.run
-        end
+        Dir.chdir(working_dir) { example.run }
       ensure
         ENV['HOME'] = original_home
         ENV['XDG_CONFIG_HOME'] = original_xdg_config_home
@@ -41,9 +39,7 @@ RSpec.shared_context 'isolated environment', :isolated_environment do
 end
 
 RSpec.shared_context 'maintain registry', :restore_registry do
-  around(:each) do |example|
-    RuboCop::Cop::Registry.with_temporary_global { example.run }
-  end
+  around(:each) { |example| RuboCop::Cop::Registry.with_temporary_global { example.run } }
 
   def stub_cop_class(name, inherit: RuboCop::Cop::Base, &block)
     klass = Class.new(inherit, &block)
@@ -100,15 +96,12 @@ RSpec.shared_context 'config', :config do # rubocop:disable Metrics/BlockLength
   end
 
   let(:config) do
-    hash = { 'AllCops' => all_cops_config,
-             cop_class.cop_name => cur_cop_config }.merge!(other_cops)
+    hash = { 'AllCops' => all_cops_config, cop_class.cop_name => cur_cop_config }.merge!(other_cops)
 
     RuboCop::Config.new(hash, "#{Dir.pwd}/.rubocop.yml")
   end
 
-  let(:cop) do
-    cop_class.new(config, cop_options)
-  end
+  let(:cop) { cop_class.new(config, cop_options) }
 end
 
 RSpec.shared_context 'mock console output' do
@@ -123,10 +116,6 @@ RSpec.shared_context 'mock console output' do
   end
 end
 
-RSpec.shared_context 'ruby 2.4', :ruby24 do
-  let(:ruby_version) { 2.4 }
-end
-
 RSpec.shared_context 'ruby 2.5', :ruby25 do
   let(:ruby_version) { 2.5 }
 end
@@ -142,3 +131,7 @@ end
 RSpec.shared_context 'ruby 3.0', :ruby30 do
   let(:ruby_version) { 3.0 }
 end
+
+RSpec.shared_context 'ruby 3.1', :ruby31 do
+  let(:ruby_version) { 3.1 }
+end

data/lib/rubocop/runner.rb

@@ -112,9 +112,7 @@ module RuboCop
     end
 
     def list_files(paths)
-      paths.each do |path|
-        puts PathUtil.relative_path(path)
-      end
+      paths.each { |path| puts PathUtil.relative_path(path) }
     end
 
     def process_file(file)
@@ -193,11 +191,10 @@ module RuboCop
 
     def redundant_cop_disable_directive(file)
       config = @config_store.for_file(file)
-      if config.for_cop(Cop::Lint::RedundantCopDisableDirective)
-               .fetch('Enabled')
-        cop = Cop::Lint::RedundantCopDisableDirective.new(config, @options)
-        yield cop if cop.relevant_file?(file)
-      end
+      return unless config.for_cop(Cop::Lint::RedundantCopDisableDirective).fetch('Enabled')
+
+      cop = Cop::Lint::RedundantCopDisableDirective.new(config, @options)
+      yield cop if cop.relevant_file?(file)
     end
 
     def filtered_run?
@@ -206,9 +203,7 @@ module RuboCop
 
     def file_started(file)
       puts "Scanning #{file}" if @options[:debug]
-      formatter_set.file_started(file,
-                                 cli_options: @options,
-                                 config_store: @config_store)
+      formatter_set.file_started(file, cli_options: @options, config_store: @config_store)
     end
 
     def file_finished(file, offenses)
@@ -372,9 +367,7 @@ module RuboCop
       @formatter_set ||= begin
         set = Formatter::FormatterSet.new(@options)
         pairs = @options[:formatters] || [['progress']]
-        pairs.each do |formatter_key, output_path|
-          set.add_formatter(formatter_key, output_path)
-        end
+        pairs.each { |formatter_key, output_path| set.add_formatter(formatter_key, output_path) }
         set
       end
     end

data/lib/rubocop/target_finder.rb

@@ -61,9 +61,7 @@ module RuboCop
       hidden_files = all_files.select { |file| file.include?(HIDDEN_PATH_SUBSTRING) }.sort
       base_dir_config = @config_store.for(base_dir)
 
-      target_files = all_files.select do |file|
-        to_inspect?(file, hidden_files, base_dir_config)
-      end
+      target_files = all_files.select { |file| to_inspect?(file, hidden_files, base_dir_config) }
 
       target_files.sort_by!(&order)
     end
@@ -96,12 +94,23 @@ module RuboCop
     end
 
     def wanted_dir_patterns(base_dir, exclude_pattern, flags)
+      base_dir = base_dir.gsub('/{}/', '/\{}/')
       dirs = Dir.glob(File.join(base_dir.gsub('/**/', '/\**/'), '*/'), flags)
                 .reject do |dir|
-                  dir.end_with?('/./', '/../') || File.fnmatch?(exclude_pattern, dir, flags)
+                  next true if dir.end_with?('/./', '/../')
+                  next true if File.fnmatch?(exclude_pattern, dir, flags)
+
+                  symlink_excluded_or_infinite_loop?(base_dir, dir, exclude_pattern, flags)
                 end
-      dirs.flat_map { |dir| wanted_dir_patterns(dir, exclude_pattern, flags) }
-          .unshift(base_dir)
+      dirs.flat_map { |dir| wanted_dir_patterns(dir, exclude_pattern, flags) }.unshift(base_dir)
+    end
+
+    def symlink_excluded_or_infinite_loop?(base_dir, current_dir, exclude_pattern, flags)
+      dir_realpath = File.realpath(current_dir)
+      File.symlink?(current_dir.chomp('/')) && (
+        File.fnmatch?(exclude_pattern, "#{dir_realpath}/", flags) ||
+        File.realpath(base_dir).start_with?(dir_realpath)
+      )
     end
 
     def combined_exclude_glob_patterns(base_dir)
@@ -117,9 +126,7 @@ module RuboCop
 
     def ruby_extensions
       @ruby_extensions ||= begin
-        ext_patterns = all_cops_include.select do |pattern|
-          pattern.start_with?('**/*.')
-        end
+        ext_patterns = all_cops_include.select { |pattern| pattern.start_with?('**/*.') }
         ext_patterns.map { |pattern| pattern.sub('**/*', '') }
       end
     end
@@ -130,16 +137,13 @@ module RuboCop
 
     def ruby_filenames
       @ruby_filenames ||= begin
-        file_patterns = all_cops_include.reject do |pattern|
-          pattern.start_with?('**/*.')
-        end
+        file_patterns = all_cops_include.reject { |pattern| pattern.start_with?('**/*.') }
         file_patterns.map { |pattern| pattern.sub('**/', '') }
       end
     end
 
     def all_cops_include
-      @all_cops_include ||=
-        @config_store.for_pwd.for_all_cops['Include'].map(&:to_s)
+      @all_cops_include ||= @config_store.for_pwd.for_all_cops['Include'].map(&:to_s)
     end
 
     def ruby_executable?(file)
@@ -162,8 +166,7 @@ module RuboCop
     end
 
     def ruby_file?(file)
-      stdin? || ruby_extension?(file) || ruby_filename?(file) ||
-        ruby_executable?(file)
+      stdin? || ruby_extension?(file) || ruby_filename?(file) || ruby_executable?(file)
     end
 
     def configured_include?(file)

data/lib/rubocop/target_ruby.rb

@@ -4,11 +4,11 @@ module RuboCop
   # The kind of Ruby that code inspected by RuboCop is written in.
   # @api private
   class TargetRuby
-    KNOWN_RUBIES = [2.4, 2.5, 2.6, 2.7, 3.0].freeze
+    KNOWN_RUBIES = [2.5, 2.6, 2.7, 3.0, 3.1].freeze
     DEFAULT_VERSION = KNOWN_RUBIES.first
 
     OBSOLETE_RUBIES = {
-      1.9 => '0.41', 2.0 => '0.50', 2.1 => '0.57', 2.2 => '0.68', 2.3 => '0.81'
+      1.9 => '0.41', 2.0 => '0.50', 2.1 => '0.57', 2.2 => '0.68', 2.3 => '0.81', 2.4 => '1.12'
     }.freeze
     private_constant :KNOWN_RUBIES, :OBSOLETE_RUBIES
 
@@ -65,15 +65,11 @@ module RuboCop
         file = version_file
         return unless file && File.file?(file)
 
-        File.read(file).match(pattern) do |md|
-          md[:version].to_f
-        end
+        File.read(file).match(pattern) { |md| md[:version].to_f }
       end
 
       def version_file
-        @version_file ||=
-          @config.find_file_upwards(filename,
-                                    @config.base_dir_for_path_parameters)
+        @version_file ||= @config.find_file_upwards(filename, @config.base_dir_for_path_parameters)
       end
     end
 

data/lib/rubocop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -100,7 +100,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -110,7 +110,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -221,6 +221,7 @@ files:
 - lib/rubocop/cop/base.rb
 - lib/rubocop/cop/bundler/duplicated_gem.rb
 - lib/rubocop/cop/bundler/gem_comment.rb
+- lib/rubocop/cop/bundler/gem_version.rb
 - lib/rubocop/cop/bundler/insecure_protocol_source.rb
 - lib/rubocop/cop/bundler/ordered_gems.rb
 - lib/rubocop/cop/commissioner.rb
@@ -331,7 +332,9 @@ files:
 - lib/rubocop/cop/layout/multiline_method_definition_brace_layout.rb
 - lib/rubocop/cop/layout/multiline_operation_indentation.rb
 - lib/rubocop/cop/layout/parameter_alignment.rb
+- lib/rubocop/cop/layout/redundant_line_break.rb
 - lib/rubocop/cop/layout/rescue_ensure_alignment.rb
+- lib/rubocop/cop/layout/single_line_block_chain.rb
 - lib/rubocop/cop/layout/space_after_colon.rb
 - lib/rubocop/cop/layout/space_after_comma.rb
 - lib/rubocop/cop/layout/space_after_method_name.rb
@@ -523,6 +526,7 @@ files:
 - lib/rubocop/cop/mixin/enforce_superclass.rb
 - lib/rubocop/cop/mixin/first_element_line_break.rb
 - lib/rubocop/cop/mixin/frozen_string_literal.rb
+- lib/rubocop/cop/mixin/gem_declaration.rb
 - lib/rubocop/cop/mixin/hash_alignment_styles.rb
 - lib/rubocop/cop/mixin/hash_transform_method.rb
 - lib/rubocop/cop/mixin/heredoc.rb
@@ -601,6 +605,7 @@ files:
 - lib/rubocop/cop/style/bare_percent_literals.rb
 - lib/rubocop/cop/style/begin_block.rb
 - lib/rubocop/cop/style/bisected_attr_accessor.rb
+- lib/rubocop/cop/style/bisected_attr_accessor/macro.rb
 - lib/rubocop/cop/style/block_comments.rb
 - lib/rubocop/cop/style/block_delimiters.rb
 - lib/rubocop/cop/style/case_equality.rb
@@ -768,6 +773,7 @@ files:
 - lib/rubocop/cop/style/stabby_lambda_parentheses.rb
 - lib/rubocop/cop/style/static_class.rb
 - lib/rubocop/cop/style/stderr_puts.rb
+- lib/rubocop/cop/style/string_chars.rb
 - lib/rubocop/cop/style/string_concatenation.rb
 - lib/rubocop/cop/style/string_hash_keys.rb
 - lib/rubocop/cop/style/string_literals.rb
@@ -780,6 +786,7 @@ files:
 - lib/rubocop/cop/style/symbol_literal.rb
 - lib/rubocop/cop/style/symbol_proc.rb
 - lib/rubocop/cop/style/ternary_parentheses.rb
+- lib/rubocop/cop/style/top_level_method_definition.rb
 - lib/rubocop/cop/style/trailing_body_on_class.rb
 - lib/rubocop/cop/style/trailing_body_on_method_definition.rb
 - lib/rubocop/cop/style/trailing_body_on_module.rb
@@ -812,7 +819,6 @@ files:
 - lib/rubocop/cop/variable_force/variable.rb
 - lib/rubocop/cop/variable_force/variable_table.rb
 - lib/rubocop/cops_documentation_generator.rb
-- lib/rubocop/core_ext/hash.rb
 - lib/rubocop/core_ext/string.rb
 - lib/rubocop/directive_comment.rb
 - lib/rubocop/error.rb
@@ -870,7 +876,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.11/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.15/
   bug_tracker_uri: https://github.com/rubocop/rubocop/issues
 post_install_message: 
 rdoc_options: []
@@ -880,7 +886,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="