cloudist 0.4.4 → 0.5.0

data/Gemfile

@@ -1,22 +1,18 @@
 source :rubygems
 
 gem 'amqp',           '~> 0.8.1'
-gem "json",           "~> 1.4.6"
+gem "json",           "~> 1.4"
 gem "i18n"
-gem "activesupport",  "~> 3.0.3"
+gem "activesupport",  "> 3.0.0"
 gem "hashie"
 gem "uuid"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  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.6.4"
-  gem "rcov",         ">= 0"
   gem "reek",         "~> 1.2.8"
   gem "roodi",        "~> 2.1.0"
 end

data/Gemfile.lock

@@ -1,40 +1,45 @@
 GIT
   remote: git://github.com/ivanvanderbyl/moqueue.git
-  revision: cf2108e3bee7730a6a57e0a95a4c17082c2b2603
+  revision: 5d20cc7bceed3cf4f40c02e638f4398b9f0a2e00
   specs:
-    moqueue (0.1.4)
-      amqp
+    moqueue (0.2.1)
+      amqp (>= 0.8.0.rc14)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.7)
-    amq-client (0.8.5)
-      amq-protocol (>= 0.8.0)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    amq-client (0.8.7)
+      amq-protocol (>= 0.8.4)
       eventmachine
-    amq-protocol (0.8.3)
-    amqp (0.8.2)
-      amq-client (~> 0.8.5)
-      amq-protocol (~> 0.8.3)
+    amq-protocol (0.8.4)
+    amqp (0.8.4)
+      amq-client (~> 0.8.7)
+      amq-protocol (~> 0.8.4)
       eventmachine
     diff-lcs (1.1.3)
     eventmachine (0.12.10)
     git (1.2.5)
-    hashie (1.0.0)
-    i18n (0.5.0)
+    hashie (1.2.0)
+    i18n (0.6.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)
+    json (1.7.3)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    multi_json (1.3.6)
     rake (0.9.2.2)
-    rcov (0.9.9)
-    reek (1.2.8)
-      ruby2ruby (~> 1.2)
+    reek (1.2.12)
+      ripper_ruby_parser (~> 0.0.7)
+      ruby2ruby (~> 1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
+    ripper_ruby_parser (0.0.8)
+      sexp_processor (~> 3.0)
     roodi (2.1.0)
       ruby_parser
     rspec (2.4.0)
@@ -48,27 +53,24 @@ GEM
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.6)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.5)
-    uuid (2.3.2)
+    sexp_processor (3.2.0)
+    systemu (2.5.1)
+    uuid (2.3.5)
       macaddr (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.0.3)
+  activesupport (> 3.0.0)
   amqp (~> 0.8.1)
-  bundler (~> 1.0.0)
   hashie
   i18n
   jeweler (~> 1.6.4)
-  json (~> 1.4.6)
-  mocha
+  json (~> 1.4)
   moqueue!
-  rake (~> 0.9.2)
-  rcov
   reek (~> 1.2.8)
   roodi (~> 2.1.0)
   rspec (~> 2.4.0)

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/cloudist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cloudist"
-  s.version = "0.4.4"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Vanderbyl"]
-  s.date = "2011-11-08"
+  s.date = "2012-07-12"
   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 = [
@@ -78,7 +78,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ivanvanderbyl/cloudist"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Super fast job queue using AMQP"
 
   if s.respond_to? :specification_version then
@@ -86,51 +86,39 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<amqp>, ["~> 0.8.1"])
-      s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.4"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_runtime_dependency(%q<activesupport>, ["> 3.0.0"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_runtime_dependency(%q<uuid>, [">= 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.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.1"])
-      s.add_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_dependency(%q<json>, ["~> 1.4"])
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_dependency(%q<activesupport>, ["> 3.0.0"])
       s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<uuid>, [">= 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.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.1"])
-    s.add_dependency(%q<json>, ["~> 1.4.6"])
+    s.add_dependency(%q<json>, ["~> 1.4"])
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+    s.add_dependency(%q<activesupport>, ["> 3.0.0"])
     s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<uuid>, [">= 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.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

data/examples/sandwich_client_with_custom_listener.rb

@@ -1,7 +1,7 @@
 # Cloudst Example: Sandwich Client with custom listener class
-# 
+#
 # This example demonstrates dispatching a job to the worker and receiving event callbacks.
-# 
+#
 # Be sure to update the Cloudist connection settings if they differ from defaults:
 # user: guest
 # pass: guest
@@ -17,23 +17,23 @@ $total_jobs = 0
 
 class SandwichListener < Cloudist::Listener
   listen_to "make.sandwich"
-  
+
   before :find_job
-  
+
   def find_job
     puts "--- #{payload.id}"
   end
-  
+
   def progress(i)
     puts "Progress: %1d%" % i
   end
-  
+
   def runtime(seconds)
     puts "#{id} Finished job in #{seconds} seconds"
     $total_jobs -= 1
     puts "--- #{$total_jobs} jobs remaining"
   end
-  
+
   # def started
   #   puts "Started"
   # end
@@ -41,16 +41,16 @@ class SandwichListener < Cloudist::Listener
   def event(type)
     puts "Event: #{type}"
   end
-  
+
   def finished
     puts "*** Finished ***"
-    
+
     if $total_jobs == 0
       puts "Completed all jobs"
       Cloudist.stop
     end
   end
-  
+
   def error(e)
     puts "#{e.exception}: #{e.message} (#{e.backtrace.first})"
   end
@@ -61,17 +61,20 @@ Cloudist.signal_trap!
 
 Cloudist.start(:logging => true) {
   puts AMQP.settings.inspect
-  
-  unless ARGV.empty?
+
+  if ARGV.empty?
+    puts "Please specify a number of workers to start as your first argument"
+    Cloudist.stop
+  else
     puts "*** Please ensure you have a worker running ***"
-    
+
     job_count = ARGV.pop.to_i
     $total_jobs = job_count
-    job_count.times { |i| 
+    job_count.times { |i|
       log.info("Dispatching sandwich making job...")
       puts "Queued job: " + enqueue('make.sandwich', {:bread => 'white', :sandwich_number => i}).id
     }
   end
-  
-  add_listener(SandwichListener)  
+
+  add_listener(SandwichListener)
 }

data/lib/cloudist/application.rb

@@ -3,7 +3,7 @@ require "singleton"
 module Cloudist
   class Application
     include Singleton
-    
+
     class << self
       def start(options = {}, &block)
         options = instance.settings.update(options)
@@ -13,21 +13,21 @@ module Cloudist
           instance.instance_eval(&block) if block_given?
         end
       end
-      
+
       def signal_trap!
         ::Signal.trap('INT') { Cloudist.stop }
         ::Signal.trap('TERM'){ Cloudist.stop }
       end
     end
-    
+
     def settings
       @@settings ||= default_settings
     end
-    
+
     def settings=(settings_hash)
       @@settings = default_settings.update(settings_hash)
     end
-    
+
     def default_settings
       uri = URI.parse(ENV["AMQP_URL"] || 'amqp://guest:guest@localhost:5672/')
       {
@@ -42,19 +42,19 @@ module Cloudist
     rescue Object => e
       raise "invalid AMQP_URL: (#{uri.inspect}) #{e.class} -> #{e.message}"
     end
-    
+
     private
-    
+
     def setup_reconnect_hook!
       AMQP.conn.connection_status do |status|
-        
+
         log.debug("AMQP connection status changed: #{status}")
-        
+
         if status == :disconnected
           AMQP.conn.reconnect(true)
         end
       end
     end
-    
+
   end
 end

data/lib/cloudist/core_ext/class.rb

@@ -3,7 +3,7 @@ require 'cloudist/core_ext/module'
 
 # Extracted from ActiveSupport 3.0
 class Class
-  
+
   # Taken from http://coderrr.wordpress.com/2008/04/10/lets-stop-polluting-the-threadcurrent-hash/
   def thread_local_accessor name, options = {}
     m = Module.new
@@ -28,8 +28,8 @@ class Class
       extend m
     end
   end
-  
-  
+
+
   # Declare a class-level attribute whose value is inheritable by subclasses.
   # Subclasses can change their own value and it will not impact parent class.
   #
@@ -136,4 +136,4 @@ class Class
     # MRI/YARV/JRuby all disallow creating new instances of a singleton class
     true
   end
-end
+end

data/lib/cloudist/job.rb

@@ -1,10 +1,10 @@
 module Cloudist
   class Job
     attr_reader :payload, :reply_queue
-    
+
     def initialize(payload)
       @payload = payload
-      
+
       if payload.reply_to
         @reply_queue = ReplyQueue.new(payload.reply_to)
         reply_queue.setup
@@ -12,67 +12,67 @@ module Cloudist
         @reply_queue = nil
       end
     end
-    
+
     def id
       payload.id
     end
-    
+
     def data
       payload.body
     end
-    
+
     def body
       data
     end
-    
+
     def log
       Cloudist.log
     end
-    
+
     def cleanup
       # :noop
     end
-    
+
     def reply(body, headers = {}, options = {})
       raise ArgumentError, "Reply queue not ready" unless reply_queue
-      
+
       options = {
         :echo => false
       }.update(options)
-      
+
       headers = {
         :message_id => payload.id,
         :message_type => "reply"
       }.update(headers)
-      
+
       reply_payload = Payload.new(body, headers)
       published_headers = reply_queue.publish(reply_payload)
-      
+
       reply_payload
     end
-    
+
     # Sends a progress update
     # Inputs: percentage - Integer
     # Optional description, this could be displayed to the user e.g. Resizing image
     def progress(percentage, description = nil)
       reply({:progress => percentage, :description => description}, {:message_type => 'progress'})
     end
-    
+
     def event(event_name, event_data = {}, options = {})
       event_data ||= {}
       reply(event_data, {:event => event_name, :message_type => 'event'}, options)
     end
-    
+
     def safely(&blk)
       yield
     rescue Exception => e
       handle_error(e)
     end
-    
+
     def handle_error(e)
       reply({:exception => e.class.name.to_s, :message => e.message.to_s, :backtrace => e.backtrace}, {:message_type => 'error'})
     end
-    
+
     def method_missing(meth, *args, &blk)
       if meth.to_s.ends_with?("!")
         event(meth.to_s.gsub(/(!)$/, ''), args.shift)
@@ -80,6 +80,6 @@ module Cloudist
         super
       end
     end
-    
+
   end
 end