factor 0.0.84 → 0.0.85

data/lib/cli/server_task.rb

@@ -6,24 +6,39 @@ module Factor
     class ServerTask < Command
       desc "start", "start the server"
       method_option :tags, :alias=>"-t", :type=>:hash, :desc=>"Optional tags to identify from workflow"
+      method_option :channels, :type=>:array, :desc=>"Optional channel ruby file list for development"
       def start
         engine = Factor::Runtime::Engine.new(get_config[:email],get_config[:token])
         
         options.tags.each {|tag,value| engine.tag(tag,value)} if options.tags?
    
-        puts "loading channels"
+        # load channels from server
+        puts "loading channels from server"
         engine = @client.load_channels(engine) do |message|
           puts "  #{message}"
         end
+        
+        # load channels from files
+        if options.channels?
+          options.channels.each do |file|
+            full_file=File.expand_path(file)
+            puts "  loading '#{full_file}'"
+            engine.load_channel(full_file)
+            puts "  loaded '#{full_file}'"
+          end
+        end
+        
         puts "loading channels complete"
       
-        puts "loading workflows"
+      
+        # load workflows from server
+        puts "loading workflows from server"
         engine = @client.load_workflows(engine) do |message|
           puts "  #{message}"
         end
         puts "loading workflows complete"
     
-        puts "loading credentials"
+        puts "loading credentials from server"
         engine = @client.load_credentials(engine) do |message|
           puts "  #{message}"
         end

data/lib/client/client.rb

@@ -43,7 +43,7 @@ module Factor
         code.call("downloading credential list")
         credentials = rest_get("credentials")
         code.call("loading credentials")
-        engine.load_credentials(credentials)
+        engine.load_credentials(credentials["value"])
       
         engine
       end

data/lib/runtime/engine.rb

@@ -31,8 +31,6 @@ module Factor
         require file
         channel_module_name = File.basename(file).gsub('.rb','').split('_').map{|ea| ea.capitalize}.join('')
         channel_module= self.class.const_get(channel_module_name)
-        puts "[channel_module.definition['module']] #{channel_module.definition["module"]}"
-        puts "[channel_module] #{channel_module.inspect}"
         @channel_modules[channel_module.definition["module"]]=channel_module  
       end
     
@@ -75,7 +73,6 @@ module Factor
               workflow = @workflows[message.workflow]
               activity = workflow.get_activity(message.position)
               if !activity.nil?
-                # puts "[activity] #{activity.to_s}"
                 action = activity["action"]
                 channel = activity["channel"]
                 method = activity["method"]
@@ -85,13 +82,11 @@ module Factor
                 if match(target)
               
                   values = message.body.merge(@credentials)
-                  # puts "[values] #{values}"
                   # 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 "[calling] #{channel}::#{method} (#{params.to_s})"
                   event = call_channel_method(channel,method,params)
               
                   response_message = message.respond(event.params,event.class.name.split("::").last)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.0.84
+  version: 0.0.85
   prerelease: 
 platform: ruby
 authors: