cookstyle 5.3.6 → 5.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6af19177bab0492d840cc42ab0b2afffaaf31c1a16492a6235811d362390f2f
-  data.tar.gz: '01748b9bfbfcc03c1d99d4e09c24db484b76fa1c12010c48d6cb37c5ed3416bc'
+  metadata.gz: 05b57a23cb7a0dec58366d56a682cde9739ec6ffbf9f38f29b122df6ecbfa32c
+  data.tar.gz: 3653be8038c0edfe6c554824f74be18727af1af7d43d20b7e6a3c9ee50b22b08
 SHA512:
-  metadata.gz: 6c84f45e06ffb944c0990ebed2d03b6a19d99c78b09c5e01fd8e16d27719c82d074364805b9e936ff793f4da805edcd706d1da7f0a16507526478603d409767c
-  data.tar.gz: 9a78e7d098beb29896f63861867766b7744bb4e5262a2aec903caed0399c9659c0c25d249a232e57795707200c0eba0bb2b5b9a7ec8b0d90fca1c66ee87f2606
+  metadata.gz: 32c2f00742dda59d0944b13a9a06b2eb0336c20d13be753781a794e23c6b2c454eb5d26e0eeaf94ea176ad6f3a25c2b6449acedc04ae2d4dc40dcdef231fcd7a
+  data.tar.gz: 432baebc8013ff191096edb735abc1a90c8f9550f60931d34e15acb8eef372141cb008c3183665925610732a933301e92f6489948e25fa0511017b7103d6536c

data/config/cookstyle.yml

@@ -1,6 +1,7 @@
 AllCops:
   TargetRubyVersion: 2.4
   Exclude:
+    - files/**/*
     - vendor/**/*
     - Guardfile
   ChefAttributes:
@@ -37,6 +38,8 @@ Chef/AttributeKeys:
   SupportedStyles:
   - strings
   - symbols
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/CopyrightCommentFormat:
   Description: Properly format copyright dates in comment blocks and ensure dates are up to date
@@ -53,6 +56,13 @@ Chef/CommentFormat:
   Enabled: true
   VersionAdded: '5.0.0'
 
+Chef/DefaultMetadataMaintainer:
+  Description: Metadata contains default maintainer information from the cookbook generator. Add actual cookbook maintainer information to the metadata.rb.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Include:
+    - '**/metadata.rb'
+
 ###############################
 # Avoiding potential problems
 ###############################
@@ -61,26 +71,36 @@ Chef/FileMode:
   Description: Use strings to represent file modes in Chef resources
   Enabled: true
   VersionAdded: '5.0.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/ServiceResource:
   Description: Use a service resource to start and stop services instead of execute resources
   Enabled: true
   VersionAdded: '5.0.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/NodeNormal:
   Description: Do not use the node.normal method
   Enabled: true
   VersionAdded: '5.1.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/NodeNormalUnless:
   Description: Do not use the node.normal_unless method
   Enabled: true
   VersionAdded: '5.1.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/TmpPath:
   Description: Use file_cache_path rather than hard-coding tmp paths
   Enabled: true
   VersionAdded: '5.0.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/InsecureCookbookURL:
   Description: Insecure http Github or Gitlab URLs for metadata source_url/issues_url fields
@@ -116,16 +136,22 @@ Chef/NodeSet:
   Description: Do not use the deprecated node.set method
   Enabled: true
   VersionAdded: '5.0.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/NodeSetUnless:
   Description: Do not use the deprecated node.set_unless method
   Enabled: true
   VersionAdded: '5.1.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/EpicFail:
   Description: Use ignore_failure method instead of the deprecated epic_fail method
   Enabled: true
   VersionAdded: '5.1.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/CookbookDependsOnPoise:
   Description: Cookbooks should not depend on the deprecated Poise framework
@@ -194,16 +220,52 @@ Chef/EasyInstallResource:
   Description: Don't use the deprecated easy_install resource resource removed in Chef 13
   Enabled: true
   VersionAdded: '5.1.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/ErlCallResource:
   Description: Don't use the deprecated erl_call resource removed in Chef 13
   Enabled: true
   VersionAdded: '5.1.0'
+  Exclude:
+    - '**/metadata.rb'
 
 Chef/RequireRecipe:
   Description: Use include_recipe instead of the require_recipe method
   Enabled: true
   VersionAdded: '5.2.0'
+  Exclude:
+    - '**/metadata.rb'
+
+Chef/NodeMethodsInsteadofAttributes:
+  Description: Use node attributes to access Ohai data instead of node methods, which were deprecated in Chef Infra Client 13.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Exclude:
+    - '**/metadata.rb'
+
+Chef/UsesDeprecatedMixins:
+  Description: Don't use deprecated Mixins no longer included in Chef Infra Client 14 and later.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Include:
+    - '**/libraries/*.rb'
+    - '**/providers/*.rb'
+
+Chef/IncludingMixinShelloutInResources:
+  Description: There is no need to include Chef::Mixin::ShellOut in resources or providers as this is already done by Chef Infra Client.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Include:
+    - '**/resources/*.rb'
+    - '**/providers/*.rb'
+
+Chef/LegacyYumCookbookRecipes:
+  Description: The elrepo, epel, ius, remi, and repoforge recipes were split into their own cookbooks and the yum recipe was renamed to be default with the release of yum cookbook 3.0 (Dec 2013).
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Exclude:
+    - '**/metadata.rb'
 
 ###############################
 # Cleaning up Legacy Code
@@ -217,7 +279,7 @@ Chef/LegacyBerksfileSource:
     - '**/Berksfile'
 
 Chef/WhyRunSupportedTrue:
-  Description: why_run_supported? no longer needs to be set to true as it is the default in Chef 13+
+  Description: whyrun_supported? no longer needs to be set to true as it is the default in Chef 13+
   Enabled: true
   VersionAdded: '5.1.0'
   Include:
@@ -328,6 +390,50 @@ Chef/ExecuteAptUpdate:
   Exclude:
     - '**/metadata.rb'
 
+Chef/WindowsZipfileUsage:
+  Description: Use the archive_file resource built into Chef Infra Client 15+ instead of the windows_zipfile from the Windows cookbook
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Exclude:
+    - '**/metadata.rb'
+
+Chef/WindowsVersionHelper:
+  Description: Use node['platform_version'] data instead of the Windows::VersionHelper helper from the Windows cookbook.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Exclude:
+    - '**/metadata.rb'
+
+Chef/MinitestHandlerUsage:
+  Description: Use Chef InSpec for testing instead of the Minitest Handler cookbook pattern.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Include:
+    - '**/metadata.rb'
+
+Chef/IncludingOhaiDefaultRecipe:
+  Description: Use the ohai_plugin resource to ship custom Ohai plugins instead of using the ohai::default recipe. If you're not shipping custom Ohai plugins, then you can remove this recipe entirely.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Exclude:
+    - '**/metadata.rb'
+
+Chef/IncludingXMLRubyRecipe:
+  Description: The xml::ruby recipe installs nokogiri which is included in Chef Infra Client 12 and later.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Exclude:
+    - '**/metadata.rb'
+
+Chef/UseInlineResourcesDefined:
+  Description: use_inline_resources is now the default for resources in Chef Infra Client 13+ and does not need to be specified.
+  Enabled: true
+  VersionAdded: '5.4.0'
+  Include:
+    - '**/libraries/*.rb'
+    - '**/providers/*.rb'
+    - '**/resources/*.rb'
+
 ###############################
 # Detecting code that breaks Chef
 ###############################

data/lib/cookstyle/version.rb

@@ -1,4 +1,4 @@
 module Cookstyle
-  VERSION = "5.3.6".freeze # rubocop: disable Style/StringLiterals
+  VERSION = "5.4.13".freeze # rubocop: disable Style/StringLiterals
   RUBOCOP_VERSION = '0.72.0'.freeze
 end

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

@@ -18,7 +18,7 @@
 module RuboCop
   module Cop
     module Chef
-      # Make sure a cookbook doesn't depend on itself
+      # Make sure a cookbook doesn't depend on itself. This will fail on Chef Infra Client 13+
       #
       # @example
       #
@@ -30,7 +30,7 @@ module RuboCop
       #   name 'foo'
       #
       class CookbooksDependsOnSelf < Cop
-        MSG = 'A cookbook cannot depend on itself'.freeze
+        MSG = 'A cookbook cannot depend on itself. This will fail on Chef Infra Client 13+'.freeze
 
         def_node_search :dependencies, '(send nil? :depends str ...)'
         def_node_matcher :cb_name?, '(send nil? :name str ...)'

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

@@ -0,0 +1,48 @@
+#
+# Copyright:: 2019, 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
+      # Metadata contains default maintainer information from the `chef generate cookbook`
+      # command. This should be updated to reflect that actual maintainer of the cookbook.
+      #
+      # @example
+      #
+      #   # bad
+      #   maintainer 'YOUR_COMPANY_NAME'
+      #   maintainer_email 'YOUR_EMAIL'
+      #
+      #   # good
+      #   maintainer 'Bob Bobberson'
+      #   maintainer_email 'bob@bobberson.com'
+      #
+
+      class DefaultMetadataMaintainer < Cop
+        MSG = 'Metadata contains default maintainer information from the cookbook generator. Add actual cookbook maintainer information to the metadata.rb.'.freeze
+
+        def_node_matcher :default_metadata?, '(send nil? {:maintainer :maintainer_email} (str {"YOUR_COMPANY_NAME" "YOUR_EMAIL"}))'
+
+        def on_send(node)
+          default_metadata?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -40,6 +40,16 @@ module RuboCop
         end
 
         def_node_search :cb_name, '(send nil? :name str ...)'
+
+        def autocorrect(_node)
+          lambda do |_corrector|
+            path = processed_source.path
+            cb_name = File.basename(File.dirname(path))
+
+            metadata = IO.read(path)
+            IO.write(path, "name '#{cb_name}'\n" + metadata)
+          end
+        end
       end
     end
   end

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

@@ -19,7 +19,8 @@ module RuboCop
     module Chef
       # When using properties in a custom resource you shouldn't set a property to
       # required and then provide a default value. If a property is required the
-      # user will always pass in a value and the default will never be used.
+      # user will always pass in a value and the default will never be used. In Chef
+      # Infra Client 13+ this became an error.
       #
       # @example
       #
@@ -30,7 +31,7 @@ module RuboCop
       #   property :bob, String, required: true
       #
       class PropertyWithRequiredAndDefault < Cop
-        MSG = 'Resource property should not be both required and have a default value'.freeze
+        MSG = 'Resource property should not be both required and have a default value. This will fail on Chef Infra Client 13+'.freeze
 
         def on_send(node)
           if required_property?(node) && property_has_default?(node)

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

@@ -0,0 +1,72 @@
+#
+# Copyright:: 2019, 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
+      # The long_description metadata.rb method is not used and is unnecessary in cookbooks
+      #
+      # @example
+      #
+      #   # bad
+      #   include Chef::Mixin::LanguageIncludeAttribute
+      #   include Chef::Mixin::RecipeDefinitionDSLCore
+      #   include Chef::Mixin::LanguageIncludeRecipe
+      #   include Chef::Mixin::Language
+      #   include Chef::DSL::Recipe::FullDSL
+      #   require 'chef/mixin/language
+      #   require 'chef/mixin/language_include_attribute
+      #   require 'chef/mixin/language_include_recipe
+
+      class UsesDeprecatedMixins < Cop
+        MSG = "Don't use deprecated Mixins no longer included in Chef Infra Client 14 and later.".freeze
+
+        def_node_matcher :deprecated_mixin?, <<-PATTERN
+          (send nil? :include (const (const (const nil? :Chef) :Mixin) { :Language :LanguageIncludeAttribute :RecipeDefinitionDSLCore :LanguageIncludeRecipe }))
+        PATTERN
+
+        def_node_matcher :deprecated_dsl?, <<-PATTERN
+          (send nil? :include (const (const (const (const nil? :Chef) :DSL) :Recipe) :FullDSL))
+        PATTERN
+
+        def_node_matcher :dsl_mixin_require?, <<-PATTERN
+          (send nil? :require ( str {"chef/mixin/language" "chef/mixin/language_include_attribute" "chef/mixin/language_include_recipe"}))
+        PATTERN
+
+        def on_send(node)
+          deprecated_mixin?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+
+          deprecated_dsl?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+
+          dsl_mixin_require?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.remove(node.loc.expression)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+#
+# Copyright:: 2019, 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
+      # The Ohai default recipe previously allowed a user to ship custom Ohai plugins to a system by including them
+      # in a directory in the Ohai cookbook. This functionality was replaced with the ohai_plugin resource, which
+      # should be used instead as it doesn't require forking the ohai cookbook.
+      #
+      # @example
+      #
+      #   # bad
+      #   include_recipe 'yum::elrepo'
+      #   include_recipe 'yum::epel'
+      #   include_recipe 'yum::ius'
+      #   include_recipe 'yum::remi'
+      #   include_recipe 'yum::repoforge'
+      #   include_recipe 'yum::yum'
+      #
+      class LegacyYumCookbookRecipes < Cop
+        MSG = 'The elrepo, epel, ius, remi, and repoforge recipes were split into their own cookbooks and the yum recipe was renamed to be default with the release of yum cookbook 3.0 (Dec 2013).'.freeze
+
+        def_node_matcher :old_yum_recipe?, <<-PATTERN
+          (send nil? :include_recipe (str {"yum::elrepo" "yum::epel" "yum::ius" "yum::remi" "yum::repoforge" "yum::yum"}))
+        PATTERN
+
+        def on_send(node)
+          old_yum_recipe?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,84 @@
+#
+# Copyright:: 2019, 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
+      # Incorrectly using node methods for Ohai data when you really want node attributes
+      #
+      # @example
+      #
+      #   # bad
+      #   node.fqdn
+      #   node.platform
+      #   node.platform_family
+      #   node.platform_version
+      #   node.hostname
+      #
+      #   # good
+      #   node['fqdn']
+      #   node['platform']
+      #   node['platform_family']
+      #   node['platform_version']
+      #   node['hostname']
+      #
+      class NodeMethodsInsteadofAttributes < Cop
+        MSG = 'Use node attributes to access Ohai data instead of node methods, which were deprecated in Chef Infra Client 13.'.freeze
+
+        def_node_matcher :node_ohai_methods?, <<-PATTERN
+          (send (send nil? :node) #non_nested_ohai_attribute?)
+        PATTERN
+
+        def on_send(node)
+          node_ohai_methods?(node) do
+            add_offense(node, location: :selector, message: MSG, severity: :refactor)
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.replace(node.loc.expression, "node['#{node.method_name}']")
+          end
+        end
+
+        private
+
+        def non_nested_ohai_attribute?(attribute)
+          %i(
+            current_user
+            domain
+            fqdn
+            hostname
+            ip6address
+            ipaddress
+            macaddress
+            machinename
+            ohai_time
+            os
+            os_version
+            platform
+            platform_build
+            platform_family
+            platform_version
+            root_group
+            shard_seed
+            uptime
+            uptime_seconds).include?(attribute)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+#
+# Copyright:: Copyright 2019, 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 node.save with effortless as there is no server to save node state back to
+      #
+      # @example
+      #
+      #   # bad
+      #   node.save
+      class CookbookUsesNodeSave < Cop
+        MSG = 'Do not use node.save with Effortless as there is no server to save node state back to'.freeze
+
+        def_node_matcher :node_save?, <<-PATTERN
+          (send (send nil? :node) :save)
+        PATTERN
+
+        def on_send(node)
+          node_save?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+#
+# Copyright:: 2019, 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
+      # There is no need to include Chef::Mixin::ShellOut in resources or providers as this is already done by Chef Infra Client.
+      #
+      # @example
+      #
+      #   # bad
+      #   require 'chef/mixin/shell_out'
+      #   include Chef::Mixin::ShellOut
+
+      class IncludingMixinShelloutInResources < Cop
+        MSG = 'There is no need to include Chef::Mixin::ShellOut in resources or providers as this is already done by Chef Infra Client.'.freeze
+
+        def_node_matcher :include_shellout?, <<-PATTERN
+          (send nil? :include (const (const (const nil? :Chef) :Mixin) :ShellOut))
+        PATTERN
+
+        def_node_matcher :require_shellout?, <<-PATTERN
+          (send nil? :require ( str "chef/mixin/shell_out"))
+        PATTERN
+
+        def on_send(node)
+          require_shellout?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+
+          include_shellout?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.remove(node.loc.expression)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+#
+# Copyright:: 2019, 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
+      # Use Chef InSpec for testing instead of the Minitest Handler cookbook pattern.
+      #
+      # @example
+      #
+      #   # bad
+      #   depends 'minitest-handler'
+      #
+      class MinitestHandlerUsage < Cop
+        MSG = 'Use Chef InSpec for testing instead of the Minitest Handler cookbook pattern.'.freeze
+
+        def_node_matcher :minitest_depends?, <<-PATTERN
+          (send nil? :depends (str "minitest-handler"))
+        PATTERN
+
+        def on_send(node)
+          minitest_depends?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.remove(node.loc.expression)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+#
+# Copyright:: 2019, 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
+      # The Ohai default recipe previously allowed a user to ship custom Ohai plugins to a system by including them
+      # in a directory in the Ohai cookbook. This functionality was replaced with the ohai_plugin resource, which
+      # should be used instead as it doesn't require forking the ohai cookbook.
+      #
+      # @example
+      #
+      #   # bad
+      #   include_recipe 'ohai::default'
+      #   include_recipe 'ohai'
+      #
+      class IncludingOhaiDefaultRecipe < Cop
+        MSG = "Use the ohai_plugin resource to ship custom Ohai plugins instead of using the ohai::default recipe. If you're not shipping custom Ohai plugins, then you can remove this recipe entirely".freeze
+
+        def_node_matcher :ohai_recipe_usage?, <<-PATTERN
+          (send nil? :include_recipe (str {"ohai" "ohai::default"}))
+        PATTERN
+
+        def on_send(node)
+          ohai_recipe_usage?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+#
+# Copyright:: 2019, 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
+      # use_inline_resources became the default in Chef Infra Client 13+ and no longer needs
+      # to be called in resources
+      #
+      # @example
+      #
+      #   # bad
+      #   use_inline_resources
+      #   use_inline_resources if defined?(use_inline_resources)
+      #
+      class UseInlineResourcesDefined < Cop
+        MSG = 'use_inline_resources is now the default for resources in Chef Infra Client 13+ and does not need to be specified.'.freeze
+
+        def on_send(node)
+          if node.method_name == :use_inline_resources
+            # don't alert on the use_inline_resources within the defined? check
+            # that would result in 2 alerts on the same line and wouldn't be useful
+            return if node.parent && node.parent.defined_type?
+
+            # catch the full offense if the method is gated like this: use_inline_resources if defined?(use_inline_resources)
+            if node.parent && node.parent.if_type? && node.parent.children.first.method_name == :defined?
+              node = node.parent
+            end
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.remove(node.loc.expression)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/modernize/{why_run_supported_true.rb → whyrun_supported_true.rb}

@@ -17,20 +17,20 @@
 module RuboCop
   module Cop
     module Chef
-      # why_run_supported? no longer needs to be set to true as that is the default in Chef 13+
+      # whyrun_supported? no longer needs to be set to true as that is the default in Chef Infra Client 13+
       #
       # @example
       #
       #   # bad
-      #   def why_run_supported?
+      #   def whyrun_supported?
       #    true
       #   end
       #
       class WhyRunSupportedTrue < Cop
-        MSG = 'why_run_supported? no longer needs to be set to true as it is the default in Chef 13+'.freeze
+        MSG = 'whyrun_supported? no longer needs to be set to true as it is the default in Chef Infra Client 13+'.freeze
 
         def on_def(node)
-          if node.method_name == :why_run_supported? && node.body == s(:true) # rubocop: disable Lint/BooleanSymbol
+          if node.method_name == :whyrun_supported? && node.body == s(:true) # rubocop: disable Lint/BooleanSymbol
             add_offense(node, location: :expression, message: MSG, severity: :refactor)
           end
         end

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

@@ -0,0 +1,45 @@
+#
+# Copyright:: 2019, 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
+      # Use node['platform_version] data instead of the Windows::VersionHelper helper from the Windows cookbook.
+      #
+      # @example
+      #
+      #   # bad
+      #   Windows::VersionHelper.nt_version
+      #
+      #   # good
+      #   node['platform_version].to_i
+      #
+      class WindowsVersionHelper < Cop
+        MSG = "Use node['platform_version'] data instead of the Windows::VersionHelper helper from the Windows cookbook.".freeze
+
+        def_node_matcher :windows_helper?, <<-PATTERN
+          (send ( const ( const {nil? cbase} :Windows ) :VersionHelper ) ... )
+        PATTERN
+
+        def on_send(node)
+          windows_helper?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+#
+# Copyright:: 2019, 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
+      # Use the archive_file resource built into Chef Infra Client 15+ instead of the windows_zipfile from the Windows cookbook
+      #
+      # @example
+      #
+      #   # bad
+      #   windows_zipfile 'C:\\files\\' do
+      #     source 'C:\\Temp\\file.zip'
+      #   end
+      #
+      class WindowsZipfileUsage < Cop
+        MSG = 'Use the archive_file resource built into Chef Infra Client 15+ instead of the windows_zipfile from the Windows cookbook'.freeze
+
+        def on_send(node)
+          add_offense(node, location: :expression, message: MSG, severity: :refactor) if node.method_name == :windows_zipfile
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+#
+# Copyright:: 2019, 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
+      # The xml::ruby recipe was used to install nokogiri into the Chef installation. Nokogiri is included
+      # in Chef Infra Client 12 and later so this recipe is no longer necessary.
+      #
+      # @example
+      #
+      #   # bad
+      #   include_recipe 'xml::ruby'
+      #
+      class IncludingXMLRubyRecipe < Cop
+        MSG = 'The xml::ruby recipe installs nokogiri which is included in Chef Infra Client 12 and later.'.freeze
+
+        def_node_matcher :xml_ruby_recipe?, <<-PATTERN
+          (send nil? :include_recipe (str "xml::ruby"))
+        PATTERN
+
+        def on_send(node)
+          xml_ruby_recipe?(node) do
+            add_offense(node, location: :expression, message: MSG, severity: :refactor)
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.remove(node.loc.expression)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 5.3.6
+  version: 5.4.13
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,6 +76,7 @@ files:
 - lib/rubocop/chef/cookbook_only.rb
 - lib/rubocop/cop/chef/correctness/block_guard_clause_string_only.rb
 - lib/rubocop/cop/chef/correctness/cb_depends_on_self.rb
+- lib/rubocop/cop/chef/correctness/default_maintainer_metadata.rb
 - lib/rubocop/cop/chef/correctness/insecure_cookbook_url.rb
 - lib/rubocop/cop/chef/correctness/invalid_license_string.rb
 - lib/rubocop/cop/chef/correctness/invalid_platform_metadata.rb
@@ -92,10 +93,13 @@ files:
 - lib/rubocop/cop/chef/deprecation/depends_compat_resource.rb
 - lib/rubocop/cop/chef/deprecation/depends_partial_search.rb
 - lib/rubocop/cop/chef/deprecation/depends_poise.rb
+- lib/rubocop/cop/chef/deprecation/deprecated_mixins.rb
 - lib/rubocop/cop/chef/deprecation/easy_install.rb
 - lib/rubocop/cop/chef/deprecation/epic_fail.rb
 - lib/rubocop/cop/chef/deprecation/erl_call.rb
+- lib/rubocop/cop/chef/deprecation/legacy_yum_cookbook_recipes.rb
 - lib/rubocop/cop/chef/deprecation/long_description_metadata.rb
+- lib/rubocop/cop/chef/deprecation/node_methods_not_attributes.rb
 - lib/rubocop/cop/chef/deprecation/node_set.rb
 - lib/rubocop/cop/chef/deprecation/node_set_unless.rb
 - lib/rubocop/cop/chef/deprecation/provides_metadata.rb
@@ -104,6 +108,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/respond_to_metadata.rb
 - lib/rubocop/cop/chef/deprecation/suggests_metadata.rb
 - lib/rubocop/cop/chef/effortless/data_bags.rb
+- lib/rubocop/cop/chef/effortless/node_save.rb
 - lib/rubocop/cop/chef/effortless/search_used.rb
 - lib/rubocop/cop/chef/modernize/apt_default_recipe.rb
 - lib/rubocop/cop/chef/modernize/berksfile_source.rb
@@ -111,13 +116,20 @@ files:
 - lib/rubocop/cop/chef/modernize/chef_14_resources.rb
 - lib/rubocop/cop/chef/modernize/defines_chefspec_matchers.rb
 - lib/rubocop/cop/chef/modernize/execute_apt_update.rb
+- lib/rubocop/cop/chef/modernize/includes_mixin_shellout.rb
+- lib/rubocop/cop/chef/modernize/minitest_handler_usage.rb
+- lib/rubocop/cop/chef/modernize/ohai_default_recipe.rb
 - lib/rubocop/cop/chef/modernize/resource_set_or_return.rb
 - lib/rubocop/cop/chef/modernize/resource_with_allowed_action.rb
 - lib/rubocop/cop/chef/modernize/resource_with_attributes.rb
 - lib/rubocop/cop/chef/modernize/respond_to_provides.rb
 - lib/rubocop/cop/chef/modernize/respond_to_resource_name.rb
-- lib/rubocop/cop/chef/modernize/why_run_supported_true.rb
+- lib/rubocop/cop/chef/modernize/use_inline_resources.rb
+- lib/rubocop/cop/chef/modernize/whyrun_supported_true.rb
 - lib/rubocop/cop/chef/modernize/windows_default_recipe.rb
+- lib/rubocop/cop/chef/modernize/windows_version_helper.rb
+- lib/rubocop/cop/chef/modernize/windows_zipfile.rb
+- lib/rubocop/cop/chef/modernize/xml_ruby_recipe.rb
 - lib/rubocop/cop/chef/modernize/yum_dnf_compat_recipe.rb
 - lib/rubocop/cop/chef/style/attribute_keys.rb
 - lib/rubocop/cop/chef/style/comment_sentence_spacing.rb