cookstyle 6.15.9 → 6.16.4

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

@@ -37,7 +37,7 @@ module RuboCop
         #   node.force_default['foo'] = true
         #   node.force_override['foo'] = true
         #
-        class NodeNormal < Cop
+        class NodeNormal < Base
           MSG = 'Do not use node.normal. Replace with default/override/force_default/force_override attribute levels.'
 
           def_node_matcher :node_normal?, <<-PATTERN
@@ -46,7 +46,7 @@ module RuboCop
 
           def on_send(node)
             node_normal?(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/correctness/node_normal_unless.rb

@@ -37,7 +37,7 @@ module RuboCop
         #   node.force_default_unless['foo'] = true
         #   node.force_override_unless['foo'] = true
         #
-        class NodeNormalUnless < Cop
+        class NodeNormalUnless < Base
           MSG = 'Do not use node.normal_unless. Replace with default/override/force_default/force_override attribute levels.'
 
           def_node_matcher :node_normal_unless?, <<-PATTERN
@@ -46,7 +46,7 @@ module RuboCop
 
           def on_send(node)
             node_normal_unless?(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/correctness/node_save.rb

@@ -28,7 +28,7 @@ module RuboCop
         #   # bad
         #   node.save
         #
-        class CookbookUsesNodeSave < Cop
+        class CookbookUsesNodeSave < Base
           MSG = "Don't use node.save to save partial node data to the Chef Infra Server mid-run unless it's absolutely necessary. Node.save can result in failed Chef Infra runs appearing in search and increases load on the Chef Infra Server."
 
           def_node_matcher :node_save?, <<-PATTERN
@@ -37,7 +37,7 @@ module RuboCop
 
           def on_send(node)
             node_save?(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/correctness/notifies_action_not_symbol.rb

@@ -42,20 +42,20 @@ module RuboCop
         #     subscribes :restart, 'service[httpd]', 'delayed'
         #   end
         #
-        class NotifiesActionNotSymbol < Cop
+        class NotifiesActionNotSymbol < Base
           include RuboCop::Chef::CookbookHelpers
+          extend AutoCorrector
 
           MSG = 'Resource notification and subscription actions should be symbols not strings.'
 
           def on_block(node)
             match_property_in_resource?(nil, %w(notifies subscribes), node) do |notifies_property|
-              add_offense(notifies_property, location: :expression, message: MSG, severity: :refactor) if notifies_property.node_parts[2].str_type?
-            end
-          end
+              return unless notifies_property.node_parts[2].str_type?
 
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.first_argument.loc.expression, ":#{node.node_parts[2].value}")
+              add_offense(notifies_property, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(notifies_property.first_argument.loc.expression,
+                  ":#{notifies_property.node_parts[2].value}")
+              end
             end
           end
         end

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

@@ -25,7 +25,7 @@ module RuboCop
         #   ::Chef::Recipe.send(:include, Opscode::OpenSSL::Password)
         #   basic_auth_password = secure_password
         #
-        class OpenSSLPasswordHelpers < Cop
+        class OpenSSLPasswordHelpers < Base
           MSG = 'The `secure_password` helper from the openssl cookbooks `Opscode::OpenSSL::Password` class should not be used to generate passwords.'
 
           def_node_matcher :openssl_helper?, <<~PATTERN
@@ -36,7 +36,7 @@ module RuboCop
 
           def on_const(node)
             openssl_helper?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :warning)
+              add_offense(node, message: MSG, severity: :warning)
             end
           end
         end

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

@@ -34,7 +34,7 @@ module RuboCop
         #    action :delete
         #  end
         #
-        class PowershellScriptDeleteFile < Cop
+        class PowershellScriptDeleteFile < Base
           include RuboCop::Chef::CookbookHelpers
 
           MSG = 'Use the `file` or `directory` resources built into Chef Infra Client with the :delete action to remove files/directories instead of using Remove-Item in a powershell_script resource'
@@ -42,9 +42,9 @@ module RuboCop
           def on_block(node)
             match_property_in_resource?(:powershell_script, 'code', node) do |code_property|
               property_data = method_arg_ast_to_string(code_property)
-              if property_data && property_data.match?(/^remove-item/i) && !property_data.include?('*')
-                add_offense(node, location: :expression, message: MSG, severity: :refactor)
-              end
+              return unless property_data && property_data.match?(/^remove-item/i) &&
+                            !property_data.include?('*')
+              add_offense(node, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -36,14 +36,14 @@ module RuboCop
         #     action [:start, :enable]
         #   end
         #
-        class ResourceSetsInternalProperties < Cop
+        class ResourceSetsInternalProperties < Base
           include RuboCop::Chef::CookbookHelpers
 
           MSG = 'Do not set properties used internally by Chef Infra Client to track the system state.'
 
           def on_block(node)
             match_property_in_resource?(:service, 'running', node) do |prop|
-              add_offense(prop, location: :expression, message: MSG, severity: :refactor)
+              add_offense(prop, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -35,14 +35,14 @@ module RuboCop
         #    service_name 'bar'
         #   end
         #
-        class ResourceSetsNameProperty < Cop
+        class ResourceSetsNameProperty < Base
           include RuboCop::Chef::CookbookHelpers
 
           MSG = 'Resource sets the name property in the resource instead of using a name_property.'
 
           def on_block(node)
             match_property_in_resource?(nil, 'name', node) do |name_node|
-              add_offense(name_node, location: :expression, message: MSG, severity: :refactor)
+              add_offense(name_node, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -34,15 +34,19 @@ module RuboCop
         #    action :nothing
         #   end
         #
-        class ResourceWithNoneAction < Cop
+        class ResourceWithNoneAction < Base
           include RuboCop::Chef::CookbookHelpers
+          extend AutoCorrector
 
           MSG = 'Resource uses the nonexistent :none action instead of the :nothing action'
 
           def on_block(node)
             match_property_in_resource?(nil, 'action', node) do |action_node|
               action_node.arguments.each do |action|
-                add_offense(action, location: :expression, message: MSG, severity: :refactor) if action.source == ':none'
+                next unless action.source == ':none'
+                add_offense(action, message: MSG, severity: :refactor) do |corrector|
+                  corrector.replace(action.loc.expression, ':nothing')
+                end
               end
             end
           end

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

@@ -29,7 +29,9 @@ module RuboCop
         #   # good
         #   not_if { ::File.exist?('/etc/foo/bar') }
         #
-        class ScopedFileExist < Cop
+        class ScopedFileExist < Base
+          extend AutoCorrector
+
           MSG = 'Scope file exist to access the correct File class by using ::File.exist? not File.exist?.'
 
           def_node_matcher :unscoped_file_exist?, <<-PATTERN
@@ -38,13 +40,9 @@ module RuboCop
 
           def on_block(node)
             unscoped_file_exist?(node) do |m|
-              add_offense(m, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.loc.expression, '::File')
+              add_offense(m, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(m.loc.expression, '::File')
+              end
             end
           end
         end

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

@@ -27,7 +27,7 @@ module RuboCop
         #   command "/etc/init.d/mysql start"
         #   command "/sbin/service/memcached start"
         #
-        class ServiceResource < Cop
+        class ServiceResource < Base
           MSG = 'Use a service resource to start and stop services'
 
           def_node_matcher :execute_command?, <<-PATTERN
@@ -37,7 +37,7 @@ module RuboCop
           def on_send(node)
             execute_command?(node) do |command|
               if starts_service?(command)
-                add_offense(command, location: :expression, message: MSG, severity: :refactor)
+                add_offense(command, message: MSG, severity: :refactor)
               end
             end
           end

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

@@ -30,7 +30,7 @@ module RuboCop
         #   remote_file "#{Chef::Config[:file_cache_path]}/large-file.tar.gz" do
         #
         #
-        class TmpPath < Cop
+        class TmpPath < Base
           MSG = 'Use file_cache_path rather than hard-coding tmp paths'
 
           def_node_matcher :remote_file?, <<-PATTERN
@@ -39,9 +39,8 @@ module RuboCop
 
           def on_send(node)
             remote_file?(node) do |command|
-              if hardcoded_tmp?(command) && !file_cache_path?(command)
-                add_offense(command, location: :expression, message: MSG, severity: :refactor)
-              end
+              return unless hardcoded_tmp?(command) && !file_cache_path?(command)
+              add_offense(command, message: MSG, severity: :refactor)
             end
           end
 

data/lib/rubocop/cop/chef/{correctness → deprecation}/cb_depends_on_self.rb

@@ -30,8 +30,9 @@ module RuboCop
       #   # good
       #   name 'foo'
       #
-      module ChefCorrectness
-        class CookbooksDependsOnSelf < Cop
+      module ChefDeprecations
+        class CookbooksDependsOnSelf < Base
+          extend AutoCorrector
           include RangeHelp
 
           MSG = 'A cookbook cannot depend on itself. This will fail on Chef Infra Client 13+'
@@ -42,19 +43,13 @@ module RuboCop
           def on_send(node)
             cb_name?(node) do
               dependencies(processed_source.ast).each do |dep|
-                if dep.arguments == node.arguments
-                  node = dep # set our dependency node as the node for autocorrecting later
-                  add_offense(node, location: dep.source_range, message: MSG, severity: :refactor)
+                next unless dep.arguments == node.arguments
+                add_offense(dep, message: MSG, severity: :refactor) do |corrector|
+                  corrector.remove(range_with_surrounding_space(range: dep.loc.expression, side: :left))
                 end
               end
             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/deprecation/chef_handler_recipe.rb

@@ -28,8 +28,9 @@ module RuboCop
         #   include_recipe 'chef_handler'
         #   include_recipe 'chef_handler::default'
         #
-        class ChefHandlerRecipe < Cop
+        class ChefHandlerRecipe < Base
           include RangeHelp
+          extend AutoCorrector
 
           MSG = 'There is no need to include the empty and deprecated chef_handler::default recipe in order to use the chef_handler resource'
 
@@ -39,13 +40,9 @@ module RuboCop
 
           def on_send(node)
             chef_handler_recipe?(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/deprecation/chef_handler_supports.rb

@@ -34,22 +34,19 @@ module RuboCop
         #     type start: true, report: true, exception: true
         #   end
         #
-        class ChefHandlerUsesSupports < Cop
+        class ChefHandlerUsesSupports < Base
           include RuboCop::Chef::CookbookHelpers
+          extend AutoCorrector
 
           MSG = 'Use the type property instead of the deprecated supports property in the chef_handler resource. The supports property was removed in chef_handler cookbook version 3.0 (June 2017) and Chef Infra Client 14.0.'
 
           def on_block(node)
             match_property_in_resource?(:chef_handler, 'supports', node) do |prop_node|
-              add_offense(prop_node, location: :expression, message: MSG, severity: :warning)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              # make sure to delete leading and trailing {}s that would create invalid ruby syntax
-              extracted_val = node.arguments.first.source.gsub(/{|}/, '')
-              corrector.replace(node.loc.expression, "type #{extracted_val}")
+              add_offense(prop_node, message: MSG, severity: :warning) do |corrector|
+                # make sure to delete leading and trailing {}s that would create invalid ruby syntax
+                extracted_val = prop_node.arguments.first.source.gsub(/{|}/, '')
+                corrector.replace(prop_node.loc.expression, "type #{extracted_val}")
+              end
             end
           end
         end

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

@@ -28,7 +28,7 @@ module RuboCop
         #   require 'chef/rest'
         #   Chef::REST::RESTRequest.new(:GET, FOO, nil).call
         #
-        class UsesChefRESTHelpers < Cop
+        class UsesChefRESTHelpers < Base
           MSG = "Don't use the helpers in Chef::REST which were removed in Chef Infra Client 13"
 
           def_node_matcher :require_rest?, <<-PATTERN
@@ -41,13 +41,13 @@ module RuboCop
 
           def on_send(node)
             require_rest?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :warning)
+              add_offense(node, message: MSG, severity: :warning)
             end
           end
 
           def on_const(node)
             rest_const?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :warning)
+              add_offense(node, message: MSG, severity: :warning)
             end
           end
         end

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

@@ -35,10 +35,11 @@ module RuboCop
         #
         #   unwind "user[postgres]"
         #
-        class ChefRewind < Cop
+        class ChefRewind < Base
           include RuboCop::Chef::CookbookHelpers
           include RangeHelp
           extend TargetChefVersion
+          extend AutoCorrector
 
           minimum_target_chef_version '12.10'
 
@@ -63,44 +64,30 @@ module RuboCop
 
           def on_send(node)
             rewind_gem_install?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :warning)
+              add_offense(node, message: MSG, severity: :warning) 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
 
             require_rewind?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :warning)
+              add_offense(node, message: MSG, severity: :warning) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
 
-            rewind_resources?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :warning)
+            rewind_resources?(node) do |string|
+              add_offense(node, message: MSG, severity: :warning) do |corrector|
+                corrector.replace(node.loc.expression, node.source.gsub(string.to_s, MAPPING[string]))
+              end
             end
           end
 
           def on_block(node)
             match_property_in_resource?(:chef_gem, 'package_name', node) do |pkg_name|
-              add_offense(node, location: :expression, message: MSG, severity: :warning) if pkg_name.arguments&.first&.str_content == 'chef-rewind'
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              rewind_gem_install?(node) do
-                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))
-                return
-              end
-
-              require_rewind?(node) do
-                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
-                return
-              end
-
-              match_property_in_resource?(:chef_gem, 'package_name', node) do |pkg_name|
+              next unless pkg_name.arguments&.first&.str_content == 'chef-rewind'
+              add_offense(node, message: MSG, severity: :warning) do |corrector|
                 corrector.remove(node.loc.expression) if pkg_name.arguments&.first&.str_content == 'chef-rewind'
-                return
-              end
-
-              rewind_resources?(node) do |string|
-                corrector.replace(node.loc.expression, node.source.gsub(string.to_s, MAPPING[string]))
               end
             end
           end

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

@@ -30,7 +30,8 @@ module RuboCop
         #   platform?('windows')
         #   platform_family?('windows')
         #
-        class ChefWindowsPlatformHelper < Cop
+        class ChefWindowsPlatformHelper < Base
+          extend AutoCorrector
           MSG = "Use `platform?('windows')` instead of the legacy `Chef::Platform.windows?` helper."
 
           def_node_matcher :chef_platform_windows?, <<-PATTERN
@@ -41,13 +42,9 @@ module RuboCop
 
           def on_send(node)
             chef_platform_windows?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :warning)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.loc.expression, "platform?('windows')")
+              add_offense(node, message: MSG, severity: :warning) do |corrector|
+                corrector.replace(node.loc.expression, "platform?('windows')")
+              end
             end
           end
         end