rubocop 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77baac77fdf5ed6293449d9653e1caeadc94b18e49bbd5115176c3681b8ed752
-  data.tar.gz: 677ced7d3409d54555aaba855aec07fac0717bdb100eef4ea0196d68688247d6
+  metadata.gz: ae0bcfc68121984fb71e933b1a00aa8d418d99dd4005cce76e986d6c387c0e50
+  data.tar.gz: '0465797f84ca499f634aac95e745a4192bb62d68f5d935b4a7e21b925893b131'
 SHA512:
-  metadata.gz: d083c6f78d892e14780bc3ab2cadf4b4208b87ab3dae357df39cc5dcbd9c2a18ff416795cd73a39c0d743fd07923ccbd092b916be3e738114558aa2b37f724cc
-  data.tar.gz: 6a5e0502cfbc9c0c5c11f075b89a91ea7ae4ec1b70134fbe6930caca9f7959282dea23f9358db291cca2a4e1fa72e830a1717c1c845528024eb89d23e6368379
+  metadata.gz: eb0e28d3926209e380aed52e134801e3e206cf9ca1bace01e133223ddfe37507a888a70b629cefb7711951eaffd089078daa0a7065cf0730ccfd79febe80f1ff
+  data.tar.gz: 17fcb97b537f9529a5bb484d85f5873f1745905712472586550f463cf689465f12aaa291efcf9371babc17b8ca7e5b2d5a99d7f6a46c800fdb3dba8dca58989e

data/README.md

@@ -51,7 +51,7 @@ To prevent an unwanted RuboCop update you might want to use a conservative versi
 in your `Gemfile`:
 
 ```rb
-gem 'rubocop', '~> 1.5', require: false
+gem 'rubocop', '~> 1.6', require: false
 ```
 
 See [versioning](https://docs.rubocop.org/rubocop/1.0/versioning.html) for further details.

data/config/default.yml

@@ -3209,9 +3209,10 @@ Style/ExponentialNotation:
 Style/FloatDivision:
   Description: 'For performing float division, coerce one side only.'
   StyleGuide: '#float-division'
-  Reference: 'https://github.com/rubocop-hq/ruby-style-guide/issues/628'
+  Reference: 'https://blog.rubystyle.guide/ruby/2019/06/21/float-division.html'
   Enabled: true
   VersionAdded: '0.72'
+  VersionChanged: '1.6'
   EnforcedStyle: single_coerce
   SupportedStyles:
     - left_coerce
@@ -4025,6 +4026,7 @@ Style/RedundantArgument:
   Enabled: pending
   Safe: false
   VersionAdded: '1.4'
+  VersionChanged: '1.6'
   Methods:
     # Array#join
     join: ''
@@ -4272,7 +4274,7 @@ Style/SingleLineBlockParams:
   Description: 'Enforces the names of some block params.'
   Enabled: false
   VersionAdded: '0.16'
-  VersionChanged: '0.47'
+  VersionChanged: '1.6'
   Methods:
     - reduce:
         - acc
@@ -4345,6 +4347,7 @@ Style/StringConcatenation:
   Enabled: true
   Safe: false
   VersionAdded: '0.89'
+  VersionChanged: '1.6'
 
 Style/StringHashKeys:
   Description: 'Prefer symbols instead of strings as hash keys.'

data/config/obsoletion.yml

@@ -0,0 +1,196 @@
+# Configuration of obsolete/deprecated cops used by `ConfigObsoletion`
+
+# Cops that were renamed
+renamed:
+  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/BlockAlignment: Layout/BlockAlignment
+  Lint/DefEndAlignment: Layout/DefEndAlignment
+  Lint/DuplicatedKey: Lint/DuplicateHashKey
+  Lint/EndAlignment: Layout/EndAlignment
+  Lint/EndInMethod: Style/EndBlock
+  Lint/Eval: Security/Eval
+  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
+  Metrics/LineLength: Layout/LineLength
+  Naming/UncommunicativeBlockParamName: Naming/BlockParameterName
+  Naming/UncommunicativeMethodParamName: Naming/MethodParameterName
+  Style/AccessorMethodName: Naming/AccessorMethodName
+  Style/AsciiIdentifiers: Naming/AsciiIdentifiers
+  Style/ClassAndModuleCamelCase: Naming/ClassAndModuleCamelCase
+  Style/ConstantName: Naming/ConstantName
+  Style/DeprecatedHashMethods: Style/PreferredHashMethods
+  Style/FileName: Naming/FileName
+  Style/FlipFlop: Lint/FlipFlop
+  Style/MethodCallParentheses: Style/MethodCallWithoutArgsParentheses
+  Style/MethodName: Naming/MethodName
+  Style/OpMethod: Naming/BinaryOperatorParameterName
+  Style/PredicateName: Naming/PredicateName
+  Style/SingleSpaceBeforeFirstArg: Layout/SpaceBeforeFirstArg
+  Style/UnneededCapitalW: Style/RedundantCapitalW
+  Style/UnneededCondition: Style/RedundantCondition
+  Style/UnneededInterpolation: Style/RedundantInterpolation
+  Style/UnneededPercentQ: Style/RedundantPercentQ
+  Style/UnneededSort: Style/RedundantSort
+  Style/VariableName: Naming/VariableName
+  Style/VariableNumber: Naming/VariableNumber
+
+# Cops that were removed
+removed:
+  Layout/SpaceAfterControlKeyword:
+    alternatives: Layout/SpaceAroundKeyword
+  Layout/SpaceBeforeModifierKeyword:
+    alternatives: Layout/SpaceAroundKeyword
+  Lint/InvalidCharacterLiteral:
+    reason: it was never being actually triggered
+  Lint/RescueWithoutErrorClass:
+    alternatives: Style/RescueStandardError
+  Lint/SpaceBeforeFirstArg:
+    reason: >
+      it was a duplicate of `Layout/SpaceBeforeFirstArg`. Please use
+      `Layout/SpaceBeforeFirstArg` instead
+  Lint/UselessComparison:
+    reason: >
+      it has been superseded by
+      `Lint/BinaryOperatorWithIdenticalOperands`. Please use
+      `Lint/BinaryOperatorWithIdenticalOperands` instead
+  Style/BracesAroundHashParameters: true
+  Style/MethodMissingSuper:
+    reason: >
+      it has been superseded by `Lint/MissingSuper`. Please use
+      `Lint/MissingSuper` instead
+  Style/SpaceAfterControlKeyword:
+    alternatives: Layout/SpaceAroundKeyword
+  Style/SpaceBeforeModifierKeyword:
+    alternatives: Layout/SpaceAroundKeyword
+  Style/TrailingComma:
+    alternatives:
+      - Style/TrailingCommaInArguments
+      - Style/TrailingCommaInArrayLiteral
+      - Style/TrailingCommaInHashLiteral
+  Style/TrailingCommaInLiteral:
+    alternatives:
+      - Style/TrailingCommaInArrayLiteral
+      - Style/TrailingCommaInHashLiteral
+
+# Cops split into multiple other cops
+split:
+  Style/MethodMissing:
+    alternatives:
+      - Style/MethodMissingSuper
+      - Style/MissingRespondToMissing
+
+# Cops that were extracted into a different gem
+extracted:
+  Performance/*: rubocop-performance
+  Rails/*: rubocop-rails
+
+# Cop parameters that have been changed
+# Can be treated as a warning instead of a failure with `severity: warning`
+changed_parameters:
+  - cops:
+      - Layout/SpaceAroundOperators
+      - Style/SpaceAroundOperators
+    parameters: MultiSpaceAllowedForOperators
+    reason: >
+      If your intention was to allow extra spaces for alignment, please
+      use `AllowForAlignment: true` instead.
+  - cops: Style/Encoding
+    parameters:
+      - EnforcedStyle
+      - SupportedStyles
+      - AutoCorrectEncodingComment
+    reason: '`Style/Encoding` no longer supports styles. The "never" behavior is always assumed.'
+  - cops: Style/IfUnlessModifier
+    parameters: MaxLineLength
+    reason: >
+      `Style/IfUnlessModifier: MaxLineLength` has been removed.
+      Use `Layout/LineLength: Max` instead
+  - cops: Style/WhileUntilModifier
+    parameters: MaxLineLength
+    reason: >
+      `Style/WhileUntilModifier: MaxLineLength` has been removed.
+      Use `Layout/LineLength: Max` instead
+  - cops: AllCops
+    parameters: RunRailsCops
+    reason: |-
+      Use the following configuration instead:
+      Rails:
+        Enabled: true
+  - cops: Layout/CaseIndentation
+    parameters: IndentWhenRelativeTo
+    alternative: EnforcedStyle
+  - cops:
+      - Lint/BlockAlignment
+      - Layout/BlockAlignment
+      - Lint/EndAlignment
+      - Layout/EndAlignment
+      - Lint/DefEndAlignment
+      - Layout/DefEndAlignment
+    parameters: AlignWith
+    alternative: EnforcedStyleAlignWith
+  - cops: Rails/UniqBeforePluck
+    parameters: EnforcedMode
+    alternative: EnforcedStyle
+  - cops: Style/MethodCallWithArgsParentheses
+    parameters: IgnoredMethodPatterns
+    alternative: IgnoredPatterns
+  - cops:
+      - Performance/Count
+      - Performance/Detect
+    parameters: SafeMode
+    reason: "`SafeMode` has been removed. Use `SafeAutoCorrect` instead."
+  - cops: Bundler/GemComment
+    parameters: Whitelist
+    alternative: IgnoredGems
+  - cops:
+      - Lint/SafeNavigationChain
+      - Lint/SafeNavigationConsistency
+      - Style/NestedParenthesizedCalls
+      - Style/SafeNavigation
+      - Style/TrivialAccessors
+    parameters: Whitelist
+    alternative: AllowedMethods
+  - cops: Style/IpAddresses
+    parameters: Whitelist
+    alternative: AllowedAddresses
+  - cops: Naming/HeredocDelimiterNaming
+    parameters: Blacklist
+    alternative: ForbiddenDelimiters
+  - cops: Naming/PredicateName
+    parameters: NamePrefixBlacklist
+    alternative: ForbiddenPrefixes
+  - cops: Naming/PredicateName
+    parameters: NameWhitelist
+    alternative: AllowedMethods
+  - cops:
+      - Metrics/BlockLength
+      - Metrics/MethodLength
+    parameters: ExcludedMethods
+    alternative: IgnoredMethods
+    severity: warning
+
+# Enforced styles that have been removed or replaced
+changed_enforced_styles:
+  - cops: Layout/IndentationConsistency
+    parameters: EnforcedStyle
+    value: rails
+    alternative: indented_internal_methods

data/lib/rubocop.rb

@@ -632,9 +632,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/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,57 @@ 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)"
-      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])
+    # 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_message(cop, param, enforced_style, alternative)
-      style = @config[cop]&.detect { |key, _| key.start_with?(param) }
 
-      return unless style && style[1] == enforced_style
+      cop_rules = rules.slice(*COP_RULE_CLASSES.keys)
+      parameter_rules = rules.slice(*PARAMETER_RULE_CLASSES.keys)
 
-      "obsolete `#{param}: #{enforced_style}` (for #{cop}) found in " \
-      "#{smart_loaded_path}\n#{alternative}"
+      load_cop_rules(cop_rules).concat(load_parameter_rules(parameter_rules))
     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
+    # 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 |configuration|
+          COP_RULE_CLASSES[rule_type].new(@config, *configuration)
         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?
-
-        obsolete_parameters.map do |parameter|
-          "obsolete parameter #{parameter} (for #{cop}) found in " \
-          "#{smart_loaded_path}\n#{alternative}"
+    # 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
       end
     end
 
-    def smart_loaded_path
-      PathUtil.smart_path(@config.loaded_path)
+    def obsoletions
+      rules.map do |rule|
+        next unless rule.violated?
+
+        if rule.warning?
+          @warnings.push(rule.message)
+          next
+        end
+
+        rule.message
+      end
     end
   end
 end