factor 0.0.99 → 0.1.00

data/lib/cli/channel_task.rb

@@ -23,12 +23,9 @@ module Factor
         puts @client.get_channels
       end
     
-      desc "add NAME DIRECTORY", "add a key and value for the credential"
-      def add(name,directory)
-        
-        #contents=File.open(File.expand_path(filename), "rb") {|f| f.read}
-        
-        puts @client.add_channel(name,directory)
+      desc "add DIRECTORY DEFINITION", "add a key and value for the credential"
+      def add(directory,definition_file)
+        puts @client.add_channel(directory,definition_file)
       end
     
       desc "remove NAME", "remove a workflow"

data/lib/cli/credential_task.rb

@@ -18,10 +18,10 @@ module Factor
         puts @client.set_credential(key,value)
       end
     
-      desc "remove KEY", "remove a value from the credentials bag"
-      def remove(key)
-        puts @client.remove_credential(key)
-      end
+      # desc "remove KEY", "remove a value from the credentials bag"
+      # def remove(key)
+      #   puts @client.remove_credential(key)
+      # end
     
     end
   end

data/lib/cli/workflow_task.rb

@@ -32,10 +32,10 @@ module Factor
         puts @client.add_workflow(name,contents)
       end
     
-      desc "remove NAME", "remove a workflow"
-      def remove(name)
-        puts @client.remove_workflow(name)
-      end
+      # desc "remove NAME", "remove a workflow"
+      # def remove(name)
+      #   puts @client.remove_workflow(name)
+      # end
       
       
       

data/lib/client/client.rb

@@ -11,6 +11,7 @@ module Factor
       attr_accessor :host
     
       def initialize(host="http://factor.io")
+      #def initialize(host="http://localhost:3000/")
         @host=host
       end
     
@@ -114,24 +115,25 @@ module Factor
         rest_get("workflows")
       end
       
-      def remove_workflow(name="")
-        rest_delete("workflows",{:name=>name})
-      end
+      # def remove_workflow(name="")
+      #   rest_delete("workflows",{:name=>name})
+      # end
       
       
       # channels
-      def add_channel(key,path)
-        file=zip(path)
-        rest_post("channels",{:name=>key,:zip=>file})
+      def add_channel(path,definition_file)
+        file=zip(File.expand_path(path))
+        definition = File.read(definition_file)
+        rest_post("channels",{:zip=>file,:definition=>definition})
       end
       
       def get_channels()
         rest_get("channels")
       end
       
-      def remove_channel(name="")
-        rest_delete("channels",{:name=>name})
-      end
+      # def remove_channel(name="")
+      #   rest_delete("channels",{:name=>name})
+      # end
       
       
     
@@ -174,7 +176,7 @@ module Factor
       def zip(directory)
         path=directory.dup
         path.sub!(%r[/$],'')
-        zip_path = File.join(path,File.basename(path))+'.zip'
+        zip_path = File.join(path,"..",File.basename(path))+'.zip'
         FileUtils.rm zip_path, :force=>true
         Zip::ZipFile.open(zip_path, 'w') do |zip|
           Dir["#{path}/**/**"].reject{|f|f==zip_path}.each do |file|

data/lib/runtime/engine.rb

@@ -31,7 +31,7 @@ module Factor
         require filename
         channel_module_name = File.basename(filename).gsub('.rb','').split('_').map{|ea| ea.capitalize}.join('')
         channel_module= self.class.const_get(channel_module_name)
-        @channel_modules[channel_module.definition["module"]]=channel_module  
+        @channel_modules[channel_module_name]=channel_module  
       end
     
       def load_credentials credentials
@@ -54,6 +54,7 @@ module Factor
     
       def launch workflow, params
         instance_id=SecureRandom.hex
+        
         @message_bus.start do
           message = Message.new
           message.position << "start"
@@ -76,8 +77,8 @@ module Factor
                 if !activity.nil?
                   action = activity["action"]
                   channel = activity["channel"]
-                  method = activity["method"]
                   target = activity["target"]
+                  params_template = activity["params"]
               
                 
                   if match(target)
@@ -87,13 +88,15 @@ module Factor
 
                     #puts "[activity-params] #{activity["params"]}"
                     #puts "[values] #{values}"
-                    params = render_template(activity["params"],values)
-                    #puts "[params] #{params}"
+                    params = render_template(params_template,values)
+                    puts "[rendered params] #{params}"
                     
-                    event = call_channel_method(channel,method,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
@@ -114,6 +117,7 @@ module Factor
       def call_channel_method(channel_name,class_name,params)
         channel_module = @channel_modules[channel_name]
         command = channel_module.const_get(class_name)
+        puts "command: #{command.inspect}"
         command.new.do_work(params)
       end
       

metadata

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