fixes for action definition and platform list

Author: joewilliams

chef/lib/chef/platform.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -25,7 +25,7 @@
 
 class Chef
   class Platform
-        
+
     @platforms = {
       :mac_os_x => {
         :default => {
@@ -97,27 +97,28 @@ class Platform
         :http_request => Chef::Provider::HttpRequest,
         :route => Chef::Provider::Route,
         :ifconfig => Chef::Provider::Ifconfig,
-        :ruby_block => Chef::Provider::RubyBlock
+        :ruby_block => Chef::Provider::RubyBlock,
+        :erl_call => Chef::Provider::ErlCall
       }
     }
 
     class << self
       attr_accessor :platforms
-      
+
       include Chef::Mixin::ParamsValidate
-            
+
       def find(name, version)
         provider_map = @platforms[:default].clone
-        
+
         name_sym = name
         if name.kind_of?(String)
           name.downcase!
           name.gsub!(/\s/, "_")
           name_sym = name.to_sym
         end
-        
+
         if @platforms.has_key?(name_sym)
-          if @platforms[name_sym].has_key?(version) 
+          if @platforms[name_sym].has_key?(version)
             Chef::Log.debug("Platform #{name.to_s} version #{version} found")
             if @platforms[name_sym].has_key?(:default)
               provider_map.merge!(@platforms[name_sym][:default])
@@ -131,7 +132,7 @@ def find(name, version)
         end
         provider_map
       end
-      
+
       def find_provider(platform, version, resource_type)
         pmap = Chef::Platform.find(platform, version)
         rtkey = resource_type
@@ -144,46 +145,46 @@ def find_provider(platform, version, resource_type)
         else
           Chef::Log.error("#{rtkey.inspect} #{pmap.inspect}")
           raise(
-            ArgumentError, 
+            ArgumentError,
             "Cannot find a provider for #{resource_type} on #{platform} version #{version}"
           )
         end
       end
-      
+
       def find_platform_and_version(node)
         platform = nil
         version = nil
-        
+
         if node[:platform]
           platform = node[:platform]
         elsif node.attribute?("os")
           platform = node[:os]
         end
-        
+
         raise ArgumentError, "Cannot find a platform for #{node}" unless platform
-        
+
         if node[:platform_version]
           version = node[:platform_version]
         elsif node[:os_version]
           version = node[:os_version]
         elsif node[:os_release]
           version = node[:os_release]
         end
-        
+
         raise ArgumentError, "Cannot find a version for #{node}" unless version
-        
+
         return platform, version
       end
-      
+
       def provider_for_node(node, resource_type)
         find_provider_for_node(node, resource_type).new(node, resource_type)
       end
 
       def find_provider_for_node(node, resource_type)
-        platform, version = find_platform_and_version(node)        
+        platform, version = find_platform_and_version(node)
         provider = find_provider(platform, version, resource_type)
       end
-      
+
       def set(args)
         validate(
           args,
@@ -204,14 +205,14 @@ def set(args)
             }
           }
         )
-        if args.has_key?(:platform)          
+        if args.has_key?(:platform)
           if args.has_key?(:version)
             if @platforms.has_key?(args[:platform])
               if @platforms[args[:platform]].has_key?(args[:version])
                 @platforms[args[:platform]][args[:version]][args[:resource].to_sym] = args[:provider]
               else
                 @platforms[args[:platform]][args[:version]] = {
-                  args[:resource].to_sym => args[:provider] 
+                  args[:resource].to_sym => args[:provider]
                 }
               end
             else
@@ -222,7 +223,7 @@ def set(args)
               }
             end
           else
-            if @platforms.has_key?(args[:platform])            
+            if @platforms.has_key?(args[:platform])
               if @platforms[args[:platform]].has_key?(:default)
                 @platforms[args[:platform]][:default][args[:resource].to_sym] = args[:provider]
               else
@@ -246,8 +247,8 @@ def set(args)
           end
         end
       end
-            
-    end    
-    
+
+    end
+
   end
 end

chef/lib/chef/provider/erl_call.rb

@@ -27,7 +27,6 @@ class ErlCall < Chef::Provider
 
       def initialize(node, new_resource)
         super(node, new_resource)
-        action_run
       end
 
       def load_current_resource

chef/lib/chef/resource/erl_call.rb

@@ -33,6 +33,8 @@ def initialize(name, collection=nil, node=nil)
         @distributed = false # if you want to have a distributed erlang node
         @name_type = "sname" # type of erlang hostname name or sname
         @node_name = "chef@localhost" # the erlang node hostname
+
+        @action = "run"
       end
 
       def code(arg=nil)