cookstyle 7.30.1 → 7.30.3

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

@@ -35,7 +35,7 @@ module RuboCop
           RESTRICT_ON_SEND = [:replaces].freeze
 
           def on_send(node)
-            add_offense(node, message: MSG, severity: :refactor) do |corrector|
+            add_offense(node, severity: :refactor) do |corrector|
               corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end

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

@@ -40,7 +40,7 @@ module RuboCop
 
           def on_block(node)
             nothing_action?(node) do
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
               end
             end

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

@@ -39,7 +39,7 @@ module RuboCop
           def on_send(node)
             return unless sensitive_property?(node)
 
-            add_offense(node, message: MSG, severity: :refactor) do |corrector|
+            add_offense(node, severity: :refactor) do |corrector|
               corrector.remove(node.source_range)
             end
           end

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

@@ -51,7 +51,7 @@ module RuboCop
 
           def on_send(node)
             string_property_with_nil_default?(node) do |nil_default|
-              add_offense(nil_default, message: MSG, severity: :refactor) do |corrector|
+              add_offense(nil_default, severity: :refactor) do |corrector|
                 range = range_with_surrounding_comma(range_with_surrounding_space(range: nil_default.loc.expression, side: :left), :left)
                 corrector.remove(range)
               end

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

@@ -35,7 +35,7 @@ module RuboCop
           RESTRICT_ON_SEND = [:suggests].freeze
 
           def on_send(node)
-            add_offense(node, message: MSG, severity: :refactor) do |corrector|
+            add_offense(node, severity: :refactor) do |corrector|
               corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end

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

@@ -46,7 +46,7 @@ module RuboCop
             property?(node) do |hash_vals|
               hash_vals.each_pair do |k, v|
                 next unless k == s(:sym, :desired_state) && v == s(:true) # cookstyle: disable Lint/BooleanSymbol
-                add_offense(v.parent, message: MSG, severity: :refactor) do |corrector|
+                add_offense(v.parent, severity: :refactor) do |corrector|
                   range = range_with_surrounding_comma(range_with_surrounding_space(range: v.parent.loc.expression, side: :left), :left)
                   corrector.remove(range)
                 end

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

@@ -55,7 +55,7 @@ module RuboCop
                 return unless (hash_keys - [:kind_of, :name_attribute, :name_property]).empty?
               end
 
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.remove(node.source_range)
               end
             end

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

@@ -94,7 +94,7 @@ module RuboCop
                 # no longer makes sense that's not our problem here.
                 create_action(node) do |create_action|
                   return unless create_action == s(:sym, :create)
-                  add_offense(prop, message: MSG, severity: :refactor) do |corrector|
+                  add_offense(prop, severity: :refactor) do |corrector|
                     corrector.replace(create_action, ':create_if_missing')
                     corrector.remove(range_by_whole_lines(prop.source_range, include_final_newline: true))
                   end
@@ -103,7 +103,7 @@ module RuboCop
 
                 # if we got this far we didn't return above when we had an action
                 # so we can just replace the not_if line with a new :create_if_missing action
-                add_offense(prop, message: MSG, severity: :refactor) do |corrector|
+                add_offense(prop, severity: :refactor) do |corrector|
                   corrector.replace(prop, 'action :create_if_missing')
                 end
               end

data/lib/rubocop/cop/chef/security/ssh_private_key.rb

@@ -38,7 +38,7 @@ module RuboCop
               next unless arg.str_type? || arg.dstr_type?
 
               if arg.value.start_with?('-----BEGIN RSA PRIVATE', '-----BEGIN EC PRIVATE') # cookstyle: disable Chef/Security/SshPrivateKey
-                add_offense(node, message: MSG, severity: :warning)
+                add_offense(node, severity: :warning)
               end
             end
           end

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

@@ -40,7 +40,7 @@ module RuboCop
 
           def on_send(node)
             default_metadata?(node) do
-              add_offense(node, message: MSG, severity: :refactor)
+              add_offense(node, severity: :refactor)
             end
           end
         end

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

@@ -37,7 +37,7 @@ module RuboCop
           def on_send(node)
             field?(node) do |str|
               return unless str.value.empty?
-              add_offense(str, message: MSG, severity: :refactor)
+              add_offense(str, severity: :refactor)
             end
           end
         end

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

@@ -45,7 +45,7 @@ module RuboCop
 
           def on_send(node)
             property?(node) do
-              add_offense(node, message: MSG, severity: :refactor) unless description_hash?(node)
+              add_offense(node, severity: :refactor) unless description_hash?(node)
             end
           end
         end

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

@@ -41,7 +41,7 @@ module RuboCop
             # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
             range = source_range(processed_source.buffer, 1, 0)
 
-            add_offense(range, message: MSG, severity: :refactor)
+            add_offense(range, severity: :refactor)
           end
 
           def_node_search :resource_description, '(send nil? :description ...)'

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

@@ -49,7 +49,7 @@ module RuboCop
             # Using range similar to RuboCop::Cop::Naming::Filename (file_name.rb)
             range = source_range(processed_source.buffer, 1, 0)
 
-            add_offense(range, message: MSG, severity: :refactor)
+            add_offense(range, severity: :refactor)
           end
 
           def_node_search :resource_examples, '(send nil? :examples dstr ...)'

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

@@ -50,7 +50,7 @@ module RuboCop
 
           def on_send(node)
             insecure_cb_url?(node) do
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.replace(node, node.source.gsub(%r{http://(www.)*}, 'https://'))
               end
             end

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

@@ -518,7 +518,7 @@ module RuboCop
           def on_send(node)
             license?(node) do |license|
               return if valid_license?(license.str_content)
-              add_offense(license, message: MSG, severity: :refactor) do |corrector|
+              add_offense(license, severity: :refactor) do |corrector|
                 correct_string = autocorrect_license_string(license.str_content)
                 corrector.replace(license, "'#{correct_string}'") if correct_string
               end

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

@@ -58,7 +58,7 @@ module RuboCop
             if node_attribute_access?(node) || node_level_attribute_access?(node)
               # node is first child for #[], need to look for the outermost parent too.
               outer_node = node
-              while outer_node.parent && outer_node.parent.type == :send && outer_node.parent.children[1] == :[]
+              while outer_node.parent && outer_node.parent.send_type? && outer_node.parent.children[1] == :[]
                 on_node_attribute_access(outer_node.children[2])
                 outer_node = outer_node.parent
               end
@@ -68,12 +68,12 @@ module RuboCop
           end
 
           def on_node_attribute_access(node)
-            if node.type == :str
+            if node.str_type?
               style_detected(:strings)
-              add_offense(node, location: :expression, message: MSG % style, severity: :refactor) if style == :symbols
-            elsif node.type == :sym
+              add_offense(node, message: MSG % style, severity: :refactor) if style == :symbols
+            elsif node.sym_type?
               style_detected(:symbols)
-              add_offense(node, location: :expression, message: MSG % style, severity: :refactor) if style == :strings
+              add_offense(node, message: MSG % style, severity: :refactor) if style == :strings
             end
           end
 

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

@@ -39,7 +39,7 @@ module RuboCop
 
             processed_source.comments.each do |comment|
               next unless comment.text.match?(/Chef [a-z]/) # https://rubular.com/r/0YzfDAbwJrDHix
-              add_offense(comment, message: MSG, severity: :refactor)
+              add_offense(comment, severity: :refactor)
             end
           end
         end

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

@@ -30,7 +30,7 @@ module RuboCop
 
             processed_source.comments.each do |comment|
               next unless comment.text.match?(/(.|\?)\s{2}/) # https://rubular.com/r/8o3SiDrQMJSzuU
-              add_offense(comment, location: comment, message: MSG, severity: :refactor) do |corrector|
+              add_offense(comment, location: comment, severity: :refactor) do |corrector|
                 corrector.replace(comment, comment.text.gsub('.  ', '. ').gsub('?  ', '? '))
               end
             end

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

@@ -49,7 +49,7 @@ module RuboCop
             processed_source.comments.each do |comment|
               next unless comment.inline? && invalid_copyright_comment?(comment) # headers aren't in blocks
 
-              add_offense(comment, message: MSG, severity: :refactor) do |corrector|
+              add_offense(comment, severity: :refactor) do |corrector|
                 correct_comment = "# Copyright:: #{copyright_date_range(comment)}, #{copyright_holder(comment)}"
                 corrector.replace(comment, correct_comment)
               end

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

@@ -40,7 +40,7 @@ module RuboCop
             processed_source.comments.each do |comment|
               next unless comment.inline? &&  # headers aren't in blocks
                           /# (?:Copyright\W*).*YOUR_(NAME|COMPANY_NAME)/.match?(comment.text)
-              add_offense(comment, message: MSG, severity: :refactor)
+              add_offense(comment, severity: :refactor)
             end
           end
         end

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

@@ -53,7 +53,7 @@ module RuboCop
               next if comment.loc.first_line > 10 # avoid false positives when we were checking further down the file
               next unless comment.inline? && CHEF_LIKE_COMMENT_REGEX.match?(comment.text) # headers aren't in blocks
 
-              add_offense(comment, message: MSG, severity: :refactor) do |corrector|
+              add_offense(comment, 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

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

@@ -62,7 +62,7 @@ module RuboCop
 
           def on_send(node)
             resource_mode?(node) do |mode_int|
-              add_offense(mode_int, message: MSG, severity: :refactor) do |corrector|
+              add_offense(mode_int, severity: :refactor) do |corrector|
                 # If it was an octal literal, make sure we write out the right number.
                 replacement_base = octal?(mode_int) ? 8 : 10
                 replacement_mode = mode_int.children.first.to_s(replacement_base)

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

@@ -47,7 +47,7 @@ module RuboCop
 
           def on_send(node)
             immediate_notify?(node) do |timing|
-              add_offense(timing, message: MSG, severity: :refactor) do |corrector|
+              add_offense(timing, severity: :refactor) do |corrector|
                 corrector.replace(timing, ':immediately')
               end
             end

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

@@ -46,7 +46,7 @@ module RuboCop
               # avoid chefspec: expect(chef_run).to include_recipe('foo')
               return if node.parent&.send_type?
 
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.replace(node, "include_recipe #{recipe.source}")
               end
             end

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

@@ -56,7 +56,7 @@ module RuboCop
               return if code.descendants.first.send_type? &&
                         code.descendants.first.negation_method?
 
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.replace(code, code.source.gsub(/^!/, ''))
                 corrector.replace(only_if.source_range, 'not_if')
               end

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

@@ -57,7 +57,7 @@ module RuboCop
           def on_block(node)
             supports_depends_array?(node) do |array, type|
               return unless array.values.count < 3
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrected_value = array.values.map { |x| "#{type} '#{x.source}'" }
                 corrector.replace(node, corrected_value.join("\n"))
               end

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

@@ -65,7 +65,7 @@ module RuboCop
           # if the parent is .to_i then we want to alert on that
           def add_offense_to_i_if_present(node)
             node = node.parent if parent_method_equals?(node, :to_i)
-            add_offense(node, message: MSG, severity: :refactor) do |corrector|
+            add_offense(node, severity: :refactor) do |corrector|
               corrector.replace(node, "node['platform_version'].to_i")
             end
           end

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

@@ -41,7 +41,7 @@ module RuboCop
 
           def on_send(node)
             trueclass_falseclass_property?(node) do |types|
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrector.replace(types, '[true, false]')
               end
             end

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

@@ -59,7 +59,7 @@ module RuboCop
           def on_send(node)
             os_equals?(node) do |operator, val|
               return unless UNNECESSARY_OS_VALUES.include?(val.value)
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrected_string = (operator == :!= ? '!' : '') + "platform_family?('#{sanitized_platform(val.value)}')"
                 corrector.replace(node, corrected_string)
               end
@@ -67,7 +67,7 @@ module RuboCop
 
             os_eql?(node) do |val|
               return unless UNNECESSARY_OS_VALUES.include?(val.value)
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrected_string = "platform_family?('#{sanitized_platform(val.value)}')"
                 corrector.replace(node, corrected_string)
               end
@@ -77,7 +77,7 @@ module RuboCop
               array_of_plats = array_from_ast(val)
               # see if all the values in the .include? usage are in our list of 1:1 platform family to os values
               return unless (UNNECESSARY_OS_VALUES & array_of_plats) == array_of_plats
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 platforms = val.values.map { |x| x.str_type? ? "'#{sanitized_platform(x.value)}'" : x.source }
                 corrected_string = "platform_family?(#{platforms.join(', ')})"
                 corrector.replace(node, corrected_string)

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

@@ -56,7 +56,7 @@ module RuboCop
           def on_case(node)
             platform_case?(node) do |node_, type|
               return unless node&.when_branches&.count == 1
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 # we have at least one supermarket cookbook with an entirely empty platform case statement
                 # we can't actually fix that so let's do nothing here.
                 unless empty_case_statement?(node)

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

@@ -58,14 +58,14 @@ module RuboCop
 
           def on_send(node)
             platform_equals?(node) do |type, operator, plat|
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrected_string = (operator == :!= ? '!' : '') + "#{type.value}?('#{plat.value}')"
                 corrector.replace(node, corrected_string)
               end
             end
 
             platform_include?(node) do |plats, type|
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 platforms = plats.values.map { |x| x.str_type? ? "'#{x.value}'" : x.source }
                 corrected_string = "#{type.value}?(#{platforms.join(', ')})"
                 corrector.replace(node, corrected_string)
@@ -73,7 +73,7 @@ module RuboCop
             end
 
             platform_eql?(node) do |type, plat|
-              add_offense(node, message: MSG, severity: :refactor) do |corrector|
+              add_offense(node, severity: :refactor) do |corrector|
                 corrected_string = "#{type.value}?('#{plat.value}')"
                 corrector.replace(node, corrected_string)
               end

data/lib/rubocop/cop/inspec/deprecation/attribute_default.rb

@@ -41,7 +41,7 @@ module RuboCop
 
           def on_send(node)
             default?(node) do |n|
-              add_offense(n, message: MSG, severity: :warning) do |corrector|
+              add_offense(n, severity: :warning) do |corrector|
                 corrector.replace(n, 'value')
               end
             end

data/lib/rubocop/cop/inspec/deprecation/attribute_helper.rb

@@ -36,7 +36,7 @@ module RuboCop
           RESTRICT_ON_SEND = [:attribute].freeze
 
           def on_send(node)
-            add_offense(node, message: MSG, severity: :warning) do |corrector|
+            add_offense(node, severity: :warning) do |corrector|
               corrector.replace(node.loc.expression, node.loc.expression.source.gsub(/^attribute/, 'input'))
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 7.30.1
+  version: 7.30.3
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.24.1
+        version: 1.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.24.1
+        version: 1.25.0
 description: 
 email:
 - thom@chef.io