factor 0.0.7 → 0.0.8

data/lib/cli/server_task.rb

@@ -5,8 +5,11 @@ module Factor
   module CLI
     class ServerTask < Command
       desc "start", "start the server"
+      method_option :tags, :alias=>"-t", :type=>:hash, :desc=>"Optional tags to identify from workflow"
       def start
         engine = Factor::Runtime::Engine.new(get_config[:email],get_config[:token])
+        
+        options.tags.each {|tag,value| engine.tag(tag,value)}
    
         puts "loading channels"
         engine = @client.load_channels(engine)

data/lib/client/client.rb

@@ -8,7 +8,8 @@ require 'open-uri'
 module Factor
   module Client
     class Client
-      HOST = "http://factor.io"
+      #HOST = "http://factor.io"
+      HOST = "http://localhost:3000"
     
       def register(email,password)
       end

data/lib/runtime/engine.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'factor'
 require 'mustache'
 require 'facter'
-require 'siren'
 
 
 module Factor
@@ -16,8 +15,12 @@ module Factor
         @workflows = Hash.new
         @message_bus = MessageBus.new(username,token)
         @credentials = Hash.new
+        @tags = Hash.new
       end
     
+      def tag(key,value)
+        @tags[key]=value
+      end
     
       # load the channel by referencing the .rb file
       # the filename is lowercase with "_" for spaces
@@ -114,8 +117,9 @@ module Factor
       
       def match(target)
         return true if target==nil || target==""
-        [key,value]=target.split("=")
-        Facter[key]==value
+        facts Facter.collection.merge(@tags)
+        key,value=target.split("=")
+        facts[key]==value
       end
       
       

data/lib/runtime/message_bus.rb

@@ -21,7 +21,8 @@ module Factor
       # the exchange routes it to the queues based on the route_key
       def start(topic="workflow",&code)
         EventMachine.run do
-          connection_settings={:host=>@host,:user=>@username,:password=>@token,:vhost=>@vhost}
+          #connection_settings={:host=>@host,:user=>@username,:password=>@token,:vhost=>@vhost}
+          connection_settings={:host=>@host}
           @connection = AMQP.connect(connection_settings)
           @channel  = AMQP::Channel.new(connection)
           @exchange = @channel.topic(topic,:auto_delete=>true) # new topic exchange

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -139,22 +139,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: siren
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement