run.rb in puppet-3.2.2

- old
+ new

@@ -31,10 +31,21 @@
     end
 
     @options = options
   end
 
+  def initialize_from_hash(hash)
+    @options = {}
+
+    hash['options'].each do |key, value|
+      @options[key.to_sym] = value
+    end
+
+    @background = hash['background']
+    @status = hash['status']
+  end
+
   def log_run
     msg = ""
     msg += "triggered run" % if options[:tags]
       msg += " with tags #{options[:tags].inspect}"
     end
@@ -61,12 +72,23 @@
     @status = "success"
 
     self
   end
 
-  def self.from_pson( pson )
+  def self.from_hash(hash)
+    obj = allocate
+    obj.initialize_from_hash(hash)
+    obj
+  end
+
+  def self.from_pson(hash)
+    if hash['options']
+      return from_hash(hash)
+    end
+
     options = { :pluginsync => Puppet[:pluginsync] }
-    pson.each do |key, value|
+
+    hash.each do |key, value|
       options[key.to_sym] = value
     end
 
     new(options)
   end