cookstyle 6.13.3 → 6.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddf96e2cc00a4c499396b6cb2b54297e64d0605edd2dba615fb28ecd0bcb91a9
-  data.tar.gz: 2ec5752d4202b2b7567f808346672b4a80c59967a8ebeed20fe354f0911236bb
+  metadata.gz: c12050a348d700990dba93b33e7e15d0151ff5f2fef01aed90bb4f8014a6c04b
+  data.tar.gz: 62577299c8994813248be5f8c73e27680fd9907d7c2088656e0cb03f035f5932
 SHA512:
-  metadata.gz: 4f5e75f32ca428f5b4395a3f42a50a37675e21dc79e89d4b7b1d731328c28e2cd1dfd116667c0c8c9b0887bfd1ca647901ecd6895c56e82bac5f4e9939c84e54
-  data.tar.gz: 6aa192abcf88b35034474eac2ebcfecd8c154e2f28e08f0995a53bb4e998e8a4af7f1e246a1f7fced0979bbd2bddd1bdd96bbde6c046fdc92299cede2b012742
+  metadata.gz: df19582100f6907be3fdb9d2fcd5f583c674b57538abce8d69d98e4112dab6232e65e3e298347479698a32dace5c41d6f99e6bd1ca83e48955c75f41ec982624
+  data.tar.gz: 0ed13875d921f88edeb14a476b7bbd71342136e6d4f7a1b9ca83a17953951e949aa38ffc85e8792a4a48ecb774d3ad8387d4fe5aa48c757c0723830c06cb272c

data/Gemfile

@@ -27,5 +27,4 @@ group :development do
   gem 'concord'
   gem 'rake'
   gem 'rspec', '>= 3.4'
-  gem 'simplecov'
 end

data/config/cookstyle.yml

@@ -5,27 +5,6 @@ AllCops:
     - '/**/files/**/*'
     - '/**/vendor/**/*'
     - Guardfile
-  ChefAttributes:
-    Patterns:
-    - attributes/.*\.rb
-  ChefDefinitions:
-    Patterns:
-    - definitions/.*\.rb
-  ChefLibraries:
-    Patterns:
-    - libraries/.*\.rb
-  ChefMetadata:
-    Patterns:
-    - metadata\.rb
-  ChefProviders:
-    Patterns:
-    - providers/.*\.rb
-  ChefRecipes:
-    Patterns:
-    - recipes/.*\.rb
-  ChefResources:
-    Patterns:
-    - resources/.*\.rb
 
 ###############################
 # ChefStyle: Making cookbooks look better
@@ -67,7 +46,7 @@ ChefStyle/CommentFormat:
     - '**/Berksfile'
 
 ChefStyle/FileMode:
-  Description: Use strings to represent file modes in Chef resources
+  Description: Use strings to represent file modes to avoid confusion between octal and base 10 integer formats.
   StyleGuide: '#chefstylefilemode'
   Enabled: true
   VersionAdded: '5.0.0'
@@ -231,14 +210,6 @@ ChefCorrectness/CookbookUsesNodeSave:
     - '**/metadata.rb'
     - '**/Berksfile'
 
-ChefCorrectness/CookbooksDependsOnSelf:
-  Description: A cookbook cannot depend on itself
-  StyleGuide: '#chefcorrectnesscookbooksdependonself'
-  Enabled: true
-  VersionAdded: '5.2.0'
-  Include:
-    - '**/metadata.rb'
-
 ChefCorrectness/MetadataMissingName:
   Description: The metadata.rb file is missing the name field which is required by Chef Infra Client 12 and later
   StyleGuide: '#chefcorrectnessmetadatamissingname'
@@ -471,6 +442,15 @@ ChefCorrectness/SupportsMustBeFloat:
   Include:
     - '**/metadata.rb'
 
+ChefCorrectness/MacosUserdefaultsInvalidType:
+  Description: The macos_userdefaults resource prior to Chef Infra Client 16.3 would silently continue if invalid types were passed resulting in unexpected behavior. Valid values are 'array', 'bool', 'dict', 'float', 'int', and 'string'.
+  StyleGuide: '#chefcorrectnessmacosuserdefaultsinvalidtype'
+  Enabled: true
+  VersionAdded: '6.14.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
 ###############################
 # ChefSharing: Issues that prevent sharing code with other teams or with the Chef community in general
 ###############################
@@ -515,7 +495,7 @@ ChefSharing/EmptyMetadataField:
     - '**/metadata.rb'
 
 ChefSharing/IncludePropertyDescriptions:
-  Description: Properties should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+  Description: Properties should include description fields to allow automated documentation. Requires Chef Infra Client 13.9 or later.
   StyleGuide: '#chefsharingincludepropetydescriptions'
   Enabled: false
   VersionAdded: '6.1.0'
@@ -524,7 +504,7 @@ ChefSharing/IncludePropertyDescriptions:
     - '**/resources/*.rb'
 
 ChefSharing/IncludeResourceDescriptions:
-  Description: Resources should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+  Description: Resources should include description fields to allow automated documentation. Requires Chef Infra Client 13.9 or later.
   StyleGuide: '#chefsharingincluderesourcedescriptions'
   Enabled: false
   VersionAdded: '6.1.0'
@@ -532,7 +512,7 @@ ChefSharing/IncludeResourceDescriptions:
     - '**/resources/*.rb'
 
 ChefSharing/IncludeResourceExamples:
-  Description: Resources should include examples field to allow automated documention. Requires Chef Infra Client 13.9 or later.
+  Description: Resources should include examples field to allow automated documentation. Requires Chef Infra Client 13.9 or later.
   StyleGuide: '#chefsharingincluderesourceexamples'
   Enabled: false
   VersionAdded: '6.10.0'
@@ -1039,7 +1019,7 @@ ChefDeprecations/ResourceUsesOnlyResourceName:
 
 ChefDeprecations/ChefDKGenerators:
   Description: Chef Workstation 0.8 and later renamed the ChefDK module used when writing custom cookbook generators from ChefDK to ChefCLI. For compatibility with the latest Chef Workstation releases you'll need to reference the new class names.
-  StyleGuide: '#chefdkgenerators'
+  StyleGuide: '#chefdeprecationschefdkgenerators'
   Enabled: true
   VersionAdded: '6.12.0'
   Exclude:
@@ -1048,7 +1028,7 @@ ChefDeprecations/ChefDKGenerators:
 
 ChefDeprecations/ChefHandlerRecipe:
   Description: There is no need to include the empty and deprecated chef_handler::default recipe in order to use the chef_handler resource.
-  StyleGuide: '#chefhandlerrecipe'
+  StyleGuide: '#chefdeprecationschefhandlerrecipe'
   Enabled: true
   VersionAdded: '6.12.0'
   Exclude:
@@ -1057,13 +1037,31 @@ ChefDeprecations/ChefHandlerRecipe:
 
 ChefDeprecations/UseAutomaticResourceName:
   Description: The use_automatic_resource_name method was removed in Chef Infra Client 16. The resource name/provides should be set explicitly instead.
-  StyleGuide: '#useautomaticresourcename'
+  StyleGuide: '#chefdeprecationsuseautomaticresourcename'
   Enabled: true
   VersionAdded: '6.12.0'
   Include:
     - '**/libraries/*.rb'
     - '**/resources/*.rb'
 
+ChefDeprecations/MacosUserdefaultsGlobalProperty:
+  Description: The `global` property in the macos_userdefaults resource was deprecated in Chef Infra Client 16.3. Omitting the `domain` property will now set global defaults.
+  StyleGuide: '#chefdeprecationsmacosuserdefaultsglobalproperty'
+  Enabled: true
+  VersionAdded: '6.14.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
+ChefDeprecations/CookbooksDependsOnSelf:
+  Description: A cookbook cannot depend on itself in Chef Infra Client 13 or later.
+  StyleGuide: '#chefdeprecationscookbooksdependonself'
+  Enabled: true
+  VersionAdded: '5.2.0'
+  VersionChanged: '6.16.0'
+  Include:
+    - '**/metadata.rb'
+
 ###############################
 # ChefModernize: Cleaning up legacy code and using new built-in resources
 ###############################
@@ -1540,7 +1538,7 @@ ChefModernize/WindowsRegistryUAC:
     - '**/Berksfile'
 
 ChefModernize/UseMultipackageInstalls:
-  Description: Pass an array of packages to package resources instead of interating over an array of packages when using multi-package capable package subystem such as apt, yum, chocolatey, dnf, or zypper. Multipackage installs are faster and simplify logs.
+  Description: Pass an array of packages to package resources instead of iterating over an array of packages when using multi-package capable package subsystem such as apt, yum, chocolatey, dnf, or zypper. Multi-package installs are faster and simplify logs.
   StyleGuide: '#chefmodernizeusemultipackageinstalls'
   Enabled: true
   VersionAdded: '6.0.0'
@@ -1873,7 +1871,7 @@ ChefEffortless/CookbookUsesDatabags:
     - '**/metadata.rb'
     - '**/Berksfile'
 
-ChefEffortless/CookbookUsesEnvironmments:
+ChefEffortless/CookbookUsesEnvironments:
   Description: Cookbook uses environments, which cannot be used in the Effortless Infra pattern
   StyleGuide: '#chefeffortlesscookbookusesenvironments'
   Enabled: false
@@ -2209,10 +2207,6 @@ Style/WordArray:
   Enabled: true
 Style/ZeroLengthPredicate:
   Enabled: true
-Metrics/BlockNesting:
-  Enabled: true
-Metrics/ParameterLists:
-  Enabled: true
 Lint/AmbiguousOperator:
   Enabled: true
 Lint/AssignmentInCondition:
@@ -2344,16 +2338,16 @@ Metrics/CyclomaticComplexity:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
-
-#### COPS FOR THE NEXT MAJOR RELEASE
+Metrics/BlockNesting:
+  Enabled: false
+Metrics/ParameterLists:
+  Enabled: false
 
 # This updates how we send helpers into the Chef recipe/resource classes and makes WAY more sense
 # Chef::Recipe.send(:include, ::Apt::Helpers) -> Chef::Recipe.include ::Apt::Helpers
 Lint/SendWithMixinArgument:
   Enabled: true
 
-#### END COPS FOR THE NEXT MAJOR RELEASE
-
 # this migrates old # rubocop: comments to use the latest namespaces, which prevents a ton of spam during cookstyle runs
 Migration/DepartmentName:
   Enabled: true
@@ -2578,3 +2572,44 @@ Style/HashEachMethods:
 # We want to catch this deprecation in cookbooks
 Lint/DeprecatedOpenSSLConstant:
   Enabled: true
+
+# This just isn't a big deal in the context of a cookbook
+Naming/AccessorMethodName:
+  Enabled: false
+
+# Rescuing a particular exception twice isn't going to work
+Lint/DuplicateRescueException:
+  Enabled: true
+
+# if b == 0 && b == 0 is invalid and we should flag it
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: true
+
+# returning at the top level with an arg is invalid
+# @TODO we can enable this once this is fixed: https://github.com/rubocop-hq/rubocop/issues/8462
+# Lint/TopLevelReturnWithArgument:
+#   Enabled: true
+
+# simplify hash acccess that doesn't actually need .dig
+Style/SingleArgumentDig:
+  Enabled: true
+
+# trying to access $2 when there is no $2 will always return nil
+Lint/OutOfRangeRegexpRef:
+  Enabled: true
+
+# simplify how people coerce arrays
+Style/ArrayCoercion:
+  Enabled: true
+
+# if your elseif is the same as your if you're gonna have a bad day
+Lint/DuplicateElsifCondition:
+  Enabled: true
+
+# simplify attr_reader and attr_write into attr_accessor
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+# avoid assignments that aren't needed
+Style/RedundantAssignment:
+  Enabled: true

data/config/disable_all.yml

@@ -53,6 +53,8 @@ Layout/EmptyLineAfterGuardClause:
   Enabled: false
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
+Layout/EmptyLineAfterMultilineCondition:
+  Enabled: false
 Layout/EmptyLineBetweenDefs:
   Enabled: false
 Layout/EmptyLinesAroundAccessModifier:
@@ -207,6 +209,8 @@ Lint/AssignmentInCondition:
   Enabled: false
 Lint/BigDecimalNew:
   Enabled: false
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: false
 Lint/BooleanSymbol:
   Enabled: false
 Lint/CircularArgumentReference:
@@ -229,14 +233,22 @@ Lint/DuplicateHashKey:
   Enabled: false
 Lint/DuplicateMethods:
   Enabled: false
+Lint/DuplicateRequire:
+  Enabled: false
+Lint/DuplicateRescueException:
+  Enabled: false
 Lint/EachWithObjectArgument:
   Enabled: false
 Lint/ElseLayout:
   Enabled: false
+Lint/EmptyConditionalBody:
+  Enabled: false
 Lint/EmptyEnsure:
   Enabled: false
 Lint/EmptyExpression:
   Enabled: false
+Lint/EmptyFile:
+  Enabled: false
 Lint/EmptyInterpolation:
   Enabled: false
 Lint/EmptyWhen:
@@ -247,6 +259,8 @@ Lint/ErbNewArguments:
   Enabled: false
 Lint/FlipFlop:
   Enabled: false
+Lint/FloatComparison:
+  Enabled: false
 Lint/FloatOutOfRange:
   Enabled: false
 Lint/FormatParameterMismatch:
@@ -269,6 +283,8 @@ Lint/Loop:
   Enabled: false
 Lint/MissingCopEnableDirective:
   Enabled: false
+Lint/MissingSuper:
+  Enabled: false
 Lint/MixedRegexpCaptureTypes:
   Enabled: false
 Lint/MultipleComparison:
@@ -287,6 +303,8 @@ Lint/NumberConversion:
   Enabled: false
 Lint/OrderedMagicComments:
   Enabled: false
+Lint/OutOfRangeRegexpRef:
+  Enabled: false
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
 Lint/PercentStringArray:
@@ -329,6 +347,8 @@ Lint/SafeNavigationWithEmpty:
   Enabled: false
 Lint/ScriptPermission:
   Enabled: false
+Lint/SelfAssignment:
+  Enabled: false
 Lint/SendWithMixinArgument:
   Enabled: false
 Lint/ShadowedArgument:
@@ -345,12 +365,18 @@ Lint/Syntax:
   Enabled: false
 Lint/ToJSON:
   Enabled: false
+Lint/TopLevelReturnWithArgument:
+  Enabled: false
+Lint/TrailingCommaInAttributeDeclaration:
+  Enabled: false
 Lint/UnderscorePrefixedVariableName:
   Enabled: false
 Lint/UnifiedInteger:
   Enabled: false
 Lint/UnreachableCode:
   Enabled: false
+Lint/UnreachableLoop:
+  Enabled: false
 Lint/UnusedBlockArgument:
   Enabled: false
 Lint/UnusedMethodArgument:
@@ -363,10 +389,10 @@ Lint/UselessAccessModifier:
   Enabled: false
 Lint/UselessAssignment:
   Enabled: false
-Lint/UselessComparison:
-  Enabled: false
 Lint/UselessElseWithoutRescue:
   Enabled: false
+Lint/UselessMethodDefinition:
+  Enabled: false
 Lint/UselessSetterCall:
   Enabled: false
 Lint/Void:
@@ -461,6 +487,8 @@ Style/ClassCheck:
   Enabled: false
 Style/ClassMethods:
   Enabled: false
+Style/ClassMethodsDefinitions:
+  Enabled: false
 Style/ClassVars:
   Enabled: false
 Style/CollectionMethods:
@@ -469,6 +497,8 @@ Style/ColonMethodCall:
   Enabled: false
 Style/ColonMethodDefinition:
   Enabled: false
+Style/CombinableLoops:
+  Enabled: false
 Style/CommandLiteral:
   Enabled: false
 Style/CommentAnnotation:
@@ -523,6 +553,8 @@ Style/EvenOdd:
   Enabled: false
 Style/ExpandPathArguments:
   Enabled: false
+Style/ExplicitBlockArgument:
+  Enabled: false
 Style/ExponentialNotation:
   Enabled: false
 Style/FloatDivision:
@@ -535,6 +567,8 @@ Style/FormatStringToken:
   Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: false
+Style/GlobalStdStream:
+  Enabled: false
 Style/GlobalVars:
   Enabled: false
 Style/GuardClause:
@@ -571,6 +605,8 @@ Style/InlineComment:
   Enabled: false
 Style/IpAddresses:
   Enabled: false
+Style/KeywordParametersOrder:
+  Enabled: false
 Style/Lambda:
   Enabled: false
 Style/LambdaCall:
@@ -587,12 +623,14 @@ Style/RedundantFetchBlock:
   Enabled: false
 Style/RedundantFileExtensionInRequire:
   Enabled: false
+Style/RedundantSelfAssignment:
+  Enabled: false
+Style/SoleNestedConditional:
+  Enabled: false
 Style/MethodCalledOnDoEndBlock:
   Enabled: false
 Style/MethodDefParentheses:
   Enabled: false
-Style/MethodMissingSuper:
-  Enabled: false
 Style/MinMax:
   Enabled: false
 Style/MissingElse:
@@ -657,6 +695,8 @@ Style/OptionHash:
   Enabled: false
 Style/OptionalArguments:
   Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false
 Style/ParallelAssignment:
   Enabled: false
 Style/ParenthesesAroundCondition:
@@ -725,6 +765,8 @@ Style/Send:
   Enabled: false
 Style/SignalException:
   Enabled: false
+Style/SingleArgumentDig:
+  Enabled: false
 Style/SingleLineBlockParams:
   Enabled: false
 Style/SingleLineMethods:
@@ -737,6 +779,8 @@ Style/StabbyLambdaParentheses:
   Enabled: false
 Style/StderrPuts:
   Enabled: false
+Style/StringConcatenation:
+  Enabled: false
 Style/StringHashKeys:
   Enabled: false
 Style/StringLiterals:

data/config/upstream.yml

@@ -210,9 +210,10 @@ Gemspec/OrderedDependencies:
     - '**/*.gemspec'
 
 Gemspec/RequiredRubyVersion:
-  Description: 'Checks that `required_ruby_version` of gemspec and `TargetRubyVersion` of .rubocop.yml are equal.'
+  Description: 'Checks that `required_ruby_version` of gemspec is specified and equal to `TargetRubyVersion` of .rubocop.yml.'
   Enabled: true
   VersionAdded: '0.52'
+  VersionChanged: '0.89'
   Include:
     - '**/*.gemspec'
 
@@ -398,7 +399,6 @@ Layout/DefEndAlignment:
   SupportedStylesAlignWith:
     - start_of_line
     - def
-  AutoCorrect: false
   Severity: warning
 
 Layout/DotPosition:
@@ -435,6 +435,14 @@ Layout/EmptyLineAfterMagicComment:
   Enabled: true
   VersionAdded: '0.49'
 
+Layout/EmptyLineAfterMultilineCondition:
+  Description: 'Enforces empty line after multiline condition.'
+  # This is disabled, because this style is not very common in practice.
+  Enabled: false
+  VersionAdded: '0.90'
+  Reference:
+    - https://github.com/airbnb/ruby#multiline-if-newline
+
 Layout/EmptyLineBetweenDefs:
   Description: 'Use empty lines between defs.'
   StyleGuide: '#empty-lines-between-methods'
@@ -554,7 +562,6 @@ Layout/EndAlignment:
     - keyword
     - variable
     - start_of_line
-  AutoCorrect: false
   Severity: warning
 
 Layout/EndOfLine:
@@ -1234,7 +1241,7 @@ Layout/SpaceInsideBlockBraces:
 
 Layout/SpaceInsideHashLiteralBraces:
   Description: "Use spaces inside hash literal braces - or don't."
-  StyleGuide: '#spaces-operators'
+  StyleGuide: '#spaces-braces'
   Enabled: true
   VersionAdded: '0.49'
   EnforcedStyle: space
@@ -1355,6 +1362,12 @@ Lint/BigDecimalNew:
   Enabled: true
   VersionAdded: '0.53'
 
+Lint/BinaryOperatorWithIdenticalOperands:
+  Description: 'This cop checks for places where binary operator has identical operands.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '0.89'
+
 Lint/BooleanSymbol:
   Description: 'Check for `:true` and `:false` symbols.'
   Enabled: true
@@ -1420,6 +1433,16 @@ Lint/DuplicateMethods:
   Enabled: true
   VersionAdded: '0.29'
 
+Lint/DuplicateRequire:
+  Description: 'Check for duplicate `require`s and `require_relative`s.'
+  Enabled: pending
+  VersionAdded: '0.90'
+
+Lint/DuplicateRescueException:
+  Description: 'Checks that there are no repeated exceptions used in `rescue` expressions.'
+  Enabled: pending
+  VersionAdded: '0.89'
+
 Lint/EachWithObjectArgument:
   Description: 'Check for immutable argument given to each_with_object.'
   Enabled: true
@@ -1430,18 +1453,29 @@ Lint/ElseLayout:
   Enabled: true
   VersionAdded: '0.17'
 
+Lint/EmptyConditionalBody:
+  Description: 'This cop checks for the presence of `if`, `elsif` and `unless` branches without a body.'
+  Enabled: 'pending'
+  AllowComments: true
+  VersionAdded: '0.89'
+
 Lint/EmptyEnsure:
   Description: 'Checks for empty ensure block.'
   Enabled: true
   VersionAdded: '0.10'
   VersionChanged: '0.48'
-  AutoCorrect: false
 
 Lint/EmptyExpression:
   Description: 'Checks for empty expressions.'
   Enabled: true
   VersionAdded: '0.45'
 
+Lint/EmptyFile:
+  Description: 'Enforces that Ruby source files are not empty.'
+  Enabled: pending
+  AllowComments: true
+  VersionAdded: '0.90'
+
 Lint/EmptyInterpolation:
   Description: 'Checks for empty string interpolation.'
   Enabled: true
@@ -1473,6 +1507,12 @@ Lint/FlipFlop:
   Enabled: true
   VersionAdded: '0.16'
 
+Lint/FloatComparison:
+  Description: 'Checks for the presence of precise comparison of floating point numbers.'
+  StyleGuide: '#float-comparison'
+  Enabled: pending
+  VersionAdded: '0.89'
+
 Lint/FloatOutOfRange:
   Description: >-
                  Catches floating-point literals too large or small for Ruby to
@@ -1520,7 +1560,7 @@ Lint/InheritException:
 Lint/InterpolationCheck:
   Description: 'Raise warning for interpolation in single q strs.'
   Enabled: true
-  SafeAutoCorrect: false
+  Safe: false
   VersionAdded: '0.50'
   VersionChanged: '0.87'
 
@@ -1542,6 +1582,7 @@ Lint/Loop:
   StyleGuide: '#loop-with-break'
   Enabled: true
   VersionAdded: '0.9'
+  VersionChanged: '0.89'
 
 Lint/MissingCopEnableDirective:
   Description: 'Checks for a `# rubocop:enable` after `# rubocop:disable`.'
@@ -1556,6 +1597,13 @@ Lint/MissingCopEnableDirective:
   # .inf for any size
   MaximumRangeSize: .inf
 
+Lint/MissingSuper:
+  Description: >-
+                  This cop checks for the presence of constructors and lifecycle callbacks
+                  without calls to `super`'.
+  Enabled: pending
+  VersionAdded: '0.89'
+
 Lint/MixedRegexpCaptureTypes:
   Description: 'Do not mix named captures and numbered captures in a Regexp literal.'
   Enabled: pending
@@ -1608,6 +1656,12 @@ Lint/OrderedMagicComments:
   Enabled: true
   VersionAdded: '0.53'
 
+Lint/OutOfRangeRegexpRef:
+  Description: 'Checks for out of range reference for Regexp because it always returns nil.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '0.89'
+
 Lint/ParenthesesAsGroupedExpression:
   Description: >-
                  Checks for method calls with a space before the opening
@@ -1758,6 +1812,11 @@ Lint/ScriptPermission:
   VersionAdded: '0.49'
   VersionChanged: '0.50'
 
+Lint/SelfAssignment:
+  Description: 'Checks for self-assignments.'
+  Enabled: pending
+  VersionAdded: '0.89'
+
 Lint/SendWithMixinArgument:
   Description: 'Checks for `send` method when using mixin.'
   Enabled: true
@@ -1808,6 +1867,16 @@ Lint/ToJSON:
   Enabled: true
   VersionAdded: '0.66'
 
+Lint/TopLevelReturnWithArgument:
+  Description: 'This cop detects top level return statements with argument.'
+  Enabled: 'pending'
+  VersionAdded: '0.89'
+
+Lint/TrailingCommaInAttributeDeclaration:
+  Description: 'This cop checks for trailing commas in attribute declarations.'
+  Enabled: pending
+  VersionAdded: '0.90'
+
 Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: true
@@ -1824,6 +1893,11 @@ Lint/UnreachableCode:
   Enabled: true
   VersionAdded: '0.9'
 
+Lint/UnreachableLoop:
+  Description: 'This cop checks for loops that will have at most one iteration.'
+  Enabled: pending
+  VersionAdded: '0.89'
+
 Lint/UnusedBlockArgument:
   Description: 'Checks for unused block arguments.'
   StyleGuide: '#underscore-unused-vars'
@@ -1873,16 +1947,18 @@ Lint/UselessAssignment:
   Enabled: true
   VersionAdded: '0.11'
 
-Lint/UselessComparison:
-  Description: 'Checks for comparison of something with itself.'
-  Enabled: true
-  VersionAdded: '0.11'
-
 Lint/UselessElseWithoutRescue:
   Description: 'Checks for useless `else` in `begin..end` without `rescue`.'
   Enabled: true
   VersionAdded: '0.17'
 
+Lint/UselessMethodDefinition:
+  Description: 'Checks for useless method definitions.'
+  Enabled: pending
+  VersionAdded: '0.90'
+  Safe: false
+  AllowComments: true
+
 Lint/UselessSetterCall:
   Description: 'Checks for useless setter call to a local variable.'
   Enabled: true
@@ -1911,7 +1987,7 @@ Metrics/AbcSize:
   # The ABC size is a calculated magnitude, so this number can be an Integer or
   # a Float.
   IgnoredMethods: []
-  Max: 15
+  Max: 17
 
 Metrics/BlockLength:
   Description: 'Avoid long blocks with many lines.'
@@ -1993,7 +2069,7 @@ Metrics/PerceivedComplexity:
   VersionAdded: '0.25'
   VersionChanged: '0.81'
   IgnoredMethods: []
-  Max: 7
+  Max: 8
 
 ################## Migration #############################
 
@@ -2352,6 +2428,7 @@ Style/ArrayCoercion:
                   Use Array() instead of explicit Array check or [*var], when dealing
                   with a variable you want to treat as an Array, but you're not certain it's an array.
   StyleGuide: '#array-coercion'
+  Safe: false
   Enabled: 'pending'
   VersionAdded: '0.88'
 
@@ -2527,6 +2604,7 @@ Style/CaseEquality:
   StyleGuide: '#no-case-equality'
   Enabled: true
   VersionAdded: '0.9'
+  VersionChanged: '0.89'
   # If AllowOnConstant is enabled, the cop will ignore violations when the receiver of
   # the case equality operator is a constant.
   #
@@ -2541,6 +2619,7 @@ Style/CaseLikeIf:
   Description: 'This cop identifies places where `if-elsif` constructions can be replaced with `case-when`.'
   StyleGuide: '#case-vs-if-else'
   Enabled: 'pending'
+  Safe: false
   VersionAdded: '0.88'
 
 Style/CharacterLiteral:
@@ -2558,7 +2637,6 @@ Style/ClassAndModuleChildren:
   # have the knowledge to perform either operation safely and thus requires
   # manual oversight.
   SafeAutoCorrect: false
-  AutoCorrect: false
   Enabled: true
   VersionAdded: '0.19'
   #
@@ -2597,6 +2675,16 @@ Style/ClassMethods:
   VersionAdded: '0.9'
   VersionChanged: '0.20'
 
+Style/ClassMethodsDefinitions:
+  Description: 'Enforces using `def self.method_name` or `class << self` to define class methods.'
+  StyleGuide: '#def-self-class-methods'
+  Enabled: false
+  VersionAdded: '0.89'
+  EnforcedStyle:  def_self
+  SupportedStyles:
+    - def_self
+    - self_class
+
 Style/ClassVars:
   Description: 'Avoid the use of class variables.'
   StyleGuide: '#no-class-vars'
@@ -2637,6 +2725,14 @@ Style/ColonMethodDefinition:
   Enabled: true
   VersionAdded: '0.52'
 
+Style/CombinableLoops:
+  Description: >-
+                  Checks for places where multiple consecutive loops over the same data
+                  can be combined into a single loop.
+  Enabled: pending
+  Safe: false
+  VersionAdded: '0.90'
+
 Style/CommandLiteral:
   Description: 'Use `` or %x around command literals.'
   StyleGuide: '#percent-x'
@@ -2880,6 +2976,16 @@ Style/ExpandPathArguments:
   Enabled: true
   VersionAdded: '0.53'
 
+Style/ExplicitBlockArgument:
+  Description: >-
+                  Consider using explicit block argument to avoid writing block literal
+                  that just passes its arguments to another block.
+  StyleGuide: '#block-argument'
+  Enabled: pending
+  # May change the yielding arity.
+  Safe: false
+  VersionAdded: '0.89'
+
 Style/ExponentialNotation:
   Description: 'When using exponential notation, favor a mantissa between 1 (inclusive) and 10 (exclusive).'
   StyleGuide: '#exponential-notation'
@@ -2961,7 +3067,13 @@ Style/FrozenStringLiteralComment:
     # `never` will enforce that the frozen string literal comment does not
     # exist in a file.
     - never
-  Safe: false
+  SafeAutoCorrect: false
+
+Style/GlobalStdStream:
+  Description: 'Enforces the use of `$stdout/$stderr/$stdin` instead of `STDOUT/STDERR/STDIN`.'
+  StyleGuide: '#global-stdout'
+  Enabled: pending
+  VersionAdded: '0.89'
 
 Style/GlobalVars:
   Description: 'Do not introduce global variables.'
@@ -3035,15 +3147,17 @@ Style/HashSyntax:
   PreferHashRocketsForNonAlnumEndingSymbols: false
 
 Style/HashTransformKeys:
-  Description: 'Prefer `transform_keys` over `each_with_object` and `map`.'
+  Description: 'Prefer `transform_keys` over `each_with_object`, `map`, or `to_h`.'
   Enabled: 'pending'
   VersionAdded: '0.80'
+  VersionChanged: '0.90'
   Safe: false
 
 Style/HashTransformValues:
-  Description: 'Prefer `transform_values` over `each_with_object` and `map`.'
+  Description: 'Prefer `transform_values` over `each_with_object`, `map`, or `to_h`.'
   Enabled: 'pending'
   VersionAdded: '0.80'
+  VersionChanged: '0.90'
   Safe: false
 
 Style/IdenticalConditionalBranches:
@@ -3140,6 +3254,12 @@ Style/IpAddresses:
     - "::"
     # :: is a valid IPv6 address, but could potentially be legitimately in code
 
+Style/KeywordParametersOrder:
+  Description: 'Enforces that optional keyword parameters are placed at the end of the parameters list.'
+  StyleGuide: '#keyword-parameters-order'
+  Enabled: pending
+  VersionAdded: '0.90'
+
 Style/Lambda:
   Description: 'Use the new lambda literal syntax for single-line blocks.'
   StyleGuide: '#lambda-multi-line'
@@ -3218,12 +3338,6 @@ Style/MethodDefParentheses:
     - require_no_parentheses
     - require_no_parentheses_except_multiline
 
-Style/MethodMissingSuper:
-  Description: Checks for `method_missing` to call `super`.
-  StyleGuide: '#no-method-missing'
-  Enabled: true
-  VersionAdded: '0.56'
-
 Style/MinMax:
   Description: >-
                  Use `Enumerable#minmax` instead of `Enumerable#min`
@@ -3519,7 +3633,6 @@ Style/NumericPredicate:
   # object. Switching these methods has to be done with knowledge of the types
   # of the variables which rubocop doesn't have.
   SafeAutoCorrect: false
-  AutoCorrect: false
   Enabled: true
   VersionAdded: '0.42'
   VersionChanged: '0.59'
@@ -3535,12 +3648,13 @@ Style/NumericPredicate:
 
 Style/OneLineConditional:
   Description: >-
-                 Favor the ternary operator(?:) over
-                 if/then/else/end constructs.
+                 Favor the ternary operator (?:) or multi-line constructs over
+                 single-line if/then/else/end constructs.
   StyleGuide: '#ternary-operator'
   Enabled: true
+  AlwaysCorrectToMultiline: false
   VersionAdded: '0.9'
-  VersionChanged: '0.38'
+  VersionChanged: '0.90'
 
 Style/OptionHash:
   Description: "Don't use option hashes when you can use keyword arguments."
@@ -3565,6 +3679,13 @@ Style/OptionalArguments:
   VersionAdded: '0.33'
   VersionChanged: '0.83'
 
+Style/OptionalBooleanParameter:
+  Description: 'Use keyword arguments when defining method with boolean argument.'
+  StyleGuide: '#boolean-keyword-arguments'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '0.89'
+
 Style/OrAssignment:
   Description: 'Recommend usage of double pipe equals (||=) where applicable.'
   StyleGuide: '#double-pipe-for-uninit'
@@ -3764,6 +3885,12 @@ Style/RedundantSelf:
   VersionAdded: '0.10'
   VersionChanged: '0.13'
 
+Style/RedundantSelfAssignment:
+  Description: 'Checks for places where redundant assignments are made for in place modification methods.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '0.90'
+
 Style/RedundantSort:
   Description: >-
                   Use `min` instead of `sort.first`,
@@ -3883,6 +4010,12 @@ Style/SignalException:
     - only_fail
     - semantic
 
+Style/SingleArgumentDig:
+  Description: 'Avoid using single argument dig method.'
+  Enabled: pending
+  VersionAdded: '0.89'
+  Safe: false
+
 Style/SingleLineBlockParams:
   Description: 'Enforces the names of some block params.'
   Enabled: false
@@ -3910,6 +4043,14 @@ Style/SlicingWithRange:
   VersionAdded: '0.83'
   Safe: false
 
+Style/SoleNestedConditional:
+  Description: >-
+                  Finds sole nested conditional nodes
+                  which can be merged into outer conditional node.
+  Enabled: pending
+  VersionAdded: '0.89'
+  AllowModifier: false
+
 Style/SpecialGlobalVars:
   Description: 'Avoid Perl-style global variables.'
   StyleGuide: '#no-cryptic-perlisms'
@@ -3938,6 +4079,13 @@ Style/StderrPuts:
   Enabled: true
   VersionAdded: '0.51'
 
+Style/StringConcatenation:
+  Description: 'Checks for places where string concatenation can be replaced with string interpolation.'
+  StyleGuide: '#string-interpolation'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '0.89'
+
 Style/StringHashKeys:
   Description: 'Prefer symbols instead of strings as hash keys.'
   StyleGuide: '#symbols-as-keys'