cookstyle 7.32.8 → 8.1.1

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

@@ -1,56 +1,56 @@
-# 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 Correctness
-        # The :nothing action is often typo'd as :none
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   service 'foo' do
-        #    action :none
-        #   end
-        #
-        #   ### correct
-        #   service 'foo' do
-        #    action :nothing
-        #   end
-        #
-        class ResourceWithNoneAction < Base
-          include RuboCop::Chef::CookbookHelpers
-          extend AutoCorrector
-
-          MSG = 'Resource uses the nonexistent :none action instead of the :nothing action'
-
-          def on_block(node)
-            match_property_in_resource?(nil, 'action', node) do |action_node|
-              action_node.arguments.each do |action|
-                next unless action.source == ':none'
-                add_offense(action, severity: :refactor) do |corrector|
-                  corrector.replace(action, ':nothing')
-                end
-              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 Correctness
+        # The :nothing action is often typo'd as :none
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   service 'foo' do
+        #    action :none
+        #   end
+        #
+        #   ### correct
+        #   service 'foo' do
+        #    action :nothing
+        #   end
+        #
+        class ResourceWithNoneAction < Base
+          include RuboCop::Chef::CookbookHelpers
+          extend AutoCorrector
+
+          MSG = 'Resource uses the nonexistent :none action instead of the :nothing action'
+
+          def on_block(node)
+            match_property_in_resource?(nil, 'action', node) do |action_node|
+              action_node.arguments.each do |action|
+                next unless action.source == ':none'
+                add_offense(action, severity: :refactor) do |corrector|
+                  corrector.replace(action, ':nothing')
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,52 +1,52 @@
-# frozen_string_literal: true
-#
-# Copyright:: 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 Correctness
-        # Scope file exist to access the correct `File` class by using `::File.exist?` not `File.exist?`.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   not_if { File.exist?('/etc/foo/bar') }
-        #
-        #   ### correct
-        #   not_if { ::File.exist?('/etc/foo/bar') }
-        #
-        class ScopedFileExist < Base
-          extend AutoCorrector
-
-          MSG = 'Scope file exist to access the correct File class by using ::File.exist? not File.exist?.'
-
-          def_node_matcher :unscoped_file_exist?, <<-PATTERN
-          (block (send nil? {:not_if :only_if}) (args) (send $(const nil? :File) {:exist? :exists?} (...)))
-          PATTERN
-
-          def on_block(node)
-            unscoped_file_exist?(node) do |m|
-              add_offense(m, severity: :refactor) do |corrector|
-                corrector.replace(m, '::File')
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 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 Correctness
+        # Scope file exist to access the correct `File` class by using `::File.exist?` not `File.exist?`.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   not_if { File.exist?('/etc/foo/bar') }
+        #
+        #   ### correct
+        #   not_if { ::File.exist?('/etc/foo/bar') }
+        #
+        class ScopedFileExist < Base
+          extend AutoCorrector
+
+          MSG = 'Scope file exist to access the correct File class by using ::File.exist? not File.exist?.'
+
+          def_node_matcher :unscoped_file_exist?, <<-PATTERN
+          (block (send nil? {:not_if :only_if}) (args) (send $(const nil? :File) {:exist? :exists?} (...)))
+          PATTERN
+
+          def on_block(node)
+            unscoped_file_exist?(node) do |m|
+              add_offense(m, severity: :refactor) do |corrector|
+                corrector.replace(m, '::File')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,56 +1,56 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2016, Chris Henry
-#
-# 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 Correctness
-        # Use a service resource to start and stop services
-        #
-        # @example when command starts a service
-        #
-        #   ### incorrect
-        #   command "/etc/init.d/mysql start"
-        #   command "/sbin/service/memcached start"
-        #
-        class ServiceResource < Base
-          MSG = 'Use a service resource to start and stop services'
-          RESTRICT_ON_SEND = [:command].freeze
-
-          def_node_matcher :execute_command?, <<-PATTERN
-            (send nil? :command $str)
-          PATTERN
-
-          def on_send(node)
-            execute_command?(node) do |command|
-              if starts_service?(command)
-                add_offense(command, severity: :refactor)
-              end
-            end
-          end
-
-          def starts_service?(cmd)
-            cmd_str = cmd.to_s
-            (cmd_str.include?('/etc/init.d') || ['service ', '/sbin/service ',
-                                                 'start ', 'stop ', 'invoke-rc.d '].any? do |service_cmd|
-               cmd_str.start_with?(service_cmd)
-             end) && %w(start stop restart reload).any? { |a| cmd_str.include?(a) }
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2016, Chris Henry
+#
+# 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 Correctness
+        # Use a service resource to start and stop services
+        #
+        # @example when command starts a service
+        #
+        #   ### incorrect
+        #   command "/etc/init.d/mysql start"
+        #   command "/sbin/service/memcached start"
+        #
+        class ServiceResource < Base
+          MSG = 'Use a service resource to start and stop services'
+          RESTRICT_ON_SEND = [:command].freeze
+
+          def_node_matcher :execute_command?, <<-PATTERN
+            (send nil? :command $str)
+          PATTERN
+
+          def on_send(node)
+            execute_command?(node) do |command|
+              if starts_service?(command)
+                add_offense(command, severity: :refactor)
+              end
+            end
+          end
+
+          def starts_service?(cmd)
+            cmd_str = cmd.to_s
+            (cmd_str.include?('/etc/init.d') || ['service ', '/sbin/service ',
+                                                 'start ', 'stop ', 'invoke-rc.d '].any? do |service_cmd|
+               cmd_str.start_with?(service_cmd)
+             end) && %w(start stop restart reload).any? { |a| cmd_str.include?(a) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/correctness/supports_must_be_float.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 Correctness
-        # Versions used in metadata.rb supports calls should be floats not integers.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   supports 'redhat', '> 8'
-        #
-        #   ### correct
-        #   supports 'redhat', '> 8.0'
-        #
-        class SupportsMustBeFloat < Base
-          extend RuboCop::Cop::AutoCorrector
-
-          MSG = 'Versions used in metadata.rb supports calls should be floats not integers.'
-          RESTRICT_ON_SEND = [:supports].freeze
-
-          def_node_matcher :supports_with_constraint?, '(send nil? :supports str $str)'
-
-          def on_send(node)
-            supports_with_constraint?(node) do |ver|
-              return if ver.source.include?('.')
-              add_offense(ver, severity: :refactor) do |corrector|
-                corrector.replace(ver, ver.source.gsub(ver.value, (ver.value + '.0')))
-              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 Correctness
+        # Versions used in metadata.rb supports calls should be floats not integers.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   supports 'redhat', '> 8'
+        #
+        #   ### correct
+        #   supports 'redhat', '> 8.0'
+        #
+        class SupportsMustBeFloat < Base
+          extend RuboCop::Cop::AutoCorrector
+
+          MSG = 'Versions used in metadata.rb supports calls should be floats not integers.'
+          RESTRICT_ON_SEND = [:supports].freeze
+
+          def_node_matcher :supports_with_constraint?, '(send nil? :supports str $str)'
+
+          def on_send(node)
+            supports_with_constraint?(node) do |ver|
+              return if ver.source.include?('.')
+              add_offense(ver, severity: :refactor) do |corrector|
+                corrector.replace(ver, ver.source.gsub(ver.value, ver.value + '.0'))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,59 +1,59 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2016, Chris Henry
-#
-# 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 Correctness
-        # Use file_cache_path rather than hard-coding system temp paths
-        #
-        # @example downloading a large file into /tmp/
-        #
-        #   ### incorrect
-        #   remote_file '/tmp/large-file.tar.gz' do
-        #
-        #   ### correct
-        #   remote_file "#{Chef::Config[:file_cache_path]}/large-file.tar.gz" do
-        #
-        class TmpPath < Base
-          MSG = 'Use file_cache_path rather than hard-coding tmp paths'
-          RESTRICT_ON_SEND = [:remote_file].freeze
-
-          def_node_matcher :remote_file?, <<-PATTERN
-            (send nil? :remote_file $str)
-          PATTERN
-
-          def on_send(node)
-            remote_file?(node) do |command|
-              return unless hardcoded_tmp?(command) && !file_cache_path?(command)
-              add_offense(command, severity: :refactor)
-            end
-          end
-
-          def hardcoded_tmp?(path)
-            path_str = path.to_s.scan(/"(.*)"/)[0][0]
-            path_str.start_with?('/tmp/')
-          end
-
-          def file_cache_path?(path)
-            path_str = path.to_s.scan(/"(.*)"/)[0][0]
-            path_str.start_with?("\#\{Chef::Config[:file_cache_path]\}")
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2016, Chris Henry
+#
+# 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 Correctness
+        # Use file_cache_path rather than hard-coding system temp paths
+        #
+        # @example downloading a large file into /tmp/
+        #
+        #   ### incorrect
+        #   remote_file '/tmp/large-file.tar.gz' do
+        #
+        #   ### correct
+        #   remote_file "#{Chef::Config[:file_cache_path]}/large-file.tar.gz" do
+        #
+        class TmpPath < Base
+          MSG = 'Use file_cache_path rather than hard-coding tmp paths'
+          RESTRICT_ON_SEND = [:remote_file].freeze
+
+          def_node_matcher :remote_file?, <<-PATTERN
+            (send nil? :remote_file $str)
+          PATTERN
+
+          def on_send(node)
+            remote_file?(node) do |command|
+              return unless hardcoded_tmp?(command) && !file_cache_path?(command)
+              add_offense(command, severity: :refactor)
+            end
+          end
+
+          def hardcoded_tmp?(path)
+            path_str = path.to_s.scan(/"(.*)"/)[0][0]
+            path_str.start_with?('/tmp/')
+          end
+
+          def file_cache_path?(path)
+            path_str = path.to_s.scan(/"(.*)"/)[0][0]
+            path_str.start_with?("\#{Chef::Config[:file_cache_path]}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/deprecation/cb_depends_on_self.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
-        # Make sure a cookbook doesn't depend on itself. This will fail on Chef Infra Client 13+
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   name 'foo'
-        #   depends 'foo'
-        #
-        #   ### correct
-        #   name 'foo'
-        #
-        class CookbooksDependsOnSelf < Base
-          extend AutoCorrector
-          include RangeHelp
-
-          MSG = 'A cookbook cannot depend on itself. This will fail on Chef Infra Client 13+'
-          RESTRICT_ON_SEND = [:name].freeze
-
-          def_node_search :dependencies, '(send nil? :depends str ...)'
-          def_node_matcher :cb_name?, '(send nil? :name str ...)'
-
-          def on_send(node)
-            cb_name?(node) do
-              dependencies(processed_source.ast).each do |dep|
-                next unless dep.arguments == node.arguments
-                add_offense(dep, severity: :refactor) do |corrector|
-                  corrector.remove(range_with_surrounding_space(range: dep.loc.expression, side: :left))
-                end
-              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
+        # Make sure a cookbook doesn't depend on itself. This will fail on Chef Infra Client 13+
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   name 'foo'
+        #   depends 'foo'
+        #
+        #   ### correct
+        #   name 'foo'
+        #
+        class CookbooksDependsOnSelf < Base
+          extend AutoCorrector
+          include RangeHelp
+
+          MSG = 'A cookbook cannot depend on itself. This will fail on Chef Infra Client 13+'
+          RESTRICT_ON_SEND = [:name].freeze
+
+          def_node_search :dependencies, '(send nil? :depends str ...)'
+          def_node_matcher :cb_name?, '(send nil? :name str ...)'
+
+          def on_send(node)
+            cb_name?(node) do
+              dependencies(processed_source.ast).each do |dep|
+                next unless dep.arguments == node.arguments
+                add_offense(dep, severity: :refactor) do |corrector|
+                  corrector.remove(range_with_surrounding_space(range: dep.loc.expression, side: :left))
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end