factor 0.0.95 → 0.0.96

data/lib/cli/server_task.rb

@@ -47,7 +47,10 @@ module Factor
         say "starting the server...", :green
         message = engine.start
         if message.is_a?(Exception)
-          say "An unknown exception occured '#{message}'", :red
+          say "[Unknown exception]", :red
+          say "  message:#{message}", :red
+          say "  backtrace:", :red
+          message.backtrace.each {|line| say "    #{line}", :red}
         else
           say "disconnecting...", :green
         end

data/lib/runtime/engine.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'factor'
 require 'mustache'
-require 'facter'
+#require 'facter'
 
 
 module Factor
@@ -84,10 +84,12 @@ module Factor
               
                     values = message.body.merge(@credentials)
                     # this maps the input values passed in with the templated defined in the workflow
-                    params = Hash.new
-                    activity["params"].each do |key,template|
-                      params[key]=Mustache.render(template,values)
-                    end
+
+                    puts "[activity-params] #{activity["params"]}"
+                    puts "[values] #{values}"
+                    params = render_template(activity["params"],values)
+                    puts "[params] #{params}"
+                    
                     event = call_channel_method(channel,method,params)
               
                     response_message = message.respond(event.params,event.class.name.split("::").last)
@@ -117,10 +119,28 @@ module Factor
       
       private 
       
+      def render_template(source,values)
+        #params = Hash.new
+        
+        if source.is_a?(Hash)
+          params = Hash.new
+          source.each do |key,template|
+            params[key]=render_template(template,values)
+          end
+        else
+          params = Mustache.render(source,values)
+        end
+        
+        # activity_params.each do |key,template|
+        #   params[key]=Mustache.render(template,values)
+        # end
+        params
+      end
+      
       def match(target)
         return true if target==nil || target==""
         facts={}
-        Facter.each {|k,v| facts[k]=v}
+        #Facter.each {|k,v| facts[k]=v}
         @tags.each {|k,v| facts[k]=v}
         key,value=target.split("=")
         facts[key]==value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.0.95
+  version: 0.0.96
   prerelease: 
 platform: ruby
 authors:
@@ -123,22 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.8
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.16
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.16
 description: Friendly command-line interface and library for Factor
 email: maciej@skierkowski.com
 executables: