From 938c37c2dd5bff3b888540ae1ae4d2e51b3208d8 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Thu, 4 Feb 2016 08:35:04 -0800 Subject: whitespace fixes 5533 Style/SpaceInsideHashLiteralBraces 2619 Style/SpaceAroundOperators 2288 Style/EmptyLinesAroundBlockBody 2012 Style/SpaceInsideBlockBraces 1444 Style/AlignHash 1395 Style/SpaceAfterComma 1382 Style/SpaceAroundEqualsInParameterDefault 800 Style/EmptyLinesAroundClassBody 396 Style/IndentationConsistency 354 Style/ExtraSpacing 310 Style/SpaceBeforeBlockBraces 309 Style/EmptyLines 304 Style/TrailingWhitespace 241 Style/MultilineOperationIndentation 230 Style/TrailingBlankLines 219 Style/EmptyLinesAroundModuleBody 212 Style/IndentHash 147 Style/IndentationWidth 120 Style/EmptyLineBetweenDefs 107 Style/SpaceAroundBlockParameters 63 Style/EmptyLinesAroundMethodBody 29 Style/EmptyLinesAroundAccessModifier 1 Style/RescueEnsureAlignment --- lib/chef/platform/provider_mapping.rb | 44 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'lib/chef/platform/provider_mapping.rb') diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb index 478ed55385..ba7bebca3d 100644 --- a/lib/chef/platform/provider_mapping.rb +++ b/lib/chef/platform/provider_mapping.rb @@ -24,7 +24,6 @@ require "chef/provider" class Chef class Platform - class << self attr_writer :platforms @@ -45,7 +44,7 @@ class Chef end if platforms.has_key?(name_sym) - platform_versions = platforms[name_sym].select {|k, v| k != :default } + platform_versions = platforms[name_sym].select { |k, v| k != :default } if platforms[name_sym].has_key?(:default) provider_map.merge!(platforms[name_sym][:default]) end @@ -89,7 +88,7 @@ class Chef return platform, version end - def provider_for_resource(resource, action=:nothing) + def provider_for_resource(resource, action = :nothing) node = resource.run_context && resource.run_context.node raise ArgumentError, "Cannot find the provider for a resource with no run context set" unless node provider = find_provider_for_node(node, resource).new(resource, resource.run_context) @@ -183,32 +182,31 @@ class Chef private - def explicit_provider(platform, version, resource_type) - resource_type.kind_of?(Chef::Resource) ? resource_type.provider : nil - end + def explicit_provider(platform, version, resource_type) + resource_type.kind_of?(Chef::Resource) ? resource_type.provider : nil + end - def platform_provider(platform, version, resource_type) - pmap = Chef::Platform.find(platform, version) - rtkey = resource_type.kind_of?(Chef::Resource) ? resource_type.resource_name.to_sym : resource_type - pmap.has_key?(rtkey) ? pmap[rtkey] : nil - end + def platform_provider(platform, version, resource_type) + pmap = Chef::Platform.find(platform, version) + rtkey = resource_type.kind_of?(Chef::Resource) ? resource_type.resource_name.to_sym : resource_type + pmap.has_key?(rtkey) ? pmap[rtkey] : nil + end - include Chef::Mixin::ConvertToClassName + include Chef::Mixin::ConvertToClassName - def resource_matching_provider(platform, version, resource_type) - if resource_type.kind_of?(Chef::Resource) - class_name = resource_type.class.name ? resource_type.class.name.split("::").last : - convert_to_class_name(resource_type.resource_name.to_s) + def resource_matching_provider(platform, version, resource_type) + if resource_type.kind_of?(Chef::Resource) + class_name = resource_type.class.name ? resource_type.class.name.split("::").last : + convert_to_class_name(resource_type.resource_name.to_s) - if Chef::Provider.const_defined?(class_name) - Chef::Log.warn("Class Chef::Provider::#{class_name} does not declare 'provides #{convert_to_snake_case(class_name).to_sym.inspect}'.") - Chef::Log.warn("This will no longer work in Chef 13: you must use 'provides' to use the resource's DSL.") - return Chef::Provider.const_get(class_name) - end + if Chef::Provider.const_defined?(class_name) + Chef::Log.warn("Class Chef::Provider::#{class_name} does not declare 'provides #{convert_to_snake_case(class_name).to_sym.inspect}'.") + Chef::Log.warn("This will no longer work in Chef 13: you must use 'provides' to use the resource's DSL.") + return Chef::Provider.const_get(class_name) end - nil end - + nil + end end end end -- cgit v1.2.1