cookstyle 7.32.8 → 8.0.0

data/lib/rubocop/cop/chef/deprecation/deprecated_chefspec_platform.rb

@@ -1,129 +1,129 @@
-# frozen_string_literal: true
-#
-# Copyright:: 2020-2022, 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
-        # Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version values so it's always best to be less specific ie. 10 instead of 10.3
-        #
-        # @example
-        #
-        #   let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '14.04') }
-        #
-        class DeprecatedChefSpecPlatform < Base
-          include RuboCop::Chef::CookbookHelpers
-          extend AutoCorrector
-
-          MSG = "Use currently supported platforms in ChefSpec listed at https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3"
-
-          DEPRECATED_MAPPING = {
-            'amazon' => {
-              '2017.12' => '2',
-              '> 2010' => true,
-            },
-            'aix' => {
-              '~> 6' => true,
-            },
-            'smartos' => {
-              '5.10' => true,
-            },
-            'ubuntu' => {
-              '< 16.04' => true,
-              '> 16.04, < 18.04' => true,
-            },
-            'fedora' => {
-              '< 32' => '32',
-            },
-            'freebsd' => {
-              '= 12.0' => '12',
-              '< 12' => true,
-            },
-            'mac_os_x' => {
-              '< 10.14' => '10.15',
-              ' = 11.0' => '11',
-            },
-            'suse' => {
-              '~> 12.0, < 12.4' => '12',
-              '< 12' => true,
-            },
-            'opensuse' => {
-              '< 14' => true,
-              '~> 42.0' => true,
-              '~> 15.0, < 15.2' => '15',
-            },
-            'debian' => {
-              '< 9' => true,
-              '> 9.0, < 9.12' => '9',
-            },
-            'centos' => {
-              '< 6.0' => true,
-              '~> 6.0, < 6.10' => '6',
-              '~> 7.0, < 7.8 ' => '7',
-            },
-            'redhat' => {
-              '< 6.0' => true,
-              '~> 6.0, < 6.10' => '6',
-              '~> 7.0, < 7.8' => '7',
-            },
-            'oracle' => {
-              '< 6.0' => true,
-              '~> 6.0, < 6.10' => '6',
-              '~> 7.0, < 7.6 ' => '7',
-            },
-          }.freeze
-
-          def_node_matcher :chefspec_definition?, <<-PATTERN
-            (send (const (const nil? :ChefSpec) ... ) :new (hash <(pair (sym :platform) $(str ... )) (pair (sym :version) $(str ... )) ... >))
-          PATTERN
-
-          def legacy_chefspec_platform(platform, version)
-            return false unless DEPRECATED_MAPPING.key?(platform)
-
-            DEPRECATED_MAPPING[platform].each_pair do |match_string, replacement|
-              return true if Gem::Dependency.new('', match_string.split(',')).match?('', version) &&
-                             replacement != version # we want to catch '7.0' and suggest '7', but not alert on '7'
-            end
-
-            false
-          end
-
-          def replacement_string(platform, version)
-            DEPRECATED_MAPPING[platform].each_pair do |match_string, replacement|
-              return replacement if Gem::Dependency.new('', match_string.split(',')).match?('', version) &&
-                                    replacement != version && # we want to catch '7.0' and suggest '7', but not alert on '7'
-                                    replacement != true # true means it's busted, but requires human intervention to fix
-            end
-
-            nil # we don't have a replacement os return nil
-          end
-
-          def on_send(node)
-            chefspec_definition?(node) do |plat, ver|
-              next unless legacy_chefspec_platform(plat.value, ver.value)
-              add_offense(node, severity: :warning) do |corrector|
-                if replacement = replacement_string(plat.value, ver.value) # rubocop: disable Lint/AssignmentInCondition
-                  corrector.replace(ver, "'#{replacement}'")
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Copyright:: 2020-2022, 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
+        # Use currently supported platforms in ChefSpec listed at https://github.com/chef/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version values so it's always best to be less specific ie. 10 instead of 10.3
+        #
+        # @example
+        #
+        #   let(:chef_run) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '14.04') }
+        #
+        class DeprecatedChefSpecPlatform < Base
+          include RuboCop::Chef::CookbookHelpers
+          extend AutoCorrector
+
+          MSG = "Use currently supported platforms in ChefSpec listed at https://github.com/chef/fauxhai/blob/main/PLATFORMS.md. Fauxhai / ChefSpec will perform fuzzy matching on platform version so it's always best to be less specific ie. 10 instead of 10.3"
+
+          DEPRECATED_MAPPING = {
+            'amazon' => {
+              '2017.12' => '2',
+              '> 2010' => true,
+            },
+            'aix' => {
+              '~> 6' => true,
+            },
+            'smartos' => {
+              '5.10' => true,
+            },
+            'ubuntu' => {
+              '< 16.04' => true,
+              '> 16.04, < 18.04' => true,
+            },
+            'fedora' => {
+              '< 32' => '32',
+            },
+            'freebsd' => {
+              '= 12.0' => '12',
+              '< 12' => true,
+            },
+            'mac_os_x' => {
+              '< 10.14' => '10.15',
+              ' = 11.0' => '11',
+            },
+            'suse' => {
+              '~> 12.0, < 12.4' => '12',
+              '< 12' => true,
+            },
+            'opensuse' => {
+              '< 14' => true,
+              '~> 42.0' => true,
+              '~> 15.0, < 15.2' => '15',
+            },
+            'debian' => {
+              '< 9' => true,
+              '> 9.0, < 9.12' => '9',
+            },
+            'centos' => {
+              '< 6.0' => true,
+              '~> 6.0, < 6.10' => '6',
+              '~> 7.0, < 7.8 ' => '7',
+            },
+            'redhat' => {
+              '< 6.0' => true,
+              '~> 6.0, < 6.10' => '6',
+              '~> 7.0, < 7.8' => '7',
+            },
+            'oracle' => {
+              '< 6.0' => true,
+              '~> 6.0, < 6.10' => '6',
+              '~> 7.0, < 7.6 ' => '7',
+            },
+          }.freeze
+
+          def_node_matcher :chefspec_definition?, <<-PATTERN
+            (send (const (const nil? :ChefSpec) ... ) :new (hash <(pair (sym :platform) $(str ... )) (pair (sym :version) $(str ... )) ... >))
+          PATTERN
+
+          def legacy_chefspec_platform(platform, version)
+            return false unless DEPRECATED_MAPPING.key?(platform)
+
+            DEPRECATED_MAPPING[platform].each_pair do |match_string, replacement|
+              return true if Gem::Dependency.new('', match_string.split(',')).match?('', version) &&
+                             replacement != version # we want to catch '7.0' and suggest '7', but not alert on '7'
+            end
+
+            false
+          end
+
+          def replacement_string(platform, version)
+            DEPRECATED_MAPPING[platform].each_pair do |match_string, replacement|
+              return replacement if Gem::Dependency.new('', match_string.split(',')).match?('', version) &&
+                                    replacement != version && # we want to catch '7.0' and suggest '7', but not alert on '7'
+                                    replacement != true # true means it's busted, but requires human intervention to fix
+            end
+
+            nil # we don't have a replacement os return nil
+          end
+
+          def on_send(node)
+            chefspec_definition?(node) do |plat, ver|
+              next unless legacy_chefspec_platform(plat.value, ver.value)
+              add_offense(node, severity: :warning) do |corrector|
+                if replacement = replacement_string(plat.value, ver.value) # rubocop: disable Lint/AssignmentInCondition
+                  corrector.replace(ver, "'#{replacement}'")
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/deprecation/deprecated_mixins.rb

@@ -1,78 +1,78 @@
-# 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
-        # Don't use deprecated Mixins no longer included in Chef Infra Client 14 and later.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   include Chef::Mixin::LanguageIncludeAttribute
-        #   include Chef::Mixin::RecipeDefinitionDSLCore
-        #   include Chef::Mixin::LanguageIncludeRecipe
-        #   include Chef::Mixin::Language
-        #   include Chef::DSL::Recipe::FullDSL
-        #   require 'chef/mixin/language'
-        #   require 'chef/mixin/language_include_attribute'
-        #   require 'chef/mixin/language_include_recipe'
-        #
-        class UsesDeprecatedMixins < Base
-          include RangeHelp
-          extend AutoCorrector
-
-          MSG = "Don't use deprecated Mixins no longer included in Chef Infra Client 14 and later."
-          RESTRICT_ON_SEND = [:include, :require].freeze
-
-          def_node_matcher :deprecated_mixin?, <<-PATTERN
-            (send nil? :include (const (const (const nil? :Chef) :Mixin) { :Language :LanguageIncludeAttribute :RecipeDefinitionDSLCore :LanguageIncludeRecipe }))
-          PATTERN
-
-          def_node_matcher :deprecated_dsl?, <<-PATTERN
-            (send nil? :include (const (const (const (const nil? :Chef) :DSL) :Recipe) :FullDSL))
-          PATTERN
-
-          def_node_matcher :dsl_mixin_require?, <<-PATTERN
-            (send nil? :require ( str {"chef/mixin/language" "chef/mixin/language_include_attribute" "chef/mixin/language_include_recipe"}))
-          PATTERN
-
-          def on_send(node)
-            deprecated_mixin?(node) do
-              add_offense(node, severity: :warning) do |corrector|
-                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
-              end
-            end
-
-            deprecated_dsl?(node) do
-              add_offense(node, severity: :warning) do |corrector|
-                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
-              end
-            end
-
-            dsl_mixin_require?(node) do
-              add_offense(node, severity: :warning) do |corrector|
-                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
-              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
+        # Don't use deprecated Mixins no longer included in Chef Infra Client 14 and later.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   include Chef::Mixin::LanguageIncludeAttribute
+        #   include Chef::Mixin::RecipeDefinitionDSLCore
+        #   include Chef::Mixin::LanguageIncludeRecipe
+        #   include Chef::Mixin::Language
+        #   include Chef::DSL::Recipe::FullDSL
+        #   require 'chef/mixin/language'
+        #   require 'chef/mixin/language_include_attribute'
+        #   require 'chef/mixin/language_include_recipe'
+        #
+        class UsesDeprecatedMixins < Base
+          include RangeHelp
+          extend AutoCorrector
+
+          MSG = "Don't use deprecated Mixins no longer included in Chef Infra Client 14 and later."
+          RESTRICT_ON_SEND = [:include, :require].freeze
+
+          def_node_matcher :deprecated_mixin?, <<-PATTERN
+            (send nil? :include (const (const (const nil? :Chef) :Mixin) { :Language :LanguageIncludeAttribute :RecipeDefinitionDSLCore :LanguageIncludeRecipe }))
+          PATTERN
+
+          def_node_matcher :deprecated_dsl?, <<-PATTERN
+            (send nil? :include (const (const (const (const nil? :Chef) :DSL) :Recipe) :FullDSL))
+          PATTERN
+
+          def_node_matcher :dsl_mixin_require?, <<-PATTERN
+            (send nil? :require ( str {"chef/mixin/language" "chef/mixin/language_include_attribute" "chef/mixin/language_include_recipe"}))
+          PATTERN
+
+          def on_send(node)
+            deprecated_mixin?(node) do
+              add_offense(node, severity: :warning) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
+            end
+
+            deprecated_dsl?(node) do
+              add_offense(node, severity: :warning) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
+            end
+
+            dsl_mixin_require?(node) do
+              add_offense(node, severity: :warning) do |corrector|
+                corrector.remove(range_with_surrounding_space(range: node.loc.expression, side: :left))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/chef/deprecation/deprecated_platform_methods.rb

@@ -1,61 +1,61 @@
-# frozen_string_literal: true
-#
-# 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 Deprecations
-        # Use `provider_for_action` or provides instead of the deprecated `Chef::Platform` methods in resources, which were removed in Chef Infra Client 13.
-        #
-        # @example
-        #
-        #   ### incorrect
-        #   resource = Chef::Resource::File.new("/tmp/foo.xyz", run_context)
-        #   provider = Chef::Platform.provider_for_resource(resource, :create)
-        #
-        #   resource = Chef::Resource::File.new("/tmp/foo.xyz", run_context)
-        #   provider = Chef::Platform.find_provider("ubuntu", "16.04", resource)
-        #
-        #   resource = Chef::Resource::File.new("/tmp/foo.xyz", run_context)
-        #   provider = Chef::Platform.find_provider_for_node(node, resource)
-        #
-        #   Chef::Platform.set :platform => :mac_os_x, :resource => :package, :provider => Chef::Provider::Package::Homebrew
-        #
-        #   ### correct
-        #   resource = Chef::Resource::File.new("/tmp/foo.xyz", run_context)
-        #   provider = resource.provider_for_action(:create)
-        #
-        #   # provides :package, platform_family: 'mac_os_x'
-
-        class DeprecatedPlatformMethods < Base
-          MSG = 'Use provider_for_action or provides instead of the deprecated Chef::Platform methods in resources, which were removed in Chef Infra Client 13.'
-          RESTRICT_ON_SEND = [:provider_for_resource, :find_provider, :find_provider_for_node, :set].freeze
-
-          def_node_matcher :platform_method?, <<-PATTERN
-            (send (const (const nil? :Chef) :Platform) {:provider_for_resource :find_provider :find_provider_for_node :set} ... )
-          PATTERN
-
-          def on_send(node)
-            platform_method?(node) do
-              add_offense(node, severity: :warning)
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# 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 Deprecations
+        # Use `provider_for_action` or provides instead of the deprecated `Chef::Platform` methods in resources, which were removed in Chef Infra Client 13.
+        #
+        # @example
+        #
+        #   ### incorrect
+        #   resource = Chef::Resource::File.new("/tmp/foo.xyz", run_context)
+        #   provider = Chef::Platform.provider_for_resource(resource, :create)
+        #
+        #   resource = Chef::Resource::File.new("/tmp/foo.xyz", run_context)
+        #   provider = Chef::Platform.find_provider("ubuntu", "16.04", resource)
+        #
+        #   resource = Chef::Resource::File.new("/tmp/foo.xyz", run_context)
+        #   provider = Chef::Platform.find_provider_for_node(node, resource)
+        #
+        #   Chef::Platform.set :platform => :mac_os_x, :resource => :package, :provider => Chef::Provider::Package::Homebrew
+        #
+        #   ### correct
+        #   resource = Chef::Resource::File.new("/tmp/foo.xyz", run_context)
+        #   provider = resource.provider_for_action(:create)
+        #
+        #   # provides :package, platform_family: 'mac_os_x'
+
+        class DeprecatedPlatformMethods < Base
+          MSG = 'Use provider_for_action or provides instead of the deprecated Chef::Platform methods in resources, which were removed in Chef Infra Client 13.'
+          RESTRICT_ON_SEND = [:provider_for_resource, :find_provider, :find_provider_for_node, :set].freeze
+
+          def_node_matcher :platform_method?, <<-PATTERN
+            (send (const (const nil? :Chef) :Platform) {:provider_for_resource :find_provider :find_provider_for_node :set} ... )
+          PATTERN
+
+          def on_send(node)
+            platform_method?(node) do
+              add_offense(node, severity: :warning)
+            end
+          end
+        end
+      end
+    end
+  end
+end