cookstyle 8.6.4 → 8.7.6

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

@@ -1,69 +1,69 @@
-# 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
-        # Don't use Ruby to shellout in an `only_if` / `not_if` conditional. Any string value used in an `only_if` / `not_if` is executed in your system's shell and the return code of the command is the result for the `not_if` / `only_if` determination.
-        #
-        # @example
-        #
-        #   # bad
-        #   cookbook_file '/logs/foo/error.log' do
-        #     source 'error.log'
-        #     only_if { system('wget https://www.bar.com/foobar.txt -O /dev/null') }
-        #   end
-        #
-        #   cookbook_file '/logs/foo/error.log' do
-        #     source 'error.log'
-        #     only_if { shell_out('wget https://www.bar.com/foobar.txt -O /dev/null').exitstatus == 0 }
-        #   end
-        #
-        #   # good
-        #   cookbook_file '/logs/foo/error.log' do
-        #     source 'error.log'
-        #     only_if 'wget https://www.bar.com/foobar.txt -O /dev/null'
-        #   end
-        #
-        class ConditionalRubyShellout < Base
-          extend AutoCorrector
-          include RuboCop::Chef::CookbookHelpers
-
-          MSG = "Don't use Ruby to shellout in an only_if / not_if conditional when you can shellout directly by wrapping the command in quotes."
-
-          def_node_matcher :conditional_shellout?, <<-PATTERN
-          (block
-            (send nil? ${:only_if :not_if})
-            (args)
-            {(send nil? :system $(str ...))
-             (send (send (send nil? :shell_out $(str ...)) :exitstatus) :== (int 0))
-              })
-          PATTERN
-
-          def on_block(node)
-            conditional_shellout?(node) do |type, val|
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.replace(node, "#{type} #{val.source}")
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) 2016-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# 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
+        # Don't use Ruby to shellout in an `only_if` / `not_if` conditional. Any string value used in an `only_if` / `not_if` is executed in your system's shell and the return code of the command is the result for the `not_if` / `only_if` determination.
+        #
+        # @example
+        #
+        #   # bad
+        #   cookbook_file '/logs/foo/error.log' do
+        #     source 'error.log'
+        #     only_if { system('wget https://www.bar.com/foobar.txt -O /dev/null') }
+        #   end
+        #
+        #   cookbook_file '/logs/foo/error.log' do
+        #     source 'error.log'
+        #     only_if { shell_out('wget https://www.bar.com/foobar.txt -O /dev/null').exitstatus == 0 }
+        #   end
+        #
+        #   # good
+        #   cookbook_file '/logs/foo/error.log' do
+        #     source 'error.log'
+        #     only_if 'wget https://www.bar.com/foobar.txt -O /dev/null'
+        #   end
+        #
+        class ConditionalRubyShellout < Base
+          extend AutoCorrector
+          include RuboCop::Chef::CookbookHelpers
+
+          MSG = "Don't use Ruby to shellout in an only_if / not_if conditional when you can shellout directly by wrapping the command in quotes."
+
+          def_node_matcher :conditional_shellout?, <<-PATTERN
+          (block
+            (send nil? ${:only_if :not_if})
+            (args)
+            {(send nil? :system $(str ...))
+             (send (send (send nil? :shell_out $(str ...)) :exitstatus) :== (int 0))
+              })
+          PATTERN
+
+          def on_block(node)
+            conditional_shellout?(node) do |type, val|
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.replace(node, "#{type} #{val.source}")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,55 +1,55 @@
-# frozen_string_literal: true
-#
-# Copyright:: 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 Correctness
-        # The `dnf_package` resource does not support the `allow_downgrades` property.
-        #
-        # @example
-        #
-        #   # bad
-        #   dnf_package 'nginx' do
-        #     version '1.2.3'
-        #     allow_downgrades true
-        #   end
-        #
-        #   # good
-        #   dnf_package 'nginx' do
-        #     version '1.2.3'
-        #   end
-        #
-        class DnfPackageAllowDowngrades < Base
-          include RangeHelp
-          include RuboCop::Chef::CookbookHelpers
-          extend AutoCorrector
-
-          MSG = 'dnf_package does not support the allow_downgrades property'
-
-          def on_block(node)
-            match_property_in_resource?(:dnf_package, :allow_downgrades, node) do |prop|
-              add_offense(prop, severity: :refactor) do |corrector|
-                corrector.remove(range_with_surrounding_space(range: prop.loc.expression, side: :left))
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) 2016-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# 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 `dnf_package` resource does not support the `allow_downgrades` property.
+        #
+        # @example
+        #
+        #   # bad
+        #   dnf_package 'nginx' do
+        #     version '1.2.3'
+        #     allow_downgrades true
+        #   end
+        #
+        #   # good
+        #   dnf_package 'nginx' do
+        #     version '1.2.3'
+        #   end
+        #
+        class DnfPackageAllowDowngrades < Base
+          include RangeHelp
+          include RuboCop::Chef::CookbookHelpers
+          extend AutoCorrector
+
+          MSG = 'dnf_package does not support the allow_downgrades property'
+
+          def on_block(node)
+            match_property_in_resource?(:dnf_package, :allow_downgrades, node) do |prop|
+              add_offense(prop, severity: :refactor) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: prop.loc.expression, side: :left))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,104 +1,104 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2024, Chef Software Inc.
-# Author:: Sumedha (<https://github.com/sumedha-lolur>)
-#
-# 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
-        # Resource guards (not_if/only_if) should not be empty strings as empty strings will always evaluate to true.
-        # This will cause confusion in your cookbooks as the guard will always pass.
-        #
-        # Empty strings in Ruby are "truthy", which means:
-        # - `only_if ''` will ALWAYS execute the resource (guard always passes)
-        # - `not_if ''` will NEVER execute the resource (guard always blocks)
-        #
-        # This behavior is usually unintended and can lead to resources running when they shouldn't
-        # or never running when they should.
-        #
-        # @example
-        #
-        #   # bad
-        #   template '/etc/foo' do
-        #     mode '0644'
-        #     source 'foo.erb'
-        #     only_if ''  # This will always be true - resource always executes
-        #   end
-        #
-        #   cookbook_file '/logs/foo/error.log' do
-        #     source 'error.log'
-        #     not_if { '' }  # This will always be true - resource never executes
-        #   end
-        #
-        #   service 'apache2' do
-        #     action :restart
-        #     only_if { '' }  # Block form also problematic
-        #   end
-        #
-        #   # good
-        #   template '/etc/foo' do
-        #     mode '0644'
-        #     source 'foo.erb'
-        #     only_if 'test -f /etc/foo'  # Actual shell command
-        #   end
-        #
-        #   cookbook_file '/logs/foo/error.log' do
-        #     source 'error.log'
-        #     not_if { ::File.exist?('/logs/foo/error.log') }  # Proper Ruby expression
-        #   end
-        #
-        #   service 'apache2' do
-        #     action :restart
-        #     only_if { node['platform'] == 'ubuntu' }  # Meaningful condition
-        #   end
-        #
-        #   # Or simply remove the guard if no condition is needed
-        #   package 'curl' do
-        #     action :install
-        #   end
-        #
-        class EmptyResourceGuard < Base
-          MSG = 'Resource guards (not_if/only_if) should not be empty strings as empty strings will always evaluate to true.'
-          RESTRICT_ON_SEND = [:not_if, :only_if].freeze
-
-          def_node_matcher :empty_string_guard?, <<-PATTERN
-            (send nil? {:not_if :only_if} (str #empty_string?))
-          PATTERN
-
-          def_node_matcher :empty_string_block_guard?, <<-PATTERN
-            (block (send nil? {:not_if :only_if}) (args) (str #empty_string?))
-          PATTERN
-
-          def empty_string?(str)
-            str.empty?
-          end
-
-          def on_send(node)
-            empty_string_guard?(node) do
-              add_offense(node, severity: :refactor)
-            end
-          end
-
-          def on_block(node)
-            empty_string_block_guard?(node) do
-              add_offense(node, severity: :refactor)
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) 2016-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# Author:: Sumedha (<https://github.com/sumedha-lolur>)
+#
+# 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
+        # Resource guards (not_if/only_if) should not be empty strings as empty strings will always evaluate to true.
+        # This will cause confusion in your cookbooks as the guard will always pass.
+        #
+        # Empty strings in Ruby are "truthy", which means:
+        # - `only_if ''` will ALWAYS execute the resource (guard always passes)
+        # - `not_if ''` will NEVER execute the resource (guard always blocks)
+        #
+        # This behavior is usually unintended and can lead to resources running when they shouldn't
+        # or never running when they should.
+        #
+        # @example
+        #
+        #   # bad
+        #   template '/etc/foo' do
+        #     mode '0644'
+        #     source 'foo.erb'
+        #     only_if ''  # This will always be true - resource always executes
+        #   end
+        #
+        #   cookbook_file '/logs/foo/error.log' do
+        #     source 'error.log'
+        #     not_if { '' }  # This will always be true - resource never executes
+        #   end
+        #
+        #   service 'apache2' do
+        #     action :restart
+        #     only_if { '' }  # Block form also problematic
+        #   end
+        #
+        #   # good
+        #   template '/etc/foo' do
+        #     mode '0644'
+        #     source 'foo.erb'
+        #     only_if 'test -f /etc/foo'  # Actual shell command
+        #   end
+        #
+        #   cookbook_file '/logs/foo/error.log' do
+        #     source 'error.log'
+        #     not_if { ::File.exist?('/logs/foo/error.log') }  # Proper Ruby expression
+        #   end
+        #
+        #   service 'apache2' do
+        #     action :restart
+        #     only_if { node['platform'] == 'ubuntu' }  # Meaningful condition
+        #   end
+        #
+        #   # Or simply remove the guard if no condition is needed
+        #   package 'curl' do
+        #     action :install
+        #   end
+        #
+        class EmptyResourceGuard < Base
+          MSG = 'Resource guards (not_if/only_if) should not be empty strings as empty strings will always evaluate to true.'
+          RESTRICT_ON_SEND = [:not_if, :only_if].freeze
+
+          def_node_matcher :empty_string_guard?, <<-PATTERN
+            (send nil? {:not_if :only_if} (str #empty_string?))
+          PATTERN
+
+          def_node_matcher :empty_string_block_guard?, <<-PATTERN
+            (block (send nil? {:not_if :only_if}) (args) (str #empty_string?))
+          PATTERN
+
+          def empty_string?(str)
+            str.empty?
+          end
+
+          def on_send(node)
+            empty_string_guard?(node) do
+              add_offense(node, severity: :refactor)
+            end
+          end
+
+          def on_block(node)
+            empty_string_block_guard?(node) do
+              add_offense(node, severity: :refactor)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,77 +1,77 @@
-# frozen_string_literal: true
-#
-# Copyright:: 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 Correctness
-        # Libraries should be injected into the `Chef::DSL::Recipe` class and not `Chef::Recipe` or `Chef::Provider` classes directly.
-        #
-        # @example
-        #
-        #   # bad
-        #   ::Chef::Recipe.send(:include, Filebeat::Helpers)
-        #   ::Chef::Provider.send(:include, Filebeat::Helpers)
-        #   ::Chef::Recipe.include Filebeat::Helpers
-        #   ::Chef::Provider.include Filebeat::Helpers
-        #
-        #   # good
-        #   ::Chef::DSL::Recipe.send(:include, Filebeat::Helpers) # covers previous Recipe & Provider classes
-        #
-        class IncorrectLibraryInjection < Base
-          include RangeHelp
-          extend AutoCorrector
-
-          MSG = 'Libraries should be injected into the Chef::DSL::Recipe class and not Chef::Recipe or Chef::Provider classes directly.'
-          RESTRICT_ON_SEND = [:send, :include].freeze
-
-          def_node_search :correct_injection?, <<-PATTERN
-            {(send
-               (const
-                 (const
-                   (const {cbase nil?} :Chef) :DSL) :Recipe) :send
-               (sym :include)
-             ... )
-             (send
-               (const
-                 (const
-                   (const {cbase nil?} :Chef) :DSL) :Recipe) :include
-             ... )}
-          PATTERN
-
-          def_node_matcher :legacy_injection?, <<-PATTERN
-            {(send (const (const {cbase nil?} :Chef) {:Recipe :Provider}) :send (sym :include) ... )
-             (send (const (const {cbase nil?} :Chef) {:Recipe :Provider}) :include ... )}
-          PATTERN
-
-          def on_send(node)
-            legacy_injection?(node) do
-              add_offense(node, severity: :refactor) do |corrector|
-                if node.parent && correct_injection?(node.parent)
-                  corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
-                else
-                  corrector.replace(node,
-                    node.source.gsub(/Chef::(Provider|Recipe)/, 'Chef::DSL::Recipe'))
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: Copyright (c) 2016-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# 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
+        # Libraries should be injected into the `Chef::DSL::Recipe` class and not `Chef::Recipe` or `Chef::Provider` classes directly.
+        #
+        # @example
+        #
+        #   # bad
+        #   ::Chef::Recipe.send(:include, Filebeat::Helpers)
+        #   ::Chef::Provider.send(:include, Filebeat::Helpers)
+        #   ::Chef::Recipe.include Filebeat::Helpers
+        #   ::Chef::Provider.include Filebeat::Helpers
+        #
+        #   # good
+        #   ::Chef::DSL::Recipe.send(:include, Filebeat::Helpers) # covers previous Recipe & Provider classes
+        #
+        class IncorrectLibraryInjection < Base
+          include RangeHelp
+          extend AutoCorrector
+
+          MSG = 'Libraries should be injected into the Chef::DSL::Recipe class and not Chef::Recipe or Chef::Provider classes directly.'
+          RESTRICT_ON_SEND = [:send, :include].freeze
+
+          def_node_search :correct_injection?, <<-PATTERN
+            {(send
+               (const
+                 (const
+                   (const {cbase nil?} :Chef) :DSL) :Recipe) :send
+               (sym :include)
+             ... )
+             (send
+               (const
+                 (const
+                   (const {cbase nil?} :Chef) :DSL) :Recipe) :include
+             ... )}
+          PATTERN
+
+          def_node_matcher :legacy_injection?, <<-PATTERN
+            {(send (const (const {cbase nil?} :Chef) {:Recipe :Provider}) :send (sym :include) ... )
+             (send (const (const {cbase nil?} :Chef) {:Recipe :Provider}) :include ... )}
+          PATTERN
+
+          def on_send(node)
+            legacy_injection?(node) do
+              add_offense(node, severity: :refactor) do |corrector|
+                if node.parent && correct_injection?(node.parent)
+                  corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+                else
+                  corrector.replace(node,
+                    node.source.gsub(/Chef::(Provider|Recipe)/, 'Chef::DSL::Recipe'))
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end