cookstyle 7.32.8 → 8.1.1

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

@@ -1,72 +1,72 @@
-# 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
-        # Pass valid platform families to the `platform_family?` helper. See [Infra Language: Platform Family](https://docs.chef.io/infra_language/checking_platforms/#platform_family-values) for a complete list of platform families.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   platform_family?('redhat')
-        #   platform_family?('sles')
-        #
-        #   ### incorrect
-        #   platform_family?('rhel')
-        #   platform_family?('suse')
-        #
-        class InvalidPlatformFamilyHelper < Base
-          include ::RuboCop::Chef::PlatformHelpers
-          include RangeHelp
-          extend AutoCorrector
-
-          MSG = 'Pass valid platform families to the platform_family? helper.'
-          RESTRICT_ON_SEND = [:platform_family?].freeze
-
-          def_node_matcher :platform_family_helper?, <<-PATTERN
-            (send nil? :platform_family? $str*)
-          PATTERN
-
-          def on_send(node)
-            platform_family_helper?(node) do |plats|
-              plats.to_a.each do |p|
-                next unless INVALID_PLATFORM_FAMILIES.key?(p.value)
-                add_offense(p, severity: :refactor) do |corrector|
-                  replacement_platform = INVALID_PLATFORM_FAMILIES[p.value]
-                  all_passed_platforms = p.parent.arguments.map(&:value)
-
-                  # see if we have a replacement platform in our hash. If not we can't autocorrect
-                  next unless replacement_platform
-                  # if the replacement platform was one of the other platforms passed we can just delete this bad platform
-                  if all_passed_platforms.include?(replacement_platform)
-                    all_passed_platforms.delete(p.value)
-                    arg_range = p.parent.arguments.first.loc.expression.join(p.parent.arguments[-1].loc.expression.end)
-                    corrector.replace(arg_range, all_passed_platforms.map { |x| "'#{x}'" }.join(', '))
-                  else
-                    corrector.replace(p.loc.expression, p.value.gsub(p.value, "'#{replacement_platform}'")) # gsub to retain quotes
-                  end
-                end
-              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
+        # Pass valid platform families to the `platform_family?` helper. See [Infra Language: Platform Family](https://docs.chef.io/infra_language/checking_platforms/#platform_family-values) for a complete list of platform families.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   platform_family?('redhat')
+        #   platform_family?('sles')
+        #
+        #   ### incorrect
+        #   platform_family?('rhel')
+        #   platform_family?('suse')
+        #
+        class InvalidPlatformFamilyHelper < Base
+          include ::RuboCop::Chef::PlatformHelpers
+          include RangeHelp
+          extend AutoCorrector
+
+          MSG = 'Pass valid platform families to the platform_family? helper.'
+          RESTRICT_ON_SEND = [:platform_family?].freeze
+
+          def_node_matcher :platform_family_helper?, <<-PATTERN
+            (send nil? :platform_family? $str*)
+          PATTERN
+
+          def on_send(node)
+            platform_family_helper?(node) do |plats|
+              plats.to_a.each do |p|
+                next unless INVALID_PLATFORM_FAMILIES.key?(p.value)
+                add_offense(p, severity: :refactor) do |corrector|
+                  replacement_platform = INVALID_PLATFORM_FAMILIES[p.value]
+                  all_passed_platforms = p.parent.arguments.map(&:value)
+
+                  # see if we have a replacement platform in our hash. If not we can't autocorrect
+                  next unless replacement_platform
+                  # if the replacement platform was one of the other platforms passed we can just delete this bad platform
+                  if all_passed_platforms.include?(replacement_platform)
+                    all_passed_platforms.delete(p.value)
+                    arg_range = p.parent.arguments.first.loc.expression.join(p.parent.arguments.last.loc.expression.end)
+                    corrector.replace(arg_range, all_passed_platforms.map { |x| "'#{x}'" }.join(', '))
+                  else
+                    corrector.replace(p.loc.expression, p.value.gsub(p.value, "'#{replacement_platform}'")) # gsub to retain quotes
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,70 +1,70 @@
-# frozen_string_literal: true
-#
-# Copyright:: 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
-        # Use valid platform family values in case statements. See [Infra Language: Platform Family](https://docs.chef.io/infra_language/checking_platforms/#platform_family-values) for a complete list of platform families.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   case node['platform_family']
-        #   when 'redhat'
-        #     puts "I'm on a RHEL-like system"
-        #   end
-        #
-        class InvalidPlatformFamilyInCase < Base
-          extend AutoCorrector
-          include RangeHelp
-          include ::RuboCop::Chef::PlatformHelpers
-
-          MSG = 'Use valid platform family values in case statements.'
-
-          def_node_matcher :node_platform_family?, <<-PATTERN
-            (send (send nil? :node) :[] (str "platform_family") )
-          PATTERN
-
-          def on_case(node)
-            node_platform_family?(node.condition) do
-              node.each_when do |when_node|
-                when_node.each_condition do |con|
-                  next unless con.str_type?
-                  # if the condition isn't a string we can't check so skip
-                  # some invalid platform families have no direct correction value and return nil instead
-                  new_value = INVALID_PLATFORM_FAMILIES[con.str_content]
-                  next unless new_value
-
-                  add_offense(con, severity: :refactor) do |corrector|
-                    # if the correct value already exists in the when statement then we just want to delete this node
-                    if con.parent.conditions.any? { |x| x.str_content == new_value }
-                      range = range_with_surrounding_comma(range_with_surrounding_space(range: con.loc.expression, side: :left), :both)
-                      corrector.remove(range)
-                    else
-                      corrector.replace(con, "'#{new_value}'")
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 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
+        # Use valid platform family values in case statements. See [Infra Language: Platform Family](https://docs.chef.io/infra_language/checking_platforms/#platform_family-values) for a complete list of platform families.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   case node['platform_family']
+        #   when 'redhat'
+        #     puts "I'm on a RHEL-like system"
+        #   end
+        #
+        class InvalidPlatformFamilyInCase < Base
+          extend AutoCorrector
+          include RangeHelp
+          include ::RuboCop::Chef::PlatformHelpers
+
+          MSG = 'Use valid platform family values in case statements.'
+
+          def_node_matcher :node_platform_family?, <<-PATTERN
+            (send (send nil? :node) :[] (str "platform_family") )
+          PATTERN
+
+          def on_case(node)
+            node_platform_family?(node.condition) do
+              node.each_when do |when_node|
+                when_node.each_condition do |con|
+                  next unless con.str_type?
+                  # if the condition isn't a string we can't check so skip
+                  # some invalid platform families have no direct correction value and return nil instead
+                  new_value = INVALID_PLATFORM_FAMILIES[con.str_content]
+                  next unless new_value
+
+                  add_offense(con, severity: :refactor) do |corrector|
+                    # if the correct value already exists in the when statement then we just want to delete this node
+                    if con.parent.conditions.any? { |x| x.str_content == new_value }
+                      range = range_with_surrounding_comma(range_with_surrounding_space(range: con.loc.expression, side: :left), :both)
+                      corrector.remove(range)
+                    else
+                      corrector.replace(con, "'#{new_value}'")
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,57 +1,57 @@
-# 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
-        # Pass valid platforms to the `platform?` helper. See [Infra Language: Platform](https://docs.chef.io/infra_language/checking_platforms/#platform-values) for a list of many common platform values.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   platform?('darwin')
-        #   platform?('rhel')
-        #   platform?('sles')
-        #
-        #   ### correct
-        #   platform?('mac_os_x')
-        #   platform?('redhat')
-        #   platform?('suse')
-        #
-        class InvalidPlatformHelper < Base
-          include ::RuboCop::Chef::PlatformHelpers
-
-          MSG = 'Pass valid platforms to the platform? helper.'
-          RESTRICT_ON_SEND = [:platform?].freeze
-
-          def_node_matcher :platform_helper?, <<-PATTERN
-            (send nil? :platform? $str*)
-          PATTERN
-
-          def on_send(node)
-            platform_helper?(node) do |plat|
-              plat.to_a.each do |p|
-                add_offense(p, severity: :refactor) if INVALID_PLATFORMS.key?(p.value)
-              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
+        # Pass valid platforms to the `platform?` helper. See [Infra Language: Platform](https://docs.chef.io/infra_language/checking_platforms/#platform-values) for a list of many common platform values.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   platform?('darwin')
+        #   platform?('rhel')
+        #   platform?('sles')
+        #
+        #   ### correct
+        #   platform?('mac_os_x')
+        #   platform?('redhat')
+        #   platform?('suse')
+        #
+        class InvalidPlatformHelper < Base
+          include ::RuboCop::Chef::PlatformHelpers
+
+          MSG = 'Pass valid platforms to the platform? helper.'
+          RESTRICT_ON_SEND = [:platform?].freeze
+
+          def_node_matcher :platform_helper?, <<-PATTERN
+            (send nil? :platform? $str*)
+          PATTERN
+
+          def on_send(node)
+            platform_helper?(node) do |plat|
+              plat.to_a.each do |p|
+                add_offense(p, severity: :refactor) if INVALID_PLATFORMS.key?(p.value)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,89 +1,89 @@
-# 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
-        # metadata.rb `supports` methods should contain valid platforms. See [Infra Language: Platform](https://docs.chef.io/infra_language/checking_platforms/#platform-values) for a list of many common platform values.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   supports 'darwin'
-        #   supports 'mswin'
-        #
-        #   ### correct
-        #   supports 'mac_os_x'
-        #   supports 'windows'
-        #
-        class InvalidPlatformMetadata < Base
-          extend AutoCorrector
-          include ::RuboCop::Chef::PlatformHelpers
-
-          MSG = 'metadata.rb "supports" platform is invalid'
-          RESTRICT_ON_SEND = [:supports].freeze
-
-          def_node_matcher :supports?, '(send nil? :supports $str ...)'
-
-          def_node_matcher :supports_array?, <<-PATTERN
-            (block
-              (send
-                $(array ...) :each)
-              (args
-                (arg _))
-              (send nil? :supports (lvar _)))
-          PATTERN
-
-          def on_send(node)
-            supports?(node) do |plat|
-              next unless INVALID_PLATFORMS[plat.str_content]
-              add_offense(plat, severity: :refactor) do |corrector|
-                correct_string = corrected_platform_source(plat)
-                next unless correct_string
-                corrector.replace(plat, correct_string)
-              end
-            end
-          end
-
-          def on_block(node)
-            supports_array?(node) do |plats|
-              plats.values.each do |plat|
-                next unless INVALID_PLATFORMS[plat.str_content]
-                add_offense(plat, severity: :refactor) do |corrector|
-                  correct_string = corrected_platform_source(plat)
-                  next unless correct_string
-                  corrector.replace(plat, correct_string)
-                end
-              end
-            end
-          end
-
-          # private
-
-          def corrected_platform_source(node)
-            val = INVALID_PLATFORMS[node.str_content.delete(',').downcase]
-            return false unless val
-
-            # if the value was previously quoted make sure to quote it again
-            node.source.match?(/^('|")/) ? "'" + val + "'" : val
-          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
+        # metadata.rb `supports` methods should contain valid platforms. See [Infra Language: Platform](https://docs.chef.io/infra_language/checking_platforms/#platform-values) for a list of many common platform values.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   supports 'darwin'
+        #   supports 'mswin'
+        #
+        #   ### correct
+        #   supports 'mac_os_x'
+        #   supports 'windows'
+        #
+        class InvalidPlatformMetadata < Base
+          extend AutoCorrector
+          include ::RuboCop::Chef::PlatformHelpers
+
+          MSG = 'metadata.rb "supports" platform is invalid'
+          RESTRICT_ON_SEND = [:supports].freeze
+
+          def_node_matcher :supports?, '(send nil? :supports $str ...)'
+
+          def_node_matcher :supports_array?, <<-PATTERN
+            (block
+              (send
+                $(array ...) :each)
+              (args
+                (arg _))
+              (send nil? :supports (lvar _)))
+          PATTERN
+
+          def on_send(node)
+            supports?(node) do |plat|
+              next unless INVALID_PLATFORMS[plat.str_content]
+              add_offense(plat, severity: :refactor) do |corrector|
+                correct_string = corrected_platform_source(plat)
+                next unless correct_string
+                corrector.replace(plat, correct_string)
+              end
+            end
+          end
+
+          def on_block(node)
+            supports_array?(node) do |plats|
+              plats.each_value do |plat|
+                next unless INVALID_PLATFORMS[plat.str_content]
+                add_offense(plat, severity: :refactor) do |corrector|
+                  correct_string = corrected_platform_source(plat)
+                  next unless correct_string
+                  corrector.replace(plat, correct_string)
+                end
+              end
+            end
+          end
+
+          # private
+
+          def corrected_platform_source(node)
+            val = INVALID_PLATFORMS[node.str_content.delete(',').downcase]
+            return false unless val
+
+            # if the value was previously quoted make sure to quote it again
+            node.source.match?(/^('|")/) ? "'" + val + "'" : val
+          end
+        end
+      end
+    end
+  end
+end