cookstyle 6.15.9 → 6.16.4

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

@@ -25,7 +25,8 @@ 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.'
@@ -39,13 +40,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,7 +42,9 @@ 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'
 
           def_node_matcher :execute_apt_update?, <<-PATTERN
@@ -59,15 +61,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,7 +32,7 @@ module RuboCop
         #     action :delete
         #   end
         #
-        class ExecuteScExe < Cop
+        class ExecuteScExe < Base
           include RuboCop::Chef::CookbookHelpers
           extend TargetChefVersion
 
@@ -42,22 +42,19 @@ module RuboCop
 
           # 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/) && node.method_name == :execute
+
+            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

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

@@ -46,29 +46,24 @@ module RuboCop
 
           # 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?(/^("|')sleep/)
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
+            return unless node.method_name == :execute && node&.arguments.first&.source&.match?(/^("|')sleep/)
+            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?(/^sleep/i)
-                add_offense(node, location: :expression, message: MSG, severity: :refactor)
-              end
+              next unless property_data && property_data.match?(/^sleep/i)
+              add_offense(node, message: MSG, severity: :refactor)
             end
 
             match_property_in_resource?(:bash, 'code', node) do |code_property|
               property_data = method_arg_ast_to_string(code_property)
-              if property_data && property_data.match?(/^sleep/i)
-                add_offense(node, location: :expression, message: MSG, severity: :refactor)
-              end
+              next unless property_data && property_data.match?(/^sleep/i)
+              add_offense(node, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -36,7 +36,7 @@ module RuboCop
         #     value '9000 65500'
         #   end
         #
-        class ExecuteSysctl < Cop
+        class ExecuteSysctl < Base
           include RuboCop::Chef::CookbookHelpers
           extend TargetChefVersion
 
@@ -46,22 +46,18 @@ module RuboCop
 
           # 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?(/^("|')sysctl -p/)
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
+            return unless node.method_name == :execute && node&.arguments.first&.source&.match?(/^("|')sysctl -p/)
+            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?(%r{^(/sbin/)?sysctl -p}i)
-                add_offense(node, location: :expression, message: MSG, severity: :refactor)
-              end
+              return unless property_data && property_data.match?(%r{^(/sbin/)?sysctl -p}i)
+              add_offense(node, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -37,7 +37,7 @@ module RuboCop
         #   # good
         #   timezone 'UTC'
         #
-        class ExecuteTzUtil < Cop
+        class ExecuteTzUtil < Base
           include RuboCop::Chef::CookbookHelpers
           extend TargetChefVersion
 
@@ -51,17 +51,20 @@ module RuboCop
 
           def on_send(node)
             execute_resource?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if node.arguments.first.value.match?(/^tzutil/i)
+              return unless node.arguments.first.value.match?(/^tzutil/i)
+              add_offense(node, message: MSG, severity: :refactor)
             end
           end
 
           def on_block(node)
             match_property_in_resource?(:execute, 'command', node) do |code_property|
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if calls_tzutil?(code_property)
+              next unless calls_tzutil?(code_property)
+              add_offense(node, message: MSG, severity: :refactor)
             end
 
             match_property_in_resource?(:powershell_script, 'code', node) do |code_property|
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if calls_tzutil?(code_property)
+              next unless calls_tzutil?(code_property)
+              add_offense(node, message: MSG, severity: :refactor)
             end
           end
 

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

@@ -27,24 +27,19 @@ module RuboCop
         #   # bad
         #   # ~FC013
         #
-        class FoodcriticComments < Cop
-          MSG = 'Remove legacy code comments that disable Foodcritic rules'
+        class FoodcriticComments < Base
+          extend AutoCorrector
 
-          def investigate(processed_source)
-            return unless processed_source.ast
+          MSG = 'Remove legacy code comments that disable Foodcritic rules'
 
+          def on_new_investigation
             processed_source.comments.each do |comment|
-              if comment.text.match?(/#\s*~FC\d{3}.*/)
-                add_offense(comment, location: :expression, message: MSG, severity: :refactor)
+              next unless comment.text.match?(/#\s*~FC\d{3}.*/)
+              add_offense(comment, message: MSG, severity: :refactor) do |corrector|
+                corrector.remove(comment.loc.expression)
               end
             end
           end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.remove(node.loc.expression)
-            end
-          end
         end
       end
     end

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

@@ -29,17 +29,15 @@ module RuboCop
         #   # good
         #   default_action :foo
         #
-        class IfProvidesDefaultAction < Cop
+        class IfProvidesDefaultAction < Base
+          extend AutoCorrector
+
           MSG = 'if defined?(default_action) is no longer necessary in Chef Resources as default_action shipped in Chef 10.8.'
 
           def on_defined?(node)
             return unless node.arguments.first == s(:send, nil, :default_action)
             node = node.parent if node.parent.respond_to?(:if?) && node.parent.if? # we want the whole if statement
-            add_offense(node, location: :expression, message: MSG, severity: :refactor)
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
+            add_offense(node, message: MSG, severity: :refactor) do |corrector|
               corrector.replace(node.loc.expression, node.children[1].source)
             end
           end

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

@@ -30,7 +30,8 @@ module RuboCop
         #   require 'chef/mixin/powershell_out'
         #   include Chef::Mixin::PowershellOut
         #
-        class IncludingMixinShelloutInResources < Cop
+        class IncludingMixinShelloutInResources < Base
+          extend AutoCorrector
           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+.'
@@ -60,7 +61,9 @@ module RuboCop
 
             # only add offenses when we're in a custom resource or HWRP, but not a plain old library
             if containing_dir == 'resources' || hwrp_classes?(processed_source.ast)
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
           end
 
@@ -73,12 +76,6 @@ module RuboCop
               check_for_offenses(node)
             end
           end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
-            end
-          end
         end
       end
     end

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

@@ -34,8 +34,9 @@ module RuboCop
         #     path 'C:\expand_here'
         #   end
         #
-        class LibarchiveFileResource < Cop
+        class LibarchiveFileResource < Base
           extend TargetChefVersion
+          extend AutoCorrector
 
           minimum_target_chef_version '15.0'
 
@@ -46,16 +47,18 @@ module RuboCop
           PATTERN
 
           def on_send(node)
-            add_offense(node, location: :expression, message: MSG, severity: :refactor) if node.method_name == :libarchive_file
-
-            notification_property?(node) do |val|
-              add_offense(val, location: :expression, message: MSG, severity: :refactor) if val.str_content&.start_with?('libarchive_file')
+            # The need for this goes away once https://github.com/rubocop-hq/rubocop/pull/8365 is pulled into Cookstyle
+            if node.method_name == :libarchive_file
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(node.loc.expression, node.source.gsub('libarchive_file', 'archive_file'))
+              end
             end
-          end
 
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.loc.expression, node.source.gsub('libarchive_file', 'archive_file'))
+            notification_property?(node) do |val|
+              next unless val.str_content&.start_with?('libarchive_file')
+              add_offense(val, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(node.loc.expression, node.source.gsub('libarchive_file', 'archive_file'))
+              end
             end
           end
         end

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

@@ -36,19 +36,17 @@ module RuboCop
         #     value '2'
         #   end
         #
-        class MacOsXUserdefaults < Cop
+        class MacOsXUserdefaults < Base
           extend TargetChefVersion
+          extend AutoCorrector
 
           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.'
 
           def on_send(node)
-            add_offense(node, location: :expression, message: MSG, severity: :refactor) if node.method_name == :mac_os_x_userdefaults
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
+            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
           end

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

@@ -26,7 +26,8 @@ module RuboCop
         #   # bad
         #   depends 'minitest-handler'
         #
-        class MinitestHandlerUsage < Cop
+        class MinitestHandlerUsage < Base
+          extend AutoCorrector
           include RangeHelp
 
           MSG = 'Use Chef InSpec for testing instead of the Minitest Handler cookbook pattern.'
@@ -37,13 +38,9 @@ module RuboCop
 
           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(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/node_roles_include.rb

@@ -29,7 +29,9 @@ module RuboCop
         #   # good
         #   node.role?('foo')
         #
-        class NodeRolesInclude < Cop
+        class NodeRolesInclude < Base
+          extend AutoCorrector
+
           MSG = "Use `node.role?('foo')` to check if a node includes a role instead of `node['roles'].include?('foo')`."
 
           def_node_matcher :node_role_include?, <<-PATTERN
@@ -41,14 +43,8 @@ module RuboCop
           PATTERN
 
           def on_send(node)
-            node_role_include?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              node_role_include?(node) do |val|
+            node_role_include?(node) do |val|
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
                 corrector.replace(node.loc.expression, "node.role?(#{val.source})")
               end
             end

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

@@ -29,7 +29,7 @@ module RuboCop
         #   include_recipe 'ohai::default'
         #   include_recipe 'ohai'
         #
-        class IncludingOhaiDefaultRecipe < Cop
+        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"
 
           def_node_matcher :ohai_recipe_usage?, <<-PATTERN
@@ -38,7 +38,7 @@ module RuboCop
 
           def on_send(node)
             ohai_recipe_usage?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
+              add_offense(node, message: MSG, severity: :refactor)
             end
           end
         end