factor 0.0.5 → 0.0.6

data/lib/cli/factor_task.rb

@@ -30,10 +30,12 @@ module Factor
       end
   
       desc "token", "login with token"
+      method_option :email, :alias=>"-e", :type=>:string, :desc=>"Email address for Factor account", :required=>true
       method_option :token, :alias=>"-t", :type=>:string, :desc=>"Token value to set", :required=>true
       def token
         config = get_config
         config[:token]=options[:token]
+        config[:email]=options[:email]
         save_config(config)
       end
     end

data/lib/cli/server_task.rb

@@ -6,9 +6,9 @@ module Factor
     class ServerTask < Command
       desc "start", "start the server"
       def start
-        engine = Factor::Engine.new
+        engine = Factor::Runtime::Engine.new(get_config[:email],get_config[:token])
 
-        client = Factor::Client.new
+        client = Factor::Client::Client.new
         client.login_token(get_config[:token])
       
         puts "loading channels"
@@ -35,7 +35,7 @@ module Factor
   
       desc "logs", "listen to incoming logs"
       def logs
-        engine = Factor::Engine.new
+        engine = Factor::Runtime::Engine.new(get_config[:email],get_config[:token])
         puts "Listening..."
         engine.logs do |message|
           puts "[#{message.route}] #{message.body}"

data/lib/cli/workflow_task.rb

@@ -10,7 +10,7 @@ module Factor
       def call(workflow_name)
         puts "starting workflow #{workflow_name} with options #{options.parameters.to_s}"
     
-        engine = Factor::Engine.new
+        engine = Factor::Runtime::Engine.new(get_config[:email],get_config[:token])
         id = engine.launch(workflow_name,options.parameters)
     
         puts "workflow executed with id #{id}"

data/lib/client/client.rb

@@ -23,7 +23,7 @@ module Factor
         workflows = rest_get("workflows")
         workflows.each do |workflow|
           workflow_definition = JSON.parse(workflow['definition'])
-          workflow=Factor::Workflow.new(workflow_definition)
+          workflow=Factor::Runtime::Workflow.new(workflow_definition)
           engine.load_workflow(workflow)
         end
         engine

data/lib/runtime/engine.rb

@@ -9,13 +9,14 @@ module Factor
       attr_accessor :channel_modules, :workflows, :message_bus
     
       # Engine needs modules that contain the code, workflows to run, and message bus for communication
-      def initialize
+      def initialize(username,token)
         @channel_modules=Hash.new
         @workflows = Hash.new
-        @message_bus ||= MessageBus.new
+        @message_bus = MessageBus.new(username,token)
         @credentials = Hash.new
       end
     
+    
       # load the channel by referencing the .rb file
       # the filename is lowercase with "_" for spaces
       # and the module inside must be camal cased to match

data/lib/runtime/message_bus.rb

@@ -1,21 +1,28 @@
 require 'rubygems'
 require 'SecureRandom'
+require 'eventmachine'
+require 'amqp'
 
 module Factor
   module Runtime
     class MessageBus
-      attr_accessor :host, :connection, :channel, :exchange, :queue
+      attr_accessor :host, :vhost, :username, :token, :connection, :channel, :exchange, :queue
     
-      def initialize(host="queue.factor.io")
-        @host = host
+      def initialize(email,token)
+        @host = "queue.factor.io"
+        @vhost = email
+        @username=email
+        @token=token
       end
+      
     
       # Creates the connection and creates a topic exchange
       # An exchange references a place to send messages to
       # the exchange routes it to the queues based on the route_key
       def start(topic="workflow",&code)
         EventMachine.run do
-          @connection = AMQP.connect(:host=>@host)
+          connection_settings={:host=>@host,:user=>@username,:password=>@token,:vhost=>@vhost}
+          @connection = AMQP.connect(connection_settings)
           @channel  = AMQP::Channel.new(connection)
           @exchange = @channel.topic(topic,:auto_delete=>true) # new topic exchange
           code.call

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-12-09 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.99.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.99.4
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+- !ruby/object:Gem::Dependency
+  name: amqp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 description: Friendly command-line interface and library for Factor
 email: maciej@skierkowski.com
 executables:
@@ -37,7 +149,7 @@ files:
 - lib/runtime/workflow.rb
 - lib/runtime/workflow_instance.rb
 - bin/factor
-homepage: https://github.com/factor-io/factor-gem
+homepage: http://rubygems.org/gems/factor
 licenses: []
 post_install_message: 
 rdoc_options: []