cloudist 0.2.1 → 0.4.1

data/Gemfile

@@ -1,18 +1,22 @@
-source "http://rubygems.org"
+source :rubygems
 
-gem "amqp", "~> 0.6.7"
-gem "json", "~> 1.4.6"
-gem "activesupport", "~> 3.0.3"
+gem 'amqp',           '~>0.8.0.rc12'
+gem "json",           "~> 1.4.6"
+gem "i18n"
+gem "activesupport",  "~> 3.0.3"
+gem "hashie"
+gem "uuid"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "moqueue", :git => "git://github.com/ivanvanderbyl/moqueue.git"
+  gem "rake",         "~> 0.8.7"
+  gem "rspec",        "~> 2.3.0"
+  gem "moqueue",      :git => "git://github.com/ivanvanderbyl/moqueue.git"
   gem "mocha"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-  gem "reek", "~> 1.2.8"
-  gem "roodi", "~> 2.1.0"
+  gem "bundler",      "~> 1.0.0"
+  gem "jeweler",      "~> 1.5.2"
+  gem "rcov",         ">= 0"
+  gem "reek",         "~> 1.2.8"
+  gem "roodi",        "~> 2.1.0"
 end

data/Gemfile.lock

@@ -8,19 +8,26 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.3)
-    amqp (0.6.7)
-      eventmachine (>= 0.12.4)
+    activesupport (3.0.7)
+    amq-client (0.7.0.alpha25)
+      amq-protocol
+      eventmachine
+    amq-protocol (0.5.0)
+    amqp (0.8.0.rc12)
+      amq-client (>= 0.7.0.alpha25)
+      eventmachine
     diff-lcs (1.1.2)
     eventmachine (0.12.10)
     git (1.2.5)
+    hashie (1.0.0)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     json (1.4.6)
-    mocha (0.9.10)
-      rake
+    macaddr (1.0.0)
+    mocha (0.9.12)
     rake (0.8.7)
     rcov (0.9.9)
     reek (1.2.8)
@@ -40,22 +47,28 @@ GEM
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.5)
+    ruby_parser (2.0.6)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.5)
+    uuid (2.3.2)
+      macaddr (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport (~> 3.0.3)
-  amqp (~> 0.6.7)
+  amqp (~> 0.8.0.rc12)
   bundler (~> 1.0.0)
+  hashie
+  i18n
   jeweler (~> 1.5.2)
   json (~> 1.4.6)
   mocha
   moqueue!
+  rake (~> 0.8.7)
   rcov
   reek (~> 1.2.8)
   roodi (~> 2.1.0)
   rspec (~> 2.3.0)
+  uuid

data/README.md

@@ -1,16 +1,12 @@
+![Cloudist](https://github.com/ivanvanderbyl/cloudist/raw/master/doc/cloudist.png)
+
 Cloudist
 ========
 
-Cloudist is a super fast job queue for high demand and scalable tasks. It uses AMQP (RabbitMQ mainly) for message store are
-distribution, while providing a simple DSL for handling jobs and responses.
-
-Cloudist can be used within Rails or just about any Ruby app to distribute long running tasks, such as encoding a video, generating PDFs, scraping site data
-or even just sending emails. Unlike other job queues (DelayedJob etc) Cloudist does not load your entire Rails stack into memory for every worker, and it is not designed to, instead it
-expects all the data your worker requires to be sent in the initial job request. This means your workers stay slim and can scale very quickly and even run on EC2 micros outside your applications
-network without any further configuration.
+Cloudist is a simple, highly scalable job queue for Ruby applications, it can run within Rails, DaemonKit or your own custom application. Cloudist uses AMQP (RabbitMQ mainly) for transport and provides a simple DSL for queuing jobs and receiving responses including logs, exceptions and job progress.
 
-Another way Cloudist differs from other AMQP based job queues like Minion is it allows workers to report events, logs, system stats and replies back to the application which distributed the
-job, and unlike database based job queues, there is almost no delay between messages, except network latency of course.
+Cloudist can be used to distribute long running tasks such as encoding a video, generating PDFs, scraping site data
+or even just sending emails. Unlike other job queues (DelayedJob etc) Cloudist does not load your entire Rails stack into memory for every worker, and it is not designed to, instead it expects all the data your worker requires to complete a job to be sent in the initial job request. This means your workers stay slim and can scale very quickly and even run on EC2 micros outside your applications environment without any further configuration.
 
 Installation
 ------------
@@ -24,74 +20,95 @@ Or if your app has a Gemfile:
 Usage
 -----
 
-Cloudist requires an EventMachine reactor loop and an AMQP connection, so if your application is already using one, or your web server supplies one (for example Thin) these examples will work
-out of the box. Otherwise simply wrap everything inside this block:
+Cloudist requires an EventMachine reactor loop and an AMQP connection, so if your application is already using one, or your web server supplies one (for example Thin) these examples will work out of the box. Otherwise simply wrap everything inside this block:
     
-    Cloudist.settings = {:user => 'guest'} # Standard AMQP settings
     Cloudist.start {
       # usual stuff here
-      worker {
-        # define a worker
+      job('make.sandwich') {
+        # define a job handler
       }
     }
     
-This will start and AMQP connection and EM loop then yield everything inside it.
+This will start an AMQP connection and EM loop then yield everything inside it.
 
 In your worker:
 
     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)
-          }
-        }    
+      job('make.sandwich') {
+        log.info("JOB (#{id}) Make sandwich with #{data[:bread]} bread")
+
+        job.started!
+
+        (1..20).each do |i|
+          job.progress(i * 5)
+          sleep(1)
+        end
+        job.finished!
       }
+
     }
     
 In your application:
     
     Cloudist.start {
-      # Enqueue sandwich job      
+
       log.info("Dispatching sandwich making job...")
-      enqueue('make.sandwich', {:bread => 'white'})
+      
+      Cloudist.enqueue('make.sandwich', {:bread => 'white', :sandwich_number => 1})
 
       # Listen to all sandwich jobs
       listen('make.sandwich') {
+        everything {
+          Cloudist.log.info("#{headers[:message_type]} - Job ID: #{job_id}")
+        }
+        
+        # This will contain any exceptions which are raised while processing the job, which will halt the job
+        error { |e|
+          Cloudist.log.error(e.inspect)
+          Cloudist.log.error(e.backtrace.inspect)
+          
+          # Exit on failure
+          Cloudist.stop
+        }
+        
+        # Process progress updates
         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}")
+          # Exit when done
+          Cloudist.stop
         }
       }
 
     }
+    
 
 If your application provides an AMQP.start loop already, you can skip the Cloudist.start
 
+Configuration
+-------------
+
+The only configuration required to get going are the AMQP settings, these can be set in two ways:
+
+1. Using the `AMQP_URL` environment variable with value of `amqp://username:password@localhost:5672/vhost`
+
+2. Updating the settings hash manually:
+    
+    
+    Cloudist.settings = {:user => 'guest', :pass => 'password', :vhost => '/', :host => 'localhost', :port => 5672}
+    
+
 Acknowledgements
--------
+----------------
 
 Portions of this gem are based on code from the following projects:
 
@@ -109,7 +126,12 @@ Contributing to Cloudist
 * Commit and push until you are happy with your contribution
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-    
+
+Authors
+-------
+
+Ivan Vanderbyl - [@IvanVanderbyl](http://twitter.com/IvanVanderbyl) - [Blog](http://ivanvanderbyl.github.com/)
+
 Copyright
 ---------
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.4.1

data/cloudist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudist}
-  s.version = "0.2.1"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Vanderbyl"]
-  s.date = %q{2011-01-20}
+  s.date = %q{2011-05-23}
   s.description = %q{Cloudist is a simple, highly scalable job queue for Ruby applications, it can run within Rails, DaemonKit or your own custom application. Refer to github page for examples}
   s.email = %q{ivanvanderbyl@me.com}
   s.extra_rdoc_files = [
@@ -26,66 +26,92 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "cloudist.gemspec",
-    "examples/extending_values.rb",
+    "examples/amqp/Gemfile",
+    "examples/amqp/Gemfile.lock",
+    "examples/amqp/amqp_consumer.rb",
+    "examples/amqp/amqp_publisher.rb",
     "examples/queue_message.rb",
-    "examples/sandwich_client.rb",
+    "examples/sandwich_client_with_custom_listener.rb",
     "examples/sandwich_worker.rb",
     "examples/sandwich_worker_with_class.rb",
     "lib/cloudist.rb",
-    "lib/cloudist/callback.rb",
-    "lib/cloudist/callback_methods.rb",
-    "lib/cloudist/callbacks/error_callback.rb",
+    "lib/cloudist/application.rb",
+    "lib/cloudist/core_ext/class.rb",
+    "lib/cloudist/core_ext/kernel.rb",
+    "lib/cloudist/core_ext/module.rb",
     "lib/cloudist/core_ext/object.rb",
     "lib/cloudist/core_ext/string.rb",
+    "lib/cloudist/encoding.rb",
     "lib/cloudist/errors.rb",
     "lib/cloudist/job.rb",
     "lib/cloudist/listener.rb",
+    "lib/cloudist/message.rb",
+    "lib/cloudist/messaging.rb",
     "lib/cloudist/payload.rb",
+    "lib/cloudist/payload_old.rb",
     "lib/cloudist/publisher.rb",
+    "lib/cloudist/queue.rb",
     "lib/cloudist/queues/basic_queue.rb",
     "lib/cloudist/queues/job_queue.rb",
     "lib/cloudist/queues/reply_queue.rb",
     "lib/cloudist/request.rb",
     "lib/cloudist/utils.rb",
     "lib/cloudist/worker.rb",
+    "lib/cloudist_old.rb",
+    "lib/em/em_timer_utils.rb",
+    "lib/em/iterator.rb",
     "spec/cloudist/basic_queue_spec.rb",
     "spec/cloudist/job_spec.rb",
+    "spec/cloudist/message_spec.rb",
+    "spec/cloudist/messaging_spec.rb",
     "spec/cloudist/payload_spec.rb",
+    "spec/cloudist/payload_spec_2_spec.rb",
+    "spec/cloudist/queue_spec.rb",
     "spec/cloudist/request_spec.rb",
     "spec/cloudist/utils_spec.rb",
     "spec/cloudist_spec.rb",
     "spec/core_ext/string_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/amqp.rb"
   ]
   s.homepage = %q{http://github.com/ivanvanderbyl/cloudist}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Super fast job queue using AMQP}
   s.test_files = [
-    "examples/extending_values.rb",
+    "examples/amqp/amqp_consumer.rb",
+    "examples/amqp/amqp_publisher.rb",
     "examples/queue_message.rb",
-    "examples/sandwich_client.rb",
+    "examples/sandwich_client_with_custom_listener.rb",
     "examples/sandwich_worker.rb",
     "examples/sandwich_worker_with_class.rb",
     "spec/cloudist/basic_queue_spec.rb",
     "spec/cloudist/job_spec.rb",
+    "spec/cloudist/message_spec.rb",
+    "spec/cloudist/messaging_spec.rb",
     "spec/cloudist/payload_spec.rb",
+    "spec/cloudist/payload_spec_2_spec.rb",
+    "spec/cloudist/queue_spec.rb",
     "spec/cloudist/request_spec.rb",
     "spec/cloudist/utils_spec.rb",
     "spec/cloudist_spec.rb",
     "spec/core_ext/string_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/amqp.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<amqp>, ["~> 0.6.7"])
+      s.add_runtime_dependency(%q<amqp>, ["~> 0.8.0.rc12"])
       s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
+      s.add_runtime_dependency(%q<uuid>, [">= 0"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<moqueue>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
@@ -95,9 +121,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_development_dependency(%q<roodi>, ["~> 2.1.0"])
     else
-      s.add_dependency(%q<amqp>, ["~> 0.6.7"])
+      s.add_dependency(%q<amqp>, ["~> 0.8.0.rc12"])
       s.add_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_dependency(%q<hashie>, [">= 0"])
+      s.add_dependency(%q<uuid>, [">= 0"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<moqueue>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
@@ -108,9 +138,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<roodi>, ["~> 2.1.0"])
     end
   else
-    s.add_dependency(%q<amqp>, ["~> 0.6.7"])
+    s.add_dependency(%q<amqp>, ["~> 0.8.0.rc12"])
     s.add_dependency(%q<json>, ["~> 1.4.6"])
+    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+    s.add_dependency(%q<hashie>, [">= 0"])
+    s.add_dependency(%q<uuid>, [">= 0"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<moqueue>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])

data/examples/amqp/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gem 'amqp', '~>0.7'

data/examples/amqp/Gemfile.lock

@@ -0,0 +1,12 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    amqp (0.7.1)
+      eventmachine (>= 0.12.4)
+    eventmachine (0.12.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  amqp (~> 0.7)

data/examples/amqp/amqp_consumer.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "rubygems"
+require 'amqp'
+
+def amqp_settings
+  uri = URI.parse(ENV["AMQP_URL"] || 'amqp://guest:guest@localhost:5672/')
+  {
+    :vhost => uri.path,
+    :host => uri.host,
+    :user => uri.user,
+    :port => uri.port || 5672,
+    :pass => uri.password,
+    :heartbeat => 120,
+    :logging => false
+  }
+rescue Object => e
+  raise "invalid AMQP_URL: (#{uri.inspect}) #{e.class} -> #{e.message}"
+end
+
+p amqp_settings
+
+def log(*args)
+  puts args.inspect
+end
+
+EM.run do
+  puts "Running..."
+  AMQP.start(amqp_settings) do |connection|
+    log "Connected to AMQP broker"
+
+    channel  = AMQP::Channel.new(connection)
+    channel.prefetch(1)
+    queue    = channel.queue("test.hello.world")
+    exchange = channel.direct
+    queue.bind(exchange)
+    
+    @count = 0
+    
+    queue.subscribe(:ack => true) do |h, payload|
+      puts "--"
+      EM.defer {
+        # sleep(1)
+        @count += 1
+        log "Received a message: #{payload} - #{@count}"
+        h.ack
+      }
+    end
+    
+    # queue.subscribe(:ack => false) do |h, payload|
+    #   @count += 1
+    #   log "Received a message: #{payload} - #{@count}"
+    # end
+  end  
+end