cookstyle 7.32.8 → 8.0.0

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

@@ -1,57 +1,57 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2020, Chef Software, Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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 Modernize
-        # Use the custom resource language's `action :my_action` blocks instead of creating actions with methods.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   def action_create
-        #    # :create action code here
-        #   end
-        #
-        #   ### correct
-        #   action :create do
-        #    # :create action code here
-        #   end
-        #
-        class ActionMethodInResource < Base
-          extend AutoCorrector
-
-          MSG = "Use the custom resource language's `action :my_action` blocks instead of creating actions with methods."
-
-          def_node_search :includes_poise?, '(send nil? :include (const nil? :Poise))'
-
-          def on_def(node)
-            return unless node.method_name.to_s.start_with?('action_') # when we stop support for Ruby < 2.7 the .to_s can go away here
-            return if node.arguments? # if they passed in arguments they may actually need this
-            return if node.parent && includes_poise?(node.parent)
-
-            add_offense(node, severity: :refactor) do |corrector|
-              # @todo when we drop ruby 2.4 support we can convert this to use delete_suffix
-              corrector.replace(node, node.source.gsub("def #{node.method_name}", "action :#{node.method_name.to_s.gsub(/^action_/, '')} do"))
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2020, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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 Modernize
+        # Use the custom resource language's `action :my_action` blocks instead of creating actions with methods.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   def action_create
+        #    # :create action code here
+        #   end
+        #
+        #   ### correct
+        #   action :create do
+        #    # :create action code here
+        #   end
+        #
+        class ActionMethodInResource < Base
+          extend AutoCorrector
+
+          MSG = "Use the custom resource language's `action :my_action` blocks instead of creating actions with methods."
+
+          def_node_search :includes_poise?, '(send nil? :include (const nil? :Poise))'
+
+          def on_def(node)
+            return unless node.method_name.to_s.start_with?('action_') # when we stop support for Ruby < 2.7 the .to_s can go away here
+            return if node.arguments? # if they passed in arguments they may actually need this
+            return if node.parent && includes_poise?(node.parent)
+
+            add_offense(node, severity: :refactor) do |corrector|
+              # @todo when we drop ruby 2.4 support we can convert this to use delete_suffix
+              corrector.replace(node, node.source.gsub("def #{node.method_name}", "action :#{node.method_name.to_s.gsub(/^action_/, '')} do"))
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,77 +1,77 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2019, Chef Software Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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 Modernize
-        # The allowed actions can now be specified using the `allowed_actions` helper instead of using the @actions or @allowed_actions variables in the resource's initialize method. In general we recommend against writing HWRPs, but if HWRPs are necessary you should utilize as much of the resource DSL as possible.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   def initialize(*args)
-        #     super
-        #     @actions = [ :create, :add ]
-        #   end
-        #
-        #   # also bad
-        #   def initialize(*args)
-        #     super
-        #     @allowed_actions = [ :create, :add ]
-        #   end
-        #
-        #   ### correct
-        #   allowed_actions [ :create, :add ]
-        #
-        class AllowedActionsFromInitialize < Base
-          include RangeHelp
-          extend AutoCorrector
-
-          MSG = 'The allowed actions of a resource can be set with the "allowed_actions" helper instead of using the initialize method.'
-
-          def on_def(node)
-            return unless node.method?(:initialize)
-            return if node.body.nil? # nil body is an empty initialize method
-
-            node.body.each_node do |x|
-              next unless x.assignment? &&
-                          !x.parent.op_asgn_type? &&
-                          !x.node_parts.empty? &&
-                          %i(@actions @allowed_actions).include?(x.node_parts.first)
-
-              add_offense(x, severity: :refactor) do |corrector|
-                # insert the new allowed_actions call above the initialize method, but not if one already exists (this is sadly common)
-                unless action_methods?(processed_source.ast)
-                  initialize_node = initialize_method(processed_source.ast).first
-                  corrector.insert_before(initialize_node.source_range, "allowed_actions #{x.descendants.first.source}\n\n")
-                end
-
-                # remove the variable from the initialize method
-                corrector.remove(range_with_surrounding_space(range: x.loc.expression, side: :left))
-              end
-            end
-          end
-
-          def_node_search :action_methods?, '(send nil? {:actions :allowed_actions} ... )'
-
-          def_node_search :initialize_method, '(def :initialize ... )'
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2019, Chef Software Inc.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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 Modernize
+        # The allowed actions can now be specified using the `allowed_actions` helper instead of using the @actions or @allowed_actions variables in the resource's initialize method. In general we recommend against writing HWRPs, but if HWRPs are necessary you should utilize as much of the resource DSL as possible.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   def initialize(*args)
+        #     super
+        #     @actions = [ :create, :add ]
+        #   end
+        #
+        #   # also bad
+        #   def initialize(*args)
+        #     super
+        #     @allowed_actions = [ :create, :add ]
+        #   end
+        #
+        #   ### correct
+        #   allowed_actions [ :create, :add ]
+        #
+        class AllowedActionsFromInitialize < Base
+          include RangeHelp
+          extend AutoCorrector
+
+          MSG = 'The allowed actions of a resource can be set with the "allowed_actions" helper instead of using the initialize method.'
+
+          def on_def(node)
+            return unless node.method?(:initialize)
+            return if node.body.nil? # nil body is an empty initialize method
+
+            node.body.each_node do |x|
+              next unless x.assignment? &&
+                          !x.parent.op_asgn_type? &&
+                          !x.node_parts.empty? &&
+                          %i(@actions @allowed_actions).include?(x.node_parts.first)
+
+              add_offense(x, severity: :refactor) do |corrector|
+                # insert the new allowed_actions call above the initialize method, but not if one already exists (this is sadly common)
+                unless action_methods?(processed_source.ast)
+                  initialize_node = initialize_method(processed_source.ast).first
+                  corrector.insert_before(initialize_node.source_range, "allowed_actions #{x.descendants.first.source}\n\n")
+                end
+
+                # remove the variable from the initialize method
+                corrector.remove(range_with_surrounding_space(range: x.loc.expression, side: :left))
+              end
+            end
+          end
+
+          def_node_search :action_methods?, '(send nil? {:actions :allowed_actions} ... )'
+
+          def_node_search :initialize_method, '(def :initialize ... )'
+        end
+      end
+    end
+  end
+end

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

@@ -1,54 +1,54 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2019, Chef Software, Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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 Modernize
-        # For many users the apt::default cookbook is used only to update apt's package cache. Chef Infra Client 12.7 and later include an apt_update resource which should be used to perform this instead. Keep in mind that some users will want to stick with the apt::default recipe as it also installs packages necessary for using https repositories on Debian systems and manages some configuration files.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   include_recipe 'apt::default'
-        #   include_recipe 'apt'
-        #
-        #   ### correct
-        #   apt_update
-        #
-        class IncludingAptDefaultRecipe < Base
-          extend TargetChefVersion
-
-          minimum_target_chef_version '12.7'
-
-          MSG = 'Do not include the Apt default recipe to update package cache. Instead use the apt_update resource, which is built into Chef Infra Client 12.7 and later.'
-          RESTRICT_ON_SEND = [:include_recipe].freeze
-
-          def_node_matcher :apt_recipe_usage?, <<-PATTERN
-            (send nil? :include_recipe (str {"apt" "apt::default"}))
-          PATTERN
-
-          def on_send(node)
-            apt_recipe_usage?(node) do
-              add_offense(node, severity: :refactor)
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2019, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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 Modernize
+        # For many users the apt::default cookbook is used only to update apt's package cache. Chef Infra Client 12.7 and later include an apt_update resource which should be used to perform this instead. Keep in mind that some users will want to stick with the apt::default recipe as it also installs packages necessary for using https repositories on Debian systems and manages some configuration files.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   include_recipe 'apt::default'
+        #   include_recipe 'apt'
+        #
+        #   ### correct
+        #   apt_update
+        #
+        class IncludingAptDefaultRecipe < Base
+          extend TargetChefVersion
+
+          minimum_target_chef_version '12.7'
+
+          MSG = 'Do not include the Apt default recipe to update package cache. Instead use the apt_update resource, which is built into Chef Infra Client 12.7 and later.'
+          RESTRICT_ON_SEND = [:include_recipe].freeze
+
+          def_node_matcher :apt_recipe_usage?, <<-PATTERN
+            (send nil? :include_recipe (str {"apt" "apt::default"}))
+          PATTERN
+
+          def on_send(node)
+            apt_recipe_usage?(node) do
+              add_offense(node, severity: :refactor)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,70 +1,70 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2019, Chef Software, Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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 Modernize
-        # There have been many different valid community site / Supermarket URLs to use in a cookbook's Berksfile. These old URLs continue to function via redirects, but should be updated to point to the latest Supermarket URL.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   source 'http://community.opscode.com/api/v3'
-        #   source 'https://supermarket.getchef.com'
-        #   source 'https://api.berkshelf.com'
-        #   site :opscode
-        #
-        #   ### correct
-        #   source 'https://supermarket.chef.io'
-        #
-        class LegacyBerksfileSource < Base
-          extend AutoCorrector
-
-          MSG = 'Do not use legacy Berksfile community sources. Use Chef Supermarket instead.'
-          RESTRICT_ON_SEND = [:source, :site].freeze
-
-          def_node_matcher :berksfile_site?, <<-PATTERN
-            (send nil? :site (:sym _))
-          PATTERN
-
-          def_node_matcher :berksfile_source?, <<-PATTERN
-            (send nil? :source (str #old_berkshelf_url?))
-          PATTERN
-
-          def old_berkshelf_url?(url)
-            %w(http://community.opscode.com/api/v3 https://supermarket.getchef.com https://api.berkshelf.com).include?(url)
-          end
-
-          def on_send(node)
-            berksfile_source?(node) do
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.replace(node, "source 'https://supermarket.chef.io'")
-              end
-            end
-
-            berksfile_site?(node) do
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.replace(node, "source 'https://supermarket.chef.io'")
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2019, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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 Modernize
+        # There have been many different valid community site / Supermarket URLs to use in a cookbook's Berksfile. These old URLs continue to function via redirects, but should be updated to point to the latest Supermarket URL.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   source 'http://community.opscode.com/api/v3'
+        #   source 'https://supermarket.getchef.com'
+        #   source 'https://api.berkshelf.com'
+        #   site :opscode
+        #
+        #   ### correct
+        #   source 'https://supermarket.chef.io'
+        #
+        class LegacyBerksfileSource < Base
+          extend AutoCorrector
+
+          MSG = 'Do not use legacy Berksfile community sources. Use Chef Supermarket instead.'
+          RESTRICT_ON_SEND = [:source, :site].freeze
+
+          def_node_matcher :berksfile_site?, <<-PATTERN
+            (send nil? :site (:sym _))
+          PATTERN
+
+          def_node_matcher :berksfile_source?, <<-PATTERN
+            (send nil? :source (str #old_berkshelf_url?))
+          PATTERN
+
+          def old_berkshelf_url?(url)
+            %w(http://community.opscode.com/api/v3 https://supermarket.getchef.com https://api.berkshelf.com).include?(url)
+          end
+
+          def on_send(node)
+            berksfile_source?(node) do
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.replace(node, "source 'https://supermarket.chef.io'")
+              end
+            end
+
+            berksfile_site?(node) do
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.replace(node, "source 'https://supermarket.chef.io'")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,55 +1,55 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2019, Chef Software, Inc.
-# Author:: Tim Smith (<tsmith84@gmail.com>)
-#
-# 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 Modernize
-        # Use the build_essential resource from the build-essential cookbook 5.0+ or Chef Infra Client 14+ instead of using the build-essential::default recipe.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   depends 'build-essential'
-        #   include_recipe 'build-essential::default'
-        #   include_recipe 'build-essential'
-        #
-        #   ### correct
-        #   build_essential 'install compilation tools'
-        #
-        class UseBuildEssentialResource < Base
-          extend AutoCorrector
-
-          MSG = 'Use the build_essential resource instead of the legacy build-essential recipe. This resource ships in the build-essential cookbook v5.0+ and is built into Chef Infra Client 14+'
-          RESTRICT_ON_SEND = [:include_recipe].freeze
-
-          def_node_matcher :build_essential_recipe_usage?, <<-PATTERN
-            (send nil? :include_recipe (str {"build-essential" "build-essential::default"}))
-          PATTERN
-
-          def on_send(node)
-            build_essential_recipe_usage?(node) do
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.replace(node, "build_essential 'install compilation tools'")
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2019, Chef Software, Inc.
+# Author:: Tim Smith (<tsmith84@gmail.com>)
+#
+# 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 Modernize
+        # Use the build_essential resource from the build-essential cookbook 5.0+ or Chef Infra Client 14+ instead of using the build-essential::default recipe.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   depends 'build-essential'
+        #   include_recipe 'build-essential::default'
+        #   include_recipe 'build-essential'
+        #
+        #   ### correct
+        #   build_essential 'install compilation tools'
+        #
+        class UseBuildEssentialResource < Base
+          extend AutoCorrector
+
+          MSG = 'Use the build_essential resource instead of the legacy build-essential recipe. This resource ships in the build-essential cookbook v5.0+ and is built into Chef Infra Client 14+'
+          RESTRICT_ON_SEND = [:include_recipe].freeze
+
+          def_node_matcher :build_essential_recipe_usage?, <<-PATTERN
+            (send nil? :include_recipe (str {"build-essential" "build-essential::default"}))
+          PATTERN
+
+          def on_send(node)
+            build_essential_recipe_usage?(node) do
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.replace(node, "build_essential 'install compilation tools'")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end