cookstyle 6.13.3 → 6.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddf96e2cc00a4c499396b6cb2b54297e64d0605edd2dba615fb28ecd0bcb91a9
-  data.tar.gz: 2ec5752d4202b2b7567f808346672b4a80c59967a8ebeed20fe354f0911236bb
+  metadata.gz: 07d286963f81d70ccc2e4eeb9b3c7fb557485877c5bb95ac2b8c2bf5aa79bd50
+  data.tar.gz: 73e58cae888fc04614c21a724257f5833b146afddc6339ae8b3dd969ea9b5f35
 SHA512:
-  metadata.gz: 4f5e75f32ca428f5b4395a3f42a50a37675e21dc79e89d4b7b1d731328c28e2cd1dfd116667c0c8c9b0887bfd1ca647901ecd6895c56e82bac5f4e9939c84e54
-  data.tar.gz: 6aa192abcf88b35034474eac2ebcfecd8c154e2f28e08f0995a53bb4e998e8a4af7f1e246a1f7fced0979bbd2bddd1bdd96bbde6c046fdc92299cede2b012742
+  metadata.gz: af409a2dbf43a42e874f8b8e40006c9b97450d8b1048b765a57774c999d0e3e3163cc391239c82e117fd1e7f5ae9de4435625994d6ef0516ba71c2716502fc87
+  data.tar.gz: 7118a2999c086064f8d0be2cea95d7b1bbe3ea00ceb7a1e0a018f683ff676d993d591127ed35450daddf402e75f84c5fecf4252d450f535b525966f0469f127c

data/config/cookstyle.yml

@@ -5,27 +5,6 @@ AllCops:
     - '/**/files/**/*'
     - '/**/vendor/**/*'
     - Guardfile
-  ChefAttributes:
-    Patterns:
-    - attributes/.*\.rb
-  ChefDefinitions:
-    Patterns:
-    - definitions/.*\.rb
-  ChefLibraries:
-    Patterns:
-    - libraries/.*\.rb
-  ChefMetadata:
-    Patterns:
-    - metadata\.rb
-  ChefProviders:
-    Patterns:
-    - providers/.*\.rb
-  ChefRecipes:
-    Patterns:
-    - recipes/.*\.rb
-  ChefResources:
-    Patterns:
-    - resources/.*\.rb
 
 ###############################
 # ChefStyle: Making cookbooks look better
@@ -67,7 +46,7 @@ ChefStyle/CommentFormat:
     - '**/Berksfile'
 
 ChefStyle/FileMode:
-  Description: Use strings to represent file modes in Chef resources
+  Description: Use strings to represent file modes to avoid confusion between octal and base 10 integer formats.
   StyleGuide: '#chefstylefilemode'
   Enabled: true
   VersionAdded: '5.0.0'
@@ -471,6 +450,15 @@ ChefCorrectness/SupportsMustBeFloat:
   Include:
     - '**/metadata.rb'
 
+ChefCorrectness/MacosUserdefaultsInvalidType:
+  Description: The macos_userdefaults resource prior to Chef Infra Client 16.3 would silently continue if invalid types were passed resulting in unexpected behavior. Valid values are 'array', 'bool', 'dict', 'float', 'int', and 'string'.
+  StyleGuide: '#chefcorrectnessmacosuserdefaultsinvalidtype'
+  Enabled: true
+  VersionAdded: '6.14.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
 ###############################
 # ChefSharing: Issues that prevent sharing code with other teams or with the Chef community in general
 ###############################
@@ -515,7 +503,7 @@ ChefSharing/EmptyMetadataField:
     - '**/metadata.rb'
 
 ChefSharing/IncludePropertyDescriptions:
-  Description: Properties should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+  Description: Properties should include description fields to allow automated documentation. Requires Chef Infra Client 13.9 or later.
   StyleGuide: '#chefsharingincludepropetydescriptions'
   Enabled: false
   VersionAdded: '6.1.0'
@@ -524,7 +512,7 @@ ChefSharing/IncludePropertyDescriptions:
     - '**/resources/*.rb'
 
 ChefSharing/IncludeResourceDescriptions:
-  Description: Resources should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+  Description: Resources should include description fields to allow automated documentation. Requires Chef Infra Client 13.9 or later.
   StyleGuide: '#chefsharingincluderesourcedescriptions'
   Enabled: false
   VersionAdded: '6.1.0'
@@ -532,7 +520,7 @@ ChefSharing/IncludeResourceDescriptions:
     - '**/resources/*.rb'
 
 ChefSharing/IncludeResourceExamples:
-  Description: Resources should include examples field to allow automated documention. Requires Chef Infra Client 13.9 or later.
+  Description: Resources should include examples field to allow automated documentation. Requires Chef Infra Client 13.9 or later.
   StyleGuide: '#chefsharingincluderesourceexamples'
   Enabled: false
   VersionAdded: '6.10.0'
@@ -1039,7 +1027,7 @@ ChefDeprecations/ResourceUsesOnlyResourceName:
 
 ChefDeprecations/ChefDKGenerators:
   Description: Chef Workstation 0.8 and later renamed the ChefDK module used when writing custom cookbook generators from ChefDK to ChefCLI. For compatibility with the latest Chef Workstation releases you'll need to reference the new class names.
-  StyleGuide: '#chefdkgenerators'
+  StyleGuide: '#chefdeprecationschefdkgenerators'
   Enabled: true
   VersionAdded: '6.12.0'
   Exclude:
@@ -1048,7 +1036,7 @@ ChefDeprecations/ChefDKGenerators:
 
 ChefDeprecations/ChefHandlerRecipe:
   Description: There is no need to include the empty and deprecated chef_handler::default recipe in order to use the chef_handler resource.
-  StyleGuide: '#chefhandlerrecipe'
+  StyleGuide: '#chefdeprecationschefhandlerrecipe'
   Enabled: true
   VersionAdded: '6.12.0'
   Exclude:
@@ -1057,13 +1045,22 @@ ChefDeprecations/ChefHandlerRecipe:
 
 ChefDeprecations/UseAutomaticResourceName:
   Description: The use_automatic_resource_name method was removed in Chef Infra Client 16. The resource name/provides should be set explicitly instead.
-  StyleGuide: '#useautomaticresourcename'
+  StyleGuide: '#chefdeprecationsuseautomaticresourcename'
   Enabled: true
   VersionAdded: '6.12.0'
   Include:
     - '**/libraries/*.rb'
     - '**/resources/*.rb'
 
+ChefDeprecations/MacosUserdefaultsGlobalProperty:
+  Description: The `global` property in the macos_userdefaults resource was deprecated in Chef Infra Client 16.3. Omitting the `domain` property will now set global defaults.
+  StyleGuide: '#chefdeprecationsmacosuserdefaultsglobalproperty'
+  Enabled: true
+  VersionAdded: '6.14.0'
+  Exclude:
+    - '**/metadata.rb'
+    - '**/Berksfile'
+
 ###############################
 # ChefModernize: Cleaning up legacy code and using new built-in resources
 ###############################
@@ -1540,7 +1537,7 @@ ChefModernize/WindowsRegistryUAC:
     - '**/Berksfile'
 
 ChefModernize/UseMultipackageInstalls:
-  Description: Pass an array of packages to package resources instead of interating over an array of packages when using multi-package capable package subystem such as apt, yum, chocolatey, dnf, or zypper. Multipackage installs are faster and simplify logs.
+  Description: Pass an array of packages to package resources instead of iterating over an array of packages when using multi-package capable package subsystem such as apt, yum, chocolatey, dnf, or zypper. Multi-package installs are faster and simplify logs.
   StyleGuide: '#chefmodernizeusemultipackageinstalls'
   Enabled: true
   VersionAdded: '6.0.0'
@@ -1873,7 +1870,7 @@ ChefEffortless/CookbookUsesDatabags:
     - '**/metadata.rb'
     - '**/Berksfile'
 
-ChefEffortless/CookbookUsesEnvironmments:
+ChefEffortless/CookbookUsesEnvironments:
   Description: Cookbook uses environments, which cannot be used in the Effortless Infra pattern
   StyleGuide: '#chefeffortlesscookbookusesenvironments'
   Enabled: false

data/lib/cookstyle.rb

@@ -7,13 +7,13 @@ require 'yaml'
 # ensure the desired target version of RuboCop is gem activated
 gem 'rubocop', "= #{Cookstyle::RUBOCOP_VERSION}"
 require 'rubocop'
-require 'rubocop/monkey_patches/comment_config.rb'
+require_relative 'rubocop/monkey_patches/comment_config.rb'
 
 # monkey patches needed for the TargetChefVersion config option
-require 'rubocop/monkey_patches/config.rb'
-require 'rubocop/monkey_patches/cop.rb'
-require 'rubocop/monkey_patches/team.rb'
-require 'rubocop/monkey_patches/registry_cop.rb'
+require_relative 'rubocop/monkey_patches/config.rb'
+require_relative 'rubocop/monkey_patches/base.rb'
+require_relative 'rubocop/monkey_patches/team.rb'
+require_relative 'rubocop/monkey_patches/registry_cop.rb'
 
 module RuboCop
   class ConfigLoader

data/lib/cookstyle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Cookstyle
-  VERSION = "6.13.3" # rubocop: disable Style/StringLiterals
+  VERSION = "6.14.7" # rubocop: disable Style/StringLiterals
   RUBOCOP_VERSION = '0.88.0'
 end

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

@@ -33,6 +33,7 @@ module RuboCop
         #
         class InvalidPlatformFamilyHelper < Cop
           include ::RuboCop::Chef::PlatformHelpers
+          include RangeHelp
 
           MSG = 'Pass valid platform families to the platform_family? helper.'
 
@@ -41,9 +42,31 @@ module RuboCop
           PATTERN
 
           def on_send(node)
-            platform_family_helper?(node) do |plat|
-              plat.to_a.each do |p|
-                add_offense(p, location: :expression, message: MSG, severity: :refactor) if INVALID_PLATFORM_FAMILIES.key?(p.value)
+            platform_family_helper?(node) do |plats|
+              plats.to_a.each do |p|
+                next unless INVALID_PLATFORM_FAMILIES.key?(p.value)
+                add_offense(p, location: :expression, message: MSG, severity: :refactor)
+              end
+            end
+          end
+
+          def autocorrect(node)
+            replacement_platform = INVALID_PLATFORM_FAMILIES[node.value]
+            all_passed_platforms = node.parent.arguments.map(&:value)
+
+            # see if we have a replacement platform in our hash. If not we can't autocorrect
+            if replacement_platform
+              # if the replacement platform was one of the other platforms passed we can just delete this bad platform
+              if all_passed_platforms.include?(replacement_platform)
+                all_passed_platforms.delete(node.value)
+                lambda do |corrector|
+                  arg_range = node.parent.arguments.first.loc.expression.join(node.parent.arguments[-1].loc.expression.end)
+                  corrector.replace(arg_range, all_passed_platforms.map { |x| "'#{x}'" }.join(', '))
+                end
+              else
+                lambda do |corrector|
+                  corrector.replace(node.loc.expression, node.value.gsub(node.value, "'#{replacement_platform}'")) # gsub to retain quotes
+                end
               end
             end
           end

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+#
+# Copyright:: 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 ChefCorrectness
+        # The macos_userdefaults resource prior to Chef Infra Client 16.3 would silently continue if invalid types were passed resulting in unexpected behavior. Valid values are: "array", "bool", "dict", "float", "int", and "string".
+        #
+        # @example
+        #
+        #   # bad
+        #   macos_userdefaults 'set a value' do
+        #     global true
+        #     key 'key'
+        #     type 'boolean'
+        #   end
+        #
+        #   # good
+        #   macos_userdefaults 'set a value' do
+        #     global true
+        #     key 'key'
+        #     type 'bool'
+        #   end
+        #
+        class MacosUserdefaultsInvalidType < Base
+          include RuboCop::Chef::CookbookHelpers
+          extend RuboCop::Cop::AutoCorrector
+
+          VALID_VALUES = %w(array bool dict float int string).freeze
+          INVALID_VALUE_MAP = {
+            'boolean' => 'bool',
+            'str' => 'string',
+            'integer' => 'int',
+          }.freeze
+
+          MSG = 'The macos_userdefaults resource prior to Chef Infra Client 16.3 would silently continue if invalid types were passed resulting in unexpected behavior. Valid values are: "array", "bool", "dict", "float", "int", and "string".'
+
+          def on_block(node)
+            match_property_in_resource?(:macos_userdefaults, 'type', node) do |type|
+              type_val = method_arg_ast_to_string(type)
+              return if VALID_VALUES.include?(type_val)
+              add_offense(type.loc.expression, message: MSG, severity: :refactor) do |corrector|
+                if INVALID_VALUE_MAP[type_val]
+                  corrector.replace(type.loc.expression, "type '#{INVALID_VALUE_MAP[type_val]}'")
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -25,20 +25,20 @@ module RuboCop
         # @example
         #
         #   # bad
-        #   execute 'some commmand' do
+        #   execute 'some command' do
         #     notifies 'restart', 'service[httpd]', 'delayed'
         #   end
         #
-        #   execute 'some commmand' do
+        #   execute 'some command' do
         #     subscribes 'restart', 'service[httpd]', 'delayed'
         #   end
         #
         #   # good
-        #   execute 'some commmand' do
+        #   execute 'some command' do
         #     notifies :restart, 'service[httpd]', 'delayed'
         #   end
         #
-        #   execute 'some commmand' do
+        #   execute 'some command' do
         #     subscribes :restart, 'service[httpd]', 'delayed'
         #   end
         #

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

@@ -19,13 +19,13 @@
 module RuboCop
   module Cop
     module Chef
-      # The Libarian-Chef depsolving project is no longer maintained and a Cheffile should not be used for cookbook depsolving. Consider using Policyfiles instead. If the Policyfiles model is not compatible with your workflow you may find Bershelf offers a more similar, and still supported, experience to Librarian-Chef.
+      # The Librarian-Chef depsolving project is no longer maintained and a Cheffile should not be used for cookbook depsolving. Consider using Policyfiles instead. If the Policyfiles model is not compatible with your workflow you may find Berkshelf offers a more similar, and still supported, experience to Librarian-Chef.
       #
       module ChefDeprecations
         class Cheffile < Cop
           include RangeHelp
 
-          MSG = 'The Libarian-Chef depsolving project is no longer maintained and a Cheffile should not be used for cookbook depsolving. Consider using Policyfiles instead.'
+          MSG = 'The Librarian-Chef depsolving project is no longer maintained and a Cheffile should not be used for cookbook depsolving. Consider using Policyfiles instead.'
 
           def investigate(processed_source)
             return if processed_source.blank?

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefDeprecations
-        # 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 informmation.
+        # 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.
         #
         # @example
         #
@@ -33,7 +33,7 @@ module RuboCop
         #   end
 
         class EOLAuditModeUsage < Cop
-          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 informmation.'
+          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.'
 
           def_node_matcher :control_group?, '(send nil? :control_group ...)'
 

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+#
+# Copyright:: 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 ChefDeprecations
+        # The `global` property in the macos_userdefaults resource was deprecated in Chef Infra Client 16.3. This property was never properly implemented and caused failures under many conditions. Omitting the `domain` property will now set global defaults.
+        #
+        # @example
+        #
+        #   # bad
+        #   macos_userdefaults 'set a value' do
+        #     global true
+        #     key 'key'
+        #     value 'value'
+        #   end
+        #
+        #   # good
+        #   macos_userdefaults 'set a value' do
+        #     key 'key'
+        #     value 'value'
+        #   end
+        #
+        class MacosUserdefaultsGlobalProperty < Base
+          extend TargetChefVersion
+          include RangeHelp
+          include RuboCop::Chef::CookbookHelpers
+          extend AutoCorrector
+
+          minimum_target_chef_version '16.3'
+
+          MSG = 'The `global` property in the macos_userdefaults resource was deprecated in Chef Infra Client 16.3. Omitting the `domain` property will now set global defaults.'
+
+          def on_block(node)
+            match_property_in_resource?(:macos_userdefaults, 'global', node) do |global|
+              add_offense(global.loc.expression, message: MSG, severity: :warning) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: global.loc.expression, side: :left))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -25,12 +25,12 @@ module RuboCop
         #
         #   # bad
         #   poise_archive 'https://example.com/myapp.tgz' do
-        #     destination '/opt/myapp'
+        #     destination '/opt/my_app'
         #   end
         #
         #   # good
         #   archive_file 'https://example.com/myapp.tgz' do
-        #     destination '/opt/myapp'
+        #     destination '/opt/my_app'
         #   end
         #
         class PoiseArchiveUsage < Cop

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

@@ -39,7 +39,7 @@ module RuboCop
 
           def_node_search :provides, '(send nil? :provides (sym $_) ...)'
 
-          # determine the cookbook name either by parsing metdata.rb or by parsing metata.json
+          # determine the cookbook name either by parsing metadata.rb or by parsing metadata.json
           #
           # @returns [String] the cookbook name
           def cookbook_name

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

@@ -27,7 +27,7 @@ module RuboCop
         #   node.environment == "production"
         #   node.chef_environment == "production"
         #
-        class CookbookUsesEnvironmments < Cop
+        class CookbookUsesEnvironments < Cop
           MSG = 'Cookbook uses environments, which cannot be used in Policyfiles or Effortless Infra'
 
           def on_send(node)

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

@@ -19,13 +19,13 @@ module RuboCop
   module Cop
     module Chef
       module ChefEffortless
-        # Neither Policyfiles or Effortless Infra which is based on Policyfiles supports Chef Roles
+        # Neither Policyfiles or Effortless Infra which is based on Policyfiles supports Chef Infra Roles
         #
         # @example
         #
         #   # bad
-        #   node.role?('webserver')
-        #   node.roles.include?('webserver')
+        #   node.role?('web_server')
+        #   node.roles.include?('web_server')
         #
         class CookbookUsesRoles < Cop
           MSG = 'Cookbook uses roles, which cannot be used in Policyfiles or Effortless Infra'

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

@@ -56,13 +56,13 @@ module RuboCop
 
           def_node_search :action_methods?, '(send nil? {:actions :allowed_actions} ... )'
 
-          def_node_search :intialize_method, '(def :initialize ... )'
+          def_node_search :initialize_method, '(def :initialize ... )'
 
           def autocorrect(node)
             lambda do |corrector|
               # insert the new allowed_actions call above the initialize method, but not if one already exists (this is sadly common)
               unless action_methods?(processed_source.ast)
-                initialize_node = intialize_method(processed_source.ast).first
+                initialize_node = initialize_method(processed_source.ast).first
                 corrector.insert_before(initialize_node.source_range, "allowed_actions #{node.descendants.first.source}\n\n")
               end
 

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

@@ -47,13 +47,13 @@ module RuboCop
             (ivasgn {:@action :@default_action} $(...))
           PATTERN
 
-          def_node_search :intialize_method, '(def :initialize ... )'
+          def_node_search :initialize_method, '(def :initialize ... )'
 
           def_node_search :default_action_method?, '(send nil? :default_action ... )'
 
           def on_ivasgn(node)
             action_variable_assignment?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if intialize_method(node.parent.parent)
+              add_offense(node, location: :expression, message: MSG, severity: :refactor) if initialize_method(node.parent.parent)
             end
           end
 
@@ -61,7 +61,7 @@ module RuboCop
             lambda do |corrector|
               # insert the new default_action call above the initialize method, but not if one already exists (this is sadly common)
               unless default_action_method?(processed_source.ast)
-                initialize_node = intialize_method(processed_source.ast).first
+                initialize_node = initialize_method(processed_source.ast).first
                 corrector.insert_before(initialize_node.source_range, "default_action #{node.descendants.first.source}\n\n")
               end
 

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefModernize
-        # In 2016 with Chef Infra Client 12.5 Custom Resources were introduced as a way of writing reusable resource code that could be shipped in cookbooks. Custom Resources offer many advantages of legacy Definitions including unit testing with ChefSpec, input validation, actions, commmon properties like not_if/only_if, and resource reporting.
+        # In 2016 with Chef Infra Client 12.5 Custom Resources were introduced as a way of writing reusable resource code that could be shipped in cookbooks. Custom Resources offer many advantages of legacy Definitions including unit testing with ChefSpec, input validation, actions, common properties like not_if/only_if, and resource reporting.
         #
         class Definitions < Cop
           include RuboCop::Chef::CookbookHelpers

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

@@ -43,19 +43,19 @@ module RuboCop
 
           def on_ivasgn(node)
             provides_assignment?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if intialize_method(node.parent.parent).any?
+              add_offense(node, location: :expression, message: MSG, severity: :refactor) if initialize_method(node.parent.parent).any?
             end
           end
 
           def_node_search :provides_method?, '(send nil? :provides ... )'
 
-          def_node_search :intialize_method, '(def :initialize ... )'
+          def_node_search :initialize_method, '(def :initialize ... )'
 
           def autocorrect(node)
             lambda do |corrector|
               # insert the new provides call above the initialize method, but not if one already exists (this is sadly common)
               unless provides_method?(processed_source.ast)
-                initialize_node = intialize_method(processed_source.ast).first
+                initialize_node = initialize_method(processed_source.ast).first
                 corrector.insert_before(initialize_node.source_range, "provides #{node.descendants.first.source}\n\n")
               end
 

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

@@ -48,12 +48,12 @@ module RuboCop
             end
           end
 
-          def_node_search :intialize_method, '(def :initialize ... )'
+          def_node_search :initialize_method, '(def :initialize ... )'
 
           def autocorrect(node)
             lambda do |corrector|
               # insert the new resource_name call above the initialize method
-              initialize_node = intialize_method(processed_source.ast).first
+              initialize_node = initialize_method(processed_source.ast).first
               corrector.insert_before(initialize_node.source_range, "resource_name #{node.descendants.first.source}\n\n")
 
               # remove the variable from the initialize method

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

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefModernize
-        # Pass an array of packages to package resources instead of interating over an array of packages when using multi-package capable package subystem such as apt, yum, chocolatey, dnf, or zypper. Multipackage installs are faster and simplify logs.
+        # Pass an array of packages to package resources instead of iterating over an array of packages when using multi-package capable package subsystem such as apt, yum, chocolatey, dnf, or zypper. Multi-package installs are faster and simplify logs.
         #
         # @example
         #
@@ -34,7 +34,7 @@ module RuboCop
         #   package %w(bmon htop vim curl)
         #
         class UseMultipackageInstalls < Cop
-          MSG = 'Pass an array of packages to package resources instead of interating over an array of packages when using multi-package capable package subystem such as apt, yum, chocolatey, dnf, or zypper. Multipackage installs are faster and simplify logs.'
+          MSG = 'Pass an array of packages to package resources instead of iterating over an array of packages when using multi-package capable package subsystem such as apt, yum, chocolatey, dnf, or zypper. Multi-package installs are faster and simplify logs.'
           MULTIPACKAGE_PLATS = %w(debian redhat suse amazon fedora scientific oracle rhel ubuntu centos redhat).freeze
 
           def_node_matcher :platform_or_platform_family?, <<-PATTERN
@@ -73,7 +73,7 @@ module RuboCop
                   (lvar _))})
           PATTERN
 
-          # see if all platforms in the when condition are multipackage compliant
+          # 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)

data/lib/rubocop/cop/chef/redundant/ohai_attribute_to_string.rb

@@ -45,18 +45,18 @@ module RuboCop
         class OhaiAttributeToString < Cop
           MSG = "This Ohai node attribute is already a string and doesn't need to be converted"
 
-          def_node_matcher :platform_to_s?, <<-PATTERN
+          def_node_matcher :attribute_to_s?, <<-PATTERN
             (send (send (send nil? :node) :[] $(str {"platform" "platform_family" "platform_version" "fqdn" "hostname" "os" "name"}) ) :to_s )
           PATTERN
 
           def on_send(node)
-            platform_to_s?(node) do
+            attribute_to_s?(node) do
               add_offense(node, location: :expression, message: MSG, severity: :refactor)
             end
           end
 
           def autocorrect(node)
-            platform_to_s?(node) do |method|
+            attribute_to_s?(node) do |method|
               lambda do |corrector|
                 corrector.replace(node.loc.expression, "node['#{method.value}']")
               end

data/lib/rubocop/cop/chef/sharing/include_property_descriptions.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefSharing
-        # Resource properties should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+        # Resource properties should include description fields to allow automated documentation. Requires Chef Infra Client 13.9 or later.
         #
         # @example
         #
@@ -34,7 +34,7 @@ module RuboCop
 
           minimum_target_chef_version '13.9'
 
-          MSG = 'Resource properties should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.'
+          MSG = 'Resource properties should include description fields to allow automated documentation. Requires Chef Infra Client 13.9 or later.'
 
           # any method named property being called with a symbol argument and anything else
           def_node_matcher :property?, '(send nil? :property (sym _) ...)'

data/lib/rubocop/cop/chef/sharing/include_resource_descriptions.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefSharing
-        # Resources should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.
+        # Resources should include description fields to allow automated documentation. Requires Chef Infra Client 13.9 or later.
         #
         # @example
         #
@@ -33,7 +33,7 @@ module RuboCop
 
           minimum_target_chef_version '13.9'
 
-          MSG = 'Resources should include description fields to allow automated documention. Requires Chef Infra Client 13.9 or later.'
+          MSG = 'Resources should include description fields to allow automated documentation. Requires Chef Infra Client 13.9 or later.'
 
           def investigate(processed_source)
             return if processed_source.blank?

data/lib/rubocop/cop/chef/sharing/include_resource_examples.rb

@@ -19,7 +19,7 @@ module RuboCop
   module Cop
     module Chef
       module ChefSharing
-        # Resources should include examples field to allow automated documention. Requires Chef Infra Client 13.9 or later.
+        # Resources should include examples field to allow automated documentation. Requires Chef Infra Client 13.9 or later.
         #
         # @example
         #
@@ -41,7 +41,7 @@ module RuboCop
 
           minimum_target_chef_version '13.9'
 
-          MSG = 'Resources should include examples field to allow automated documention. Requires Chef Infra Client 13.9 or later.'
+          MSG = 'Resources should include examples field to allow automated documentation. Requires Chef Infra Client 13.9 or later.'
 
           def investigate(processed_source)
             return if processed_source.blank?

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

@@ -19,39 +19,58 @@ module RuboCop
   module Cop
     module Chef
       module ChefStyle
-        # Check the file modes are given as strings instead of integers.
+        # Use strings to represent file modes to avoid confusion between octal and base 10 integer formats.
         #
         # @example
         #
         #   # bad
-        #   mode 644
-        #   mode 0644
+        #   remote_directory '/etc/my.conf' do
+        #     content 'some content'
+        #     mode 0600
+        #     action :create
+        #   end
+        #
+        #   remote_directory 'handler' do
+        #     source 'handlers'
+        #     recursive true
+        #     files_mode 644
+        #     action :create
+        #   end
         #
         #   # good
-        #   mode '644'
+        #   remote_directory '/etc/my.conf' do
+        #     content 'some content'
+        #     mode '600'
+        #     action :create
+        #   end
+        #
+        #   remote_directory 'handler' do
+        #     source 'handlers'
+        #     recursive true
+        #     files_mode '644'
+        #     action :create
+        #   end
         #
-        class FileMode < Cop
-          MSG = 'Use strings for file modes'
+        class FileMode < Base
+          extend RuboCop::Cop::AutoCorrector
+
+          MSG = 'Use strings to represent file modes to avoid confusion between octal and base 10 integer formats'
 
           def_node_matcher :resource_mode?, <<-PATTERN
-            (send nil? :mode $int)
+            (send nil? {:mode :files_mode} $int)
           PATTERN
 
           def on_send(node)
             resource_mode?(node) do |mode_int|
-              add_offense(mode_int, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              # If it was an octal literal, make sure we write out the right number.
-              replacement_base = octal?(node) ? 8 : 10
-              replacement_mode = node.children.first.to_s(replacement_base)
+              add_offense(mode_int.loc.expression, message: MSG, severity: :refactor) do |corrector|
+                # If it was an octal literal, make sure we write out the right number.
+                replacement_base = octal?(mode_int) ? 8 : 10
+                replacement_mode = mode_int.children.first.to_s(replacement_base)
 
-              # we build our own escaped string instead of using .inspect because that way
-              # we can use single quotes instead of the double quotes that .inspect adds
-              corrector.replace(node.loc.expression, "\'#{replacement_mode}\'")
+                # we build our own escaped string instead of using .inspect because that way
+                # we can use single quotes instead of the double quotes that .inspect adds
+                corrector.replace(mode_int.loc.expression, "\'#{replacement_mode}\'")
+              end
             end
           end
 

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

@@ -67,7 +67,7 @@ module RuboCop
                   condition_string = node.when_branches.first.conditions.map(&:source).join(', ')
 
                   # single line bodies without an else statement should be transformed into `X if platform?('ubuntu')` style statements
-                  # while multiline statements should just have the case and when bits replace with `if platform?('ubuntu')`
+                  # while multi-line statements should just have the case and when bits replace with `if platform?('ubuntu')`
                   if !node.else? && !node.when_branches.first.body.multiline?
                     new_source = "#{node.when_branches.first.body.source} if #{type.value}?(#{condition_string})"
                     corrector.replace(node.loc.expression, new_source)

data/lib/rubocop/monkey_patches/{cop.rb → base.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module RuboCop
   module Cop
-    class Cop
+    class Base
       # This is a copy of the #target_rails_version method from rubocop-rails
       def target_chef_version
         @config.target_chef_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 6.13.3
+  version: 6.14.7
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -67,6 +67,7 @@ files:
 - lib/rubocop/cop/chef/correctness/invalid_value_for_platform_helper.rb
 - lib/rubocop/cop/chef/correctness/invalid_version_metadata.rb
 - lib/rubocop/cop/chef/correctness/lazy_eval_node_attribute_defaults.rb
+- lib/rubocop/cop/chef/correctness/macos_userdefaults_invalid_type.rb
 - lib/rubocop/cop/chef/correctness/malformed_value_for_platform.rb
 - lib/rubocop/cop/chef/correctness/metadata_missing_name.rb
 - lib/rubocop/cop/chef/correctness/node_normal.rb
@@ -113,6 +114,7 @@ files:
 - lib/rubocop/cop/chef/deprecation/legacy_yum_cookbook_recipes.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
 - lib/rubocop/cop/chef/deprecation/name_property_and_default.rb
 - lib/rubocop/cop/chef/deprecation/node_deep_fetch.rb
 - lib/rubocop/cop/chef/deprecation/node_methods_not_attributes.rb
@@ -258,9 +260,9 @@ files:
 - lib/rubocop/cop/chef/style/unnecessary_platform_case_statement.rb
 - 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/cop.rb
 - lib/rubocop/monkey_patches/registry_cop.rb
 - lib/rubocop/monkey_patches/team.rb
 homepage: