cloudist 0.0.3 → 0.1.0

data/README.md

@@ -39,31 +39,56 @@ This will start and AMQP connection and EM loop then yield everything inside it.
 
 In your worker:
 
-    Cloudist.worker {
-      job('make.sandwich') {
-        # Make sandwich here
-        
-        # Your worker has access to the data sent from the server in the 'data' attribute
-        data # => {:bread => "white", :sauce => 'bbq'}
-        
-        # Fire the finished event
-        finished!
+    Cloudist.start {
+      log.info("Started Worker")
+
+      worker {
+        job('make.sandwich') {
+          log.info("JOB (#{id}) Make sandwich with #{data[:bread]} bread")
+          log.debug(data.inspect)
+
+          # Do long running tasks here
+          EM.defer {
+            progress(0)
+            started!
+            progress(10)
+            sleep(1)
+            progress(20)
+            sleep(5)
+            progress(90)
+            sleep(1)
+            finished!
+            progress(100)
+          }
+        }    
       }
     }
     
 In your application:
-
-    job = Cloudist.enqueue('make.sandwich', :bread => "white", :sauce => 'bbq')
     
-    Cloudist.listen(job) {
-      event('finished') {
-        # Called when we finish making a sandwich
+    Cloudist.start {
+      # Enqueue sandwich job      
+      log.info("Dispatching sandwich making job...")
+      enqueue('make.sandwich', {:bread => 'white'})
+
+      # Listen to all sandwich jobs
+      listen('make.sandwich') {
+        progress {
+          Cloudist.log.info("Progress: #{data[:progress]}")
+        }
+
+        event('started') {
+          Cloudist.log.info("Started making sandwich at #{Time.now.to_s}")
+        }
+
+        event('finished'){
+          Cloudist.log.info("Finished making sandwich at #{Time.now.to_s}")
+        }
       }
+
     }
-    
-You don't need to listen to responses immediately, if you store the job_id you can listen to responses at any time in the near future.
 
-You can also queue jobs outside an EventMachine loop using Cloudist.enqueue but this will be very slow as it has to connect to your message queue first.
+If your application provides an AMQP.start loop already, you can skip the Cloudist.start
 
 Acknowledgements
 -------
@@ -73,8 +98,6 @@ Portions of this gem are based on code from the following projects:
 - Heroku's Droid gem
 - Lizzy
 - Minion
-- Nanite
-- Smith
 
 Contributing to Cloudist
 ------------------------

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/cloudist.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudist}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Vanderbyl"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "examples/sandwich_worker.rb",
     "lib/cloudist.rb",
     "lib/cloudist/basic_queue.rb",
+    "lib/cloudist/callback.rb",
     "lib/cloudist/core_ext/string.rb",
     "lib/cloudist/errors.rb",
     "lib/cloudist/job.rb",

data/examples/sandwich_client.rb

@@ -13,8 +13,6 @@ $:.unshift File.dirname(__FILE__) + '/../lib'
 require "rubygems"
 require "cloudist"
 
-ENV['AMQP_URL'] = 'amqp://test_pilot:t35t_p1l0t!@ec2-50-16-8-137.compute-1.amazonaws.com:5672/ivan'
-
 Cloudist.signal_trap!
 
 Cloudist.start {
@@ -24,8 +22,17 @@ Cloudist.start {
   
   # Listen to all sandwich jobs
   listen('make.sandwich') {
-    # Cloudist.log.info("Make sandwich event: #{data[:event]}")
-    Cloudist.log.debug(queue_header.headers.inspect)
+    progress {
+      Cloudist.log.info("Progress: #{data[:progress]}")
+    }
+    
+    event('started') {
+      Cloudist.log.info("Started making sandwich at #{Time.now.to_s}")
+    }
+    
+    event('finished'){
+      Cloudist.log.info("Finished making sandwich at #{Time.now.to_s}")
+    }
   }
   
 }

data/examples/sandwich_worker.rb

@@ -14,8 +14,6 @@ $:.unshift File.dirname(__FILE__) + '/../lib'
 require "rubygems"
 require "cloudist"
 
-ENV['AMQP_URL'] = 'amqp://test_pilot:t35t_p1l0t!@ec2-50-16-8-137.compute-1.amazonaws.com:5672/ivan'
-
 Cloudist.signal_trap!
 
 Cloudist.start {
@@ -29,9 +27,15 @@ Cloudist.start {
       log.debug(data.inspect)
       
       EM.defer {
+        progress(0)
         started!
+        progress(10)
+        sleep(1)
+        progress(20)
         sleep(5)
+        progress(90)
         finished!
+        progress(100)
       }
     }    
   }

data/lib/cloudist.rb

@@ -18,6 +18,7 @@ require "cloudist/payload"
 require "cloudist/request"
 require "cloudist/worker"
 require "cloudist/listener"
+require "cloudist/callback"
 require "cloudist/job"
 
 module Cloudist

data/lib/cloudist/callback.rb

@@ -0,0 +1,28 @@
+module Cloudist
+  class Callback
+
+    attr_reader :payload, :source
+
+    def initialize(source)
+      @source = source
+    end
+    
+    def call(payload)
+      @payload = payload
+      instance_eval(&source)
+    end
+    
+    def data
+      payload.body
+    end
+    
+    def headers
+      payload.headers
+    end
+    
+    def runtime
+      
+    end
+    
+  end
+end

data/lib/cloudist/listener.rb

@@ -1,9 +1,13 @@
 module Cloudist
   class Listener
     
-    attr_reader :job_queue_name, :job_id
+    attr_reader :job_queue_name, :job_id, :callbacks
+    
+    @@valid_callbacks = ["event", "progress", "reply", "update"]
     
     def initialize(job_or_queue_name)
+      @callbacks = {}
+      
       if job_or_queue_name.is_a?(Cloudist::Job)
         @job_queue_name = Utils.reply_prefix(job_or_queue_name.payload.headers[:master_queue])
         @job_id = job_or_queue_name.id
@@ -19,9 +23,31 @@ module Cloudist
       reply_queue = Cloudist::ReplyQueue.new(job_queue_name)
       reply_queue.setup(job_id) if job_id
       
-      reply_queue.subscribe do |request|        
-        # job = Job.new(request.payload)
-        request.instance_eval(&block)
+      self.instance_eval(&block)
+      
+      reply_queue.subscribe do |request|
+        payload = request.payload
+        
+        key = [payload.message_type.to_s, payload.headers[:event]].compact.join(':')
+        
+        if callbacks.has_key?(key)
+          callbacks_to_call = callbacks[key]
+          callbacks_to_call.each do |c|
+            c.call(payload)
+          end
+        end
+      end
+    end
+    
+    def method_missing(meth, *args, &blk)
+      if @@valid_callbacks.include?(meth.to_s)
+        
+        # callback should in format of "event:started" or "progress"
+        key = [meth.to_s, args.shift].compact.join(':')
+        
+        (@callbacks[key] ||= []) << Callback.new(blk)
+      else
+        super
       end
     end
     

data/lib/cloudist/payload.rb

@@ -105,6 +105,10 @@ module Cloudist
       headers[:reply_to]
     end
     
+    def message_type
+      headers[:message_type]
+    end
+    
     def event_hash
       @event_hash ||= headers[:event_hash] || body.delete('event_hash') || create_event_hash
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudist
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ivan Vanderbyl
@@ -206,6 +206,7 @@ files:
 - examples/sandwich_worker.rb
 - lib/cloudist.rb
 - lib/cloudist/basic_queue.rb
+- lib/cloudist/callback.rb
 - lib/cloudist/core_ext/string.rb
 - lib/cloudist/errors.rb
 - lib/cloudist/job.rb