cloudist 0.4.3 → 0.4.4

data/Gemfile

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

data/Gemfile.lock

@@ -9,26 +9,27 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.7)
-    amq-client (0.7.0.alpha25)
-      amq-protocol
+    amq-client (0.8.5)
+      amq-protocol (>= 0.8.0)
       eventmachine
-    amq-protocol (0.5.0)
-    amqp (0.8.0.rc12)
-      amq-client (>= 0.7.0.alpha25)
+    amq-protocol (0.8.3)
+    amqp (0.8.2)
+      amq-client (~> 0.8.5)
+      amq-protocol (~> 0.8.3)
       eventmachine
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     eventmachine (0.12.10)
     git (1.2.5)
     hashie (1.0.0)
     i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.4.6)
     macaddr (1.0.0)
     mocha (0.9.12)
-    rake (0.8.7)
+    rake (0.9.2.2)
     rcov (0.9.9)
     reek (1.2.8)
       ruby2ruby (~> 1.2)
@@ -36,14 +37,14 @@ GEM
       sexp_processor (~> 3.0)
     roodi (2.1.0)
       ruby_parser
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.4.0)
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
@@ -58,17 +59,17 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 3.0.3)
-  amqp (~> 0.8.0.rc12)
+  amqp (~> 0.8.1)
   bundler (~> 1.0.0)
   hashie
   i18n
-  jeweler (~> 1.5.2)
+  jeweler (~> 1.6.4)
   json (~> 1.4.6)
   mocha
   moqueue!
-  rake (~> 0.8.7)
+  rake (~> 0.9.2)
   rcov
   reek (~> 1.2.8)
   roodi (~> 2.1.0)
-  rspec (~> 2.3.0)
+  rspec (~> 2.4.0)
   uuid

data/README.md

@@ -11,88 +11,20 @@ or even just sending emails. Unlike other job queues (DelayedJob etc) Cloudist d
 Installation
 ------------
 
-    gem install cloudist
+```bash
+gem install cloudist
+```
 
 Or if your app has a Gemfile:
-    
-    gem 'cloudist'
+
+```ruby
+gem 'cloudist', '~> 0.4.4'
+```
 
 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.start {
-      # usual stuff here
-      job('make.sandwich') {
-        # define a job handler
-      }
-    }
-    
-This will start an AMQP connection and EM loop then yield everything inside it.
-
-In your worker:
-
-    Cloudist.start {
-      log.info("Started Worker")
-
-      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 {
-
-      log.info("Dispatching sandwich making job...")
-      
-      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
+**Refer to examples.**
 
 Configuration
 -------------
@@ -102,10 +34,17 @@ The only configuration required to get going are the AMQP settings, these can be
 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}
-    
+
+```ruby
+Cloudist.settings = {:user => 'guest', :pass => 'password', :vhost => '/', :host => 'localhost', :port => 5672}
+```
+ 
+Now and what's coming
+---------------------
+
+Cloudist was developed to provide the messaging layer used within TestPilot [Continuous Integration](http://testpilot.me) service.
+
+TestPilot still uses [Cloudist](http://testpilot.me/ivan/cloudist) heavily and a number of features will be merged in soon.
 
 Acknowledgements
 ----------------
@@ -130,7 +69,7 @@ Contributing to Cloudist
 Authors
 -------
 
-Ivan Vanderbyl - [@IvanVanderbyl](http://twitter.com/IvanVanderbyl) - [Blog](http://ivanvanderbyl.github.com/)
+[IvanVanderbyl](http://testpilot.me/ivan) - [Blog](http://ivanvanderbyl.github.com/)
 
 Copyright
 ---------

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/cloudist.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cloudist}
-  s.version = "0.4.3"
+  s.name = "cloudist"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Vanderbyl"]
-  s.date = %q{2011-05-28}
-  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.date = "2011-11-08"
+  s.description = "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 = "ivanvanderbyl@me.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -75,82 +75,61 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/amqp.rb"
   ]
-  s.homepage = %q{http://github.com/ivanvanderbyl/cloudist}
+  s.homepage = "http://github.com/ivanvanderbyl/cloudist"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Super fast job queue using AMQP}
-  s.test_files = [
-    "examples/amqp/amqp_consumer.rb",
-    "examples/amqp/amqp_publisher.rb",
-    "examples/queue_message.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/support/amqp.rb"
-  ]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Super fast job queue using AMQP"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<amqp>, ["~> 0.8.0.rc12"])
+      s.add_runtime_dependency(%q<amqp>, ["~> 0.8.1"])
       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<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_development_dependency(%q<moqueue>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       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.8.0.rc12"])
+      s.add_dependency(%q<amqp>, ["~> 0.8.1"])
       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<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<moqueue>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<reek>, ["~> 1.2.8"])
       s.add_dependency(%q<roodi>, ["~> 2.1.0"])
     end
   else
-    s.add_dependency(%q<amqp>, ["~> 0.8.0.rc12"])
+    s.add_dependency(%q<amqp>, ["~> 0.8.1"])
     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<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     s.add_dependency(%q<moqueue>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<reek>, ["~> 1.2.8"])
     s.add_dependency(%q<roodi>, ["~> 2.1.0"])

data/lib/cloudist/queue.rb

@@ -1,35 +1,38 @@
 module Cloudist
+  #
+  # NOTE: Queue is Deprecated, please use BasicQueue
+  #
   class Queue
-    
+
     attr_reader :options, :name, :channel, :q, :ex
-    
+
     class_attribute :cached_queues
-    
+
     def initialize(name, options = {})
       self.class.cached_queues ||= {}
-      
+
       options = {
         :auto_delete => false,
         :durable => true
       }.update(options)
-      
+
       @name, @options = name, options
-      
+
       setup
       p self.cached_queues.keys
-      
+
       log.debug(tag)
       purge
     end
-    
+
     def purge
       q.purge
     end
-    
+
     def inspect
       "<#{self.class.name} name=#{name} exchange=#{ex ? ex.name : 'nil'}>"
     end
-    
+
     def log
       Cloudist.log
     end
@@ -40,38 +43,38 @@ module Cloudist
         a << "exchange=#{ex.name}" if ex
       }.join(' ')
     end
-    
+
     def publish(msg)
       raise ArgumentError, "Publish expects a Cloudist::Message object" unless msg.is_a?(Cloudist::Message)
-      
+
       body, headers = msg.encoded
       # EM.defer {
         publish_to_ex(body, headers)
       # }
-      
+
       p msg.body.to_hash
     end
-    
+
     # def channel
     #   self.class.channel
     # end
-    # 
+    #
     # def q
     #   self.class.q
     # end
-    # 
+    #
     # def ex
     #   self.class.ex
     # end
-    
+
     def publish_to_ex(body, headers = {})
       ex.publish(body, headers)
     end
-    
+
     def publish_to_q(body, headers = {})
       q.publish(body, headers)
     end
-    
+
     def teardown
       q.unsubscribe
       channel.close
@@ -81,34 +84,34 @@ module Cloudist
     def destroy
       teardown
     end
-    
+
     def subscribe(options = {}, &block)
       options[:ack] = true
       q.subscribe(options) do |queue_header, encoded_message|
         request = Cloudist::Request.new(self, encoded_message, queue_header)
-        
+
         msg = Cloudist::Message.new(*request.for_message)
-        
+
         EM.defer do
           begin
             raise Cloudist::ExpiredMessage if request.expired?
             yield msg
-            
+
           rescue Cloudist::ExpiredMessage
             log.error "AMQP Message Timeout: #{tag} ttl=#{request.ttl} age=#{request.age}"
-            
+
           rescue Exception => e
             Cloudist.handle_error(e)
-            
+
           ensure
             request.ack unless Cloudist.closing?
           end
         end
       end
     end
-    
+
     private
-    
+
     def setup
       if self.class.cached_queues.keys.include?(name.to_sym)
         @q = self.class.cached_queues[name.to_sym][:q]
@@ -126,27 +129,27 @@ module Cloudist
       end
       setup_binding
     end
-    
+
     def setup_channel
       @channel = ::AMQP::Channel.new
-      
+
       # Set up QOS. If you do not do this then the subscribe in receive_message
       # will get overwelmd and the whole thing will collapse in on itself.
       channel.prefetch(1)
     end
-    
+
     def setup_queue
       @q = channel.queue(name, options)
     end
-    
+
     def setup_exchange
       @ex = channel.direct(name)
       # setup_binding
     end
-    
+
     def setup_binding
       q.bind(ex)
     end
-    
+
   end
 end