cookstyle 7.32.8 → 8.1.1

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

@@ -1,93 +1,93 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2021, 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
-        # Chef Infra Client 15.5 and later include cloud helpers to make detecting instances that run on public and private clouds easier.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   node['cloud']['provider'] == 'alibaba'
-        #   node['cloud']['provider'] == 'ec2'
-        #   node['cloud']['provider'] == 'gce'
-        #   node['cloud']['provider'] == 'rackspace'
-        #   node['cloud']['provider'] == 'eucalyptus'
-        #   node['cloud']['provider'] == 'linode'
-        #   node['cloud']['provider'] == 'openstack'
-        #   node['cloud']['provider'] == 'azure'
-        #   node['cloud']['provider'] == 'digital_ocean'
-        #   node['cloud']['provider'] == 'softlayer'
-        #
-        #   ### correct
-        #   alibaba?
-        #   ec2?
-        #   gce?
-        #   rackspace?
-        #   eucalyptus?
-        #   linode?
-        #   openstack?
-        #   azure?
-        #   digital_ocean?
-        #   softlayer?
-        #
-        class UseChefLanguageCloudHelpers < Base
-          extend AutoCorrector
-          extend TargetChefVersion
-
-          minimum_target_chef_version '15.5'
-
-          MSG = 'Chef Infra Client 15.5 and later include cloud helpers to make detecting instances that run on public and private clouds easier.'
-          RESTRICT_ON_SEND = [:==, :[]].freeze
-          VALID_CLOUDS = %w(alibaba ec2 gce rackspace eucalyptus linode openstack azure digital_ocean softlayer).freeze
-
-          def_node_matcher :provider_comparison?, <<-PATTERN
-            (send
-              (send
-                (send
-                  (send nil? :node) :[]
-                  (str "cloud")) :[]
-                (str "provider")) :==
-              (str $_))
-          PATTERN
-
-          def_node_matcher :node_cloud?, <<-PATTERN
-            (send
-              (send nil? :node) :[]
-              (str "cloud"))
-          PATTERN
-
-          def on_send(node)
-            provider_comparison?(node) do |cloud_name|
-              # skip it if someone was checking for a bogus cloud provider
-              next unless VALID_CLOUDS.include?(cloud_name)
-
-              # if they were checking for node['cloud'] and the provider replace it all
-              node = node.parent if node.parent.and_type? && node_cloud?(node.left_sibling)
-
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.replace(node, "#{cloud_name}?")
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2021, 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
+        # Chef Infra Client 15.5 and later include cloud helpers to make detecting instances that run on public and private clouds easier.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   node['cloud']['provider'] == 'alibaba'
+        #   node['cloud']['provider'] == 'ec2'
+        #   node['cloud']['provider'] == 'gce'
+        #   node['cloud']['provider'] == 'rackspace'
+        #   node['cloud']['provider'] == 'eucalyptus'
+        #   node['cloud']['provider'] == 'linode'
+        #   node['cloud']['provider'] == 'openstack'
+        #   node['cloud']['provider'] == 'azure'
+        #   node['cloud']['provider'] == 'digital_ocean'
+        #   node['cloud']['provider'] == 'softlayer'
+        #
+        #   ### correct
+        #   alibaba?
+        #   ec2?
+        #   gce?
+        #   rackspace?
+        #   eucalyptus?
+        #   linode?
+        #   openstack?
+        #   azure?
+        #   digital_ocean?
+        #   softlayer?
+        #
+        class UseChefLanguageCloudHelpers < Base
+          extend AutoCorrector
+          extend TargetChefVersion
+
+          minimum_target_chef_version '15.5'
+
+          MSG = 'Chef Infra Client 15.5 and later include cloud helpers to make detecting instances that run on public and private clouds easier.'
+          RESTRICT_ON_SEND = [:==, :[]].freeze
+          VALID_CLOUDS = %w(alibaba ec2 gce rackspace eucalyptus linode openstack azure digital_ocean softlayer).freeze
+
+          def_node_matcher :provider_comparison?, <<-PATTERN
+            (send
+              (send
+                (send
+                  (send nil? :node) :[]
+                  (str "cloud")) :[]
+                (str "provider")) :==
+              (str $_))
+          PATTERN
+
+          def_node_matcher :node_cloud?, <<-PATTERN
+            (send
+              (send nil? :node) :[]
+              (str "cloud"))
+          PATTERN
+
+          def on_send(node)
+            provider_comparison?(node) do |cloud_name|
+              # skip it if someone was checking for a bogus cloud provider
+              next unless VALID_CLOUDS.include?(cloud_name)
+
+              # if they were checking for node['cloud'] and the provider replace it all
+              node = node.parent if node.parent.and_type? && node_cloud?(node.left_sibling)
+
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.replace(node, "#{cloud_name}?")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,69 +1,69 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2021, 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
-        # Chef Infra Client 15.5 and later include a large number of new helpers in the Chef Infra Language to simplify checking the system configuration in recipes and resources. These should be used when possible over more complex attributes or ENV var comparisons.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   ENV['CI']
-        #   ENV['TEST_KITCHEN']
-        #
-        #   ### correct
-        #   ci?
-        #   kitchen?
-        #
-        class UseChefLanguageEnvHelpers < Base
-          extend AutoCorrector
-          extend TargetChefVersion
-
-          minimum_target_chef_version '15.5'
-
-          RESTRICT_ON_SEND = [:[]].freeze
-
-          def_node_matcher :env?, <<-PATTERN
-            (send
-              (const nil? :ENV) :[]
-              (str ${"TEST_KITCHEN" "CI"}))
-          PATTERN
-
-          def on_send(node)
-            env?(node) do |env_value|
-              # we don't handle .nil? checks yet so just skip them
-              next if node.parent.send_type? && node.parent.method?(:nil?)
-
-              case env_value
-              when 'CI'
-                add_offense(node, message: 'Chef Infra Client 15.5 and later include a helper `ci?` that should be used to see if the `CI` env var is set.', severity: :refactor) do |corrector|
-                  corrector.replace(node, 'ci?')
-                end
-              when 'TEST_KITCHEN'
-                add_offense(node, message: 'Chef Infra Client 15.5 and later include a helper `kitchen?` that should be used to see if the `TEST_KITCHEN` env var is set.', severity: :refactor) do |corrector|
-                  corrector.replace(node, 'kitchen?')
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2021, 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
+        # Chef Infra Client 15.5 and later include a large number of new helpers in the Chef Infra Language to simplify checking the system configuration in recipes and resources. These should be used when possible over more complex attributes or ENV var comparisons.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   ENV['CI']
+        #   ENV['TEST_KITCHEN']
+        #
+        #   ### correct
+        #   ci?
+        #   kitchen?
+        #
+        class UseChefLanguageEnvHelpers < Base
+          extend AutoCorrector
+          extend TargetChefVersion
+
+          minimum_target_chef_version '15.5'
+
+          RESTRICT_ON_SEND = [:[]].freeze
+
+          def_node_matcher :env?, <<-PATTERN
+            (send
+              (const nil? :ENV) :[]
+              (str ${"TEST_KITCHEN" "CI"}))
+          PATTERN
+
+          def on_send(node)
+            env?(node) do |env_value|
+              # we don't handle .nil? checks yet so just skip them
+              next if node.parent.send_type? && node.parent.method?(:nil?)
+
+              case env_value
+              when 'CI'
+                add_offense(node, message: 'Chef Infra Client 15.5 and later include a helper `ci?` that should be used to see if the `CI` env var is set.', severity: :refactor) do |corrector|
+                  corrector.replace(node, 'ci?')
+                end
+              when 'TEST_KITCHEN'
+                add_offense(node, message: 'Chef Infra Client 15.5 and later include a helper `kitchen?` that should be used to see if the `TEST_KITCHEN` env var is set.', severity: :refactor) do |corrector|
+                  corrector.replace(node, 'kitchen?')
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,60 +1,60 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2021, 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
-        # Chef Infra Client 15.5 and later include a `systemd?` helper for checking if a Linux system uses systemd.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   node['init_package'] == 'systemd'
-        #
-        #   ### correct
-        #   systemd?
-        #
-        class UseChefLanguageSystemdHelper < Base
-          extend AutoCorrector
-          extend TargetChefVersion
-
-          minimum_target_chef_version '15.5'
-
-          MSG = 'Chef Infra Client 15.5 and later include a `systemd?` helper for checking if a Linux system uses systemd.'
-          RESTRICT_ON_SEND = [:==].freeze
-
-          def_node_matcher :node_init_package?, <<-PATTERN
-              (send
-                (send
-                  (send nil? :node) :[]
-                  (str "init_package")) :==
-                (str "systemd"))
-            PATTERN
-
-          def on_send(node)
-            node_init_package?(node) do |_cloud_name|
-              add_offense(node, severity: :refactor) do |corrector|
-                corrector.replace(node, 'systemd?')
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2021, 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
+        # Chef Infra Client 15.5 and later include a `systemd?` helper for checking if a Linux system uses systemd.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   node['init_package'] == 'systemd'
+        #
+        #   ### correct
+        #   systemd?
+        #
+        class UseChefLanguageSystemdHelper < Base
+          extend AutoCorrector
+          extend TargetChefVersion
+
+          minimum_target_chef_version '15.5'
+
+          MSG = 'Chef Infra Client 15.5 and later include a `systemd?` helper for checking if a Linux system uses systemd.'
+          RESTRICT_ON_SEND = [:==].freeze
+
+          def_node_matcher :node_init_package?, <<-PATTERN
+              (send
+                (send
+                  (send nil? :node) :[]
+                  (str "init_package")) :==
+                (str "systemd"))
+            PATTERN
+
+          def on_send(node)
+            node_init_package?(node) do |_cloud_name|
+              add_offense(node, severity: :refactor) do |corrector|
+                corrector.replace(node, 'systemd?')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end