cookstyle 6.15.9 → 6.16.4

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

@@ -29,7 +29,9 @@ module RuboCop
         #   attribute :name, kind_of: String
         #   attribute :name, kind_of: String, name_attribute: true
         #
-        class UnnecessaryNameProperty < Cop
+        class UnnecessaryNameProperty < Base
+          extend AutoCorrector
+
           MSG = 'There is no need to define a property or attribute named :name in a resource as Chef Infra defines this on all resources by default.'
 
           def_node_matcher :name_attribute?, <<-PATTERN
@@ -56,17 +58,15 @@ module RuboCop
 
           def on_send(node)
             name_property?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.remove(node.source_range)
+              end
             end
 
             name_attribute?(node) do
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.remove(node.source_range)
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.remove(node.source_range)
+              end
             end
           end
         end

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

@@ -41,8 +41,10 @@ module RuboCop
         #     action :create_if_missing
         #   end
         #
-        class UseCreateIfMissing < Cop
+        class UseCreateIfMissing < Base
           include RuboCop::Chef::CookbookHelpers
+          extend AutoCorrector
+
           MSG = 'Use the :create_if_missing action instead of not_if with a ::File.exist(FOO) check.'
 
           def_node_matcher :not_if_file_exist?, <<-PATTERN
@@ -59,18 +61,14 @@ module RuboCop
             not_if_file_exist?(node) do |props|
               file_like_resource?(node.parent.parent) do |resource_blk_name|
                 # the not_if file name is the same as the resource name and there's no action defined (it's the default)
-                if props == resource_blk_name && create_action?(node.parent.parent).nil?
-                  add_offense(node, location: :expression, message: MSG, severity: :refactor)
+                return unless props == resource_blk_name && create_action?(node.parent.parent).nil?
+
+                add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                  corrector.replace(node.loc.expression, 'action :create_if_missing')
                 end
               end
             end
           end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.loc.expression, 'action :create_if_missing')
-            end
-          end
         end
       end
     end

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

@@ -33,14 +33,14 @@ module RuboCop
         #   maintainer 'Bob Bobberson'
         #   maintainer_email 'bob@bobberson.com'
         #
-        class DefaultMetadataMaintainer < Cop
+        class DefaultMetadataMaintainer < Base
           MSG = 'Metadata contains default maintainer information from the cookbook generator. Add actual cookbook maintainer information to the metadata.rb.'
 
           def_node_matcher :default_metadata?, '(send nil? {:maintainer :maintainer_email} (str {"YOUR_COMPANY_NAME" "The Authors" "YOUR_EMAIL" "you@example.com"}))'
 
           def on_send(node)
             default_metadata?(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/sharing/empty_metadata_field.rb

@@ -30,14 +30,15 @@ module RuboCop
         #   # good
         #   license 'Apache-2.0'
         #
-        class EmptyMetadataField < Cop
+        class EmptyMetadataField < Base
           MSG = 'Cookbook metadata.rb contains a field with an empty string.'
 
           def_node_matcher :field?, '(send nil? _ $str ...)'
 
           def on_send(node)
             field?(node) do |str|
-              add_offense(str, location: :expression, message: MSG, severity: :refactor) if str.value.empty?
+              return unless str.value.empty?
+              add_offense(str, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -27,7 +27,7 @@ module RuboCop
         #   resource_name :foo
         #   description "The foo resource is used to do..."
         #
-        class IncludeResourceDescriptions < Cop
+        class IncludeResourceDescriptions < Base
           include RangeHelp
           extend TargetChefVersion
 
@@ -35,13 +35,13 @@ module RuboCop
 
           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?
+          def on_new_investigation
+            return if processed_source.blank? || resource_description(processed_source.ast).any?
 
             # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
             range = source_range(processed_source.buffer, 1, 0)
 
-            add_offense(nil, location: range, message: MSG, severity: :refactor) unless resource_description(processed_source.ast).any?
+            add_offense(range, message: MSG, severity: :refactor)
           end
 
           def_node_search :resource_description, '(send nil? :description ...)'

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

@@ -35,7 +35,7 @@ module RuboCop
         #     ```
         #   DOC
         #
-        class IncludeResourceExamples < Cop
+        class IncludeResourceExamples < Base
           include RangeHelp
           extend TargetChefVersion
 
@@ -43,13 +43,13 @@ module RuboCop
 
           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?
+          def on_new_investigation
+            return if processed_source.blank? || resource_examples(processed_source.ast).any?
 
             # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
             range = source_range(processed_source.buffer, 1, 0)
 
-            add_offense(nil, location: range, message: MSG, severity: :refactor) unless resource_examples(processed_source.ast).any?
+            add_offense(range, message: MSG, severity: :refactor)
           end
 
           def_node_search :resource_examples, '(send nil? :examples dstr ...)'

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

@@ -33,7 +33,9 @@ module RuboCop
         #   source_url 'http://github.com/something/something'
         #   source_url 'http://gitlab.com/something/something'
         #
-        class InsecureCookbookURL < Cop
+        class InsecureCookbookURL < Base
+          extend AutoCorrector
+
           MSG = 'Insecure http Github or Gitlab URLs for metadata source_url/issues_url fields'
 
           def_node_matcher :insecure_cb_url?, <<-PATTERN
@@ -47,13 +49,9 @@ module RuboCop
 
           def on_send(node)
             insecure_cb_url?(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(%r{http://(www.)*}, 'https://'))
+              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(node.loc.expression, node.source.gsub(%r{http://(www.)*}, 'https://'))
+              end
             end
           end
         end

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

@@ -37,7 +37,9 @@ module RuboCop
         # json_data = JSON.parse(Net::HTTP.get(URI('https://raw.githubusercontent.com/spdx/license-list-data/master/json/licenses.json')))
         # licenses = json_data['licenses'].map {|l| l['licenseId'] }.sort
         #
-        class InvalidLicenseString < Cop
+        class InvalidLicenseString < Base
+          extend AutoCorrector
+
           VALID_LICENSE_STRING = %w(
             0BSD
             AAL
@@ -461,17 +463,10 @@ module RuboCop
 
           def on_send(node)
             license?(node) do |license|
-              unless valid_license?(license.str_content)
-                add_offense(license, location: :expression, message: MSG, severity: :refactor)
-              end
-            end
-          end
-
-          def autocorrect(node)
-            correct_string = autocorrect_license_string(node.str_content)
-            if correct_string
-              lambda do |corrector|
-                corrector.replace(node.loc.expression, "'#{correct_string}'")
+              return if valid_license?(license.str_content)
+              add_offense(license, message: MSG, severity: :refactor) do |corrector|
+                correct_string = autocorrect_license_string(license.str_content)
+                corrector.replace(license.loc.expression, "'#{correct_string}'") if correct_string
               end
             end
           end

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

@@ -35,13 +35,12 @@ module RuboCop
         class ChefWhaaat < Cop
           MSG = 'Do you mean Chef (the company) or a Chef product (e.g. Chef Infra, Chef InSpec, etc)?'
 
-          def investigate(processed_source)
+          def on_new_investigation
             return unless processed_source.ast
 
             processed_source.comments.each do |comment|
-              if comment.text.match?(/Chef [a-z]/) # https://rubular.com/r/0YzfDAbwJrDHix
-                add_offense(comment, location: comment.loc.expression, message: MSG, severity: :refactor)
-              end
+              next unless comment.text.match?(/Chef [a-z]/) # https://rubular.com/r/0YzfDAbwJrDHix
+              add_offense(comment.loc.expression, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -22,22 +22,20 @@ module RuboCop
       module ChefStyle
         # Replaces double spaces between sentences with a single space.
         # Note: This is DISABLED by default.
-        class CommentSentenceSpacing < Cop
+        class CommentSentenceSpacing < Base
+          extend AutoCorrector
           MSG = 'Use a single space after sentences in comments'
 
           def investigate(processed_source)
             return unless processed_source.ast
 
             processed_source.comments.each do |comment|
-              if comment.text.match?(/(.|\?)\s{2}/) # https://rubular.com/r/8o3SiDrQMJSzuU
-                add_offense(comment, location: comment.loc.expression, message: MSG, severity: :refactor)
+              next unless comment.text.match?(/(.|\?)\s{2}/) # https://rubular.com/r/8o3SiDrQMJSzuU
+              add_offense(comment, location: comment.loc.expression, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(comment.loc.expression, comment.text.gsub('.  ', '. ').gsub('?  ', '? '))
               end
             end
           end
-
-          def autocorrect(comment)
-            ->(corrector) { corrector.replace(comment.loc.expression, comment.text.gsub('.  ', '. ').gsub('?  ', '? ')) }
-          end
         end
       end
     end

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

@@ -43,23 +43,19 @@ module RuboCop
 
           MSG = 'Properly format copyrights header comments'
 
-          def investigate(processed_source)
+          def on_new_investigation
             return unless processed_source.ast
 
             processed_source.comments.each do |comment|
-              next unless comment.inline? # headers aren't in blocks
+              next unless comment.inline? && invalid_copyright_comment?(comment) # headers aren't in blocks
 
-              if invalid_copyright_comment?(comment)
-                add_offense(comment, location: comment.loc.expression, message: MSG, severity: :refactor)
+              add_offense(comment, location: comment.loc.expression, message: MSG, severity: :refactor) do |corrector|
+                correct_comment = "# Copyright:: #{copyright_date_range(comment)}, #{copyright_holder(comment)}"
+                corrector.replace(comment.loc.expression, correct_comment)
               end
             end
           end
 
-          def autocorrect(comment)
-            correct_comment = "# Copyright:: #{copyright_date_range(comment)}, #{copyright_holder(comment)}"
-            ->(corrector) { corrector.replace(comment.loc.expression, correct_comment) }
-          end
-
           private
 
           def copyright_date_range(comment)

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

@@ -32,18 +32,16 @@ module RuboCop
         #   Copyright:: 2019 Tim Smith
         #   Copyright:: 2019 Chef Software, Inc.
         #
-        class DefaultCopyrightComments < Cop
+        class DefaultCopyrightComments < Base
           MSG = 'Cookbook copyright comment headers should be updated for a real person or organization.'
 
-          def investigate(processed_source)
+          def on_new_investigation
             return unless processed_source.ast
 
             processed_source.comments.each do |comment|
-              next unless comment.inline? # headers aren't in blocks
-
-              if /# (?:Copyright\W*).*YOUR_(NAME|COMPANY_NAME)/.match?(comment.text)
-                add_offense(comment, location: comment.loc.expression, message: MSG, severity: :refactor)
-              end
+              next unless comment.inline? &&  # headers aren't in blocks
+                          /# (?:Copyright\W*).*YOUR_(NAME|COMPANY_NAME)/.match?(comment.text)
+              add_offense(comment.loc.expression, message: MSG, severity: :refactor)
             end
           end
         end

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

@@ -40,33 +40,30 @@ module RuboCop
         #   License:: Apache License, Version 2.0
         #   Cookbook:: Tomcat
         #
-        class CommentFormat < Cop
+        class CommentFormat < Base
+          extend AutoCorrector
+
           MSG = 'Properly format header comments'
 
-          def investigate(processed_source)
+          def on_new_investigation
             return unless processed_source.ast
 
             processed_source.comments.each do |comment|
               next if comment.loc.first_line > 10 # avoid false positives when we were checking further down the file
-              next unless comment.inline? # headers aren't in blocks
+              next unless comment.inline? && invalid_comment?(comment) # headers aren't in blocks
 
-              if invalid_comment?(comment)
-                add_offense(comment, location: comment.loc.expression, message: MSG, severity: :refactor)
+              add_offense(comment.loc.expression, message: MSG, severity: :refactor) do |corrector|
+                # Extract the type and the actual value. Strip out "Name" or "File"
+                # 'Cookbook Name' should be 'Cookbook'. Also skip a :: if present
+                # https://rubular.com/r/Do9fpLWXlCmvdJ
+                match = /^#\s*([A-Za-z]+)\s?(?:Name|File)?(?:::)?\s(.*)/.match(comment.text)
+                comment_type, value = match.captures
+                correct_comment = "# #{comment_type}:: #{value}"
+                corrector.replace(comment.loc.expression, correct_comment)
               end
             end
           end
 
-          def autocorrect(comment)
-            # Extract the type and the actual value. Strip out "Name" or "File"
-            # 'Cookbook Name' should be 'Cookbook'. Also skip a :: if present
-            # https://rubular.com/r/Do9fpLWXlCmvdJ
-            match = /^#\s*([A-Za-z]+)\s?(?:Name|File)?(?:::)?\s(.*)/.match(comment.text)
-            comment_type, value = match.captures
-            correct_comment = "# #{comment_type}:: #{value}"
-
-            ->(corrector) { corrector.replace(comment.loc.expression, correct_comment) }
-          end
-
           private
 
           def invalid_comment?(comment)

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

@@ -35,7 +35,9 @@ module RuboCop
         #     notifies :restart, 'service[apache]', :immediately
         #   end
         #
-        class ImmediateNotificationTiming < Cop
+        class ImmediateNotificationTiming < Base
+          extend AutoCorrector
+
           MSG = 'Use :immediately instead of :immediate for resource notification timing'
 
           def_node_matcher :immediate_notify?, <<-PATTERN
@@ -44,13 +46,9 @@ module RuboCop
 
           def on_send(node)
             immediate_notify?(node) do |timing|
-              add_offense(timing, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              corrector.replace(node.loc.expression, ':immediately')
+              add_offense(timing.loc.expression, message: MSG, severity: :refactor) do |corrector|
+                corrector.replace(timing.loc.expression, ':immediately')
+              end
             end
           end
         end

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

@@ -33,7 +33,9 @@ module RuboCop
         #     not_if { systemd }
         #   end
         #
-        class NegatingOnlyIf < Cop
+        class NegatingOnlyIf < Base
+          extend AutoCorrector
+
           MSG = 'Instead of using only_if conditionals with ! to negate the returned value, use not_if which is easier to read'
 
           def_node_matcher :negated_only_if?, <<-PATTERN
@@ -45,7 +47,7 @@ module RuboCop
           PATTERN
 
           def on_block(node)
-            negated_only_if?(node) do |_only_if, code|
+            negated_only_if?(node) do |only_if, code|
               # skip inspec controls where we don't have not_if
               return if node.parent&.parent&.block_type? &&
                         node.parent&.parent&.method_name == :control
@@ -54,13 +56,7 @@ module RuboCop
               return if code.descendants.first.send_type? &&
                         code.descendants.first.negation_method?
 
-              add_offense(node, location: :expression, message: MSG, severity: :refactor)
-            end
-          end
-
-          def autocorrect(node)
-            negated_only_if?(node) do |only_if, code|
-              lambda do |corrector|
+              add_offense(node.loc.expression, message: MSG, severity: :refactor) do |corrector|
                 corrector.replace(code.loc.expression, code.source.gsub(/^!/, ''))
                 corrector.replace(only_if.source_range, 'not_if')
               end

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

@@ -41,7 +41,8 @@ module RuboCop
         #   depends 'apt'
         #   depends 'yum'
         #
-        class OverlyComplexSupportsDependsMetadata < Cop
+        class OverlyComplexSupportsDependsMetadata < Base
+          extend AutoCorrector
           MSG = "Don't loop over an array to set cookbook dependencies or supported platforms if you have fewer than three values to set."
 
           def_node_matcher :supports_depends_array?, <<-PATTERN
@@ -54,14 +55,9 @@ module RuboCop
           PATTERN
 
           def on_block(node)
-            supports_depends_array?(node) do |array, _type|
-              add_offense(node, location: :expression, message: MSG, severity: :refactor) if array.values.count < 3
-            end
-          end
-
-          def autocorrect(node)
-            lambda do |corrector|
-              supports_depends_array?(node) do |array, type|
+            supports_depends_array?(node) do |array, type|
+              return unless array.values.count < 3
+              add_offense(node.loc.expression, message: MSG, severity: :refactor) do |corrector|
                 corrected_value = array.values.map { |x| "#{type} '#{x.source}'" }
                 corrector.replace(node.loc.expression, corrected_value.join("\n"))
               end