cookstyle 7.8.3 → 7.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e04dd24b5b97c48a31e63a92a6d333c5c43bc4a4548d7f478a1568c3a6852f04
-  data.tar.gz: c03fcc110f131b4d0d4d094d13e8d3f7027c3f995d19e9b31f7ef37308e112e8
+  metadata.gz: 2da2b22b8cbec39156ae6f213739615fac386c943b19062270624f49733692eb
+  data.tar.gz: e294eddf92cf044629ad569af5f2cef1775044c599952a546529212e79bceb45
 SHA512:
-  metadata.gz: 85afba2dca8cf6626f58c7cb42ce79f2e9b41c9f2e4eef8833988130d1cb4376de34942ad8fb4337271f5c4b6b15f5e32f31443620227c719379f993850dd34d
-  data.tar.gz: a4a02a5e22bdd2b39d2b867c7a669a24fb4b324558ed6073971674f1155323736aac2bb1446fa73e0c073b6e84a36a96a6c0986d1e027feb73fcd4ec9f953c18
+  metadata.gz: cf63786305a68c636fabd90f597b8f11e3936cf70180899435d3a520d45227fdfd007fe862facbe7a584413bcf6d00b8cc43fa3a56ec7ef986a96a5f7b798673
+  data.tar.gz: fef011328aae08ad9bf62a8f6b772da9a20e28baa8ef1c4fbcdd251269a9d62f2e15df1f79794c1fc84fcfb7c4c341fad910ff1e2689a4446a763fae254f889b

data/config/cookstyle.yml

@@ -1,6 +1,6 @@
 AllCops:
   SuggestExtensions: false
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   TargetChefVersion: ~
   Exclude:
     - '/**/files/**/*'
@@ -221,7 +221,7 @@ Chef/Correctness/MetadataMissingName:
     - '**/metadata.rb'
 
 Chef/Correctness/BlockGuardWithOnlyString:
-  Description: A resource guard (not_if/only_if) that is a string should not be wrapped in {}. Wrapping a guard string in {} causes it to be executed as Ruby code which will always returns true instead of a shell command that will actually run.
+  Description: A resource guard (not_if/only_if) that is a string should not be wrapped in {}. Wrapping a guard string in {} causes it to be executed as Ruby code which will always return true instead of a shell command that will actually run.
   StyleGuide: 'chef_correctness_blockguardwithonlystring'
   Enabled: true
   VersionAdded: '5.2.0'
@@ -584,7 +584,7 @@ Chef/Deprecations/NodeSetUnless:
     - '**/Berksfile'
 
 Chef/Deprecations/EpicFail:
-  Description: Use ignore_failure method instead of the deprecated epic_fail method
+  Description: Use `ignore_failure` in resources to continue when failures occur instead of the deprecated `epic_fail` property
   StyleGuide: 'chef_deprecations_epicfail'
   Enabled: true
   VersionAdded: '5.1.0'
@@ -843,7 +843,7 @@ Chef/Deprecations/DeprecatedYumRepositoryProperties:
     - '**/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.
+  Description: The beta Audit Mode feature in Chef Infra Client was removed in Chef Infra Client 15.0.
   StyleGuide: 'chef_deprecations_eolauditmodeusage'
   Enabled: true
   VersionAdded: '5.10.0'
@@ -905,7 +905,7 @@ Chef/Deprecations/PartialSearchClassUsage:
     - '**/metadata.rb'
 
 Chef/Deprecations/Cheffile:
-  Description: The Libarian-Chef depsolving project is no longer maintained and should not be used for cookbook depsolving. Consider using Policyfiles instead.
+  Description: The Librarian-Chef depsolving project is no longer maintained and should not be used for cookbook depsolving. Consider using Policyfiles instead.
   StyleGuide: 'chef_deprecations_cheffile'
   Enabled: true
   VersionAdded: '5.12.0'
@@ -1071,7 +1071,7 @@ Chef/Deprecations/ChefDKGenerators:
     - '**/Berksfile'
 
 Chef/Deprecations/ChefHandlerRecipe:
-  Description: There is no need to include the empty and deprecated chef_handler::default recipe in order to use the chef_handler resource.
+  Description: There is no need to include the empty and deprecated chef_handler::default recipe to use the chef_handler resource.
   StyleGuide: 'chef_deprecations_chefhandlerrecipe'
   Enabled: true
   VersionAdded: '6.12.0'
@@ -1107,7 +1107,7 @@ Chef/Deprecations/CookbooksDependsOnSelf:
     - '**/metadata.rb'
 
 Chef/Deprecations/ChefShellout:
-  Description: Don't use deprecated Chef::ShellOut which was removed in Chef Infra Client 13. Use Mixlib::ShellOut instead, which behaves identically.
+  Description: Don't use the deprecated `Chef::ShellOut` class which was removed in Chef Infra Client 13. Use the `Mixlib::ShellOut` class instead, which behaves identically.
   StyleGuide: 'chef_deprecations_chefshellout'
   Enabled: true
   VersionAdded: '6.17.0'
@@ -2247,8 +2247,9 @@ Style/Proc:
   Enabled: true
 Style/RaiseArgs:
   Enabled: true
+# disabled for now as this breaks ruby_block resources
 Style/RedundantBegin:
-  Enabled: true
+  Enabled: false
 Style/RedundantException:
   Enabled: true
 Style/RedundantFreeze:
@@ -2721,7 +2722,7 @@ Lint/BinaryOperatorWithIdenticalOperands:
 # Lint/TopLevelReturnWithArgument:
 #   Enabled: true
 
-# simplify hash acccess that doesn't actually need .dig
+# simplify hash access that doesn't actually need .dig
 Style/SingleArgumentDig:
   Enabled: true
 

data/config/disable_all.yml

@@ -5,6 +5,8 @@ Bundler/DuplicatedGem:
   Enabled: false
 Bundler/GemComment:
   Enabled: false
+Bundler/GemVersion:
+  Enabled: false
 Bundler/InsecureProtocolSource:
   Enabled: false
 Bundler/OrderedGems:
@@ -147,8 +149,12 @@ Layout/MultilineOperationIndentation:
   Enabled: false
 Layout/ParameterAlignment:
   Enabled: false
+Layout/RedundantLineBreak:
+  Enabled: false
 Layout/RescueEnsureAlignment:
   Enabled: false
+Layout/SingleLineBlockChain:
+  Enabled: false
 Layout/SpaceAfterColon:
   Enabled: false
 Layout/SpaceAfterComma:
@@ -851,6 +857,8 @@ Style/StabbyLambdaParentheses:
   Enabled: false
 Style/StderrPuts:
   Enabled: false
+Style/StringChars:
+  Enabled: false
 Style/StringConcatenation:
   Enabled: false
 Style/StringHashKeys:
@@ -897,6 +905,8 @@ Style/TrivialAccessors:
   Enabled: false
 Style/UnlessElse:
   Enabled: false
+Style/UnlessLogicalOperators:
+  Enabled: false
 Style/UnpackFirst:
   Enabled: false
 Style/VariableInterpolation:

data/config/upstream.yml

@@ -130,7 +130,7 @@ AllCops:
   # What MRI version of the Ruby interpreter is the inspected code intended to
   # run on? (If there is more than one, set this to the lowest version.)
   # If a value is specified for TargetRubyVersion then it is used. Acceptable
-  # values are specificed as a float (i.e. 2.5); the teeny version of Ruby
+  # values are specificed as a float (i.e. 3.0); the teeny version of Ruby
   # should not be included. If the project specifies a Ruby version in the
   # .tool-versions or .ruby-version files, Gemfile or gems.rb file, RuboCop will
   # try to determine the desired version of Ruby by inspecting the
@@ -138,7 +138,7 @@ AllCops:
   # or gems.locked file. (Although the Ruby version is specified in the Gemfile
   # or gems.rb file, RuboCop reads the final value from the lock file.) If the
   # Ruby version is still unresolved, RuboCop will use the oldest officially
-  # supported Ruby version (currently Ruby 2.4).
+  # supported Ruby version (currently Ruby 2.5).
   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
@@ -174,6 +174,20 @@ Bundler/GemComment:
   IgnoredGems: []
   OnlyFor: []
 
+Bundler/GemVersion:
+  Description: 'Requires or forbids specifying gem versions.'
+  Enabled: false
+  VersionAdded: '1.14'
+  EnforcedStyle: 'required'
+  SupportedStyles:
+    - 'required'
+    - 'forbidden'
+  Include:
+    - '**/*.gemfile'
+    - '**/Gemfile'
+    - '**/gems.rb'
+  AllowedGems: []
+
 Bundler/InsecureProtocolSource:
   Description: >-
                  The source `:gemcutter`, `:rubygems` and `:rubyforge` are deprecated
@@ -1101,11 +1115,24 @@ Layout/ParameterAlignment:
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
+Layout/RedundantLineBreak:
+  Description: >-
+                 Do not break up an expression into multiple lines when it fits
+                 on a single line.
+  Enabled: false
+  InspectBlocks: false
+  VersionAdded: '1.13'
+
 Layout/RescueEnsureAlignment:
   Description: 'Align rescues and ensures correctly.'
   Enabled: true
   VersionAdded: '0.49'
 
+Layout/SingleLineBlockChain:
+  Description: 'Put method call on a separate line if chained to a single line block.'
+  Enabled: false
+  VersionAdded: '1.14'
+
 Layout/SpaceAfterColon:
   Description: 'Use spaces after colons.'
   StyleGuide: '#spaces-operators'
@@ -1380,6 +1407,8 @@ Lint/AmbiguousBlockAssociation:
   StyleGuide: '#syntax'
   Enabled: true
   VersionAdded: '0.48'
+  VersionChanged: '1.13'
+  IgnoredMethods: []
 
 Lint/AmbiguousOperator:
   Description: >-
@@ -2055,13 +2084,18 @@ Lint/SuppressedException:
   StyleGuide: '#dont-hide-exceptions'
   Enabled: true
   AllowComments: true
+  AllowNil: true
   VersionAdded: '0.9'
-  VersionChanged: '0.81'
+  VersionChanged: '1.12'
 
 Lint/SymbolConversion:
   Description: 'Checks for unnecessary symbol conversions.'
   Enabled: pending
   VersionAdded: '1.9'
+  EnforcedStyle: strict
+  SupportedStyles:
+    - strict
+    - consistent
 
 Lint/Syntax:
   Description: 'Checks for syntax errors.'
@@ -2489,6 +2523,7 @@ Naming/MemoizedInstanceVariableName:
     - disallowed
     - required
     - optional
+  Safe: false
 
 Naming/MethodName:
   Description: 'Use the configured style when naming methods.'
@@ -3174,6 +3209,7 @@ Style/Documentation:
   Description: 'Document classes and non-namespace modules.'
   Enabled: true
   VersionAdded: '0.9'
+  AllowedConstants: []
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
@@ -3446,6 +3482,8 @@ Style/HashConversion:
   Description: 'Avoid Hash[] in favor of ary.to_h or literal hashes.'
   Enabled: pending
   VersionAdded: '1.10'
+  VersionChanged: '1.11'
+  AllowSplatArgument: true
 
 Style/HashEachMethods:
   Description: 'Use Hash#each_key and Hash#each_value.'
@@ -3670,6 +3708,7 @@ Style/MethodCallWithArgsParentheses:
   AllowParenthesesInMultilineCall: false
   AllowParenthesesInChaining: false
   AllowParenthesesInCamelCaseMethod: false
+  AllowParenthesesInStringInterpolation: false
   EnforcedStyle: require_parentheses
   SupportedStyles:
     - require_parentheses
@@ -4489,6 +4528,13 @@ Style/StderrPuts:
   Enabled: true
   VersionAdded: '0.51'
 
+Style/StringChars:
+  Description: 'Checks for uses of `String#split` with empty string or regexp literal argument.'
+  StyleGuide: '#string-chars'
+  Enabled: pending
+  Safe: false
+  VersionAdded: '1.12'
+
 Style/StringConcatenation:
   Description: 'Checks for places where string concatenation can be replaced with string interpolation.'
   StyleGuide: '#string-interpolation'
@@ -4586,6 +4632,7 @@ Style/SymbolProc:
   Safe: false
   VersionAdded: '0.26'
   VersionChanged: '1.5'
+  AllowMethodsWithArguments: false
   # 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:
@@ -4738,6 +4785,16 @@ Style/UnlessElse:
   Enabled: true
   VersionAdded: '0.9'
 
+Style/UnlessLogicalOperators:
+  Description: >-
+                 Checks for use of logical operators in an unless condition.
+  Enabled: false
+  VersionAdded: '1.11'
+  EnforcedStyle: forbid_mixed_logical_operators
+  SupportedStyles:
+    - forbid_mixed_logical_operators
+    - forbid_logical_operators
+
 Style/UnpackFirst:
   Description: >-
                  Checks for accessing the first element of `String#unpack`

data/cookstyle.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Cookstyle is a code linting tool that helps you to write better Chef Infra cookbooks by detecting and automatically correcting style, syntax, and logic mistakes in your code.'
   spec.license       = 'Apache-2.0'
   spec.homepage      = 'https://docs.chef.io/workstation/cookstyle/'
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.5'
 
   # the gemspec and Gemfile are necessary for appbundling of the gem
   spec.files = %w(LICENSE cookstyle.gemspec Gemfile) + Dir.glob('{lib,bin,config}/**/*')

data/lib/cookstyle.rb

@@ -7,7 +7,7 @@ require 'yaml' unless defined?(YAML)
 # ensure the desired target version of RuboCop is gem activated
 gem 'rubocop', "= #{Cookstyle::RUBOCOP_VERSION}"
 require 'rubocop'
-require_relative 'rubocop/monkey_patches/comment_config'
+require_relative 'rubocop/monkey_patches/directive_comment'
 
 # monkey patches needed for the TargetChefVersion config option
 require_relative 'rubocop/monkey_patches/config'

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "7.8.3" # rubocop: disable Style/StringLiterals
-  RUBOCOP_VERSION = '1.10.0'
+  VERSION = "7.11.3" # rubocop: disable Style/StringLiterals
+  RUBOCOP_VERSION = '1.14.0'
 end

data/lib/rubocop/cop/chef/correctness/block_guard_clause_string_only.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # A resource guard (not_if/only_if) that is a string should not be wrapped in {}. Wrapping a guard string in {} causes it to be executed as Ruby code which will always returns true instead of a shell command that will actually run.
+        # A resource guard (not_if/only_if) that is a string should not be wrapped in `{}`. Wrapping a guard string in {} causes it to be executed as Ruby code which will always return true instead of a shell command that will actually run.
         #
         # @example
         #
@@ -40,7 +40,7 @@ module RuboCop
         class BlockGuardWithOnlyString < Base
           extend AutoCorrector
 
-          MSG = 'A resource guard (not_if/only_if) that is a string should not be wrapped in {}. Wrapping a guard string in {} causes it to be executed as Ruby code which will always returns true instead of a shell command that will actually run.'
+          MSG = 'A resource guard (not_if/only_if) that is a string should not be wrapped in {}. Wrapping a guard string in {} causes it to be executed as Ruby code which will always return true instead of a shell command that will actually run.'
 
           def_node_matcher :block_guard_with_only_string?, <<-PATTERN
             (block (send nil? ${:not_if :only_if}) (args) (str $_) )

data/lib/rubocop/cop/chef/correctness/chef_application_fatal.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Use raise to force Chef Infra Client to fail instead of using Chef::Application.fatal, which masks the full stack trace of the failure and makes debugging difficult.
+        # Use `raise` to force Chef Infra Client to fail instead of using `Chef::Application.fatal`, which masks the full stack trace of the failure and makes debugging difficult.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/conditional_ruby_shellout.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Don't use Ruby to shellout in a only_if / not_if conditional when you can just shellout directly. Any string value used with only_if / not_if is executed in your system's shell and the return code of the command is the result for the not_if / only_if determination.
+        # Don't use Ruby to shellout in a `only_if` / `not_if` conditional. Any string value used in an `only_if` / `not_if` is executed in your system's shell and the return code of the command is the result for the `not_if` / `only_if` determination.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/dnf_package_allow_downgrades.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # dnf_package does not support the allow_downgrades property
+        # The `dnf_package` resource does not support the `allow_downgrades` property.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/incorrect_library_injection.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Libraries should be injected into the Chef::DSL::Recipe class and not Chef::Recipe or Chef::Provider classes directly.
+        # Libraries should be injected into the `Chef::DSL::Recipe` class and not `Chef::Recipe` or `Chef::Provider` classes directly.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/invalid_notification_timing.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Valid notification timings are :immediately, :immediate (alias for :immediately), :delayed, and :before.
+        # Valid notification timings are `:immediately`, `:immediate` (alias for :immediately), `:delayed`, and `:before`.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/invalid_platform_family_helper.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Pass valid platform families to the platform_family? helper.
+        # Pass valid platform families to the `platform_family?` helper. See [Infra Language: Platform Family](https://docs.chef.io/infra_language/checking_platforms/#platform_family-values) for a complete list of platform families.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/invalid_platform_family_values_in_case.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Use valid platform family values in case statements.
+        # Use valid platform family values in case statements. See [Infra Language: Platform Family](https://docs.chef.io/infra_language/checking_platforms/#platform_family-values) for a complete list of platform families.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/invalid_platform_helper.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Pass valid platforms to the platform? helper.
+        # Pass valid platforms to the `platform?` helper. See [Infra Language: Platform](https://docs.chef.io/infra_language/checking_platforms/#platform-values) for a list of many common platform values.
         #
         # @example
         #
@@ -32,6 +32,7 @@ module RuboCop
         #   platform?('mac_os_x')
         #   platform?('redhat)
         #   platform?('suse')
+        #
         class InvalidPlatformHelper < Base
           include ::RuboCop::Chef::PlatformHelpers
 

data/lib/rubocop/cop/chef/correctness/invalid_platform_metadata.rb

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # metadata.rb supports methods should contain valid platforms.
+        # metadata.rb `supports` methods should contain valid platforms. See [Infra Language: Platform](https://docs.chef.io/infra_language/checking_platforms/#platform-values) for a list of many common platform values.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/invalid_platform_values_in_case.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Use valid platform values in case statements.
+        # Use valid platform values in case statements. See [Infra Language: Platform](https://docs.chef.io/infra_language/checking_platforms/#platform-values) for a list of many common platform values.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/invalid_value_for_platform_family_helper.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Pass valid platforms families to the value_for_platform_family helper.
+        # Pass valid platform families to the value_for_platform_family helper. See [Infra Language: Platform Family](https://docs.chef.io/infra_language/checking_platforms/#platform_family-values) for a complete list of platform families.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/invalid_value_for_platform_helper.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Pass valid platforms to the value_for_platform helper.
+        # Pass valid platforms to the value_for_platform helper. See [Infra Language: Platform](https://docs.chef.io/infra_language/checking_platforms/#platform-values) for a list of many common platform values.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/node_normal.rb

@@ -18,13 +18,9 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Normal attributes are discouraged since their semantics differ importantly from the
-        # default and override levels. Their values persist in the node object even after
-        # all code referencing them has been deleted, unlike default and override.
+        # Normal attributes are discouraged since their semantics differ importantly from the default and override levels. Their values persist in the node object even after all code referencing them has been deleted, unlike default and override.
         #
-        # Code should be updated to use default or override levels, but this will change
-        # attribute merging behavior so needs to be validated manually and force_default or
-        # force_override levels may need to be used in recipe code.
+        # Code should be updated to use default or override levels, but this will change attribute merging behavior so needs to be validated manually and force_default or force_override levels may need to be used in recipe code.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/node_normal_unless.rb

@@ -18,13 +18,9 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Normal attributes are discouraged since their semantics differ importantly from the
-        # default and override levels. Their values persist in the node object even after
-        # all code referencing them has been deleted, unlike default and override.
+        # Normal attributes are discouraged since their semantics differ importantly from the default and override levels. Their values persist in the node object even after all code referencing them has been deleted, unlike default and override.
         #
-        # Code should be updated to use default or override levels, but this will change
-        # attribute merging behavior so needs to be validated manually and force_default or
-        # force_override levels may need to be used in recipe code.
+        # Code should be updated to use default or override levels, but this will change attribute merging behavior so needs to be validated manually and force_default or force_override levels may need to be used in recipe code.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/node_save.rb

@@ -19,9 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Don't use node.save to save partial node data to the Chef Infra Server mid-run unless it's
-        # absolutely necessary. Node.save can result in failed Chef Infra runs appearing in search and
-        # increases load on the Chef Infra Server."
+        # Don't use node.save to save partial node data to the Chef Infra Server mid-run unless it's a requirement of cookbook design that can't be avoided. Node.save can result in failed Chef Infra runs appearing in search and increases load on the Chef Infra Server."
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/notifies_action_not_symbol.rb

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # When notifying or subscribing an action within a resource the action should always be a symbol. In Chef Infra Client releases before 14.0 this may result in double notification.
+        # When notifying or subscribing actions within a resource the action should always be a symbol. In Chef Infra Client releases before 14.0, this may result in double notification.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/openssl_password_helpers.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # The openSSL cookbook provides a deprecated `secure_password` helper in the `Opscode::OpenSSL::Password` class, which should not longer be used. This helper would generate a random password that would be used when a data bag or attribute was no present. The practice of generating passwords to be stored on the node is bad security as it exposes the password to anyone that can view the nodes, and deleting a node deletes the password. Passwords should be retrieved from a secure source for use in cookbooks.
+        # The OpenSSL cookbook provides a deprecated `secure_password` helper in the `Opscode::OpenSSL::Password` class, which should no longer be used. This helper would generate a random password that would be used when a data bag or attribute was no present. The practice of generating passwords to be stored on the node is bad security as it exposes the password to anyone that can view the nodes, and deleting a node deletes the password. Passwords should be retrieved from a secure source for use in cookbooks.
         #
         #   #### incorrect
         #   ::Chef::Recipe.send(:include, Opscode::OpenSSL::Password)

data/lib/rubocop/cop/chef/correctness/resource_sets_internal_properties.rb

@@ -19,9 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Chef Infra Client uses properties in several resources to track state. These
-        # should not be set in recipes as they break the internal workings of the Chef
-        # Infra Client
+        # Chef Infra Client uses properties in several resources to track state. These should not be set in recipes as they break the internal workings of the Chef Infra Client
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/scoped_file_exist.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Scope file exist to access the correct File class by using ::File.exist? not File.exist?.
+        # Scope file exist to access the correct `File` class by using `::File.exist?` not `File.exist?`.
         #
         # @example
         #

data/lib/rubocop/cop/chef/correctness/tmp_path.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Correctness
-        # Use file_cache_path rather than hard-coding tmp paths
+        # Use file_cache_path rather than hard-coding system temp paths
         #
         # @example downloading a large file into /tmp/
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # There is no need to include the empty and deprecated chef_handler::default recipe in order to use the chef_handler resource
+        # There is no need to include the empty and deprecated chef_handler::default recipe to use the chef_handler resource
         #
         # @example
         #
@@ -32,7 +32,7 @@ module RuboCop
           include RangeHelp
           extend AutoCorrector
 
-          MSG = 'There is no need to include the empty and deprecated chef_handler::default recipe in order to use the chef_handler resource'
+          MSG = 'There is no need to include the empty and deprecated chef_handler::default recipe to use the chef_handler resource'
           RESTRICT_ON_SEND = [:include_recipe].freeze
 
           def_node_matcher :chef_handler_recipe?, <<-PATTERN

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # 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.
+        # 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.
         #
         # @example
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Chef::REST was removed in Chef Infra Client 13.
+        # The `Chef::REST` class was removed in Chef Infra Client 13.
         #
         # @example
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Use delete_resource / edit_resource introduced in Chef Infra Client 12.10 instead of functionality in the deprecated chef-rewind gem
+        # Use `delete_resource` or `edit_resource` helpers introduced in Chef Infra Client 12.10 instead of functionality in the deprecated `chef-rewind` gem
         #
         # @example
         #
@@ -48,7 +48,7 @@ module RuboCop
             unwind: 'delete_resource',
           }.freeze
 
-          MSG = 'Use delete_resource / edit_resource introduced in Chef Infra Client 12.10 instead of functionality in the deprecated chef-rewind gem'
+          MSG = 'Use delete_resource or edit_resource helpers introduced in Chef Infra Client 12.10 instead of functionality in the deprecated chef-rewind gem'
           RESTRICT_ON_SEND = [:chef_gem, :require, :rewind, :unwind].freeze
 
           def_node_matcher :rewind_gem_install?, <<-PATTERN

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

@@ -20,9 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Don't use deprecated Chef::ShellOut which was removed in Chef Infra Client 13.
-        # Use Mixlib::ShellOut instead, which behaves identically or convert to the shell_out
-        # helper provided in chef-utils.
+        # Don't use the deprecated `Chef::ShellOut` class which was removed in Chef Infra Client 13. Use the `Mixlib::ShellOut` class instead, which behaves identically or convert to the simpler `shell_out` helper.
         #
         # @example
         #
@@ -40,7 +38,7 @@ module RuboCop
           include RangeHelp
           extend AutoCorrector
 
-          MSG = "Don't use deprecated Chef::ShellOut which was removed in Chef Infra Client 13. Use Mixlib::ShellOut instead, which behaves identically."
+          MSG = "Don't use the deprecated `Chef::ShellOut` class which was removed in Chef Infra Client 13. Use the `Mixlib::ShellOut` class instead, which behaves identically."
           RESTRICT_ON_SEND = [:new, :require, :include].freeze
 
           def_node_matcher :include_shellout?, <<-PATTERN

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # 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.
+        # 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.
         #
         # @example
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Use ChefSpec::SoloRunner or ChefSpec::ServerRunner instead of the deprecated ChefSpec::Runner. These new runners were introduced in ChefSpec 4.1 (Oct 2014).
+        # Use `ChefSpec::SoloRunner` or `ChefSpec::ServerRunner` instead of the deprecated `ChefSpec::Runner`. These new runners were introduced in ChefSpec 4.1 (Oct 2014).
         #
         # @example
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Use the :remove action in the chocolatey_package resource instead of :uninstall which was removed in Chef Infra Client 14+
+        # Use the `:remove` action in the `chocolatey_package` resource instead of `:uninstall` which was removed in Chef Infra Client 14+.
         #
         # @example
         #

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Don't depend on the deprecated compat_resource cookbook made obsolete by Chef Infra Client 12.19+
+        # Don't depend on the deprecated `compat_resource` cookbook made obsolete by Chef Infra Client 12.19+.
         #
         # @example
         #

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Don't depend on the partial_search cookbook made obsolete by Chef Infra Client 13
+        # Don't depend on the `partial_search` cookbook made obsolete by Chef Infra Client 13.
         #
         # @example
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3
+        # Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version values so it's always best to be less specific ie. 10 instead of 10.3
         #
         # @example
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Don't use deprecated Mixins no longer included in Chef Infra Client 14 and later
+        # Don't use deprecated Mixins no longer included in Chef Infra Client 14 and later.
         #
         # @example
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Use provider_for_action or provides instead of the deprecated Chef::Platform methods in resources, which were removed in Chef Infra Client 13.
+        # Use `provider_for_action` or provides instead of the deprecated `Chef::Platform` methods in resources, which were removed in Chef Infra Client 13.
         #
         # @example
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # The large number of shell_out helper methods in Chef Infra Client has been reduced to just shell_out and shell_out! methods. The legacy methods were removed in Chef Infra Client and cookbooks using these legacy helpers will need to be updated.
+        # The large number of `shell_out` helper methods in Chef Infra Client has been reduced to just `shell_out` and `shell_out!` methods. The legacy methods were removed in Chef Infra Client and cookbooks using these legacy helpers will need to be updated.
         #
         # @example
         #

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Don't use the deprecated older_than_win_2012_or_8? helper. Windows versions before 2012 and 8 are now end of life and this helper will always return false.
+        # Don't use the deprecated `older_than_win_2012_or_8?` helper. Windows versions before 2012 and 8 are now end of life and this helper will always return false.
         #
         # @example
         #

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

@@ -19,7 +19,7 @@ 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.
+        # 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
         #

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # With the release of Chef Infra Client 12.14 and the yum cookbook 3.0 several properties in the yum_repository resource were renamed. url -> baseurl, keyurl -> gpgkey, and mirrorexpire -> mirror_expire.
+        # With the release of Chef Infra Client 12.14 and the yum cookbook 3.0 several properties in the `yum_repository` resource were renamed. `url` -> `baseurl`, `keyurl` -> `gpgkey`, and `mirrorexpire` -> `mirror_expire`.
         #
         # @example
         #

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Don't use the deprecated easy_install resource removed in Chef Infra Client 13
+        # Don't use the deprecated easy_install resource removed in Chef Infra Client 13.
         #
         # @example
         #

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # The beta Audit Mode for 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 information.
+        # The beta Audit Mode for Chef Infra Client was removed in Chef Infra Client 15.0. Users should instead use InSpec and the audit cookbook or the Compliance Phase introduced in Chef Infra Client 17. See https://www.inspec.io/ for more information.
         #
         # @example
         #
@@ -33,7 +33,7 @@ module RuboCop
         #   end
 
         class EOLAuditModeUsage < Base
-          MSG = '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 information.'
+          MSG = 'The beta Audit Mode feature in Chef Infra Client was removed in Chef Infra Client 15.0.'
           RESTRICT_ON_SEND = [:control_group].freeze
 
           def_node_matcher :control_group?, '(send nil? :control_group ...)'

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Make sure ignore_failure is used instead of epic_fail
+        # Use `ignore_failure` in resources to continue when failures occur instead of the deprecated `epic_fail` property.
         #
         # @example
         #
@@ -37,7 +37,7 @@ module RuboCop
         class EpicFail < Base
           extend AutoCorrector
 
-          MSG = 'Use ignore_failure method instead of the deprecated epic_fail method'
+          MSG = 'Use `ignore_failure` in resources to continue when failures occur instead of the deprecated `epic_fail` property'
           RESTRICT_ON_SEND = [:epic_fail].freeze
 
           def on_send(node)

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

@@ -20,7 +20,7 @@ module RuboCop
   module Cop
     module Chef
       module Deprecations
-        # Don't use the deprecated erl_call resource
+        # Don't use the deprecated `erl_call` resource removed in Chef Infra Client 13."
         #
         # @example
         #

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module Style
-        # Use the platform_family?() helpers instead of node['os] == 'foo' for platform_families that match one-to-one with OS values. These helpers are easier to read and can accept multiple platform arguments, which greatly simplifies complex platform logic. All values of `os` from Ohai match one-to-one with `platform_family` values except for `linux`, which has no single equivalent `plaform_family`.
+        # Use the platform_family?() helpers instead of node['os] == 'foo' for platform_families that match one-to-one with OS values. These helpers are easier to read and can accept multiple platform arguments, which greatly simplifies complex platform logic. All values of `os` from Ohai match one-to-one with `platform_family` values except for `linux`, which has no single equivalent `platform_family`.
         #
         # @example
         #

data/lib/rubocop/monkey_patches/{comment_config.rb → directive_comment.rb}

@@ -2,10 +2,11 @@
 module RuboCop
   # we're monkey patching the config regex to allow for # cookstyle: disable whatever
   # in addition to the # rubocop: disable whatever that comes with RuboCop
-  class CommentConfig
-    remove_const('COMMENT_DIRECTIVE_REGEXP')
-    COMMENT_DIRECTIVE_REGEXP = Regexp.new(
-      "# (?:rubocop|cookstyle): ((?:disable|enable|todo))\\b #{COPS_PATTERN}".gsub(' ', '\s*')
+  class DirectiveComment
+    remove_const('DIRECTIVE_COMMENT_REGEXP')
+    DIRECTIVE_COMMENT_REGEXP = Regexp.new(
+      "# (?:rubocop|cookstyle) : ((?:disable|enable|todo))\\b #{COPS_PATTERN}"
+        .gsub(' ', '\s*')
     )
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.8.3
+  version: 7.11.3
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.14.0
 description: 
 email:
 - thom@chef.io
@@ -85,7 +85,6 @@ files:
 - lib/rubocop/cop/chef/correctness/service_resource.rb
 - lib/rubocop/cop/chef/correctness/supports_must_be_float.rb
 - lib/rubocop/cop/chef/correctness/tmp_path.rb
-- lib/rubocop/cop/chef/deprecation/ use_automatic_resource_name.rb
 - lib/rubocop/cop/chef/deprecation/cb_depends_on_self.rb
 - lib/rubocop/cop/chef/deprecation/chef_handler_recipe.rb
 - lib/rubocop/cop/chef/deprecation/chef_handler_supports.rb
@@ -145,6 +144,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/ruby_block_create_action.rb
 - lib/rubocop/cop/chef/deprecation/run_command_helper.rb
 - lib/rubocop/cop/chef/deprecation/search_uses_positional_parameters.rb
+- lib/rubocop/cop/chef/deprecation/use_automatic_resource_name.rb
 - lib/rubocop/cop/chef/deprecation/use_inline_resources.rb
 - lib/rubocop/cop/chef/deprecation/use_yaml_dump.rb
 - lib/rubocop/cop/chef/deprecation/user_supports_property.rb
@@ -275,8 +275,8 @@ files:
 - lib/rubocop/cop/chef/style/use_platform_helpers.rb
 - lib/rubocop/cop/target_chef_version.rb
 - lib/rubocop/monkey_patches/base.rb
-- lib/rubocop/monkey_patches/comment_config.rb
 - lib/rubocop/monkey_patches/config.rb
+- lib/rubocop/monkey_patches/directive_comment.rb
 - lib/rubocop/monkey_patches/registry_cop.rb
 - lib/rubocop/monkey_patches/team.rb
 homepage: https://docs.chef.io/workstation/cookstyle/
@@ -296,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="