cookstyle 7.32.8 → 8.1.1

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

@@ -1,63 +1,63 @@
-# 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 resource name can now be specified using the `resource_name` helper instead of using the @resource_name variable in the resource provider 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
-        #     @resource_name = :foo
-        #   end
-        #
-        #  ### correct
-        #  resource_name :create
-
-        class ResourceNameFromInitialize < Base
-          extend AutoCorrector
-          include RangeHelp
-
-          MSG = 'The name of a resource can be set with the "resource_name" 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.node_parts.empty? && x.node_parts.first == :@resource_name
-
-              add_offense(x, severity: :refactor) do |corrector|
-                # insert the new resource_name call above the initialize method
-                initialize_node = initialize_method(processed_source.ast).first
-                corrector.insert_before(initialize_node.source_range, "resource_name #{x.descendants.first.source}\n\n")
-                # 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 :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 resource name can now be specified using the `resource_name` helper instead of using the @resource_name variable in the resource provider 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
+        #     @resource_name = :foo
+        #   end
+        #
+        #  ### correct
+        #  resource_name :create
+
+        class ResourceNameFromInitialize < Base
+          extend AutoCorrector
+          include RangeHelp
+
+          MSG = 'The name of a resource can be set with the "resource_name" 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.node_parts.empty? && x.node_parts.first == :@resource_name
+
+              add_offense(x, severity: :refactor) do |corrector|
+                # insert the new resource_name call above the initialize method
+                initialize_node = initialize_method(processed_source.ast).first
+                corrector.insert_before(initialize_node.source_range, "resource_name #{x.descendants.first.source}\n\n")
+                # 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 :initialize_method, '(def :initialize ... )'
+        end
+      end
+    end
+  end
+end

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

@@ -1,49 +1,49 @@
-# 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
-        # set_or_return within a method should not be used to define property in a resource. Instead use the property method which properly validates and defines properties in a way that works with reporting and documentation functionality in Chef Infra Client
-        #
-        # @example
-        #
-        #   ### incorrect
-        #    def severity(arg = nil)
-        #      set_or_return(
-        #        :severity, arg,
-        #        :kind_of => String,
-        #        :default => nil
-        #      )
-        #    end
-        #
-        #   ### correct
-        #   property :severity, String
-        #
-        class SetOrReturnInResources < Base
-          MSG = 'Do not use set_or_return within a method to define a property for a resource. Use the property method instead, which supports validation, reporting, and documentation functionality'
-          RESTRICT_ON_SEND = [:set_or_return].freeze
-
-          def on_send(node)
-            add_offense(node, severity: :refactor)
-          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
+        # set_or_return within a method should not be used to define property in a resource. Instead use the property method which properly validates and defines properties in a way that works with reporting and documentation functionality in Chef Infra Client
+        #
+        # @example
+        #
+        #   ### incorrect
+        #    def severity(arg = nil)
+        #      set_or_return(
+        #        :severity, arg,
+        #        :kind_of => String,
+        #        :default => nil
+        #      )
+        #    end
+        #
+        #   ### correct
+        #   property :severity, String
+        #
+        class SetOrReturnInResources < Base
+          MSG = 'Do not use set_or_return within a method to define a property for a resource. Use the property method instead, which supports validation, reporting, and documentation functionality'
+          RESTRICT_ON_SEND = [:set_or_return].freeze
+
+          def on_send(node)
+            add_offense(node, severity: :refactor)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,66 +1,66 @@
-# 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
-        # In HWRPs and LWRPs you defined attributes, but custom resources changed the name to be properties to avoid confusion with chef recipe attributes. When writing a custom resource they should be called properties even though the two are aliased.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   attribute :something, String
-        #
-        #   action :create do
-        #     # some action code because we're in a custom resource
-        #   end
-        #
-        #   ### correct
-        #   property :something, String
-        #
-        #   action :create do
-        #     # some action code because we're in a custom resource
-        #   end
-        #
-        class CustomResourceWithAttributes < Base
-          extend AutoCorrector
-
-          MSG = 'Custom Resources should contain properties not attributes'
-          RESTRICT_ON_SEND = [:attribute].freeze
-
-          def_node_matcher :attribute?, <<-PATTERN
-            (send nil? $:attribute ... )
-          PATTERN
-
-          def_node_search :resource_actions?, <<-PATTERN
-            (block (send nil? :action ... ) ... )
-          PATTERN
-
-          def on_send(node)
-            return unless resource_actions?(processed_source.ast)
-            attribute?(node) do
-              add_offense(node.loc.selector, severity: :refactor) do |corrector|
-                corrector.replace(node.loc.selector, 'property')
-              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
+        # In HWRPs and LWRPs you defined attributes, but custom resources changed the name to be properties to avoid confusion with chef recipe attributes. When writing a custom resource they should be called properties even though the two are aliased.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   attribute :something, String
+        #
+        #   action :create do
+        #     # some action code because we're in a custom resource
+        #   end
+        #
+        #   ### correct
+        #   property :something, String
+        #
+        #   action :create do
+        #     # some action code because we're in a custom resource
+        #   end
+        #
+        class CustomResourceWithAttributes < Base
+          extend AutoCorrector
+
+          MSG = 'Custom Resources should contain properties not attributes'
+          RESTRICT_ON_SEND = [:attribute].freeze
+
+          def_node_matcher :attribute?, <<-PATTERN
+            (send nil? $:attribute ... )
+          PATTERN
+
+          def_node_search :resource_actions?, <<-PATTERN
+            (block (send nil? :action ... ) ... )
+          PATTERN
+
+          def on_send(node)
+            return unless resource_actions?(processed_source.ast)
+            attribute?(node) do
+              add_offense(node.loc.selector, severity: :refactor) do |corrector|
+                corrector.replace(node.loc.selector, 'property')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,94 +1,94 @@
-# 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
-        # There is no need to check if the chef_gem resource supports compile_time as Chef Infra Client 12.1 and later support the compile_time property.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   chef_gem 'ultradns-sdk' do
-        #     compile_time true if Chef::Resource::ChefGem.method_defined?(:compile_time)
-        #     action :nothing
-        #   end
-        #
-        #   chef_gem 'ultradns-sdk' do
-        #     compile_time true if Chef::Resource::ChefGem.instance_methods(false).include?(:compile_time)
-        #     action :nothing
-        #   end
-        #
-        #   chef_gem 'ultradns-sdk' do
-        #     compile_time true if respond_to?(:compile_time)
-        #     action :nothing
-        #   end
-        #
-        #   ### correct
-        #   chef_gem 'ultradns-sdk' do
-        #     compile_time true
-        #     action :nothing
-        #   end
-        #
-        class RespondToCompileTime < Base
-          include RuboCop::Chef::CookbookHelpers
-          extend TargetChefVersion
-          extend AutoCorrector
-
-          minimum_target_chef_version '12.1'
-
-          MSG = 'There is no need to check if the chef_gem resource supports compile_time as Chef Infra Client 12.1 and later support the compile_time property.'
-
-          def_node_matcher :compile_time_method_defined?, <<-PATTERN
-          (if
-            {
-              (send
-              (const
-                (const
-                  (const nil? :Chef) :Resource) :ChefGem) :method_defined?
-              (sym :compile_time))
-
-              (send
-                (send
-                  (const
-                    (const
-                      (const nil? :Chef) :Resource) :ChefGem) :instance_methods
-                  (false)) :include?
-                (sym :compile_time))
-
-              (send nil? :respond_to?
-                (sym :compile_time))
-            }
-            (send nil? :compile_time
-              $(_)) nil?)
-          PATTERN
-
-          def on_block(node)
-            match_property_in_resource?(:chef_gem, 'compile_time', node) do |compile_time_property|
-              compile_time_method_defined?(compile_time_property.parent) do |val|
-                add_offense(compile_time_property.parent, severity: :refactor) do |corrector|
-                  corrector.replace(compile_time_property.parent, "compile_time #{val.source}")
-                end
-              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 Modernize
+        # There is no need to check if the chef_gem resource supports compile_time as Chef Infra Client 12.1 and later support the compile_time property.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   chef_gem 'ultradns-sdk' do
+        #     compile_time true if Chef::Resource::ChefGem.method_defined?(:compile_time)
+        #     action :nothing
+        #   end
+        #
+        #   chef_gem 'ultradns-sdk' do
+        #     compile_time true if Chef::Resource::ChefGem.instance_methods(false).include?(:compile_time)
+        #     action :nothing
+        #   end
+        #
+        #   chef_gem 'ultradns-sdk' do
+        #     compile_time true if respond_to?(:compile_time)
+        #     action :nothing
+        #   end
+        #
+        #   ### correct
+        #   chef_gem 'ultradns-sdk' do
+        #     compile_time true
+        #     action :nothing
+        #   end
+        #
+        class RespondToCompileTime < Base
+          include RuboCop::Chef::CookbookHelpers
+          extend TargetChefVersion
+          extend AutoCorrector
+
+          minimum_target_chef_version '12.1'
+
+          MSG = 'There is no need to check if the chef_gem resource supports compile_time as Chef Infra Client 12.1 and later support the compile_time property.'
+
+          def_node_matcher :compile_time_method_defined?, <<-PATTERN
+          (if
+            {
+              (send
+              (const
+                (const
+                  (const nil? :Chef) :Resource) :ChefGem) :method_defined?
+              (sym :compile_time))
+
+              (send
+                (send
+                  (const
+                    (const
+                      (const nil? :Chef) :Resource) :ChefGem) :instance_methods
+                  (false)) :include?
+                (sym :compile_time))
+
+              (send nil? :respond_to?
+                (sym :compile_time))
+            }
+            (send nil? :compile_time
+              $(_)) nil?)
+          PATTERN
+
+          def on_block(node)
+            match_property_in_resource?(:chef_gem, 'compile_time', node) do |compile_time_property|
+              compile_time_method_defined?(compile_time_property.parent) do |val|
+                add_offense(compile_time_property.parent, severity: :refactor) do |corrector|
+                  corrector.replace(compile_time_property.parent, "compile_time #{val.source}")
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end