rubocop 1.5.2 → 1.8.1

data/lib/rubocop.rb

@@ -7,7 +7,7 @@ require 'rainbow'
 require 'set'
 require 'forwardable'
 require 'regexp_parser'
-require 'unicode/display_width/no_string_ext'
+require 'unicode/display_width'
 
 # we have to require RuboCop's version, before rubocop-ast's
 require_relative 'rubocop/version'
@@ -28,6 +28,7 @@ require_relative 'rubocop/name_similarity'
 require_relative 'rubocop/string_interpreter'
 require_relative 'rubocop/error'
 require_relative 'rubocop/warning'
+require_relative 'rubocop/util'
 
 require_relative 'rubocop/cop/util'
 require_relative 'rubocop/cop/offense'
@@ -60,6 +61,7 @@ require_relative 'rubocop/cop/mixin/annotation_comment'
 require_relative 'rubocop/cop/mixin/array_min_size'
 require_relative 'rubocop/cop/mixin/array_syntax'
 require_relative 'rubocop/cop/mixin/alignment'
+require_relative 'rubocop/cop/mixin/allowed_identifiers'
 require_relative 'rubocop/cop/mixin/allowed_methods'
 require_relative 'rubocop/cop/mixin/auto_corrector'
 require_relative 'rubocop/cop/mixin/check_assignment'
@@ -230,6 +232,7 @@ require_relative 'rubocop/cop/layout/space_around_keyword'
 require_relative 'rubocop/cop/layout/space_around_method_call_operator'
 require_relative 'rubocop/cop/layout/space_around_operators'
 require_relative 'rubocop/cop/layout/space_before_block_braces'
+require_relative 'rubocop/cop/layout/space_before_brackets'
 require_relative 'rubocop/cop/layout/space_before_comma'
 require_relative 'rubocop/cop/layout/space_before_comment'
 require_relative 'rubocop/cop/layout/space_before_first_arg'
@@ -247,6 +250,7 @@ require_relative 'rubocop/cop/layout/space_inside_string_interpolation'
 require_relative 'rubocop/cop/layout/trailing_empty_lines'
 require_relative 'rubocop/cop/layout/trailing_whitespace'
 
+require_relative 'rubocop/cop/lint/ambiguous_assignment'
 require_relative 'rubocop/cop/lint/ambiguous_block_association'
 require_relative 'rubocop/cop/lint/ambiguous_operator'
 require_relative 'rubocop/cop/lint/ambiguous_regexp_literal'
@@ -259,6 +263,7 @@ require_relative 'rubocop/cop/lint/constant_definition_in_block'
 require_relative 'rubocop/cop/lint/constant_resolution'
 require_relative 'rubocop/cop/lint/debugger'
 require_relative 'rubocop/cop/lint/deprecated_class_methods'
+require_relative 'rubocop/cop/lint/deprecated_constants'
 require_relative 'rubocop/cop/lint/deprecated_open_ssl_constant'
 require_relative 'rubocop/cop/lint/disjunctive_assignment_in_constructor'
 require_relative 'rubocop/cop/lint/duplicate_branch'
@@ -292,6 +297,7 @@ require_relative 'rubocop/cop/lint/implicit_string_concatenation'
 require_relative 'rubocop/cop/lint/inherit_exception'
 require_relative 'rubocop/cop/lint/ineffective_access_modifier'
 require_relative 'rubocop/cop/lint/interpolation_check'
+require_relative 'rubocop/cop/lint/lambda_without_literal_block'
 require_relative 'rubocop/cop/lint/literal_as_condition'
 require_relative 'rubocop/cop/lint/literal_in_interpolation'
 require_relative 'rubocop/cop/lint/loop'
@@ -315,6 +321,7 @@ require_relative 'rubocop/cop/lint/raise_exception'
 require_relative 'rubocop/cop/lint/rand_one'
 require_relative 'rubocop/cop/lint/redundant_cop_disable_directive'
 require_relative 'rubocop/cop/lint/redundant_cop_enable_directive'
+require_relative 'rubocop/cop/lint/redundant_dir_glob_sort'
 require_relative 'rubocop/cop/lint/redundant_require_statement'
 require_relative 'rubocop/cop/lint/redundant_safe_navigation'
 require_relative 'rubocop/cop/lint/redundant_splat_expansion'
@@ -443,6 +450,7 @@ require_relative 'rubocop/cop/style/empty_else'
 require_relative 'rubocop/cop/style/empty_lambda_parameter'
 require_relative 'rubocop/cop/style/empty_literal'
 require_relative 'rubocop/cop/style/empty_method'
+require_relative 'rubocop/cop/style/endless_method'
 require_relative 'rubocop/cop/style/encoding'
 require_relative 'rubocop/cop/style/end_block'
 require_relative 'rubocop/cop/style/eval_with_location'
@@ -460,6 +468,7 @@ require_relative 'rubocop/cop/style/global_vars'
 require_relative 'rubocop/cop/style/guard_clause'
 require_relative 'rubocop/cop/style/hash_as_last_array_item'
 require_relative 'rubocop/cop/style/hash_each_methods'
+require_relative 'rubocop/cop/style/hash_except'
 require_relative 'rubocop/cop/style/hash_like_case'
 require_relative 'rubocop/cop/style/hash_syntax'
 require_relative 'rubocop/cop/style/hash_transform_keys'
@@ -632,9 +641,19 @@ require_relative 'rubocop/cached_data'
 require_relative 'rubocop/config'
 require_relative 'rubocop/config_loader_resolver'
 require_relative 'rubocop/config_loader'
+require_relative 'rubocop/config_obsoletion/rule'
+require_relative 'rubocop/config_obsoletion/cop_rule'
+require_relative 'rubocop/config_obsoletion/parameter_rule'
+require_relative 'rubocop/config_obsoletion/changed_enforced_styles'
+require_relative 'rubocop/config_obsoletion/changed_parameter'
+require_relative 'rubocop/config_obsoletion/extracted_cop'
+require_relative 'rubocop/config_obsoletion/removed_cop'
+require_relative 'rubocop/config_obsoletion/renamed_cop'
+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/lockfile'
 require_relative 'rubocop/target_finder'
 require_relative 'rubocop/directive_comment'
 require_relative 'rubocop/comment_config'

data/lib/rubocop/cli/command/suggest_extensions.rb

@@ -3,7 +3,10 @@
 module RuboCop
   class CLI
     module Command
-      # Run all the selected cops and report the result.
+      # Suggest RuboCop extensions to install based on Gemfile dependencies.
+      # Only primary dependencies are evaluated, so if a dependency depends on a
+      # gem with an extension, it is not suggested. However, if an extension is
+      # a transitive dependency, it will not be suggested.
       # @api private
       class SuggestExtensions < Base
         # Combination of short and long formatter names.
@@ -11,39 +14,6 @@ module RuboCop
 
         self.command_name = :suggest_extensions
 
-        class << self
-          # Gems that the current bundle depends on
-          # Suggestions are only made for gems that are 1st party dependencies
-          def dependent_gems
-            bundler do |gems|
-              gems.dependencies.map(&:name)
-            end
-          end
-
-          # All installed gems in the current bundle
-          # If a suggestion is installed but not depended on, it still should not
-          # be suggested.
-          def installed_gems
-            bundler do
-              # Load specs from the lockfile without trying to resolve them
-              return [] unless Bundler.default_lockfile
-
-              lockfile = Bundler.read_file(Bundler.default_lockfile)
-              Bundler::LockfileParser.new(lockfile).specs.map(&:name)
-            end
-          end
-
-          private
-
-          def bundler
-            return [] unless defined?(Bundler)
-
-            yield Bundler.load
-          rescue Bundler::BundlerError
-            []
-          end
-        end
-
         def run
           return if skip? || extensions.none?
 
@@ -82,25 +52,27 @@ module RuboCop
         end
 
         def extensions
-          return [] unless dependent_gems.any?
+          return [] unless lockfile.dependencies.any?
 
-          @extensions ||= begin
-            extensions = @config_store.for_pwd.for_all_cops['SuggestExtensions'] || {}
-            extensions.select { |_, v| (Array(v) & dependent_gems).any? }.keys - installed_gems
-          end
+          extensions = @config_store.for_pwd.for_all_cops['SuggestExtensions'] || {}
+          extensions.select { |_, v| (Array(v) & dependent_gems).any? }.keys - installed_gems
         end
 
-        def puts(*args)
-          output = (@options[:stderr] ? $stderr : $stdout)
-          output.puts(*args)
+        def lockfile
+          @lockfile ||= Lockfile.new
         end
 
         def dependent_gems
-          @dependent_gems ||= self.class.dependent_gems
+          lockfile.dependencies.map(&:name)
         end
 
         def installed_gems
-          @installed_gems ||= self.class.installed_gems
+          lockfile.gems.map(&:name)
+        end
+
+        def puts(*args)
+          output = (@options[:stderr] ? $stderr : $stdout)
+          output.puts(*args)
         end
       end
     end

data/lib/rubocop/comment_config.rb

@@ -47,6 +47,12 @@ module RuboCop
       )
     end
 
+    def comment_only_line?(line_number)
+      non_comment_token_line_numbers.none? do |non_comment_line_number|
+        non_comment_line_number == line_number
+      end
+    end
+
     private
 
     def extra_enabled_comments_with_names(extras:, names:)
@@ -166,12 +172,6 @@ module RuboCop
       @all_cop_names ||= Cop::Registry.global.names - [REDUNDANT_DISABLE]
     end
 
-    def comment_only_line?(line_number)
-      non_comment_token_line_numbers.none? do |non_comment_line_number|
-        non_comment_line_number == line_number
-      end
-    end
-
     def non_comment_token_line_numbers
       @non_comment_token_line_numbers ||= begin
         non_comment_tokens = processed_source.tokens.reject(&:comment?)

data/lib/rubocop/config.rb

@@ -50,8 +50,8 @@ module RuboCop
       self
     end
 
-    def_delegators :@hash, :[], :[]=, :delete, :each, :key?, :keys, :each_key,
-                   :fetch, :map, :merge, :to_h, :to_hash, :transform_values
+    def_delegators :@hash, :[], :[]=, :delete, :dig, :each, :key?, :keys, :each_key,
+                   :fetch, :map, :merge, :replace, :to_h, :to_hash, :transform_values
     def_delegators :@validator, :validate, :target_ruby_version
 
     def to_s
@@ -281,6 +281,9 @@ module RuboCop
     end
 
     def enable_cop?(qualified_cop_name, cop_options)
+      # If the cop is explicitly enabled, the other checks can be skipped.
+      return true if cop_options['Enabled'] == true
+
       department = department_of(qualified_cop_name)
       cop_enabled = cop_options.fetch('Enabled') do
         !for_all_cops['DisabledByDefault']
@@ -292,10 +295,10 @@ module RuboCop
     end
 
     def department_of(qualified_cop_name)
-      cop_department, cop_name = qualified_cop_name.split('/')
-      return nil if cop_name.nil?
+      *cop_department, _ = qualified_cop_name.split('/')
+      return nil if cop_department.empty?
 
-      self[cop_department]
+      self[cop_department.join('/')]
     end
   end
 end

data/lib/rubocop/config_loader.rb

@@ -31,6 +31,7 @@ module RuboCop
 
       def clear_options
         @debug = nil
+        @loaded_features = []
         FileFinder.root_level = nil
       end
 
@@ -174,15 +175,12 @@ module RuboCop
       end
 
       def loaded_features
-        @loaded_features.flatten.compact
-      end
-
-      private
-
-      def file_path(file)
-        File.absolute_path(file.is_a?(RemoteConfig) ? file.file : file)
+        @loaded_features.flatten.compact.uniq
       end
 
+      # @api private
+      # Used to add features that were required inside a config or from
+      # the CLI using `--require`.
       def add_loaded_features(loaded_features)
         if instance_variable_defined?(:@loaded_features)
           instance_variable_get(:@loaded_features) << loaded_features
@@ -191,6 +189,12 @@ module RuboCop
         end
       end
 
+      private
+
+      def file_path(file)
+        File.absolute_path(file.is_a?(RemoteConfig) ? file.file : file)
+      end
+
       def find_project_dotfile(target_dir)
         find_file_upwards(DOTFILE, target_dir, project_root)
       end

data/lib/rubocop/config_loader_resolver.rb

@@ -20,12 +20,13 @@ module RuboCop
       end
     end
 
-    # rubocop:disable Metrics/MethodLength
-    def resolve_inheritance(path, hash, file, debug)
+    def resolve_inheritance(path, hash, file, debug) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       inherited_files = Array(hash['inherit_from'])
       base_configs(path, inherited_files, file)
         .reverse.each_with_index do |base_config, index|
         override_department_setting_for_cops(base_config, hash)
+        override_enabled_for_disabled_departments(base_config, hash)
+
         base_config.each do |k, v|
           next unless v.is_a?(Hash)
 
@@ -39,7 +40,6 @@ module RuboCop
         end
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     def resolve_inheritance_from_gems(hash)
       gems = hash.delete('inherit_gem')
@@ -75,6 +75,7 @@ module RuboCop
       end
 
       config = handle_disabled_by_default(config, default_configuration) if disabled_by_default
+      override_enabled_for_disabled_departments(default_configuration, config)
 
       opts = { inherit_mode: config['inherit_mode'] || {},
                unset_nil: unset_nil }
@@ -122,10 +123,26 @@ module RuboCop
       end
     end
 
+    # If a cop was previously explicitly enabled, but then superseded by the
+    # department being disabled, disable it.
+    def override_enabled_for_disabled_departments(base_hash, derived_hash)
+      cops_to_disable = derived_hash.each_key.with_object([]) do |key, cops|
+        next unless disabled?(derived_hash, key)
+
+        cops.concat(base_hash.keys.grep(Regexp.new("^#{key}/")))
+      end
+
+      cops_to_disable.each do |cop_name|
+        next unless base_hash.dig(cop_name, 'Enabled') == true
+
+        derived_hash.replace(merge({ cop_name => { 'Enabled' => false } }, derived_hash))
+      end
+    end
+
     private
 
     def disabled?(hash, department)
-      hash[department] && hash[department]['Enabled'] == false
+      hash[department].is_a?(Hash) && hash[department]['Enabled'] == false
     end
 
     def duplicate_setting?(base_hash, derived_hash, key, inherited_file)

data/lib/rubocop/config_obsoletion.rb

@@ -4,233 +4,40 @@ module RuboCop
   # This class handles obsolete configuration.
   # @api private
   class ConfigObsoletion
-    RENAMED_COPS = {
-      'Layout/AlignArguments' => 'Layout/ArgumentAlignment',
-      'Layout/AlignArray' => 'Layout/ArrayAlignment',
-      'Layout/AlignHash' => 'Layout/HashAlignment',
-      'Layout/AlignParameters' => 'Layout/ParameterAlignment',
-      'Layout/IndentArray' => 'Layout/FirstArrayElementIndentation',
-      'Layout/IndentAssignment' => 'Layout/AssignmentIndentation',
-      'Layout/IndentFirstArgument' => 'Layout/FirstArgumentIndentation',
-      'Layout/IndentFirstArrayElement' => 'Layout/FirstArrayElementIndentation',
-      'Layout/IndentFirstHashElement' => 'Layout/FirstHashElementIndentation',
-      'Layout/IndentFirstParameter' => 'Layout/FirstParameterIndentation',
-      'Layout/IndentHash' => 'Layout/FirstHashElementIndentation',
-      'Layout/IndentHeredoc' => 'Layout/HeredocIndentation',
-      'Layout/LeadingBlankLines' => 'Layout/LeadingEmptyLines',
-      'Layout/Tab' => 'Layout/IndentationStyle',
-      'Layout/TrailingBlankLines' => 'Layout/TrailingEmptyLines',
-      'Lint/DuplicatedKey' => 'Lint/DuplicateHashKey',
-      'Lint/EndInMethod' => 'Style/EndBlock',
-      'Lint/HandleExceptions' => 'Lint/SuppressedException',
-      'Lint/MultipleCompare' => 'Lint/MultipleComparison',
-      'Lint/StringConversionInInterpolation' => 'Lint/RedundantStringCoercion',
-      'Lint/UnneededCopDisableDirective' => 'Lint/RedundantCopDisableDirective',
-      'Lint/UnneededCopEnableDirective' => 'Lint/RedundantCopEnableDirective',
-      'Lint/UnneededRequireStatement' => 'Lint/RedundantRequireStatement',
-      'Lint/UnneededSplatExpansion' => 'Lint/RedundantSplatExpansion',
-      'Naming/UncommunicativeBlockParamName' => 'Naming/BlockParameterName',
-      'Naming/UncommunicativeMethodParamName' => 'Naming/MethodParameterName',
-      'Style/DeprecatedHashMethods' => 'Style/PreferredHashMethods',
-      'Style/MethodCallParentheses' => 'Style/MethodCallWithoutArgsParentheses',
-      'Style/OpMethod' => 'Naming/BinaryOperatorParameterName',
-      'Style/SingleSpaceBeforeFirstArg' => 'Layout/SpaceBeforeFirstArg',
-      'Style/UnneededCapitalW' => 'Style/RedundantCapitalW',
-      'Style/UnneededCondition' => 'Style/RedundantCondition',
-      'Style/UnneededInterpolation' => 'Style/RedundantInterpolation',
-      'Style/UnneededPercentQ' => 'Style/RedundantPercentQ',
-      'Style/UnneededSort' => 'Style/RedundantSort'
-    }.map do |old_name, new_name|
-      [old_name, "The `#{old_name}` cop has been renamed to `#{new_name}`."]
-    end
-
-    MOVED_COPS = {
-      'Security' => 'Lint/Eval',
-      'Naming' => %w[Style/ClassAndModuleCamelCase Style/ConstantName
-                     Style/FileName Style/MethodName Style/PredicateName
-                     Style/VariableName Style/VariableNumber
-                     Style/AccessorMethodName Style/AsciiIdentifiers],
-      'Layout' => %w[Lint/BlockAlignment Lint/EndAlignment
-                     Lint/DefEndAlignment Metrics/LineLength],
-      'Lint' => 'Style/FlipFlop'
-    }.map do |new_department, old_names|
-      Array(old_names).map do |old_name|
-        [old_name, "The `#{old_name}` cop has been moved to " \
-                   "`#{new_department}/#{old_name.split('/').last}`."]
+    DEFAULT_RULES_FILE = File.join(ConfigLoader::RUBOCOP_HOME, 'config', 'obsoletion.yml')
+    COP_RULE_CLASSES = {
+      'renamed' => RenamedCop,
+      'removed' => RemovedCop,
+      'split' => SplitCop,
+      'extracted' => ExtractedCop
+    }.freeze
+    PARAMETER_RULE_CLASSES = {
+      'changed_parameters' => ChangedParameter,
+      'changed_enforced_styles' => ChangedEnforcedStyles
+    }.freeze
+
+    attr_reader :rules, :warnings
+
+    class << self
+      attr_accessor :files
+
+      def legacy_cop_names
+        # Used by DepartmentName#qualified_legacy_cop_name
+        new(Config.new).rules.select(&:cop_rule?).map(&:old_name)
       end
     end
 
-    REMOVED_COPS = {
-      'Layout/SpaceAfterControlKeyword' => 'Layout/SpaceAroundKeyword',
-      'Layout/SpaceBeforeModifierKeyword' => 'Layout/SpaceAroundKeyword',
-      'Lint/RescueWithoutErrorClass' => 'Style/RescueStandardError',
-      'Style/SpaceAfterControlKeyword' => 'Layout/SpaceAroundKeyword',
-      'Style/SpaceBeforeModifierKeyword' => 'Layout/SpaceAroundKeyword',
-      'Style/TrailingComma' => 'Style/TrailingCommaInArguments, ' \
-                               'Style/TrailingCommaInArrayLiteral, and/or ' \
-                               'Style/TrailingCommaInHashLiteral',
-      'Style/TrailingCommaInLiteral' => 'Style/TrailingCommaInArrayLiteral ' \
-                                        'and/or ' \
-                                        'Style/TrailingCommaInHashLiteral',
-      'Style/BracesAroundHashParameters' => nil
-    }.map do |old_name, other_cops|
-      if other_cops
-        more = ". Please use #{other_cops} instead".gsub(%r{[A-Z]\w+/\w+},
-                                                         '`\&`')
-      end
-      [old_name, "The `#{old_name}` cop has been removed#{more}."]
-    end
-
-    REMOVED_COPS_WITH_REASON = {
-      'Lint/InvalidCharacterLiteral' => 'it was never being actually triggered',
-      'Lint/SpaceBeforeFirstArg' =>
-        'it was a duplicate of `Layout/SpaceBeforeFirstArg`. Please use ' \
-        '`Layout/SpaceBeforeFirstArg` instead',
-      'Style/MethodMissingSuper' => 'it has been superseded by `Lint/MissingSuper`. Please use ' \
-        '`Lint/MissingSuper` instead',
-      'Lint/UselessComparison' => 'it has been superseded by '\
-        '`Lint/BinaryOperatorWithIdenticalOperands`. Please use '\
-        '`Lint/BinaryOperatorWithIdenticalOperands` instead'
-    }.map do |cop_name, reason|
-      [cop_name, "The `#{cop_name}` cop has been removed since #{reason}."]
-    end
-
-    SPLIT_COPS = {
-      'Style/MethodMissing' =>
-        'The `Style/MethodMissing` cop has been split into ' \
-        '`Style/MethodMissingSuper` and `Style/MissingRespondToMissing`.'
-    }.to_a
-
-    OBSOLETE_COPS = Hash[*(RENAMED_COPS + MOVED_COPS + REMOVED_COPS +
-                           REMOVED_COPS_WITH_REASON + SPLIT_COPS).flatten]
-
-    # Parameters can be deprecated but not disabled by setting `severity: :warning`
-    OBSOLETE_PARAMETERS = [
-      {
-        cops: %w[Layout/SpaceAroundOperators Style/SpaceAroundOperators],
-        parameters: 'MultiSpaceAllowedForOperators',
-        alternative: 'If your intention was to allow extra spaces for ' \
-                     'alignment, please use AllowForAlignment: true instead.'
-      },
-      {
-        cops: 'Style/Encoding',
-        parameters: %w[EnforcedStyle SupportedStyles
-                       AutoCorrectEncodingComment],
-        alternative: 'Style/Encoding no longer supports styles. ' \
-                     'The "never" behavior is always assumed.'
-      },
-      {
-        cops: 'Style/IfUnlessModifier',
-        parameters: 'MaxLineLength',
-        alternative: '`Style/IfUnlessModifier: MaxLineLength` has been ' \
-                     'removed. Use `Layout/LineLength: Max` instead'
-      },
-      {
-        cops: 'Style/WhileUntilModifier',
-        parameters: 'MaxLineLength',
-        alternative: '`Style/WhileUntilModifier: MaxLineLength` has been ' \
-                     'removed. Use `Layout/LineLength: Max` instead'
-      },
-      {
-        cops: 'AllCops',
-        parameters: 'RunRailsCops',
-        alternative: "Use the following configuration instead:\n" \
-                     "Rails:\n  Enabled: true"
-      },
-      {
-        cops: 'Layout/CaseIndentation',
-        parameters: 'IndentWhenRelativeTo',
-        alternative: '`IndentWhenRelativeTo` has been renamed to ' \
-                     '`EnforcedStyle`'
-      },
-      {
-        cops: %w[Lint/BlockAlignment Layout/BlockAlignment Lint/EndAlignment
-                 Layout/EndAlignment Lint/DefEndAlignment
-                 Layout/DefEndAlignment],
-        parameters: 'AlignWith',
-        alternative: '`AlignWith` has been renamed to `EnforcedStyleAlignWith`'
-      },
-      {
-        cops: 'Rails/UniqBeforePluck',
-        parameters: 'EnforcedMode',
-        alternative: '`EnforcedMode` has been renamed to `EnforcedStyle`'
-      },
-      {
-        cops: 'Style/MethodCallWithArgsParentheses',
-        parameters: 'IgnoredMethodPatterns',
-        alternative: '`IgnoredMethodPatterns` has been renamed to ' \
-                     '`IgnoredPatterns`'
-      },
-      {
-        cops: %w[Performance/Count Performance/Detect],
-        parameters: 'SafeMode',
-        alternative: '`SafeMode` has been removed. ' \
-                     'Use `SafeAutoCorrect` instead.'
-      },
-      {
-        cops: 'Bundler/GemComment',
-        parameters: 'Whitelist',
-        alternative: '`Whitelist` has been renamed to `IgnoredGems`.'
-      },
-      {
-        cops: %w[
-          Lint/SafeNavigationChain Lint/SafeNavigationConsistency
-          Style/NestedParenthesizedCalls Style/SafeNavigation
-          Style/TrivialAccessors
-        ],
-        parameters: 'Whitelist',
-        alternative: '`Whitelist` has been renamed to `AllowedMethods`.'
-      },
-      {
-        cops: 'Style/IpAddresses',
-        parameters: 'Whitelist',
-        alternative: '`Whitelist` has been renamed to `AllowedAddresses`.'
-      },
-      {
-        cops: 'Naming/HeredocDelimiterNaming',
-        parameters: 'Blacklist',
-        alternative: '`Blacklist` has been renamed to `ForbiddenDelimiters`.'
-      },
-      {
-        cops: 'Naming/PredicateName',
-        parameters: 'NamePrefixBlacklist',
-        alternative: '`NamePrefixBlacklist` has been renamed to ' \
-                     '`ForbiddenPrefixes`.'
-      },
-      {
-        cops: 'Naming/PredicateName',
-        parameters: 'NameWhitelist',
-        alternative: '`NameWhitelist` has been renamed to ' \
-                     '`AllowedMethods`.'
-      },
-      {
-        cops: %w[Metrics/BlockLength Metrics/MethodLength],
-        parameters: 'ExcludedMethods',
-        alternative: '`ExcludedMethods` has been renamed to `IgnoredMethods`.',
-        severity: :warning
-      }
-    ].freeze
-
-    OBSOLETE_ENFORCED_STYLES = [
-      {
-        cop: 'Layout/IndentationConsistency',
-        parameter: 'EnforcedStyle',
-        enforced_style: 'rails',
-        alternative: '`EnforcedStyle: rails` has been renamed to ' \
-                     '`EnforcedStyle: indented_internal_methods`'
-      }
-    ].freeze
-
-    attr_reader :warnings
+    # Can be extended by extension libraries to add their own obsoletions
+    self.files = [DEFAULT_RULES_FILE]
 
     def initialize(config)
       @config = config
+      @rules = load_rules
       @warnings = []
     end
 
-    def reject_obsolete_cops_and_parameters
-      messages = [obsolete_cops, obsolete_parameters,
-                  obsolete_enforced_style].flatten.compact
+    def reject_obsolete!
+      messages = obsoletions.flatten.compact
       return if messages.empty?
 
       raise ValidationError, messages.join("\n")
@@ -238,64 +45,59 @@ module RuboCop
 
     private
 
-    def obsolete_cops
-      OBSOLETE_COPS.map do |cop_name, message|
-        next unless @config.key?(cop_name) ||
-                    @config.key?(Cop::Badge.parse(cop_name).cop_name)
-
-        message + "\n(obsolete configuration found in " \
-                  "#{smart_loaded_path}, please update it)"
+    # Default rules for obsoletions are in config/obsoletion.yml
+    # Additional rules files can be added with `RuboCop::ConfigObsoletion.files << filename`
+    def load_rules
+      rules = self.class.files.each_with_object({}) do |filename, hash|
+        hash.merge!(YAML.safe_load(File.read(filename))) do |_key, first, second|
+          first.merge(second)
+        end
       end
-    end
 
-    def obsolete_enforced_style
-      OBSOLETE_ENFORCED_STYLES.map do |params|
-        obsolete_enforced_style_message(params[:cop], params[:parameter],
-                                        params[:enforced_style],
-                                        params[:alternative])
-      end
-    end
+      cop_rules = rules.slice(*COP_RULE_CLASSES.keys)
+      parameter_rules = rules.slice(*PARAMETER_RULE_CLASSES.keys)
 
-    def obsolete_enforced_style_message(cop, param, enforced_style, alternative)
-      style = @config[cop]&.detect { |key, _| key.start_with?(param) }
+      load_cop_rules(cop_rules).concat(load_parameter_rules(parameter_rules))
+    end
 
-      return unless style && style[1] == enforced_style
+    # Cop rules are keyed by the name of the original cop
+    def load_cop_rules(rules)
+      rules.flat_map do |rule_type, data|
+        data.map do |cop_name, configuration|
+          next unless configuration # allow configurations to be disabled with `CopName: ~`
 
-      "obsolete `#{param}: #{enforced_style}` (for #{cop}) found in " \
-      "#{smart_loaded_path}\n#{alternative}"
+          COP_RULE_CLASSES[rule_type].new(@config, cop_name, configuration)
+        end.compact
+      end
     end
 
-    def obsolete_parameters
-      OBSOLETE_PARAMETERS.collect do |params|
-        messages = obsolete_parameter_message(params[:cops], params[:parameters],
-                                              params[:alternative])
-
-        # Warnings are collected separately and not added to the error message
-        if messages && params.fetch(:severity, :error) == :warning
-          @warnings.concat(messages)
-          next
+    # Parameter rules may apply to multiple cops and multiple parameters
+    # and are given as an array. Each combination is turned into a separate
+    # rule object.
+    def load_parameter_rules(rules)
+      rules.flat_map do |rule_type, data|
+        data.flat_map do |configuration|
+          cops = Array(configuration['cops'])
+          parameters = Array(configuration['parameters'])
+
+          cops.product(parameters).map do |cop, parameter|
+            PARAMETER_RULE_CLASSES[rule_type].new(@config, cop, parameter, configuration)
+          end
         end
-
-        messages
       end
     end
 
-    def obsolete_parameter_message(cops, parameters, alternative)
-      Array(cops).map do |cop|
-        obsolete_parameters = Array(parameters).select do |param|
-          @config[cop]&.key?(param)
-        end
-        next if obsolete_parameters.empty?
+    def obsoletions
+      rules.map do |rule|
+        next unless rule.violated?
 
-        obsolete_parameters.map do |parameter|
-          "obsolete parameter #{parameter} (for #{cop}) found in " \
-          "#{smart_loaded_path}\n#{alternative}"
+        if rule.warning?
+          @warnings.push(rule.message)
+          next
         end
-      end
-    end
 
-    def smart_loaded_path
-      PathUtil.smart_path(@config.loaded_path)
+        rule.message
+      end
     end
   end
 end