factor 0.0.92 → 0.0.93

data/lib/cli/server_task.rb

@@ -13,53 +13,58 @@ module Factor
         options.tags.each {|tag,value| engine.tag(tag,value)} if options.tags?
    
         # load channels from server
-        puts "loading channels from server"
+        say "loading channels from server"
         engine = @client.load_channels(engine) do |message|
-          puts "  #{message}"
+          say "  #{message}"
         end
         
         # load channels from files
         if options.channels?
           options.channels.each do |file|
             full_file=File.expand_path(file)
-            puts "  loading '#{full_file}'"
+            say "  loading '#{full_file}'"
             engine.load_channel(full_file)
-            puts "  loaded '#{full_file}'"
+            say "  loaded '#{full_file}'"
           end
         end
         
-        puts "loading channels complete"
+        say "loading channels complete"
       
       
         # load workflows from server
-        puts "loading workflows from server"
+        say "loading workflows from server"
         engine = @client.load_workflows(engine) do |message|
-          puts "  #{message}"
+          say "  #{message}"
         end
-        puts "loading workflows complete"
+        say "loading workflows complete"
     
-        puts "loading credentials from server"
+        say "loading credentials from server"
         engine = @client.load_credentials(engine) do |message|
-          puts "  #{message}"
+          say "  #{message}"
         end
-        puts "loading credentials complete"
-    
-        puts "starting the server..."
-        engine.start
+        say "loading credentials complete"
     
+        say "starting the server...", :green
+        message = engine.start
+        if message.is_a?(Exception)
+          say "An unknown exception occured '#{message}'", :red
+        else
+          say "disconnecting...", :green
+        end
+        
       end
   
       desc "list", "list all the running servers"
       def list
-        puts "listing all servers"
+        say "listing all servers"
       end
   
       desc "logs", "listen to incoming logs"
       def logs
         engine = Factor::Runtime::Engine.new(get_config[:email],get_config[:token])
-        puts "Listening..."
+        say "Listening...", :green
         engine.logs do |message|
-          puts "[#{message.route}] #{message.body}"
+          say "[#{message.route}] #{message.body}"
         end
       end
   

data/lib/client/client.rb

@@ -61,7 +61,8 @@ module Factor
           uri = URI.parse(channel['zip_url'])
         
           # temp file to store the zip for download
-          temp_file = Tempfile.new([uri.path.gsub(/\W+/,'-'), '.zip'], :encoding => 'ascii-8bit')
+          #temp_file = Tempfile.new([uri.path.gsub(/\W+/,'-'), '.zip'], :encoding => 'ascii-8bit')
+          temp_file = Tempfile.new([uri.to_s.gsub(/\W+/,'-'), '.zip'])
         
           # temp directory where zip will be decompressed
           unzip_dir=temp_file.path[0..-5]
@@ -77,8 +78,8 @@ module Factor
           unzip(temp_file.path,unzip_dir)
         
           code.call("loading '#{channel['zip_url']}' into engine")
-          Dir.glob("#{unzip_dir}/**/*.rb").each do |file|
-            engine.load_channel(file)
+          Dir.glob("#{unzip_dir}/**/*.rb").each do |ruby_file_name|
+            engine.load_channel(ruby_file_name)
           end
         
         end

data/lib/runtime/engine.rb

@@ -27,7 +27,7 @@ module Factor
       # and the module inside must be camal cased to match
       # once loaded it is in the channel_modules Hash
       def load_channel filename
-        file=File.new filename
+        file= filename.is_a?(String) ? File.new filename : filename
         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)
@@ -67,39 +67,45 @@ module Factor
     
       # start your engines. vroom vrooooom!
       def start
-        @message_bus.start do
-          @message_bus.listen do |message|
-            if @workflows.include? message.workflow
-              workflow = @workflows[message.workflow]
-              activity = workflow.get_activity(message.position)
-              if !activity.nil?
-                action = activity["action"]
-                channel = activity["channel"]
-                method = activity["method"]
-                target = activity["target"]
+        begin
+          @message_bus.start do
+            @message_bus.listen do |message|
+              if @workflows.include? message.workflow
+                workflow = @workflows[message.workflow]
+                activity = workflow.get_activity(message.position)
+                if !activity.nil?
+                  action = activity["action"]
+                  channel = activity["channel"]
+                  method = activity["method"]
+                  target = activity["target"]
               
                 
-                if match(target)
+                  if match(target)
               
-                  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
-                  event = call_channel_method(channel,method,params)
+                    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
+                    event = call_channel_method(channel,method,params)
               
-                  response_message = message.respond(event.params,event.class.name.split("::").last)
+                    response_message = message.respond(event.params,event.class.name.split("::").last)
               
               
-                  @message_bus.send response_message
-                end
+                    @message_bus.send response_message
+                  end
               
+                end
+              else
+                # workflow doesn't exist
               end
-            else
-              # workflow doesn't exist
             end
           end
+        rescue SystemExit, Interrupt
+          "done"
+        rescue Exception => ex
+          ex
         end
       end
 

metadata

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