fixes for erl_call

Author: joewilliams

chef/lib/chef/provider/erl_call.rb

@@ -27,10 +27,9 @@ class ErlCall < Chef::Provider
 
       def initialize(node, new_resource)
         super(node, new_resource)
-        action_run
       end
 
-      def action_run
+      def load_current_resource
         case @new_resource.name_type
         when "sname"
           node = "-sname #{@new_resource.node_name}"
@@ -50,11 +49,15 @@ def action_run
           distributed = ""
         end
 
-        status = popen4("erl_call -e #{distributed} #{cookie} #{node}") do |pid, stdin, stdout, stderr|
+        command = "erl_call -e #{distributed} #{node} #{cookie}"
+
+        status = popen4(command, :waitlast => true) do |pid, stdin, stdout, stderr|
           Chef::Log.info("Running erl_call '#{@new_resource.name}' on '#{@new_resource.node_name}'")
-          @new_resource.code.each { |line| stdin.puts "#{line}" }
+          Chef::Log.debug("erl_call '#{@new_resource.name}' command: #{command}")
+          Chef::Log.debug("erl_call '#{@new_resource.name}' code: #{@new_resource.code}")
+          @new_resource.code.each { |line| stdin.puts "#{line.chomp!}" }
           stdin.close
-          Chef::Log.debug("Output from erl_call on '#{@new_resource.node_name}': ")
+          Chef::Log.debug("erl_call '#{@new_resource.name}' output: ")
           stdout.each { |line| Chef::Log.debug("#{line}")}
         end
       end

chef/lib/chef/resource/erl_call.rb

@@ -25,47 +25,49 @@ class ErlCall < Chef::Resource
       def initialize(name, collection=nil, node=nil)
         super(name, collection, node)
         @resource_name = :erl_call
+
+        @code = "q()."
         @cookie = nil
-        @node_name = "chef@localhost"
-        @name_type = "sname"
         @distributed = false
+        @name_type = "sname"
+        @node_name = "chef@localhost"
       end
 
-      def cookie(arg=nil)
+      def code(arg=nil)
         set_or_return(
-          :cookie,
+          :code,
           arg,
           :kind_of => [ String ]
         )
       end
 
-      def distributed(arg=nil)
+      def cookie(arg=nil)
         set_or_return(
-          :distributed,
+          :cookie,
           arg,
-          :kind_of => [ TrueClass, FalseClass ]
+          :kind_of => [ String ]
         )
       end
 
-      def name(arg=nil)
+      def distributed(arg=nil)
         set_or_return(
-          :name,
+          :distributed,
           arg,
-          :kind_of => [ String ]
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
       def name_type(arg=nil)
         set_or_return(
-          :sname,
+          :name_type,
           arg,
           :kind_of => [ String ]
         )
       end
 
       def node_name(arg=nil)
         set_or_return(
-          :name,
+          :node_name,
           arg,
           :kind_of => [ String ]
         )