cookstyle 6.14.7 → 6.16.7

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

@@ -31,8 +31,11 @@ module RuboCop
         #   # good
         #   build_essential 'install compilation tools'
         #
-        class UseBuildEssentialResource < Cop
+        class UseBuildEssentialResource < Base
+          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"}))
@@ -40,13 +43,9 @@ module RuboCop
 
           def on_send(node)
             build_essential_recipe_usage?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.loc.expression, "build_essential 'install compilation tools'")
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(node.loc.expression, "build_essential 'install compilation tools'")
+              end
             end
           end
         end

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

@@ -32,13 +32,15 @@ module RuboCop
         #   depends 'swap'
         #   depends 'sysctl'
         #
-        class UnnecessaryDependsChef14 < Cop
+        class UnnecessaryDependsChef14 < Base
+          extend AutoCorrector
           extend TargetChefVersion
           include RangeHelp
 
           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"}) ... )
@@ -46,13 +48,9 @@ module RuboCop
 
           def on_send(node)
             legacy_depends?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
           end
         end

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

@@ -27,11 +27,13 @@ module RuboCop
         #   # bad
         #   chef_gem 'nokogiri'
         #
-        class ChefGemNokogiri < Cop
+        class ChefGemNokogiri < Base
+          extend AutoCorrector
           include RangeHelp
           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"))
@@ -39,20 +41,20 @@ module RuboCop
 
           def on_block(node)
             match_property_in_resource?(:chef_gem, 'package_name', node) do |pkg_name|
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if pkg_name.arguments&.first&.str_content == 'nokogiri'
+              return unless pkg_name.arguments&.first&.str_content == 'nokogiri'
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                node = node.parent if node.parent&.block_type? # make sure we get the whole block not just the method in the block
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
           end
 
           def on_send(node)
             nokogiri_install?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              node = node.parent if node.parent&.block_type? # make sure we get the whole block not just the method in the block
-              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                node = node.parent if node.parent&.block_type? # make sure we get the whole block not just the method in the block
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
           end
         end

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

@@ -33,7 +33,7 @@ module RuboCop
         #    compile_time true
         #   end
         #
-        class ResourceForcingCompileTime < Cop
+        class ResourceForcingCompileTime < Base
           MSG = "Set 'compile_time true' in resources when available instead of forcing resources to run at compile time by setting an action on the block."
 
           def_node_matcher :compile_time_resource?, <<-PATTERN
@@ -42,7 +42,7 @@ module RuboCop
 
           def on_send(node)
             compile_time_resource?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
+              add_offense(node, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -29,8 +29,11 @@ module RuboCop
         #   # good
         #   only_if { ::File.exist?('bin/foo') }
         #
-        class ConditionalUsingTest < Cop
+        class ConditionalUsingTest < Base
+          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 )
@@ -38,13 +41,8 @@ module RuboCop
 
           def on_send(node)
             resource_conditional?(node) do |conditional|
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if conditional.value.match?(/^test -[ef] \S*$/)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              resource_conditional?(node) do |conditional|
+              return unless conditional.value.match?(/^test -[ef] \S*$/)
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
                 new_string = "{ ::File.exist?('#{conditional.value.match(/^test -[ef] (\S*)$/)[1]}') }"
                 corrector.replace(conditional.loc.expression, new_string)
               end

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

@@ -60,7 +60,7 @@ module RuboCop
         #     action :delete
         #   end
         #
-        class CronDFileOrTemplate < Cop
+        class CronDFileOrTemplate < Base
           extend TargetChefVersion
 
           minimum_target_chef_version '14.4'
@@ -78,7 +78,7 @@ module RuboCop
           def on_block(node)
             file_or_template?(node) do |file_name|
               return unless file_name.start_with?('/etc/cron.d/')
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
+              add_offense(node, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -29,19 +29,17 @@ module RuboCop
         #   # good
         #   cron_access 'mike'
         #
-        class CronManageResource < Cop
+        class CronManageResource < Base
           extend TargetChefVersion
+          extend AutoCorrector
 
           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, location: :expression, message: MSG, severity: :refactor) if node.method_name == :cron_manage
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
+            add_offense(node, message: MSG, severity: :refactor) do |corrector|
               corrector.replace(node.loc.expression, node.source.gsub(/^cron_manage/, 'cron_access'))
             end
           end

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

@@ -31,7 +31,9 @@ module RuboCop
         #   plain_text_data = data_bag_item('foo', 'bar')
         #   encrypted_data = data_bag_item('foo2', 'bar2')
         #
-        class DatabagHelpers < Cop
+        class DatabagHelpers < Base
+          extend AutoCorrector
+
           MSG = 'Use the `data_bag_item` helper instead of `Chef::DataBagItem.load` or `Chef::EncryptedDataBagItem.load`.'
 
           def_node_matcher :data_bag_class_load?, <<-PATTERN
@@ -43,13 +45,10 @@ module RuboCop
 
           def on_send(node)
             data_bag_class_load?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.loc.expression, node.source.gsub(/Chef::(EncryptedDataBagItem|DataBagItem).load/, 'data_bag_item'))
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(node.loc.expression,
+                   node.source.gsub(/Chef::(EncryptedDataBagItem|DataBagItem).load/, 'data_bag_item'))
+              end
             end
           end
         end

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

@@ -38,7 +38,8 @@ module RuboCop
         #  # good
         #  default_action :create
 
-        class DefaultActionFromInitialize < Cop
+        class DefaultActionFromInitialize < Base
+          extend AutoCorrector
           include RangeHelp
 
           MSG = 'The default action of a resource can be set with the "default_action" helper instead of using the initialize method.'
@@ -53,20 +54,17 @@ module RuboCop
 
           def on_ivasgn(node)
             action_variable_assignment?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if initialize_method(node.parent.parent)
-            end
-          end
+              return unless initialize_method(node.parent.parent)
+              add_offense(node, message: MSG, severity: :refactor) 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 = initialize_method(processed_source.ast).first
+                  corrector.insert_before(initialize_node.source_range, "default_action #{node.descendants.first.source}\n\n")
+                end
 
-          def autocorrect(node)
-            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 = initialize_method(processed_source.ast).first
-                corrector.insert_before(initialize_node.source_range, "default_action #{node.descendants.first.source}\n\n")
+                # remove the variable from the initialize method
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
               end
-
-              # remove the variable from the initialize method
-              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -30,7 +30,8 @@ module RuboCop
         #     end
         #   end
         #
-        class DefinesChefSpecMatchers < Cop
+        class DefinesChefSpecMatchers < Base
+          extend AutoCorrector
           include RangeHelp
 
           MSG = 'ChefSpec matchers are now auto generated by ChefSpec 7.1+ and do not need to be defined in a cookbook'
@@ -41,13 +42,9 @@ module RuboCop
 
           def on_if(node)
             chefspec_matcher?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
           end
         end

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

@@ -21,13 +21,13 @@ module RuboCop
       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, common properties like not_if/only_if, and resource reporting.
         #
-        class Definitions < Cop
+        class Definitions < Base
           include RuboCop::Chef::CookbookHelpers
 
           MSG = 'Legacy Chef Infra definitions should be rewritten as custom resources to take full advantage of the Chef Infra feature set.'
 
           def on_block(node)
-            add_offense(node, location: :expression, message: MSG, severity: :refactor) if node.respond_to?(:method_name) && node.method_name == :define
+            add_offense(node, message: MSG, severity: :refactor) if node.respond_to?(:method_name) && node.method_name == :define
           end
         end
       end

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

@@ -26,13 +26,15 @@ module RuboCop
         #   # bad
         #   depends 'zypper'
         #
-        class DependsOnZypperCookbook < Cop
+        class DependsOnZypperCookbook < Base
+          extend AutoCorrector
           extend TargetChefVersion
           include RangeHelp
 
           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"))
@@ -40,13 +42,9 @@ module RuboCop
 
           def on_send(node)
             zypper_depends?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
           end
         end

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

@@ -25,10 +25,12 @@ module RuboCop
         #   include Chef::DSL::Recipe
         #   include Chef::DSL::IncludeRecipe
         #
-        class DslIncludeInResource < Cop
+        class DslIncludeInResource < Base
+          extend AutoCorrector
           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
@@ -39,13 +41,9 @@ module RuboCop
 
           def on_send(node)
             dsl_include?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
           end
         end

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

@@ -28,7 +28,8 @@ module RuboCop
         #     super
         #   end
         #
-        class EmptyResourceInitializeMethod < Cop
+        class EmptyResourceInitializeMethod < Base
+          extend AutoCorrector
           include RangeHelp
 
           MSG = 'There is no need for an empty initialize method in a resource'
@@ -39,13 +40,9 @@ module RuboCop
 
           def on_def(node)
             empty_initialize?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
           end
         end

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

@@ -42,8 +42,11 @@ module RuboCop
         #     notifies :update, 'apt_update[update apt cache]', :immediately
         #   end
         #
-        class ExecuteAptUpdate < Cop
+        class ExecuteAptUpdate < Base
+          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" }))
@@ -59,15 +62,15 @@ module RuboCop
 
           def on_send(node)
             execute_apt_update?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
+              add_offense(node, message: MSG, severity: :refactor)
             end
 
             notification_property?(node) do |val|
-              add_offense(val, location: :expression, message: MSG, severity: :refactor) if val.str_content&.start_with?('execute[apt-get update]')
+              add_offense(val, message: MSG, severity: :refactor) if val.str_content&.start_with?('execute[apt-get update]')
             end
 
             execute_command?(node) do |val|
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if val.str_content == 'apt-get update'
+              add_offense(node, message: MSG, severity: :refactor) if val.str_content == 'apt-get update'
             end
           end
         end

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

@@ -32,32 +32,30 @@ module RuboCop
         #     action :delete
         #   end
         #
-        class ExecuteScExe < Cop
+        class ExecuteScExe < Base
           include RuboCop::Chef::CookbookHelpers
           extend TargetChefVersion
 
           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)
-            return unless node.method_name == :execute
-
             # 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
-            if node&.arguments.first&.source&.match?(/^("|')sc.exe/)
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
+            return unless node&.arguments.first&.source&.match?(/^("|')sc.exe/)
+
+            add_offense(node, message: MSG, severity: :refactor)
           end
 
           # block execute resources
           def on_block(node)
             match_property_in_resource?(:execute, 'command', node) do |code_property|
               property_data = method_arg_ast_to_string(code_property)
-              if property_data && property_data.match?(/^sc.exe/i)
-                add_offense(node, location: :expression, message: MSG, severity: :refactor)
-              end
+              return unless property_data && property_data.match?(/^sc.exe/i)
+              add_offense(node, message: MSG, severity: :refactor)
             end
           end
         end