cookstyle 6.16.4 → 6.17.6

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

@@ -30,6 +30,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Do not include the deprecated xml::ruby recipe to install the nokogiri gem. Chef Infra Client 12 and later ships with nokogiri included.'
+          RESTRICT_ON_SEND = [:include_recipe].freeze
 
           def_node_matcher :xml_ruby_recipe?, <<-PATTERN
             (send nil? :include_recipe (str "xml::ruby"))

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

@@ -32,6 +32,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Do not include the deprecated yum::dnf_yum_compat default recipe to install yum on dnf systems. Chef Infra Client now includes built in support for DNF packages.'
+          RESTRICT_ON_SEND = [:include_recipe].freeze
 
           def_node_matcher :yum_dnf_compat_recipe_usage?, <<-PATTERN
             (send nil? :include_recipe (str "yum::dnf_yum_compat"))

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

@@ -28,9 +28,10 @@ module RuboCop
         #   data_bag(data_bag_name)
         class CookbookUsesDatabags < Base
           MSG = 'Cookbook uses data bags, which cannot be used in the Effortless Infra pattern'
+          RESTRICT_ON_SEND = [:data_bag, :data_bag_item].freeze
 
           def on_send(node)
-            add_offense(node, message: MSG, severity: :refactor) if %i(data_bag data_bag_item).include?(node.method_name)
+            add_offense(node, message: MSG, severity: :refactor)
           end
         end
       end

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

@@ -29,10 +29,10 @@ module RuboCop
         #
         class CookbookUsesEnvironments < Base
           MSG = 'Cookbook uses environments, which cannot be used in Policyfiles or Effortless Infra'
+          RESTRICT_ON_SEND = [:environment, :chef_environment].freeze
 
           def on_send(node)
-            if %i(environment chef_environment).include?(node.method_name) &&
-               node.receiver &&
+            if node.receiver &&
                node.receiver.send_type? &&
                node.receiver.method_name == :node
               add_offense(node, message: MSG, severity: :refactor)

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

@@ -28,10 +28,10 @@ module RuboCop
         #
         class CookbookUsesPolicygroups < Base
           MSG = 'Cookbook uses Policy Groups, which cannot be used with Effortless Infra'
+          RESTRICT_ON_SEND = [:policy_group].freeze
 
           def on_send(node)
-            if node.method_name == :policy_group &&
-               node.receiver &&
+            if node.receiver &&
                node.receiver.send_type? &&
                node.receiver.method_name == :node
               add_offense(node, message: MSG, severity: :refactor)

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

@@ -29,10 +29,10 @@ module RuboCop
         #
         class CookbookUsesRoles < Base
           MSG = 'Cookbook uses roles, which cannot be used in Policyfiles or Effortless Infra'
+          RESTRICT_ON_SEND = [:role?, :roles].freeze
 
           def on_send(node)
-            if %i(role? roles).include?(node.method_name) &&
-               node.receiver &&
+            if node.receiver &&
                node.receiver.send_type? &&
                node.receiver.method_name == :node
               add_offense(node, message: MSG, severity: :refactor)

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

@@ -29,10 +29,10 @@ module RuboCop
         #
         class SearchForEnvironmentsOrRoles < Base
           MSG = 'Cookbook uses search with a node query that looks for a role or environment'
+          RESTRICT_ON_SEND = [:search].freeze
 
           def on_send(node)
-            if node.method_name == :search &&
-               node.arguments[1]&.value&.match?(/chef_environment|role/)
+            if node.arguments[1]&.value&.match?(/chef_environment|role/)
               add_offense(node, message: MSG, severity: :refactor)
             end
           end

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

@@ -28,9 +28,10 @@ module RuboCop
         #
         class CookbookUsesSearch < Base
           MSG = 'Cookbook uses search, which cannot be used in the Effortless Infra pattern'
+          RESTRICT_ON_SEND = [:search].freeze
 
           def on_send(node)
-            add_offense(node, message: MSG, severity: :refactor) if node.method_name == :search
+            add_offense(node, message: MSG, severity: :refactor)
           end
         end
       end

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

@@ -36,6 +36,7 @@ module RuboCop
           minimum_target_chef_version '12.7'
 
           MSG = 'Do not include the Apt default recipe to update package cache. Instead use the apt_update resource, which is built into Chef Infra Client 12.7 and later.'
+          RESTRICT_ON_SEND = [:include_recipe].freeze
 
           def_node_matcher :apt_recipe_usage?, <<-PATTERN
             (send nil? :include_recipe (str {"apt" "apt::default"}))

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

@@ -38,6 +38,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Do not use legacy Berksfile community sources. Use Chef Supermarket instead.'
+          RESTRICT_ON_SEND = [:source, :site].freeze
 
           def_node_matcher :berksfile_site?, <<-PATTERN
             (send nil? :site (:sym _))

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

@@ -35,6 +35,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Use the build_essential resource instead of the legacy build-essential recipe. This resource ships in the build-essential cookbook v5.0+ and is built into Chef Infra Client 14+'
+          RESTRICT_ON_SEND = [:include_recipe].freeze
 
           def_node_matcher :build_essential_recipe_usage?, <<-PATTERN
             (send nil? :include_recipe (str {"build-essential" "build-essential::default"}))

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

@@ -40,6 +40,7 @@ module RuboCop
           minimum_target_chef_version '14.0'
 
           MSG = "Don't depend on cookbooks made obsolete by Chef Infra Client 14+. These community cookbooks contain resources that are now included in Chef Infra Client itself."
+          RESTRICT_ON_SEND = [:depends].freeze
 
           def_node_matcher :legacy_depends?, <<-PATTERN
             (send nil? :depends (str {"build-essential" "chef_handler" "chef_hostname" "dmg" "mac_os_x" "swap" "sysctl"}) ... )

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

@@ -33,6 +33,7 @@ module RuboCop
           include RuboCop::Chef::CookbookHelpers
 
           MSG = 'The nokogiri gem ships in Chef Infra Client 12+ and does not need to be installed before being used.'
+          RESTRICT_ON_SEND = [:chef_gem].freeze
 
           def_node_matcher :nokogiri_install?, <<-PATTERN
             (send nil? :chef_gem (str "nokogiri"))

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

@@ -33,6 +33,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = "Use ::File.exist?('/foo/bar') instead of the slower 'test -f /foo/bar' which requires shelling out"
+          RESTRICT_ON_SEND = [:not_if, :only_if].freeze
 
           def_node_matcher :resource_conditional?, <<~PATTERN
           (send nil? {:not_if :only_if} $str )

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

@@ -36,10 +36,10 @@ module RuboCop
           minimum_target_chef_version '14.4'
 
           MSG = 'The cron_manage resource was renamed to cron_access in the 6.1 release of the cron cookbook and later shipped in Chef Infra Client 14.4. The new resource name should be used.'
+          RESTRICT_ON_SEND = [:cron_manage].freeze
 
           def on_send(node)
             add_offense(node, message: MSG, severity: :refactor) do |corrector|
-              return unless node.method_name == :cron_manage
               corrector.replace(node.loc.expression, node.source.gsub(/^cron_manage/, 'cron_access'))
             end
           end

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

@@ -34,6 +34,7 @@ module RuboCop
           minimum_target_chef_version '13.3'
 
           MSG = "Don't depend on the zypper cookbook as the zypper_repository resource is built into Chef Infra Client 13.3+"
+          RESTRICT_ON_SEND = [:depends].freeze
 
           def_node_matcher :zypper_depends?, <<-PATTERN
             (send nil? :depends (str "zypper"))

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

@@ -30,6 +30,7 @@ module RuboCop
           include RangeHelp
 
           MSG = 'Chef Infra Client 12.4+ includes the Chef::DSL::Recipe in the resource and provider classed by default so there is no need to include this DSL in your resources or providers.'
+          RESTRICT_ON_SEND = [:include].freeze
 
           def_node_matcher :dsl_include?, <<-PATTERN
           (send nil? :include

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

@@ -46,6 +46,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Use the apt_update resource instead of the execute resource to run an apt-get update package cache update'
+          RESTRICT_ON_SEND = [:execute, :notifies, :subscribes, :command].freeze
 
           def_node_matcher :execute_apt_update?, <<-PATTERN
             (send nil? :execute (str { "apt-get update" "apt-get update -y" "apt-get -y update" }))

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

@@ -39,12 +39,13 @@ module RuboCop
           minimum_target_chef_version '14.0'
 
           MSG = 'Chef Infra Client 14.0 and later includes :create, :delete, and :configure actions with the full idempotency of the windows_service resource. See the windows_service documentation at https://docs.chef.io/resource_windows_service.html for additional details on creating services with the windows_service resource'
+          RESTRICT_ON_SEND = [:execute].freeze
 
           # non block execute resources
           def on_send(node)
             # use a regex on source instead of .value in case there's string interpolation which adds a complex dstr type
             # with a nested string and a begin. Source allows us to avoid a lot of defensive programming here
-            return unless node&.arguments.first&.source&.match?(/^("|')sc.exe/) && node.method_name == :execute
+            return unless node&.arguments.first&.source&.match?(/^("|')sc.exe/)
 
             add_offense(node, message: MSG, severity: :refactor)
           end

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

@@ -43,12 +43,13 @@ module RuboCop
           minimum_target_chef_version '15.5'
 
           MSG = 'Chef Infra Client 15.5 and later include a chef_sleep resource that should be used to sleep between executing resources if necessary instead of using the bash or execute resources to run the sleep command.'
+          RESTRICT_ON_SEND = [:execute].freeze
 
           # non block execute resources
           def on_send(node)
             # use a regex on source instead of .value in case there's string interpolation which adds a complex dstr type
             # with a nested string and a begin. Source allows us to avoid a lot of defensive programming here
-            return unless node.method_name == :execute && node&.arguments.first&.source&.match?(/^("|')sleep/)
+            return unless node&.arguments.first&.source&.match?(/^("|')sleep/)
             add_offense(node, message: MSG, severity: :refactor)
           end
 

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

@@ -43,12 +43,13 @@ module RuboCop
           minimum_target_chef_version '14.0'
 
           MSG = 'Chef Infra Client 14.0 and later includes a sysctl resource that should be used to idempotently load sysctl values instead of templating files and using execute to load them.'
+          RESTRICT_ON_SEND = [:execute].freeze
 
           # non block execute resources
           def on_send(node)
             # use a regex on source instead of .value in case there's string interpolation which adds a complex dstr type
             # with a nested string and a begin. Source allows us to avoid a lot of defensive programming here
-            return unless node.method_name == :execute && node&.arguments.first&.source&.match?(/^("|')sysctl -p/)
+            return unless node&.arguments.first&.source&.match?(/^("|')sysctl -p/)
             add_offense(node, message: MSG, severity: :refactor)
           end
 

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

@@ -44,6 +44,7 @@ module RuboCop
           minimum_target_chef_version '14.6'
 
           MSG = 'Use the timezone resource included in Chef Infra Client 14.6+ instead of shelling out to tzutil'
+          RESTRICT_ON_SEND = [:execute].freeze
 
           def_node_matcher :execute_resource?, <<-PATTERN
             (send nil? :execute $str)

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

@@ -35,6 +35,7 @@ module RuboCop
           include RangeHelp
 
           MSG = 'There is no need to include Chef::Mixin::ShellOut or Chef::Mixin::PowershellOut in resources or providers as this is already done by Chef Infra Client 12.4+.'
+          RESTRICT_ON_SEND = [:include, :require].freeze
 
           def_node_matcher :include_shellout?, <<-PATTERN
             (send nil? :include (const (const (const nil? :Chef) :Mixin) {:ShellOut :PowershellOut}))

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

@@ -41,6 +41,7 @@ module RuboCop
           minimum_target_chef_version '15.0'
 
           MSG = 'Use the archive_file resource built into Chef Infra Client 15+ instead of the libarchive file resource'
+          RESTRICT_ON_SEND = [:libarchive_file, :notifies, :subscribes].freeze
 
           def_node_matcher :notification_property?, <<-PATTERN
             (send nil? {:notifies :subscribes} (sym _) $(...) (sym _))

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

@@ -43,9 +43,9 @@ module RuboCop
           minimum_target_chef_version '14.0'
 
           MSG = 'The mac_os_x_userdefaults resource was renamed to macos_userdefaults when it was added to Chef Infra Client 14.0. The new resource name should be used.'
+          RESTRICT_ON_SEND = [:mac_os_x_userdefaults].freeze
 
           def on_send(node)
-            return unless node.method_name == :mac_os_x_userdefaults
             add_offense(node, message: MSG, severity: :refactor) do |corrector|
               corrector.replace(node.loc.expression, node.source.gsub(/^mac_os_x_userdefaults/, 'macos_userdefaults'))
             end

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

@@ -31,6 +31,7 @@ module RuboCop
           include RangeHelp
 
           MSG = 'Use Chef InSpec for testing instead of the Minitest Handler cookbook pattern.'
+          RESTRICT_ON_SEND = [:depends].freeze
 
           def_node_matcher :minitest_depends?, <<-PATTERN
             (send nil? :depends (str "minitest-handler"))

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

@@ -31,6 +31,7 @@ module RuboCop
         #
         class IncludingOhaiDefaultRecipe < Base
           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"
+          RESTRICT_ON_SEND = [:include_recipe].freeze
 
           def_node_matcher :ohai_recipe_usage?, <<-PATTERN
             (send nil? :include_recipe (str {"ohai" "ohai::default"}))

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

@@ -39,9 +39,9 @@ module RuboCop
           minimum_target_chef_version '14.0'
 
           MSG = 'The openssl_rsa_key resource was renamed to openssl_rsa_private_key in Chef Infra Client 14.0. The new resource name should be used.'
+          RESTRICT_ON_SEND = [:openssl_rsa_key].freeze
 
           def on_send(node)
-            return unless node.method_name == :openssl_rsa_key
             add_offense(node, message: MSG, severity: :refactor) do |corrector|
               corrector.replace(node.loc.expression, node.source.gsub(/^openssl_rsa_key/, 'openssl_rsa_private_key'))
             end

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

@@ -45,9 +45,9 @@ module RuboCop
           minimum_target_chef_version '14.4'
 
           MSG = 'The openssl_x509 resource was renamed to openssl_x509_certificate in Chef Infra Client 14.4. The new resource name should be used.'
+          RESTRICT_ON_SEND = [:openssl_x509].freeze
 
           def on_send(node)
-            return unless node.method_name == :openssl_x509
             add_offense(node, message: MSG, severity: :refactor) do |corrector|
               corrector.replace(node.loc.expression, node.source.gsub(/^openssl_x509/, 'openssl_x509_certificate'))
             end

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

@@ -36,9 +36,9 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'The osx_config_profile resource was renamed to osx_profile. The new resource name should be used.'
+          RESTRICT_ON_SEND = [:osx_config_profile].freeze
 
           def on_send(node)
-            return unless node.method_name == :osx_config_profile
             add_offense(node, message: MSG, severity: :refactor) do |corrector|
               corrector.replace(node.loc.expression, node.source.gsub(/^osx_config_profile/, 'osx_profile'))
             end

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

@@ -33,6 +33,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Resource property sets name_attribute instead of name_property'
+          RESTRICT_ON_SEND = [:property].freeze
 
           # match on a property that has any name and any type and a hash that
           # contains name_attribute true. The hash pairs are wrapped in

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

@@ -40,9 +40,9 @@ module RuboCop
         #
         class SetOrReturnInResources < Base
           MSG = 'Do not use set_or_return within a method to define a property for a resource. Use the property method instead, which supports validation, reporting, and documentation functionality'
+          RESTRICT_ON_SEND = [:set_or_return].freeze
 
           def on_send(node)
-            return unless node.method_name == :set_or_return
             add_offense(node, message: MSG, severity: :refactor)
           end
         end

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

@@ -44,6 +44,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Custom Resources should contain properties not attributes'
+          RESTRICT_ON_SEND = [:attribute].freeze
 
           def_node_matcher :attribute?, <<-PATTERN
             (send nil? $:attribute ... )

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

@@ -39,9 +39,10 @@ module RuboCop
           minimum_target_chef_version '14.0'
 
           MSG = 'Chef Infra Client 14.0 and later includes :create, :delete, and :configure actions without the need for the sc cookbook dependency. See the windows_service documentation at https://docs.chef.io/resource_windows_service.html for additional details.'
+          RESTRICT_ON_SEND = [:sc_windows].freeze
 
           def on_send(node)
-            add_offense(node, message: MSG, severity: :refactor) if node.method_name == :sc_windows
+            add_offense(node, message: MSG, severity: :refactor)
           end
         end
       end

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

@@ -35,9 +35,10 @@ module RuboCop
           minimum_target_chef_version '15.0'
 
           MSG = 'Use the archive_file resource built into Chef Infra Client 15+ instead of the seven_zip_archive'
+          RESTRICT_ON_SEND = [:seven_zip_archive].freeze
 
           def on_send(node)
-            add_offense(node, message: MSG, severity: :refactor) if node.method_name == :seven_zip_archive
+            add_offense(node, message: MSG, severity: :refactor)
           end
         end
       end

data/lib/rubocop/cop/chef/modernize/{systctl_param_resource.rb → sysctl_param_resource.rb}

@@ -39,9 +39,9 @@ module RuboCop
           minimum_target_chef_version '14.0'
 
           MSG = 'The sysctl_param resource was renamed to sysctl when it was added to Chef Infra Client 14.0. The new resource name should be used.'
+          RESTRICT_ON_SEND = [:sysctl_param].freeze
 
           def on_send(node)
-            return unless node.method_name == :sysctl_param
             add_offense(node, message: MSG, severity: :refactor) do |corrector|
               corrector.replace(node.loc.expression, node.source.gsub(/^sysctl_param/, 'sysctl'))
             end

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

@@ -32,6 +32,7 @@ module RuboCop
           include RangeHelp
 
           MSG = 'Chef Infra Client 12.4+ includes mixlib/shellout automatically in resources and providers.'
+          RESTRICT_ON_SEND = [:require].freeze
 
           def_node_matcher :require_mixlibshellout?, <<-PATTERN
           (send nil? :require ( str "mixlib/shellout"))

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

@@ -33,6 +33,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Instead of using require with a File.expand_path and __FILE__ use the simpler require_relative method.'
+          RESTRICT_ON_SEND = [:require].freeze
 
           def_node_matcher :require_with_expand_path?, <<-PATTERN
             (send nil? :require

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

@@ -32,6 +32,7 @@ module RuboCop
           extend AutoCorrector
 
           MSG = 'Do not include the Windows default recipe, which only installs win32 gems already included in Chef Infra Client'
+          RESTRICT_ON_SEND = [:include_recipe].freeze
 
           def_node_matcher :windows_recipe_usage?, <<-PATTERN
             (send nil? :include_recipe (str {"windows" "windows::default"}))

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

@@ -44,11 +44,11 @@ module RuboCop
           minimum_target_chef_version '15.0'
 
           MSG = 'Chef Infra Client 15.0 and later includes a windows_uac resource that should be used to set Windows UAC values instead of setting registry keys directly.'
+          RESTRICT_ON_SEND = [:registry_key].freeze
 
           # non block execute resources
           def on_send(node)
-            return unless node.method_name == :registry_key &&
-                          node&.arguments.first&.source.match?(/(HKLM|HKEY_LOCAL_MACHINE)\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\System/i) &&
+            return unless node&.arguments.first&.source.match?(/(HKLM|HKEY_LOCAL_MACHINE)\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\System/i) &&
                           node.parent&.method_name != :describe
 
             # use source instead of .value in case there's string interpolation which adds a complex dstr type

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

@@ -34,9 +34,10 @@ module RuboCop
           minimum_target_chef_version '15.0'
 
           MSG = 'Use the archive_file resource built into Chef Infra Client 15+ instead of the windows_zipfile from the Windows cookbook'
+          RESTRICT_ON_SEND = [:windows_zipfile].freeze
 
           def on_send(node)
-            add_offense(node, message: MSG, severity: :refactor) if node.method_name == :windows_zipfile
+            add_offense(node, message: MSG, severity: :refactor)
           end
         end
       end