cookstyle 5.18.4 → 5.19.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56fb1dda6ccaeeb4a3f521c52407e12becf9f1b1625a89b4c893f415820e40c4
-  data.tar.gz: 46c9bf893653173d77d7282056dc81cb385ef2b6f7828cc5f76e0e4e8e51a3f4
+  metadata.gz: 0f5cc0916309f625be3469422c3feb76f7e1340fca4ae99cc5110b0b80f857f6
+  data.tar.gz: 1c813c90c2bef8b8c869c4d9a826be958507a31db227c4b67ff1025192ab624c
 SHA512:
-  metadata.gz: f3e1c5acbb968e895c0a8190c28635baa023574e797d0b56ba54bba776f97f24b7d0f718bb02b92080175f46f475500a02254db3bd6f92090fd89f5b2239ec4e
-  data.tar.gz: 44d2c68635670c76ac81c4941dd70a3fd99fa53cdf40654576584784fd88b256f6c94066716cdff8c8cb7b63b29f68b17524b654e7de4cba514d89803993941b
+  metadata.gz: 0e8ae2b07a6b712889fa67ececde059ae3063fa89627fe6937668ed101a9874bfc98d2faaf5ac36cf99063fb14c9835595052213ffc299d5bc0b5aac28502153
+  data.tar.gz: 61747c1c26cf1708cfd82ca7945850c8fb2022a18d16c33145ed805741c313ee6bb0c0fc849ba90dad4a0a65ae53e10ea9d4b0291f5b14faaafc43ea18d7a8b0

data/config/cookstyle.yml

@@ -115,6 +115,13 @@ ChefStyle/TrueClassFalseClassResourceProperties:
     - '**/libraries/*.rb'
     - '**/resources/*.rb'
 
+ChefStyle/OverlyComplexSupportsDependsMetadata:
+  Description: Don't loop over an array to set cookbook dependencies or supported platforms if you have fewer than three values to set.
+  Enabled: true
+  VersionAdded: '5.19.0'
+  Include:
+    - '**/metadata.rb'
+
 ###############################
 # ChefCorrectness: Avoiding potential problems
 ###############################
@@ -1095,7 +1102,7 @@ ChefRedundantCode/ConflictsMetadata:
     - '**/metadata.rb'
 
 ChefRedundantCode/SuggestsMetadata:
-  Description: Don't use the deprecated 'suggests' metadata value
+  Description: The suggests metadata.rb method is not used and is unnecessary in cookbooks.
   Enabled: true
   VersionAdded: '5.1.0'
   VersionChanged: '5.15.0'
@@ -1103,7 +1110,7 @@ ChefRedundantCode/SuggestsMetadata:
     - '**/metadata.rb'
 
 ChefRedundantCode/ProvidesMetadata:
-  Description: Don't use the deprecated 'provides' metadata value
+  Description: The provides metadata.rb method is not used and is unnecessary in cookbooks.
   Enabled: true
   VersionAdded: '5.1.0'
   VersionChanged: '5.15.0'
@@ -1111,7 +1118,7 @@ ChefRedundantCode/ProvidesMetadata:
     - '**/metadata.rb'
 
 ChefRedundantCode/ReplacesMetadata:
-  Description: Don't use the deprecated 'replaces' metadata value
+  Description: The replaces metadata.rb method is not used and is unnecessary in cookbooks.
   Enabled: true
   VersionAdded: '5.1.0'
   VersionChanged: '5.15.0'
@@ -1119,7 +1126,7 @@ ChefRedundantCode/ReplacesMetadata:
     - '**/metadata.rb'
 
 ChefRedundantCode/AttributeMetadata:
-  Description: Don't use the deprecated 'attribute' metadata value
+  Description: The attribute metadata.rb method is not used and is unnecessary in cookbooks.
   Enabled: true
   VersionAdded: '5.1.0'
   VersionChanged: '5.15.0'
@@ -1221,6 +1228,13 @@ ChefRedundantCode/AptRepositoryDistributionDefault:
     - '**/attributes/*.rb'
     - '**/Berksfile'
 
+ChefRedundantCode/GroupingMetadata:
+  Description: The grouping metadata.rb method is not used and is unnecessary in cookbooks.
+  Enabled: true
+  VersionAdded: '5.19.0'
+  Include:
+    - '**/metadata.rb'
+
 ###############################
 # Migrating to new patterns
 ###############################

data/lib/cookstyle/version.rb

@@ -1,4 +1,4 @@
 module Cookstyle
-  VERSION = "5.18.4".freeze # rubocop: disable Style/StringLiterals
+  VERSION = "5.19.9".freeze # rubocop: disable Style/StringLiterals
   RUBOCOP_VERSION = '0.75.1'.freeze
 end

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

@@ -31,6 +31,8 @@ module RuboCop
       #
       module ChefCorrectness
         class CookbooksDependsOnSelf < Cop
+          include RangeHelp
+
           MSG = 'A cookbook cannot depend on itself. This will fail on Chef Infra Client 13+'.freeze
 
           def_node_search :dependencies, '(send nil? :depends str ...)'
@@ -49,7 +51,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.source_range)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -36,6 +36,7 @@ module RuboCop
         #
         class ChefRewind < Cop
           include RuboCop::Chef::CookbookHelpers
+          include RangeHelp
           extend TargetChefVersion
 
           minimum_target_chef_version '12.10'
@@ -83,12 +84,12 @@ module RuboCop
             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(node.loc.expression)
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
                 return
               end
 
               require_rewind?(node) do
-                corrector.remove(node.loc.expression)
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
                 return
               end
 

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

@@ -26,6 +26,7 @@ module RuboCop
         #   depends 'compat_resource'
         #
         class CookbookDependsOnCompatResource < Cop
+          include RangeHelp
           extend TargetChefVersion
 
           minimum_target_chef_version '12.19'
@@ -44,7 +45,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -34,6 +34,8 @@ module RuboCop
         #   require 'chef/mixin/language_include_recipe'
         #
         class UsesDeprecatedMixins < Cop
+          include RangeHelp
+
           MSG = "Don't use deprecated Mixins no longer included in Chef Infra Client 14 and later.".freeze
 
           def_node_matcher :deprecated_mixin?, <<-PATTERN
@@ -64,7 +66,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -29,6 +29,8 @@ module RuboCop
         #   use_inline_resources if respond_to?(:use_inline_resources)
         #
         class UseInlineResourcesDefined < Cop
+          include RangeHelp
+
           MSG = 'use_inline_resources is now the default for resources in Chef Infra Client 13+ and does not need to be specified.'.freeze
 
           def on_send(node)
@@ -47,7 +49,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: 2019, Chef Software, Inc.
+# Copyright:: 2019-2020, Chef Software, Inc.
 # Author:: Tim Smith (<tsmith@chef.io>)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,6 +30,10 @@ module RuboCop
         #     })
         #   end
         #
+        #   user 'betty' do
+        #     supports :manage_home => true
+        #   end
+        #
         #   # good
         #   user "betty" do
         #     manage_home true
@@ -51,7 +55,7 @@ module RuboCop
             lambda do |corrector|
               new_text = []
               node.arguments.first.each_pair do |k, v|
-                new_text << "#{k.source} #{v.source}"
+                new_text << "#{k.value} #{v.source}"
               end
 
               corrector.replace(node.loc.expression, new_text.join("\n  "))

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

@@ -27,6 +27,8 @@ module RuboCop
         #   include_recipe 'yum::dnf_yum_compat'
         #
         class IncludingYumDNFCompatRecipe < Cop
+          include RangeHelp
+
           MSG = 'Do not include the deprecated yum::dnf_yum_compat default recipe to install yum on dnf systems. Chef Infra Client now includes built in support for DNF packages.'.freeze
 
           def_node_matcher :yum_dnf_compat_recipe_usage?, <<-PATTERN
@@ -41,7 +43,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -47,7 +47,7 @@ module RuboCop
             return if node.body.nil? # nil body is an empty initialize method
 
             node.body.each_node do |x|
-              if x.assignment? && !x.node_parts.empty? && %i(@actions @allowed_actions).include?(x.node_parts.first)
+              if x.assignment? && !x.parent.op_asgn_type? && !x.node_parts.empty? && %i(@actions @allowed_actions).include?(x.node_parts.first)
                 add_offense(x, location: :expression, message: MSG, severity: :refactor)
               end
             end

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

@@ -33,6 +33,7 @@ module RuboCop
         #
         class UnnecessaryDependsChef14 < Cop
           extend TargetChefVersion
+          include RangeHelp
 
           minimum_target_chef_version '14.0'
 
@@ -50,7 +51,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -27,6 +27,7 @@ module RuboCop
         #   chef_gem 'nokogiri'
         #
         class ChefGemNokogiri < Cop
+          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.'.freeze
@@ -50,7 +51,7 @@ module RuboCop
           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(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -42,20 +42,19 @@ module RuboCop
 
           MSG = 'The default action of a resource can be set with the "default_action" helper instead of using the initialize method.'.freeze
 
-          def on_def(node)
-            return unless node.method_name == :initialize
-            return if node.body.nil? # nil body is an empty initialize method
+          def_node_matcher :action_in_initializer?, <<-PATTERN
+            (def :initialize (args ...) <(begin ... $(ivasgn {:@action :@default_action} $(...)))> )
+          PATTERN
 
-            node.body.each_node do |x|
-              if x.assignment? && !x.node_parts.empty? && %i(@action @default_action).include?(x.node_parts.first)
-                add_offense(x, location: :expression, message: MSG, severity: :refactor)
-              end
-            end
-          end
+          def_node_search :intialize_method, '(def :initialize ... )'
 
           def_node_search :default_action_method?, '(send nil? :default_action ... )'
 
-          def_node_search :intialize_method, '(def :initialize ... )'
+          def on_def(node)
+            action_in_initializer?(node) do |action, _val|
+              add_offense(action, location: :expression, message: MSG, severity: :refactor)
+            end
+          end
 
           def autocorrect(node)
             lambda do |corrector|

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

@@ -30,6 +30,8 @@ module RuboCop
         #   end
         #
         class DefinesChefSpecMatchers < Cop
+          include RangeHelp
+
           MSG = 'ChefSpec matchers are now auto generated by ChefSpec 7.1+ and do not need to be defined in a cookbook'.freeze
 
           def_node_matcher :chefspec_matcher?, <<-PATTERN
@@ -44,7 +46,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -27,6 +27,7 @@ module RuboCop
         #
         class DependsOnZypperCookbook < Cop
           extend TargetChefVersion
+          include RangeHelp
 
           minimum_target_chef_version '13.3'
 
@@ -44,7 +45,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -28,6 +28,8 @@ module RuboCop
         #   end
         #
         class EmptyResourceInitializeMethod < Cop
+          include RangeHelp
+
           MSG = 'There is no need for an empty initialize method in a resource'.freeze
 
           def_node_matcher :empty_initialize?, <<-PATTERN
@@ -42,7 +44,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -30,6 +30,8 @@ module RuboCop
         #   include Chef::Mixin::PowershellOut
         #
         class IncludingMixinShelloutInResources < Cop
+          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+.'.freeze
 
           def_node_matcher :include_shellout?, <<-PATTERN
@@ -52,7 +54,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -26,6 +26,8 @@ module RuboCop
         #   depends 'minitest-handler'
         #
         class MinitestHandlerUsage < Cop
+          include RangeHelp
+
           MSG = 'Use Chef InSpec for testing instead of the Minitest Handler cookbook pattern.'.freeze
 
           def_node_matcher :minitest_depends?, <<-PATTERN
@@ -40,7 +42,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -27,6 +27,8 @@ module RuboCop
         #   require 'mixlib/shellout'
         #
         class UnnecessaryMixlibShelloutRequire < Cop
+          include RangeHelp
+
           MSG = 'Chef Infra Client 12.4+ includes mixlib/shellout automatically in resources and providers.'.freeze
 
           def_node_matcher :require_mixlibshellout?, <<-PATTERN
@@ -41,7 +43,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -29,6 +29,7 @@ module RuboCop
         #
         class WhyRunSupportedTrue < Cop
           extend TargetChefVersion
+          include RangeHelp
 
           minimum_target_chef_version '13.0'
 
@@ -42,7 +43,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -27,6 +27,8 @@ module RuboCop
         #   include_recipe 'windows'
         #
         class IncludingWindowsDefaultRecipe < Cop
+          include RangeHelp
+
           MSG = 'Do not include the Windows default recipe, which only installs win32 gems already included in Chef Infra Client'.freeze
 
           def_node_matcher :windows_recipe_usage?, <<-PATTERN
@@ -41,7 +43,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -33,6 +33,8 @@ module RuboCop
         #              default: '"127.0.0.1:2181"'
         #
         class AttributeMetadata < Cop
+          include RangeHelp
+
           MSG = 'The attribute metadata.rb method is not used and is unnecessary in cookbooks.'.freeze
 
           def on_send(node)
@@ -41,7 +43,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :right))
             end
           end
         end

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

@@ -28,6 +28,8 @@ module RuboCop
         #   conflicts "another_cookbook"
         #
         class ConflictsMetadata < Cop
+          include RangeHelp
+
           MSG = 'The conflicts metadata.rb method is not used and is unnecessary in cookbooks.'.freeze
 
           def on_send(node)
@@ -36,7 +38,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :right))
             end
           end
         end

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

@@ -0,0 +1,48 @@
+#
+# Copyright:: 2019-2020, Chef Software Inc.
+# Author:: Tim Smith (<tsmith@chef.io>)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module RuboCop
+  module Cop
+    module Chef
+      module ChefRedundantCode
+        # The grouping metadata.rb method is not used and is unnecessary in cookbooks.
+        #
+        # @example
+        #
+        #   # bad
+        #   grouping 'windows_log_rotate', title: 'Demonstration cookbook with code to switch loggers'
+        #
+        #
+        class GroupingMetadata < Cop
+          include RangeHelp
+
+          MSG = 'The grouping metadata.rb method is not used and is unnecessary in cookbooks.'.freeze
+
+          def on_send(node)
+            add_offense(node, location: :expression, message: MSG, severity: :refactor) if node.method_name == :grouping
+          end
+
+          def autocorrect(node)
+            lambda do |corrector|
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -37,7 +37,12 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :right))
+              if node.arguments.first.respond_to?(:heredoc?) && node.arguments.first.heredoc?
+                total_range = range_with_surrounding_space(range: node.loc.expression.join(node.arguments.first.loc.heredoc_end), side: :left)
+                corrector.remove(total_range)
+              else
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
             end
           end
         end

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

@@ -28,6 +28,8 @@ module RuboCop
         #   provides "some_thing"
         #
         class ProvidesMetadata < Cop
+          include RangeHelp
+
           MSG = 'The provides metadata.rb method is not used and is unnecessary in cookbooks.'.freeze
 
           def on_send(node)
@@ -36,7 +38,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -28,6 +28,8 @@ module RuboCop
         #
         #
         class RecipeMetadata < Cop
+          include RangeHelp
+
           MSG = "The recipe metadata.rb method is not used and is unnecessary in cookbooks. Recipes should be documented in the cookbook's README.md file instead.".freeze
 
           def on_send(node)
@@ -36,7 +38,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -28,6 +28,8 @@ module RuboCop
         #   replaces "another_cookbook"
         #
         class ReplacesMetadata < Cop
+          include RangeHelp
+
           MSG = 'The replaces metadata.rb method is not used and is unnecessary in cookbooks.'.freeze
 
           def on_send(node)
@@ -36,7 +38,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -28,6 +28,8 @@ module RuboCop
         #   end
         #
         class ResourceWithNothingAction < Cop
+          include RangeHelp
+
           MSG = 'There is no need to define a :nothing action in your resource as Chef Infra Client provides the :nothing action by default for every resource.'.freeze
 
           def_node_matcher :nothing_action?, <<-PATTERN
@@ -42,7 +44,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.source_range)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -28,6 +28,8 @@ module RuboCop
         #   suggests "another_cookbook"
         #
         class SuggestsMetadata < Cop
+          include RangeHelp
+
           MSG = 'The suggests metadata.rb method is not used and is unnecessary in cookbooks.'.freeze
 
           def on_send(node)
@@ -36,7 +38,7 @@ module RuboCop
 
           def autocorrect(node)
             lambda do |corrector|
-              corrector.remove(node.loc.expression)
+              corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
             end
           end
         end

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

@@ -450,6 +450,7 @@ module RuboCop
             'gplv2': 'GPL-2.0',
             'gplv3': 'GPL-3.0',
             'mit license': 'MIT',
+            'UNLICENSED': 'all rights reserved',
           }.freeze
 
           MSG = 'Cookbook metadata.rb does not use a SPDX compliant license string or "all rights reserved". See https://spdx.org/licenses/ for a complete list of license identifiers.'.freeze

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

@@ -47,7 +47,10 @@ module RuboCop
               # If it was an octal literal, make sure we write out the right number.
               replacement_base = octal?(node) ? 8 : 10
               replacement_mode = node.children.first.to_s(replacement_base)
-              corrector.replace(node.loc.expression, replacement_mode.inspect)
+
+              # we build our own escaped string instead of using .inspect because that way
+              # we can use single quotes instead of the double quotes that .inspect adds
+              corrector.replace(node.loc.expression, "\'#{replacement_mode}\'")
             end
           end
 

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

@@ -0,0 +1,73 @@
+#
+# Copyright:: 2020, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith@chef.io>)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module RuboCop
+  module Cop
+    module Chef
+      module ChefStyle
+        # Don't loop over an array to set cookbook dependencies or supported platforms if you have fewer than three values to set.  Setting multiple `supports` or `depends` values is simpler and easier to understand for new users.
+        #
+        # @example
+        #
+        #   # bad
+        #
+        #   %w( debian ubuntu ).each do |os|
+        #     supports os
+        #   end
+        #
+        #   %w( apt yum ).each do |cb|
+        #     depends cb
+        #   end
+        #
+        #   # good
+        #
+        #   supports 'debian'
+        #   supports 'ubuntu'
+        #
+        #   depends 'apt'
+        #   depends 'yum'
+        #
+        class OverlyComplexSupportsDependsMetadata < Cop
+          MSG = "Don't loop over an array to set cookbook dependencies or supported platforms if you have fewer than three values to set.".freeze
+
+          def_node_matcher :supports_depends_array?, <<-PATTERN
+            (block
+              (send
+                $(array ...) :each)
+              (args
+                (arg _))
+              (send nil? ${:supports :depends} (lvar _)))
+          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|
+                corrected_value = array.values.map { |x| "#{type} '#{x.source}'" }
+                corrector.replace(node.loc.expression, corrected_value.join("\n"))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cookstyle
 version: !ruby/object:Gem::Version
-  version: 5.18.4
+  version: 5.19.9
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -179,6 +179,7 @@ files:
 - lib/rubocop/cop/chef/redundant/attribute_metadata.rb
 - lib/rubocop/cop/chef/redundant/conflicts_metadata.rb
 - lib/rubocop/cop/chef/redundant/custom_resource_with_allowed_actions.rb
+- lib/rubocop/cop/chef/redundant/grouping_metadata.rb
 - lib/rubocop/cop/chef/redundant/long_description_metadata.rb
 - lib/rubocop/cop/chef/redundant/name_property_and_required.rb
 - lib/rubocop/cop/chef/redundant/property_with_default_and_required.rb
@@ -201,6 +202,7 @@ files:
 - lib/rubocop/cop/chef/style/comments_format.rb
 - lib/rubocop/cop/chef/style/file_mode.rb
 - lib/rubocop/cop/chef/style/immediate_notification_timing.rb
+- lib/rubocop/cop/chef/style/overly_complex_supports_depends_metadata.rb
 - lib/rubocop/cop/chef/style/simplify_platform_major_version_check.rb
 - lib/rubocop/cop/chef/style/true_false_resource_properties.rb
 - lib/rubocop/cop/chef/style/unnecessary_platform_case_statement.rb