rubocop 1.5.2 → 1.8.1

data/lib/rubocop/options.rb

@@ -66,7 +66,7 @@ module RuboCop
         add_configuration_options(opts)
         add_formatting_options(opts)
 
-        option(opts, '-r', '--require FILE') { |f| require f }
+        option(opts, '-r', '--require FILE') { |f| require_feature(f) }
 
         add_severity_option(opts)
         add_flags_with_optional_args(opts)
@@ -92,14 +92,7 @@ module RuboCop
           raise OptionArgumentError, message
         end
 
-        @options[:"#{option}"] =
-          if list.empty?
-            ['']
-          else
-            list.split(',').map do |c|
-              Cop::Registry.qualified_cop_name(c, "--#{option} option")
-            end
-          end
+        @options[:"#{option}"] = list.empty? ? [''] : list.split(',')
       end
     end
 
@@ -239,6 +232,13 @@ module RuboCop
       long_opt[2..-1].sub('[no-]', '').sub(/ .*/, '')
                      .tr('-', '_').gsub(/[\[\]]/, '').to_sym
     end
+
+    def require_feature(file)
+      # If any features were added on the CLI from `--require`,
+      # add them to the config.
+      ConfigLoader.add_loaded_features(file)
+      require file
+    end
   end
 
   # Validates option arguments and the options' compatibility with each other.

data/lib/rubocop/rspec/cop_helper.rb

@@ -9,10 +9,6 @@ module CopHelper
   let(:ruby_version) { 2.4 }
   let(:rails_version) { false }
 
-  def inspect_source_file(source)
-    Tempfile.open('tmp') { |f| inspect_source(source, f) }
-  end
-
   def inspect_source(source, file = nil)
     RuboCop::Formatter::DisabledConfigFormatter.config_to_allow_offenses = {}
     RuboCop::Formatter::DisabledConfigFormatter.detected_styles = {}

data/lib/rubocop/rspec/expect_offense.rb

@@ -111,28 +111,9 @@ module RuboCop
         source
       end
 
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def expect_offense(source, file = nil, severity: nil, **replacements)
-        source = format_offense(source, **replacements)
-        RuboCop::Formatter::DisabledConfigFormatter
-          .config_to_allow_offenses = {}
-        RuboCop::Formatter::DisabledConfigFormatter.detected_styles = {}
-        cop.instance_variable_get(:@options)[:auto_correct] = true
-
-        expected_annotations = AnnotatedSource.parse(source)
-
-        if expected_annotations.plain_source == source
-          raise 'Use `expect_no_offenses` to assert that no offenses are found'
-        end
-
-        @processed_source = parse_source(expected_annotations.plain_source,
-                                         file)
-
-        unless @processed_source.valid_syntax?
-          raise 'Error parsing example code: ' \
-            "#{@processed_source.diagnostics.map(&:render).join("\n")}"
-        end
-
+        expected_annotations = parse_annotations(source, **replacements)
+        @processed_source = parse_processed_source(expected_annotations.plain_source, file)
         @offenses = _investigate(cop, @processed_source)
         actual_annotations =
           expected_annotations.with_offense_annotations(@offenses)
@@ -143,7 +124,14 @@ module RuboCop
         @offenses
       end
 
-      def expect_correction(correction, loop: true)
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def expect_correction(correction, loop: true, source: nil)
+        if source
+          expected_annotations = parse_annotations(source, raise_error: false)
+          @processed_source = parse_processed_source(expected_annotations.plain_source)
+          _investigate(cop, @processed_source)
+        end
+
         raise '`expect_correction` must follow `expect_offense`' unless @processed_source
 
         iteration = 0
@@ -192,6 +180,30 @@ module RuboCop
         expect(actual_annotations.to_s).to eq(source)
       end
 
+      def parse_annotations(source, raise_error: true, **replacements)
+        set_formatter_options
+
+        source = format_offense(source, **replacements)
+        annotations = AnnotatedSource.parse(source)
+        return annotations unless raise_error && annotations.plain_source == source
+
+        raise 'Use `expect_no_offenses` to assert that no offenses are found'
+      end
+
+      def parse_processed_source(source, file = nil)
+        processed_source = parse_source(source, file)
+        return processed_source if processed_source.valid_syntax?
+
+        raise 'Error parsing example code: ' \
+          "#{processed_source.diagnostics.map(&:render).join("\n")}"
+      end
+
+      def set_formatter_options
+        RuboCop::Formatter::DisabledConfigFormatter.config_to_allow_offenses = {}
+        RuboCop::Formatter::DisabledConfigFormatter.detected_styles = {}
+        cop.instance_variable_get(:@options)[:auto_correct] = true
+      end
+
       # Parsed representation of code annotated with the `^^^ Message` style
       class AnnotatedSource
         ANNOTATION_PATTERN = /\A\s*(\^+|\^{}) /.freeze

data/lib/rubocop/runner.rb

@@ -323,11 +323,16 @@ module RuboCop
       Cop::Team.mobilize(mobilized_cop_classes(config), config, @options)
     end
 
-    def mobilized_cop_classes(config)
+    def mobilized_cop_classes(config) # rubocop:disable Metrics/AbcSize
       @mobilized_cop_classes ||= {}.compare_by_identity
       @mobilized_cop_classes[config] ||= begin
         cop_classes = Cop::Registry.all
 
+        # `@options[:only]` and `@options[:except]` are not qualified until
+        # needed so that the Registry can be fully loaded, including any
+        # cops added by `require`s.
+        qualify_option_cop_names
+
         OptionsValidator.new(@options).validate_cop_options
 
         if @options[:only]
@@ -342,6 +347,16 @@ module RuboCop
       end
     end
 
+    def qualify_option_cop_names
+      %i[only except].each do |option|
+        next unless @options[option]
+
+        @options[option].map! do |cop_name|
+          Cop::Registry.qualified_cop_name(cop_name, "--#{option} option")
+        end
+      end
+    end
+
     def filter_cop_classes(cop_classes, config)
       # use only cops that link to a style guide if requested
       return unless style_guide_cops_only?(config)

data/lib/rubocop/target_finder.rb

@@ -58,7 +58,7 @@ module RuboCop
       base_dir = base_dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
       all_files = find_files(base_dir, File::FNM_DOTMATCH)
       # use file.include? for performance optimization
-      hidden_files = all_files.select { |file| file.include?(HIDDEN_PATH_SUBSTRING) }
+      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|
@@ -70,7 +70,9 @@ module RuboCop
 
     def to_inspect?(file, hidden_files, base_dir_config)
       return false if base_dir_config.file_to_exclude?(file)
-      return true if !hidden_files.include?(file) && ruby_file?(file)
+      return true if !hidden_files.bsearch do |hidden_file|
+        file <=> hidden_file
+      end && ruby_file?(file)
 
       base_dir_config.file_to_include?(file)
     end

data/lib/rubocop/target_ruby.rb

@@ -44,33 +44,61 @@ module RuboCop
     # The target ruby version may be found in a .ruby-version file.
     # @api private
     class RubyVersionFile < Source
-      FILENAME = '.ruby-version'
+      RUBY_VERSION_FILENAME = '.ruby-version'
+      RUBY_VERSION_PATTERN = /\A(?:ruby-)?(?<version>\d+\.\d+)/.freeze
 
       def name
-        "`#{FILENAME}`"
+        "`#{RUBY_VERSION_FILENAME}`"
       end
 
       private
 
+      def filename
+        RUBY_VERSION_FILENAME
+      end
+
+      def pattern
+        RUBY_VERSION_PATTERN
+      end
+
       def find_version
-        file = ruby_version_file
+        file = version_file
         return unless file && File.file?(file)
 
-        # rubocop:disable Lint/MixedRegexpCaptureTypes
-        # `(ruby-)` is not a capture type.
-        File.read(file).match(/\A(ruby-)?(?<version>\d+\.\d+)/) do |md|
-          # rubocop:enable Lint/MixedRegexpCaptureTypes
+        File.read(file).match(pattern) do |md|
           md[:version].to_f
         end
       end
 
-      def ruby_version_file
-        @ruby_version_file ||=
-          @config.find_file_upwards(FILENAME,
+      def version_file
+        @version_file ||=
+          @config.find_file_upwards(filename,
                                     @config.base_dir_for_path_parameters)
       end
     end
 
+    # The target ruby version may be found in a .tool-versions file, in a line
+    # starting with `ruby`.
+    # @api private
+    class ToolVersionsFile < RubyVersionFile
+      TOOL_VERSIONS_FILENAME = '.tool-versions'
+      TOOL_VERSIONS_PATTERN = /\Aruby (?:ruby-)?(?<version>\d+\.\d+)/.freeze
+
+      def name
+        "`#{TOOL_VERSIONS_FILENAME}`"
+      end
+
+      private
+
+      def filename
+        TOOL_VERSIONS_FILENAME
+      end
+
+      def pattern
+        TOOL_VERSIONS_PATTERN
+      end
+    end
+
     # The lock file of Bundler may identify the target ruby version.
     # @api private
     class BundlerLockFile < Source
@@ -194,7 +222,15 @@ module RuboCop
       KNOWN_RUBIES
     end
 
-    SOURCES = [RuboCopConfig, RubyVersionFile, BundlerLockFile, GemspecFile, Default].freeze
+    SOURCES = [
+      RuboCopConfig,
+      RubyVersionFile,
+      ToolVersionsFile,
+      BundlerLockFile,
+      GemspecFile,
+      Default
+    ].freeze
+
     private_constant :SOURCES
 
     def initialize(config)

data/lib/rubocop/util.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module RuboCop
+  # This module contains a collection of useful utility methods.
+  module Util
+    def self.silence_warnings
+      # Replaces Kernel::silence_warnings since it hides any warnings,
+      # including the RuboCop ones
+      old_verbose = $VERBOSE
+      $VERBOSE = nil
+      yield
+    ensure
+      $VERBOSE = old_verbose
+    end
+  end
+end

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.5.2'
+    STRING = '1.8.1'
 
     MSG = '%<version>s (using Parser %<parser_version>s, '\
           'rubocop-ast %<rubocop_ast_version>s, ' \
@@ -34,7 +34,13 @@ module RuboCop
 
     # @api private
     def self.extension_versions(env)
-      env.config_store.for_pwd.loaded_features.sort.map do |loaded_feature|
+      features = Util.silence_warnings do
+        # Suppress any config issues when loading the config (ie. deprecations,
+        # pending cops, etc.).
+        env.config_store.for_pwd.loaded_features.sort
+      end
+
+      features.map do |loaded_feature|
         next unless (match = loaded_feature.match(/rubocop-(?<feature>.*)/))
 
         feature = match[:feature]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.8.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1.5
+        version: 3.0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.1.5
+        version: 3.0.0.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: 1.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
         version: 1.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,7 @@ files:
 - assets/logo.png
 - assets/output.html.erb
 - config/default.yml
+- config/obsoletion.yml
 - exe/rubocop
 - lib/rubocop.rb
 - lib/rubocop/ast_aliases.rb
@@ -203,6 +204,15 @@ files:
 - lib/rubocop/config_loader.rb
 - lib/rubocop/config_loader_resolver.rb
 - lib/rubocop/config_obsoletion.rb
+- lib/rubocop/config_obsoletion/changed_enforced_styles.rb
+- lib/rubocop/config_obsoletion/changed_parameter.rb
+- lib/rubocop/config_obsoletion/cop_rule.rb
+- lib/rubocop/config_obsoletion/extracted_cop.rb
+- lib/rubocop/config_obsoletion/parameter_rule.rb
+- lib/rubocop/config_obsoletion/removed_cop.rb
+- lib/rubocop/config_obsoletion/renamed_cop.rb
+- lib/rubocop/config_obsoletion/rule.rb
+- lib/rubocop/config_obsoletion/split_cop.rb
 - lib/rubocop/config_regeneration.rb
 - lib/rubocop/config_store.rb
 - lib/rubocop/config_validator.rb
@@ -248,6 +258,7 @@ files:
 - lib/rubocop/cop/internal_affairs/offense_location_keyword.rb
 - lib/rubocop/cop/internal_affairs/redundant_location_argument.rb
 - lib/rubocop/cop/internal_affairs/redundant_message_argument.rb
+- lib/rubocop/cop/internal_affairs/style_detected_api_use.rb
 - lib/rubocop/cop/internal_affairs/useless_message_assertion.rb
 - lib/rubocop/cop/layout/access_modifier_indentation.rb
 - lib/rubocop/cop/layout/argument_alignment.rb
@@ -325,6 +336,7 @@ files:
 - lib/rubocop/cop/layout/space_around_method_call_operator.rb
 - lib/rubocop/cop/layout/space_around_operators.rb
 - lib/rubocop/cop/layout/space_before_block_braces.rb
+- lib/rubocop/cop/layout/space_before_brackets.rb
 - lib/rubocop/cop/layout/space_before_comma.rb
 - lib/rubocop/cop/layout/space_before_comment.rb
 - lib/rubocop/cop/layout/space_before_first_arg.rb
@@ -343,6 +355,7 @@ files:
 - lib/rubocop/cop/layout/trailing_whitespace.rb
 - lib/rubocop/cop/legacy/corrections_proxy.rb
 - lib/rubocop/cop/legacy/corrector.rb
+- lib/rubocop/cop/lint/ambiguous_assignment.rb
 - lib/rubocop/cop/lint/ambiguous_block_association.rb
 - lib/rubocop/cop/lint/ambiguous_operator.rb
 - lib/rubocop/cop/lint/ambiguous_regexp_literal.rb
@@ -355,6 +368,7 @@ files:
 - lib/rubocop/cop/lint/constant_resolution.rb
 - lib/rubocop/cop/lint/debugger.rb
 - lib/rubocop/cop/lint/deprecated_class_methods.rb
+- lib/rubocop/cop/lint/deprecated_constants.rb
 - lib/rubocop/cop/lint/deprecated_open_ssl_constant.rb
 - lib/rubocop/cop/lint/disjunctive_assignment_in_constructor.rb
 - lib/rubocop/cop/lint/duplicate_branch.rb
@@ -388,6 +402,7 @@ files:
 - lib/rubocop/cop/lint/ineffective_access_modifier.rb
 - lib/rubocop/cop/lint/inherit_exception.rb
 - lib/rubocop/cop/lint/interpolation_check.rb
+- lib/rubocop/cop/lint/lambda_without_literal_block.rb
 - lib/rubocop/cop/lint/literal_as_condition.rb
 - lib/rubocop/cop/lint/literal_in_interpolation.rb
 - lib/rubocop/cop/lint/loop.rb
@@ -411,6 +426,7 @@ files:
 - lib/rubocop/cop/lint/rand_one.rb
 - lib/rubocop/cop/lint/redundant_cop_disable_directive.rb
 - lib/rubocop/cop/lint/redundant_cop_enable_directive.rb
+- lib/rubocop/cop/lint/redundant_dir_glob_sort.rb
 - lib/rubocop/cop/lint/redundant_require_statement.rb
 - lib/rubocop/cop/lint/redundant_safe_navigation.rb
 - lib/rubocop/cop/lint/redundant_splat_expansion.rb
@@ -472,6 +488,7 @@ files:
 - lib/rubocop/cop/metrics/utils/repeated_csend_discount.rb
 - lib/rubocop/cop/migration/department_name.rb
 - lib/rubocop/cop/mixin/alignment.rb
+- lib/rubocop/cop/mixin/allowed_identifiers.rb
 - lib/rubocop/cop/mixin/allowed_methods.rb
 - lib/rubocop/cop/mixin/annotation_comment.rb
 - lib/rubocop/cop/mixin/array_min_size.rb
@@ -614,6 +631,7 @@ files:
 - lib/rubocop/cop/style/empty_method.rb
 - lib/rubocop/cop/style/encoding.rb
 - lib/rubocop/cop/style/end_block.rb
+- lib/rubocop/cop/style/endless_method.rb
 - lib/rubocop/cop/style/eval_with_location.rb
 - lib/rubocop/cop/style/even_odd.rb
 - lib/rubocop/cop/style/expand_path_arguments.rb
@@ -629,6 +647,7 @@ files:
 - lib/rubocop/cop/style/guard_clause.rb
 - lib/rubocop/cop/style/hash_as_last_array_item.rb
 - 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_syntax.rb
 - lib/rubocop/cop/style/hash_transform_keys.rb
@@ -808,6 +827,7 @@ files:
 - lib/rubocop/formatter/tap_formatter.rb
 - lib/rubocop/formatter/text_util.rb
 - lib/rubocop/formatter/worst_offenders_formatter.rb
+- lib/rubocop/lockfile.rb
 - lib/rubocop/magic_comment.rb
 - lib/rubocop/name_similarity.rb
 - lib/rubocop/options.rb
@@ -825,6 +845,7 @@ files:
 - lib/rubocop/string_interpreter.rb
 - lib/rubocop/target_finder.rb
 - lib/rubocop/target_ruby.rb
+- lib/rubocop/util.rb
 - lib/rubocop/version.rb
 - lib/rubocop/warning.rb
 - lib/rubocop/yaml_duplication_checker.rb
@@ -835,7 +856,7 @@ metadata:
   homepage_uri: https://rubocop.org/
   changelog_uri: https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop-hq/rubocop/
-  documentation_uri: https://docs.rubocop.org/rubocop/1.5/
+  documentation_uri: https://docs.rubocop.org/rubocop/1.8/
   bug_tracker_uri: https://github.com/rubocop-hq/rubocop/issues
 post_install_message: 
 rdoc_options: []