cookstyle 7.32.8 → 8.1.1

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

@@ -1,52 +1,52 @@
-# 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 Deprecations
-        # There is no need to include the empty and deprecated chef_handler::default recipe to use the chef_handler resource
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   include_recipe 'chef_handler'
-        #   include_recipe 'chef_handler::default'
-        #
-        class ChefHandlerRecipe < Base
-          include RangeHelp
-          extend AutoCorrector
-
-          MSG = 'There is no need to include the empty and deprecated chef_handler::default recipe to use the chef_handler resource'
-          RESTRICT_ON_SEND = [:include_recipe].freeze
-
-          def_node_matcher :chef_handler_recipe?, <<-PATTERN
-            (send nil? :include_recipe (str {"chef_handler" "chef_handler::default"}))
-          PATTERN
-
-          def on_send(node)
-            chef_handler_recipe?(node) do
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
-              end
-            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 Deprecations
+        # There is no need to include the empty and deprecated chef_handler::default recipe to use the chef_handler resource
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   include_recipe 'chef_handler'
+        #   include_recipe 'chef_handler::default'
+        #
+        class ChefHandlerRecipe < Base
+          include RangeHelp
+          extend AutoCorrector
+
+          MSG = 'There is no need to include the empty and deprecated chef_handler::default recipe to use the chef_handler resource'
+          RESTRICT_ON_SEND = [:include_recipe].freeze
+
+          def_node_matcher :chef_handler_recipe?, <<-PATTERN
+            (send nil? :include_recipe (str {"chef_handler" "chef_handler::default"}))
+          PATTERN
+
+          def on_send(node)
+            chef_handler_recipe?(node) do
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,55 +1,55 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2019-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 Deprecations
-        # Use the type `property` instead of the deprecated `supports` property in the `chef_handler` resource. The `supports` property was removed in `chef_handler` cookbook version 3.0 (June 2017) and Chef Infra Client 14.0.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   chef_handler 'whatever' do
-        #     supports start: true, report: true, exception: true
-        #   end0
-        #
-        #   ### correct
-        #   chef_handler 'whatever' do
-        #     type start: true, report: true, exception: true
-        #   end
-        #
-        class ChefHandlerUsesSupports < Base
-          include RuboCop::Chef::CookbookHelpers
-          extend AutoCorrector
-
-          MSG = 'Use the type property instead of the deprecated supports property in the chef_handler resource. The supports property was removed in chef_handler cookbook version 3.0 (June 2017) and Chef Infra Client 14.0.'
-
-          def on_block(node)
-            match_property_in_resource?(:chef_handler, 'supports', node) do |prop_node|
-              add_offense(prop_node, severity: :warning) do |corrector|
-                # make sure to delete leading and trailing {}s that would create invalid ruby syntax
-                extracted_val = prop_node.arguments.first.source.gsub(/{|}/, '')
-                corrector.replace(prop_node, "type #{extracted_val}")
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2019-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 Deprecations
+        # Use the type `property` instead of the deprecated `supports` property in the `chef_handler` resource. The `supports` property was removed in `chef_handler` cookbook version 3.0 (June 2017) and Chef Infra Client 14.0.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   chef_handler 'whatever' do
+        #     supports start: true, report: true, exception: true
+        #   end0
+        #
+        #   ### correct
+        #   chef_handler 'whatever' do
+        #     type start: true, report: true, exception: true
+        #   end
+        #
+        class ChefHandlerUsesSupports < Base
+          include RuboCop::Chef::CookbookHelpers
+          extend AutoCorrector
+
+          MSG = 'Use the type property instead of the deprecated supports property in the chef_handler resource. The supports property was removed in chef_handler cookbook version 3.0 (June 2017) and Chef Infra Client 14.0.'
+
+          def on_block(node)
+            match_property_in_resource?(:chef_handler, 'supports', node) do |prop_node|
+              add_offense(prop_node, severity: :warning) do |corrector|
+                # make sure to delete leading and trailing {}s that would create invalid ruby syntax
+                extracted_val = prop_node.arguments.first.source.gsub(/{|}/, '')
+                corrector.replace(prop_node, "type #{extracted_val}")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,57 +1,57 @@
-# 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 Deprecations
-        # The `Chef::REST` class was removed in Chef Infra Client 13.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   require 'chef/rest'
-        #   Chef::REST::RESTRequest.new(:GET, FOO, nil).call
-        #
-        class UsesChefRESTHelpers < Base
-          MSG = "Don't use the helpers in Chef::REST which were removed in Chef Infra Client 13"
-          RESTRICT_ON_SEND = [:require].freeze
-
-          def_node_matcher :require_rest?, <<-PATTERN
-          (send nil? :require ( str "chef/rest"))
-          PATTERN
-
-          def_node_matcher :rest_const?, <<-PATTERN
-          (const (const nil? :Chef) :REST)
-          PATTERN
-
-          def on_send(node)
-            require_rest?(node) do
-              add_offense(node, severity: :warning)
-            end
-          end
-
-          def on_const(node)
-            rest_const?(node) do
-              add_offense(node, severity: :warning)
-            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 Deprecations
+        # The `Chef::REST` class was removed in Chef Infra Client 13.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   require 'chef/rest'
+        #   Chef::REST::RESTRequest.new(:GET, FOO, nil).call
+        #
+        class UsesChefRESTHelpers < Base
+          MSG = "Don't use the helpers in Chef::REST which were removed in Chef Infra Client 13"
+          RESTRICT_ON_SEND = [:require].freeze
+
+          def_node_matcher :require_rest?, <<-PATTERN
+          (send nil? :require ( str "chef/rest"))
+          PATTERN
+
+          def_node_matcher :rest_const?, <<-PATTERN
+          (const (const nil? :Chef) :REST)
+          PATTERN
+
+          def on_send(node)
+            require_rest?(node) do
+              add_offense(node, severity: :warning)
+            end
+          end
+
+          def on_const(node)
+            rest_const?(node) do
+              add_offense(node, severity: :warning)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,98 +1,98 @@
-# 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 Deprecations
-        # Use `delete_resource` or `edit_resource` helpers introduced in Chef Infra Client 12.10 instead of functionality in the deprecated `chef-rewind` gem
-        #
-        # @example
-        #
-        #   chef_gem 'chef-rewind'
-        #
-        #   require 'chef/rewind'
-        #
-        #   rewind "user[postgres]" do
-        #     home '/var/lib/pgsql/9.2'
-        #     cookbook 'my-postgresql'
-        #   end
-        #
-        #   unwind "user[postgres]"
-        #
-        class ChefRewind < Base
-          include RuboCop::Chef::CookbookHelpers
-          include RangeHelp
-          extend TargetChefVersion
-          extend AutoCorrector
-
-          minimum_target_chef_version '12.10'
-
-          MAPPING = {
-            rewind: 'edit_resource',
-            unwind: 'delete_resource',
-          }.freeze
-
-          MSG = 'Use delete_resource or edit_resource helpers introduced in Chef Infra Client 12.10 instead of functionality in the deprecated chef-rewind gem'
-          RESTRICT_ON_SEND = [:chef_gem, :require, :rewind, :unwind].freeze
-
-          def_node_matcher :rewind_gem_install?, <<-PATTERN
-            (send nil? :chef_gem (str "chef-rewind"))
-          PATTERN
-
-          def_node_matcher :require_rewind?, <<-PATTERN
-            (send nil? :require (str "chef/rewind"))
-          PATTERN
-
-          def_node_matcher :rewind_resources?, <<-PATTERN
-            (send nil? ${:rewind :unwind} ... )
-          PATTERN
-
-          def on_send(node)
-            rewind_gem_install?(node) do
-              add_offense(node, severity: :warning) do |corrector|
-                node = node.parent if node.parent&.block_type? # make sure we get the whole block not just the method in the block
-                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
-              end
-            end
-
-            require_rewind?(node) do
-              add_offense(node, severity: :warning) do |corrector|
-                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
-              end
-            end
-
-            rewind_resources?(node) do |string|
-              add_offense(node, severity: :warning) do |corrector|
-                corrector.replace(node, node.source.gsub(string.to_s, MAPPING[string]))
-              end
-            end
-          end
-
-          def on_block(node)
-            match_property_in_resource?(:chef_gem, 'package_name', node) do |pkg_name|
-              next unless pkg_name.arguments&.first&.str_content == 'chef-rewind'
-              add_offense(node, severity: :warning) do |corrector|
-                corrector.remove(node) if pkg_name.arguments&.first&.str_content == 'chef-rewind'
-              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 Deprecations
+        # Use `delete_resource` or `edit_resource` helpers introduced in Chef Infra Client 12.10 instead of functionality in the deprecated `chef-rewind` gem
+        #
+        # @example
+        #
+        #   chef_gem 'chef-rewind'
+        #
+        #   require 'chef/rewind'
+        #
+        #   rewind "user[postgres]" do
+        #     home '/var/lib/pgsql/9.2'
+        #     cookbook 'my-postgresql'
+        #   end
+        #
+        #   unwind "user[postgres]"
+        #
+        class ChefRewind < Base
+          include RuboCop::Chef::CookbookHelpers
+          include RangeHelp
+          extend TargetChefVersion
+          extend AutoCorrector
+
+          minimum_target_chef_version '12.10'
+
+          MAPPING = {
+            rewind: 'edit_resource',
+            unwind: 'delete_resource',
+          }.freeze
+
+          MSG = 'Use delete_resource or edit_resource helpers introduced in Chef Infra Client 12.10 instead of functionality in the deprecated chef-rewind gem'
+          RESTRICT_ON_SEND = [:chef_gem, :require, :rewind, :unwind].freeze
+
+          def_node_matcher :rewind_gem_install?, <<-PATTERN
+            (send nil? :chef_gem (str "chef-rewind"))
+          PATTERN
+
+          def_node_matcher :require_rewind?, <<-PATTERN
+            (send nil? :require (str "chef/rewind"))
+          PATTERN
+
+          def_node_matcher :rewind_resources?, <<-PATTERN
+            (send nil? ${:rewind :unwind} ... )
+          PATTERN
+
+          def on_send(node)
+            rewind_gem_install?(node) do
+              add_offense(node, severity: :warning) do |corrector|
+                node = node.parent if node.parent&.block_type? # make sure we get the whole block not just the method in the block
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
+            end
+
+            require_rewind?(node) do
+              add_offense(node, severity: :warning) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
+            end
+
+            rewind_resources?(node) do |string|
+              add_offense(node, severity: :warning) do |corrector|
+                corrector.replace(node, node.source.gsub(string.to_s, MAPPING[string]))
+              end
+            end
+          end
+
+          def on_block(node)
+            match_property_in_resource?(:chef_gem, 'package_name', node) do |pkg_name|
+              next unless pkg_name.arguments&.first&.str_content == 'chef-rewind'
+              add_offense(node, severity: :warning) do |corrector|
+                corrector.remove(node) if pkg_name.arguments&.first&.str_content == 'chef-rewind'
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end