cookstyle 7.0.0 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7657520e64c1c6c6a5fb35520e8b03b7627c0cbf7f8c97c6b98876188174dd2
-  data.tar.gz: 541043c03cc4521990a973bad5b07834c89fa60d1d385ca449c63979917689ce
+  metadata.gz: afe67bc1be4b70753843d22598cd29dd7edded20c3762230d4cbfb08ba2ed240
+  data.tar.gz: f4f3c739c446a6560b8f9319c63b87dc48c2d338ad45316369a1ed848d40222a
 SHA512:
-  metadata.gz: 177c42fe47c369af9a4f83545c0b702ee0407e3e66eb7f055055fa644b24fdc2f99dcfcabe7c1b16c29ed58a90d351a5e8a573a6e7d5beb443cecf0f858e4751
-  data.tar.gz: 48ccb6906f3793eabd00fe6f3b3ff1651196375d509ef5d07018552364e1f7b7dce47434d3d8c766b1aa3910b734747c3f39669a5749174f275e51ae6a81fb61
+  metadata.gz: 64ec5f89be1438ba7e29f1e19e9f8b6ebbac1320550f5b32d2a5d58b7ea1994ed4fe08f1243a1328beb46acca4da67608d6ba4b0f3944487adc8af90f9e8fc5e
+  data.tar.gz: 7b6118d966b9585555db7cd3d7b61114e5229a792d9bd9ee23e71a0330ca004187f8ca11cda4b6922c57007ddd0d8e57d30e925f957517dce27ee24532da7cfa

data/Gemfile

@@ -11,8 +11,6 @@ group :debug do
 end
 
 group :docs do
-  gem 'github-markup'
-  gem 'redcarpet'
   gem 'yard'
 end
 
@@ -26,9 +24,6 @@ group :rubocop_gems do
 end
 
 group :development do
-  gem 'adamantium'
-  gem 'anima'
-  gem 'concord'
   gem 'rake'
   gem 'rspec', '>= 3.4'
-end
+end

data/config/cookstyle.yml

@@ -1,4 +1,5 @@
 AllCops:
+  SuggestExtensions: false
   TargetRubyVersion: 2.4
   TargetChefVersion: ~
   Exclude:
@@ -11,7 +12,7 @@ AllCops:
 ###############################
 
 Chef/Style:
-  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chefstyle.md
+  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chef_style.md
 
 Chef/Style/AttributeKeys:
   Description: Check which style of keys are used to access node attributes.
@@ -155,7 +156,7 @@ Chef/Style/IncludeRecipeWithParentheses:
 ###############################
 
 Chef/Correctness:
-  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chefcorrectness.md
+  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chef_correctness.md
 
 Chef/Correctness/ServiceResource:
   Description: Use a service resource to start and stop services instead of execute resources
@@ -484,7 +485,7 @@ Chef/Correctness/OctalModeAsString:
 ###############################
 
 Chef/Sharing:
-  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chefsharing.md
+  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chef_sharing.md
 
 Chef/Sharing/InsecureCookbookURL:
   Description: Insecure http Github or Gitlab URLs for metadata source_url/issues_url fields
@@ -552,7 +553,7 @@ Chef/Sharing/IncludeResourceExamples:
 ###############################
 
 Chef/Deprecations:
-  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chefdeprecations.md
+  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chef_deprecations.md
 
 Chef/Deprecations/NodeDeepFetch:
   Description: Do not use the deprecated chef-sugar node.deep_fetch methods
@@ -819,7 +820,8 @@ Chef/Deprecations/UsesRunCommandHelper:
   VersionAdded: '5.9.0'
   Exclude:
     - '**/metadata.rb'
-    - 'Rakefile'
+    - '**/Berksfile'
+    - '**/Rakefile'
 
 Chef/Deprecations/ChefHandlerUsesSupports:
   Description: Use the type property instead of the deprecated supports property in the chef_handler resource. The supports property was removed in chef_handler cookbook version 3.0 (June 2017) and Chef Infra Client 14.0.
@@ -836,6 +838,8 @@ Chef/Deprecations/DeprecatedYumRepositoryProperties:
   VersionAdded: '5.10.0'
   Exclude:
     - '**/metadata.rb'
+    - '**/attributes/*.rb'
+    - '**/Berksfile'
 
 Chef/Deprecations/EOLAuditModeUsage:
   Description: The beta Audit Mode feature in Chef Infra Client was removed in Chef Infra Client 15.0. Users should instead use InSpec and the audit cookbook. See https://www.inspec.io/ for more informmation.
@@ -844,6 +848,8 @@ Chef/Deprecations/EOLAuditModeUsage:
   VersionAdded: '5.10.0'
   Exclude:
     - '**/metadata.rb'
+    - '**/attributes/*.rb'
+    - '**/Berksfile'
 
 Chef/Deprecations/ResourceInheritsFromCompatResource:
   Description: HWRP style resource should inherit from the 'Chef::Resource' class and not the 'ChefCompat::Resource' class from the deprecated compat_resource cookbook.
@@ -860,12 +866,18 @@ Chef/Deprecations/VerifyPropertyUsesFileExpansion:
   VersionAdded: '5.10.0'
   Exclude:
     - '**/metadata.rb'
+    - '**/attributes/*.rb'
+    - '**/Berksfile'
 
 Chef/Deprecations/PoiseArchiveUsage:
   Description: The poise_archive resource in the deprecated poise-archive should be replaced with the archive_file resource found in Chef Infra Client 15+.
   StyleGuide: '#chefdeprecationspoisearchiveusage'
   Enabled: true
   VersionAdded: '5.11.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/attributes/*.rb'
+    - '**/Berksfile'
 
 Chef/Deprecations/PartialSearchHelperUsage:
   Description: Legacy partial_search usage should be updated to use :filter_result in the search helper instead.
@@ -906,6 +918,8 @@ Chef/Deprecations/LegacyNotifySyntax:
   VersionAdded: '5.13.0'
   Exclude:
     - '**/metadata.rb'
+    - '**/attributes/*.rb'
+    - '**/Berksfile'
 
 Chef/Deprecations/NodeSetWithoutLevel:
   Description: When setting a node attribute in Chef Infra Client 11 and later you must specify the precedence level.
@@ -1137,12 +1151,50 @@ Chef/Deprecations/UseYamlDump:
   Enabled: true
   VersionAdded: '6.21.0'
 
+Chef/Deprecations/LibrarianChefSpec:
+  Description: The Librarian-Chef depsolving project is no longer maintained and ChefSpec should not use Librarian-Chef for cookbook depsolving. Consider using Policyfiles instead.
+  StyleGuide: '#chefdeprecationslibrarianchefspec'
+  Enabled: true
+  VersionAdded: '7.1.0'
+  Include:
+    - '**/specs/*.rb'
+
+Chef/Deprecations/FoodcriticTesting:
+  Description: The Foodcritic cookbook linter has been deprecated and should no longer be used for validating cookbooks
+  StyleGuide: '#chefdeprecationsfoodcritictesting'
+  Enabled: true
+  VersionAdded: '7.1.0'
+  Include:
+    - '**/Rakefile'
+    - '**/Gemfile'
+
+Chef/Deprecations/DeprecatedYumRepositoryActions:
+  Description: With the release of Chef Infra Client 12.14 and the yum cookbook 3.0 several actions in the yum_repository resource actions were renamed. The `add` action became `create` and `delete` became `remove` to better match other resources in Chef Infra Client.
+  StyleGuide: '#chefdeprecationsdeprecatedyumrepositoryactions'
+  Enabled: true
+  VersionAdded: '7.3.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/attributes/*.rb'
+    - '**/Berksfile'
+    - '**/Rakefile'
+
+Chef/Deprecations/ChefSugarHelpers:
+  Description: Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/master/chef-utils#getting-started
+  StyleGuide: '#chefdeprecationschefsugarhelpers'
+  Enabled: true
+  VersionAdded: '7.3.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/Berksfile'
+    - '**/Rakefile'
+
 ###############################
 # Chef/Modernize: Cleaning up legacy code and using new built-in resources
 ###############################
 
 Chef/Modernize:
-  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chefmodernize.md
+  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chef_modernize.md
 
 Chef/Modernize/LegacyBerksfileSource:
   Description: Do not use legacy Berksfile community sources. Use Chef Supermarket instead.
@@ -1194,6 +1246,7 @@ Chef/Modernize/RespondToProvides:
   VersionAdded: '5.2.0'
   Include:
     - '**/providers/*.rb'
+    - '**/resources/*.rb'
     - '**/libraries/*.rb'
 
 Chef/Modernize/SetOrReturnInResources:
@@ -1697,14 +1750,13 @@ Chef/Modernize/ActionMethodInResource:
   Include:
     - '**/resources/*.rb'
     - '**/providers/*.rb'
-    - '**/libraries/*.rb'
 
 ###############################
 # Chef/RedundantCode: Cleanup unnecessary code in your cookbooks regardless of Chef Infra Client release
 ###############################
 
 Chef/RedundantCode:
-  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chefredundantcode.md
+  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chef_redundantcode.md
 
 Chef/RedundantCode/ConflictsMetadata:
   Description: Don't use the deprecated 'conflicts' metadata value
@@ -1926,7 +1978,7 @@ Chef/RedundantCode/DoubleCompileTime:
 ###############################
 
 Chef/Effortless:
-  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chefeffortless.md
+  StyleGuideBaseURL: https://github.com/chef/cookstyle/blob/master/docs/cops_chef_effortless.md
 
 Chef/Effortless/CookbookUsesSearch:
   Description: Cookbook uses search, which cannot be used in the Effortless Infra pattern
@@ -2079,6 +2131,7 @@ Style/EmptyElse:
   Enabled: true
 Layout/EmptyLineBetweenDefs:
   Enabled: true
+  AllowAdjacentOneLineDefs: true
 Layout/EmptyLines:
   Enabled: true
 Layout/EmptyLinesAroundAccessModifier:
@@ -2422,10 +2475,9 @@ Metrics/BlockNesting:
 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
+# The warning message from this is misleading and can lead to wrong but syntactically valid code.
 Lint/SendWithMixinArgument:
-  Enabled: true
+  Enabled: false
 
 # this migrates old # rubocop: comments to use the latest namespaces, which prevents a ton of spam during cookstyle runs
 Migration/DepartmentName:
@@ -2746,4 +2798,8 @@ Style/ExpandPathArguments:
 
 # Avoid a safe navigation operator if we don't need it
 Lint/RedundantSafeNavigation:
-  Enabled: true
+  Enabled: true
+
+# Avoid using blocks to remove nils from a Hash/Array
+Style/CollectionCompact:
+  Enabled: true

data/config/disable_all.yml

@@ -229,6 +229,8 @@ Lint/DeprecatedOpenSSLConstant:
   Enabled: false
 Lint/DisjunctiveAssignmentInConstructor:
   Enabled: false
+Lint/DuplicateBranch:
+  Enabled: false
 Lint/DuplicateCaseCondition:
   Enabled: false
 Lint/DuplicateElsifCondition:
@@ -249,6 +251,8 @@ Lint/ElseLayout:
   Enabled: false
 Lint/EmptyBlock:
   Enabled: false
+Lint/EmptyClass:
+  Enabled: false
 Lint/EmptyConditionalBody:
   Enabled: false
 Lint/EmptyEnsure:
@@ -307,6 +311,8 @@ Lint/NestedPercentLiteral:
   Enabled: false
 Lint/NextWithoutAccumulator:
   Enabled: false
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: false
 Lint/NonDeterministicRequireOrder:
   Enabled: false
 Lint/NonLocalExitFromIterator:
@@ -387,6 +393,8 @@ Lint/TrailingCommaInAttributeDeclaration:
   Enabled: false
 Lint/UnderscorePrefixedVariableName:
   Enabled: false
+Lint/UnexpectedBlockArity:
+  Enabled: false
 Lint/UnifiedInteger:
   Enabled: false
 Lint/UnmodifiedReduceAccumulator:
@@ -515,6 +523,8 @@ Style/ClassMethodsDefinitions:
   Enabled: false
 Style/ClassVars:
   Enabled: false
+Style/CollectionCompact:
+  Enabled: false
 Style/CollectionMethods:
   Enabled: false
 Style/ColonMethodCall:
@@ -653,6 +663,8 @@ Style/RedundantSelfAssignment:
   Enabled: false
 Style/SoleNestedConditional:
   Enabled: false
+Style/StaticClass:
+  Enabled: false
 Style/MethodCalledOnDoEndBlock:
   Enabled: false
 Style/MethodDefParentheses:
@@ -689,6 +701,8 @@ Style/MutableConstant:
   Enabled: false
 Style/NegatedIf:
   Enabled: false
+Style/NegatedIfElseCondition:
+  Enabled: false
 Style/NegatedUnless:
   Enabled: false
 Style/NegatedWhile:
@@ -703,6 +717,8 @@ Style/Next:
   Enabled: false
 Style/NilComparison:
   Enabled: false
+Style/NilLambda:
+  Enabled: false
 Style/NonNilCheck:
   Enabled: false
 Style/Not:
@@ -741,6 +757,8 @@ Style/RaiseArgs:
   Enabled: false
 Style/RandomWithOffset:
   Enabled: false
+Style/RedundantArgument:
+  Enabled: false
 Style/RedundantBegin:
   Enabled: false
 Style/RedundantCapitalW:

data/config/upstream.yml

@@ -139,6 +139,16 @@ AllCops:
   # from the lock file.) If the Ruby version is still unresolved, RuboCop will
   # use the oldest officially supported Ruby version (currently Ruby 2.4).
   TargetRubyVersion: ~
+  # Determines if a notification for extension libraries should be shown when
+  # rubocop is run. Keys are the name of the extension, and values are an array
+  # of gems in the Gemfile that the extension is suggested for, if not already
+  # included.
+  SuggestExtensions:
+    rubocop-rails: [rails]
+    rubocop-rspec: [rspec, rspec-rails]
+    rubocop-minitest: [minitest]
+    rubocop-sequel: [sequel]
+    rubocop-rake: [rake]
 
 #################### Bundler ###############################
 
@@ -459,10 +469,14 @@ Layout/EmptyLineAfterMultilineCondition:
     - https://github.com/airbnb/ruby#multiline-if-newline
 
 Layout/EmptyLineBetweenDefs:
-  Description: 'Use empty lines between defs.'
+  Description: 'Use empty lines between class/module/method defs.'
   StyleGuide: '#empty-lines-between-methods'
   Enabled: true
   VersionAdded: '0.49'
+  VersionChanged: '1.4'
+  EmptyLineBetweenMethodDefs: true
+  EmptyLineBetweenClassDefs: true
+  EmptyLineBetweenModuleDefs: true
   # If `true`, this parameter means that single line method definitions don't
   # need an empty line between them.
   AllowAdjacentOneLineDefs: false
@@ -891,8 +905,8 @@ Layout/LineLength:
   StyleGuide: '#max-line-length'
   Enabled: true
   VersionAdded: '0.25'
-  VersionChanged: '0.84'
-  AutoCorrect: false
+  VersionChanged: '1.4'
+  AutoCorrect: true
   Max: 120
   # To make it possible to copy or click on URIs in the code, we allow lines
   # containing a URI to be longer than Max.
@@ -1176,7 +1190,7 @@ Layout/SpaceBeforeBlockBraces:
   SupportedStylesForEmptyBraces:
     - space
     - no_space
-  VersionChanged: '0.52.1'
+  VersionChanged: '0.52'
 
 Layout/SpaceBeforeComma:
   Description: 'No spaces before commas.'
@@ -1400,6 +1414,11 @@ Lint/ConstantDefinitionInBlock:
   StyleGuide: '#no-constant-definition-in-block'
   Enabled: true
   VersionAdded: '0.91'
+  VersionChanged: '1.3'
+  # `enums` for Typed Enums via T::Enum in Sorbet.
+  # https://sorbet.org/docs/tenum
+  AllowedMethods:
+    - enums
 
 Lint/ConstantResolution:
   Description: 'Check that constants are fully qualified with `::`.'
@@ -1415,6 +1434,22 @@ Lint/Debugger:
   Enabled: true
   VersionAdded: '0.14'
   VersionChanged: '0.49'
+  DebuggerReceivers:
+    - binding
+    - Kernel
+    - Pry
+  DebuggerMethods:
+    - debugger
+    - byebug
+    - remote_byebug
+    - pry
+    - remote_pry
+    - pry_remote
+    - console
+    - rescue
+    - save_and_open_page
+    - save_and_open_screenshot
+    - irb
 
 Lint/DeprecatedClassMethods:
   Description: 'Check for deprecated class method calls.'
@@ -1433,6 +1468,11 @@ Lint/DisjunctiveAssignmentInConstructor:
   VersionAdded: '0.62'
   VersionChanged: '0.88'
 
+Lint/DuplicateBranch:
+  Description: Checks that there are no repeated bodies within `if/unless`, `case-when` and `rescue` constructs.
+  Enabled: pending
+  VersionAdded: '1.3'
+
 Lint/DuplicateCaseCondition:
   Description: 'Do not repeat values in case conditionals.'
   Enabled: true
@@ -1478,12 +1518,21 @@ Lint/ElseLayout:
   Description: 'Check for odd code arrangement in an else block.'
   Enabled: true
   VersionAdded: '0.17'
+  VersionChanged: '1.2'
 
 Lint/EmptyBlock:
   Description: 'This cop checks for blocks without a body.'
   Enabled: pending
   VersionAdded: '1.1'
+  VersionChanged: '1.3'
   AllowComments: true
+  AllowEmptyLambdas: true
+
+Lint/EmptyClass:
+  Description: 'Checks for classes and metaclasses without a body.'
+  Enabled: pending
+  VersionAdded: '1.3'
+  AllowComments: false
 
 Lint/EmptyConditionalBody:
   Description: 'This cop checks for the presence of `if`, `elsif` and `unless` branches without a body.'
@@ -1627,7 +1676,8 @@ Lint/Loop:
   StyleGuide: '#loop-with-break'
   Enabled: true
   VersionAdded: '0.9'
-  VersionChanged: '0.89'
+  VersionChanged: '1.3'
+  Safe: false
 
 Lint/MissingCopEnableDirective:
   Description: 'Checks for a `# rubocop:enable` after `# rubocop:disable`.'
@@ -1648,6 +1698,7 @@ Lint/MissingSuper:
                   without calls to `super`'.
   Enabled: true
   VersionAdded: '0.89'
+  VersionChanged: '1.4'
 
 Lint/MixedRegexpCaptureTypes:
   Description: 'Do not mix named captures and numbered captures in a Regexp literal.'
@@ -1679,6 +1730,11 @@ Lint/NextWithoutAccumulator:
   Enabled: true
   VersionAdded: '0.36'
 
+Lint/NoReturnInBeginEndBlocks:
+  Description: 'Do not `return` inside `begin..end` blocks in assignment contexts.'
+  Enabled: pending
+  VersionAdded: '1.2'
+
 Lint/NonDeterministicRequireOrder:
   Description: 'Always sort arrays returned by Dir.glob when requiring files.'
   Enabled: true
@@ -1824,7 +1880,7 @@ Lint/RescueException:
   StyleGuide: '#no-blind-rescues'
   Enabled: true
   VersionAdded: '0.9'
-  VersionChanged: '0.27.1'
+  VersionChanged: '0.27'
 
 Lint/RescueType:
   Description: 'Avoid rescuing from non constants that could result in a `TypeError`.'
@@ -1952,6 +2008,23 @@ Lint/UnderscorePrefixedVariableName:
   VersionAdded: '0.21'
   AllowKeywordBlockArguments: false
 
+Lint/UnexpectedBlockArity:
+  Description: 'Looks for blocks that have fewer arguments that the calling method expects.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.5'
+  Methods:
+    chunk_while: 2
+    each_with_index: 2
+    each_with_object: 2
+    inject: 2
+    max: 2
+    min: 2
+    minmax: 2
+    reduce: 2
+    slice_when: 2
+    sort: 2
+
 Lint/UnifiedInteger:
   Description: 'Use Integer instead of Fixnum or Bignum.'
   Enabled: true
@@ -1961,6 +2034,7 @@ Lint/UnmodifiedReduceAccumulator:
   Description: Checks for `reduce` or `inject` blocks that do not update the accumulator each iteration.
   Enabled: pending
   VersionAdded: '1.1'
+  VersionChanged: '1.5'
 
 Lint/UnreachableCode:
   Description: 'Unreachable code.'
@@ -2036,8 +2110,9 @@ Lint/UselessMethodDefinition:
 Lint/UselessSetterCall:
   Description: 'Checks for useless setter call to a local variable.'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '0.13'
-  VersionChanged: '0.80'
+  VersionChanged: '1.2'
   Safe: false
 
 Lint/UselessTimes:
@@ -2063,21 +2138,23 @@ Metrics/AbcSize:
     - https://en.wikipedia.org/wiki/ABC_Software_Metric
   Enabled: true
   VersionAdded: '0.27'
-  VersionChanged: '0.81'
+  VersionChanged: '1.5'
   # The ABC size is a calculated magnitude, so this number can be an Integer or
   # a Float.
   IgnoredMethods: []
+  CountRepeatedAttributes: true
   Max: 17
 
 Metrics/BlockLength:
   Description: 'Avoid long blocks with many lines.'
   Enabled: true
   VersionAdded: '0.44'
-  VersionChanged: '0.87'
+  VersionChanged: '1.5'
   CountComments: false  # count full line comments?
   Max: 25
   CountAsOne: []
-  ExcludedMethods:
+  ExcludedMethods: [] # deprecated, retained for backwards compatibility
+  IgnoredMethods:
     # By default, exclude the `#refine` method, as it tends to have larger
     # associated blocks.
     - refine
@@ -2118,11 +2195,12 @@ Metrics/MethodLength:
   StyleGuide: '#short-methods'
   Enabled: true
   VersionAdded: '0.25'
-  VersionChanged: '0.87'
+  VersionChanged: '1.5'
   CountComments: false  # count full line comments?
   Max: 10
   CountAsOne: []
-  ExcludedMethods: []
+  ExcludedMethods: [] # deprecated, retained for backwards compatibility
+  IgnoredMethods: []
 
 Metrics/ModuleLength:
   Description: 'Avoid modules longer than 100 lines of code.'
@@ -2138,8 +2216,10 @@ Metrics/ParameterLists:
   StyleGuide: '#too-many-params'
   Enabled: true
   VersionAdded: '0.25'
+  VersionChanged: '1.5'
   Max: 5
   CountKeywordArgs: true
+  MaxOptionalParameters: 3
 
 Metrics/PerceivedComplexity:
   Description: >-
@@ -2181,6 +2261,7 @@ Naming/BinaryOperatorParameterName:
   StyleGuide: '#other-arg'
   Enabled: true
   VersionAdded: '0.50'
+  VersionChanged: '1.2'
 
 Naming/BlockParameterName:
   Description: >-
@@ -2287,6 +2368,7 @@ Naming/HeredocDelimiterCase:
   StyleGuide: '#heredoc-delimiters'
   Enabled: true
   VersionAdded: '0.50'
+  VersionChanged: '1.2'
   EnforcedStyle: uppercase
   SupportedStyles:
     - lowercase
@@ -2305,7 +2387,7 @@ Naming/MemoizedInstanceVariableName:
     Memoized method name should match memo instance variable name.
   Enabled: true
   VersionAdded: '0.53'
-  VersionChanged: '0.58'
+  VersionChanged: '1.2'
   EnforcedStyleForLeadingUnderscores: disallowed
   SupportedStylesForLeadingUnderscores:
     - disallowed
@@ -2403,14 +2485,25 @@ Naming/VariableName:
     - camelCase
 
 Naming/VariableNumber:
-  Description: 'Use the configured style when numbering variables.'
+  Description: 'Use the configured style when numbering symbols, methods and variables.'
+  StyleGuide: '#snake-case-symbols-methods-vars-with-numbers'
   Enabled: true
   VersionAdded: '0.50'
+  VersionChanged: '1.4'
   EnforcedStyle: normalcase
   SupportedStyles:
     - snake_case
     - normalcase
     - non_integer
+  CheckMethodNames: true
+  CheckSymbols: true
+  AllowedIdentifiers:
+    - capture3     # Open3.capture3
+    - iso8601      # Time#iso8601
+    - rfc1123_date # CGI.rfc1123_date
+    - rfc822       # Time#rfc822
+    - rfc2822      # Time#rfc2822
+    - rfc3339      # DateTime.rfc3339
 
 #################### Security ##############################
 
@@ -2789,6 +2882,13 @@ Style/ClassVars:
   Enabled: true
   VersionAdded: '0.13'
 
+Style/CollectionCompact:
+  Description: 'Use `{Array,Hash}#{compact,compact!}` instead of custom logic to reject nils.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.2'
+  VersionChanged: '1.3'
+
 # Align with the style guide.
 Style/CollectionMethods:
   Description: 'Preferred collection methods.'
@@ -2852,17 +2952,18 @@ Style/CommandLiteral:
 Style/CommentAnnotation:
   Description: >-
                  Checks formatting of special comments
-                 (TODO, FIXME, OPTIMIZE, HACK, REVIEW).
+                 (TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE).
   StyleGuide: '#annotate-keywords'
   Enabled: true
   VersionAdded: '0.10'
-  VersionChanged: '0.31'
+  VersionChanged: '1.3'
   Keywords:
     - TODO
     - FIXME
     - OPTIMIZE
     - HACK
     - REVIEW
+    - NOTE
 
 Style/CommentedKeyword:
   Description: 'Do not place comments on the same line as certain keywords.'
@@ -2958,6 +3059,7 @@ Style/DocumentDynamicEvalDefinition:
   StyleGuide: '#eval-comment-docs'
   Enabled: pending
   VersionAdded: '1.1'
+  VersionChanged: '1.3'
 
 Style/Documentation:
   Description: 'Document classes and non-namespace modules.'
@@ -2986,7 +3088,7 @@ Style/DoubleNegation:
   StyleGuide: '#no-bang-bang'
   Enabled: true
   VersionAdded: '0.19'
-  VersionChanged: '0.84'
+  VersionChanged: '1.2'
   EnforcedStyle: allowed_in_returns
   SafeAutoCorrect: false
   SupportedStyles:
@@ -3107,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
@@ -3285,6 +3388,7 @@ Style/IfInsideElse:
   Enabled: true
   AllowIfModifier: false
   VersionAdded: '0.36'
+  VersionChanged: '1.3'
 
 Style/IfUnlessModifier:
   Description: >-
@@ -3317,12 +3421,14 @@ Style/ImplicitRuntimeError:
   VersionAdded: '0.41'
 
 Style/InfiniteLoop:
-  Description: 'Use Kernel#loop for infinite loops.'
+  Description: >-
+                 Use Kernel#loop for infinite loops.
+                 This cop is unsafe in the body may raise a `StopIteration` exception.
+  Safe: false
   StyleGuide: '#infinite-loop'
   Enabled: true
   VersionAdded: '0.26'
   VersionChanged: '0.61'
-  SafeAutoCorrect: true
 
 Style/InlineComment:
   Description: 'Avoid trailing inline comments.'
@@ -3611,6 +3717,13 @@ Style/NegatedIf:
     - prefix
     - postfix
 
+Style/NegatedIfElseCondition:
+  Description: >-
+                This cop checks for uses of `if-else` and ternary operators with a negated condition
+                which can be simplified by inverting condition and swapping branches.
+  Enabled: pending
+  VersionAdded: '1.2'
+
 Style/NegatedUnless:
   Description: 'Favor if over unless for negative conditions.'
   StyleGuide: '#if-for-negatives'
@@ -3698,6 +3811,11 @@ Style/NilComparison:
     - predicate
     - comparison
 
+Style/NilLambda:
+  Description: 'Prefer `-> {}` to `-> { nil }`.'
+  Enabled: pending
+  VersionAdded: '1.3'
+
 Style/NonNilCheck:
   Description: 'Checks for redundant nil checks.'
   StyleGuide: '#no-non-nil-checks'
@@ -3847,7 +3965,7 @@ Style/PercentLiteralDelimiters:
     '%r': '{}'
     '%w': '[]'
     '%W': '[]'
-  VersionChanged: '0.48.1'
+  VersionChanged: '0.48'
 
 Style/PercentQLiterals:
   Description: 'Checks if uses of %Q/%q match the configured preference.'
@@ -3888,11 +4006,12 @@ Style/RaiseArgs:
   StyleGuide: '#exception-class-messages'
   Enabled: true
   VersionAdded: '0.14'
-  VersionChanged: '0.40'
+  VersionChanged: '1.2'
   EnforcedStyle: exploded
   SupportedStyles:
     - compact # raise Exception.new(msg)
     - exploded # raise Exception, msg
+  AllowedCompactTypes: []
 
 Style/RandomWithOffset:
   Description: >-
@@ -3902,6 +4021,18 @@ Style/RandomWithOffset:
   Enabled: true
   VersionAdded: '0.52'
 
+Style/RedundantArgument:
+  Description: 'Check for a redundant argument passed to certain methods.'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.4'
+  VersionChanged: '1.6'
+  Methods:
+    # Array#join
+    join: ''
+    # String#split
+    split: ' '
+
 Style/RedundantAssignment:
   Description: 'Checks for redundant assignment before returning.'
   Enabled: true
@@ -4143,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
@@ -4172,6 +4303,7 @@ Style/SoleNestedConditional:
                   which can be merged into outer conditional node.
   Enabled: true
   VersionAdded: '0.89'
+  VersionChanged: '1.5'
   AllowModifier: false
 
 Style/SpecialGlobalVars:
@@ -4196,6 +4328,13 @@ Style/StabbyLambdaParentheses:
     - require_parentheses
     - require_no_parentheses
 
+Style/StaticClass:
+  Description: 'Prefer modules to classes with only class methods.'
+  StyleGuide: '#modules-vs-classes'
+  Enabled: false
+  Safe: false
+  VersionAdded: '1.3'
+
 Style/StderrPuts:
   Description: 'Use `warn` instead of `$stderr.puts`.'
   StyleGuide: '#warn'
@@ -4208,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.'
@@ -4246,7 +4386,7 @@ Style/StringMethods:
   Description: 'Checks if configured preferred methods are used over non-preferred.'
   Enabled: false
   VersionAdded: '0.34'
-  VersionChanged: '0.34.2'
+  VersionChanged: '0.34'
   # Mapping from undesired method to desired_method
   # e.g. to use `to_sym` over `intern`:
   #
@@ -4297,7 +4437,7 @@ Style/SymbolProc:
   Enabled: true
   Safe: false
   VersionAdded: '0.26'
-  VersionChanged: '0.64'
+  VersionChanged: '1.5'
   # A list of method names to be ignored by the check.
   # The names should be fairly unique, otherwise you'll end up ignoring lots of code.
   IgnoredMethods:

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.0.0" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.1.0'
+  VERSION = "7.4.0" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.6.1'
 end

data/lib/rubocop/cop/chef/deprecation/chef_sugar_helpers.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2020, Chef Software Inc.
+# Author:: Tim Smith (<tsmith@chef.io>)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module RuboCop
+  module Cop
+    module Chef
+      # Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/master/chef-utils#getting-started
+      #
+      # @example
+      #
+      #   # bad
+      #   vagrant_key?
+      #   vagrant_domain?
+      #   vagrant_user?
+      #   require_chef_gem
+      #   best_ip_for(node)
+      #   nexus?
+      #   ios_xr?
+      #   ruby_20?
+      #   ruby_19?
+      #   includes_recipe?('foo::bar')
+      #   wrlinux?
+      #   dev_null
+      #   nexentacore_platform?
+      #   opensolaris_platform?
+      #   nexentacore?
+      #   opensolaris?
+      #
+      module Deprecations
+        class ChefSugarHelpers < Base
+          MSG = 'Do not use legacy chef-sugar helper methods, which will not be moved into Chef Infra Client itself. For a complete set of chef-sugar helpers now shipping in Chef Infra Client itself see https://github.com/chef/chef/tree/master/chef-utils#getting-started'
+          RESTRICT_ON_SEND = [:vagrant_key?, :vagrant_domain?, :vagrant_user?, :require_chef_gem, :best_ip_for, :nexus?, :ios_xr?, :ruby_20?, :ruby_19?, :includes_recipe?, :wrlinux?, :dev_null, :nexentacore_platform?, :opensolaris_platform?, :nexentacore?, :opensolaris?].freeze
+
+          def on_send(node)
+            add_offense(node, message: MSG, severity: :refactor)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/deprecation/deprecated_chefspec_platform.rb

@@ -55,7 +55,7 @@ module RuboCop
               '< 11' => true,
             },
             'mac_os_x' => {
-              '< 10.12' => '10.15',
+              '< 10.14' => '10.15',
             },
             'suse' => {
               '~> 12.0, < 12.4' => '12',
@@ -67,8 +67,7 @@ module RuboCop
               '= 15.0' => '15',
             },
             'debian' => {
-              '< 8' => true,
-              '> 8.0, < 8.11' => '8',
+              '< 9' => true,
               '> 9.0, < 9.11' => '9',
             },
             'centos' => {

data/lib/rubocop/cop/chef/deprecation/deprecated_yum_repository_actions.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2020, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith@chef.io>)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module RuboCop
+  module Cop
+    module Chef
+      module Deprecations
+        # With the release of Chef Infra Client 12.14 and the yum cookbook 3.0 the actions the yum_repository resource actions were renamed. The `add` action became `create` and `delete` became `remove` to better match other resources in Chef Infra Client.
+        #
+        # @example
+        #
+        #   # bad
+        #   yum_repository 'OurCo' do
+        #     description 'OurCo yum repository'
+        #     baseurl 'http://artifacts.ourco.org/foo/bar'
+        #     gpgkey 'http://artifacts.ourco.org/pub/yum/RPM-GPG-KEY-OURCO-6'
+        #     action :add
+        #   end
+        #
+        #   # good
+        #   yum_repository 'OurCo' do
+        #     description 'OurCo yum repository'
+        #     baseurl 'http://artifacts.ourco.org/foo/bar'
+        #     gpgkey 'http://artifacts.ourco.org/pub/yum/RPM-GPG-KEY-OURCO-6'
+        #     action :create
+        #   end
+        #
+        class DeprecatedYumRepositoryActions < Base
+          include RuboCop::Chef::CookbookHelpers
+          extend TargetChefVersion
+          extend AutoCorrector
+
+          minimum_target_chef_version '12.14'
+
+          MSG = 'With the release of Chef Infra Client 12.14 and the yum cookbook 3.0 several properties in the yum_repository resource the actions the yum_repository resource actions were renamed. The `add` action became `create` and `delete` became `remove` to better match other resources in Chef Infra Client.'
+
+          def on_block(node)
+            match_property_in_resource?(:yum_repository, 'action', node) do |prop_node|
+              next unless prop_node.arguments.first.sym_type?
+              next unless [s(:sym, :add), s(:sym, :delete)].include?(prop_node.arguments.first)
+
+              add_offense(prop_node, message: MSG, severity: :warning) do |corrector|
+                corrector.replace(prop_node, prop_node.source
+                  .gsub('add', 'create')
+                  .gsub('delete', 'remove'))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/deprecation/foodcritic_testing.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2020, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith@chef.io>)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module RuboCop
+  module Cop
+    module Chef
+      module Deprecations
+        # The Foodcritic cookbook linter has been deprecated and should no longer be used for validating cookbooks.
+        #
+        # @example
+        #
+        #   # bad
+        #   gem 'foodcritic'
+        #   require 'foodcritic'
+        #
+        class FoodcriticTesting < Base
+          MSG = 'The Foodcritic cookbook linter has been deprecated and should no longer be used for validating cookbooks.'
+          RESTRICT_ON_SEND = [:require, :gem].freeze
+
+          def on_send(node)
+            return unless node.arguments.first == s(:str, 'foodcritic')
+
+            add_offense(node, message: MSG, severity: :warning)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/deprecation/librarian_chefspec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+#
+# Copyright:: 2020, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith@chef.io>)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module RuboCop
+  module Cop
+    module Chef
+      module Deprecations
+        # The Librarian-Chef depsolving project is no longer maintained and a Cheffile should not be used for cookbook depsolving. Consider using Policyfiles instead.
+        #
+        # @example
+        #
+        #   # bad
+        #   require 'chefspec/librarian'
+        #
+        class LibrarianChefSpec < Base
+          MSG = 'The Librarian-Chef depsolving project is no longer maintained and ChefSpec should not use Librarian-Chef for cookbook depsolving. Consider using Policyfiles instead.'
+          RESTRICT_ON_SEND = [:require].freeze
+
+          def on_send(node)
+            return unless node.arguments.first == s(:str, 'chefspec/librarian')
+
+            add_offense(node, message: MSG, severity: :warning)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/modernize/use_multipackage_installs.rb

@@ -60,8 +60,8 @@ module RuboCop
                     (lvar _))}) nil?)
           PATTERN
 
-          def_node_matcher :package_array_install?, <<-PATTERN
-          (block
+          def_node_search :package_array_install, <<-PATTERN
+          $(block
             (send
               $(array ... ) :each)
             (args ... )
@@ -78,27 +78,31 @@ module RuboCop
           # see if all platforms in the when condition are multi-package compliant
           def multipackage_platforms?(condition_obj)
             condition_obj.all? do |p|
-              MULTIPACKAGE_PLATS.include?(p.value)
+              # make sure it's a string (not a regex) and it's in the array
+              p.str_type? && MULTIPACKAGE_PLATS.include?(p.value)
             end
           end
 
           def on_when(node)
             return unless platform_or_platform_family?(node.parent.condition) &&
-                          package_array_install?(node.body) &&
                           multipackage_platforms?(node.conditions)
-            check_offense(node.body)
+            return if node.body.nil? # don't blow up on empty whens
+
+            package_array_install(node.body) do |install_block, pkgs|
+              add_offense(install_block, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(install_block, "package #{pkgs.source}")
+              end
+            end
           end
 
           def on_if(node)
             platform_helper?(node) do |plats, blk, _pkgs|
-              check_offense(blk) if multipackage_platforms?(plats)
-            end
-          end
+              return unless multipackage_platforms?(plats)
 
-          def check_offense(node)
-            add_offense(node, message: MSG, severity: :refactor) do |corrector|
-              package_array_install?(node) do |vals|
-                corrector.replace(node, "package #{vals.source}")
+              add_offense(blk, message: MSG, severity: :refactor) do |corrector|
+                package_array_install(blk) do |install_block, pkgs|
+                  corrector.replace(install_block, "package #{pkgs.source}")
+                end
               end
             end
           end

data/lib/rubocop/cop/chef/style/comment_sentence_spacing.rb

@@ -26,7 +26,7 @@ module RuboCop
           extend AutoCorrector
           MSG = 'Use a single space after sentences in comments'
 
-          def investigate(processed_source)
+          def on_new_investigation
             return unless processed_source.ast
 
             processed_source.comments.each do |comment|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.4.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.6.1
 description: 
 email:
 - thom@chef.io
@@ -92,6 +92,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/chef_rest.rb
 - lib/rubocop/cop/chef/deprecation/chef_rewind.rb
 - lib/rubocop/cop/chef/deprecation/chef_shellout.rb
+- lib/rubocop/cop/chef/deprecation/chef_sugar_helpers.rb
 - lib/rubocop/cop/chef/deprecation/chef_windows_platform_helper.rb
 - lib/rubocop/cop/chef/deprecation/chefdk_generators.rb
 - lib/rubocop/cop/chef/deprecation/cheffile.rb
@@ -106,6 +107,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/deprecated_platform_methods.rb
 - lib/rubocop/cop/chef/deprecation/deprecated_shellout_methods.rb
 - lib/rubocop/cop/chef/deprecation/deprecated_windows_version_check.rb
+- lib/rubocop/cop/chef/deprecation/deprecated_yum_repository_actions.rb
 - lib/rubocop/cop/chef/deprecation/deprecated_yum_repository_properties.rb
 - lib/rubocop/cop/chef/deprecation/easy_install.rb
 - lib/rubocop/cop/chef/deprecation/eol_audit_mode.rb
@@ -113,11 +115,13 @@ files:
 - lib/rubocop/cop/chef/deprecation/erl_call.rb
 - lib/rubocop/cop/chef/deprecation/execute_path_property.rb
 - lib/rubocop/cop/chef/deprecation/execute_relative_creates_without_cwd.rb
+- lib/rubocop/cop/chef/deprecation/foodcritic_testing.rb
 - lib/rubocop/cop/chef/deprecation/hwrp_without_provides.rb
 - lib/rubocop/cop/chef/deprecation/inherits_compat_resource.rb
 - lib/rubocop/cop/chef/deprecation/launchd_deprecated_hash_property.rb
 - lib/rubocop/cop/chef/deprecation/legacy_notify_syntax.rb
 - lib/rubocop/cop/chef/deprecation/legacy_yum_cookbook_recipes.rb
+- lib/rubocop/cop/chef/deprecation/librarian_chefspec.rb
 - lib/rubocop/cop/chef/deprecation/locale_lc_all_property.rb
 - lib/rubocop/cop/chef/deprecation/log_resource_notifications.rb
 - lib/rubocop/cop/chef/deprecation/macos_userdefaults_global_property.rb