factor 0.1.01 → 0.1.02

data/lib/cli/server_task.rb

@@ -7,42 +7,43 @@ module Factor
       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"
+      method_option :verbose, :type=>:boolean, :desc=>"Display everything"
       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?
    
         # load channels from server
-        say "loading channels from server"
+        say "loading channels from server" if options.verbose?
         engine = @client.load_channels(engine) do |message|
-          say "  #{message}"
+          say "  #{message}" if options.verbose?
         end
         
         # load channels from files
         if options.channels?
           options.channels.each do |file|
             full_file=File.expand_path(file)
-            say "  loading '#{full_file}'"
+            say "  loading '#{full_file}'" if options.verbose?
             engine.load_channel(full_file)
-            say "  loaded '#{full_file}'"
+            say "  loaded '#{full_file}'" if options.verbose?
           end
         end
         
-        say "loading channels complete"
+        say "loading channels complete" if options.verbose?
       
       
         # load workflows from server
-        say "loading workflows from server"
+        say "loading workflows from server" if options.verbose?
         engine = @client.load_workflows(engine) do |message|
-          say "  #{message}"
+          say "  #{message}" if options.verbose?
         end
-        say "loading workflows complete"
+        say "loading workflows complete" if options.verbose?
     
-        say "loading credentials from server"
+        say "loading credentials from server" if options.verbose?
         engine = @client.load_credentials(engine) do |message|
-          say "  #{message}"
+          say "  #{message}" if options.verbose?
         end
-        say "loading credentials complete"
+        say "loading credentials complete" if options.verbose?
     
         say "starting the server...", :green
         message = engine.start

data/lib/client/client.rb

@@ -11,7 +11,6 @@ module Factor
       attr_accessor :host
     
       def initialize(host="http://factor.io")
-      #def initialize(host="http://localhost:3000/")
         @host=host
       end
     
@@ -78,11 +77,10 @@ module Factor
           # unzip download zip into unzipped directory
           unzip(temp_file.path,unzip_dir)
         
-          code.call("loading '#{channel['zip_url']}' into engine")
-          Dir.glob("#{unzip_dir}/**/*.rb").each do |ruby_file_name|
-            engine.load_channel(ruby_file_name)
-          end
-        
+          filename = unzip_dir + "/" + channel['name'].split(/(?=[A-Z])/).map{ |x| x.downcase }.join('_') + ".rb"
+          
+          code.call("loading '#{filename}' into engine")
+          engine.load_channel(filename)
         end
       
       

data/lib/runtime/engine.rb

@@ -80,27 +80,16 @@ module Factor
                   target = activity["target"]
                   params_template = activity["params"]
               
-                
-                  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
 
-                    #puts "[activity-params] #{activity["params"]}"
-                    #puts "[values] #{values}"
+                    # this maps the input values passed in with the templated defined in the workflow
                     params = render_template(params_template,values)
-                    puts "[rendered params] #{params}"
-                    
                     event = call_channel_method(channel,action,params)
-              
-                    # puts "event #{event.inspect}"
                     response_message = message.respond(event.params,event.class.name.split("::").last)
               
-                    # puts "response #{response_message.inspect}"
-              
                     @message_bus.send response_message
                   end
-              
                 end
               else
                 # workflow doesn't exist

metadata

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