sweatshop 1.4.0 → 1.5.0

data/README.markdown

@@ -1,20 +1,20 @@
-# SweatShop
+# Sweatshop
 
-SweatShop provides an api to background resource intensive tasks. Much of the api design was copied from Workling, with a few tweaks.
+Sweatshop provides an api to background resource intensive tasks. Much of the api design was copied from Workling, with a few tweaks.
 Currently, it runs rabbitmq and kestrel, but it can support any number of queues.
 
 ## Installing
 
-    gem install sweat_shop
-    freeze in your gems directory (add config.gem 'sweat_shop' to your environment)
-    cd vendor/gems/sweat_shop
+    gem install sweatshop
+    freeze in your gems directory (add config.gem 'sweatshop' to your environment)
+    cd vendor/gems/sweatshop
     rake setup
 
 ## Writing workers
 
-Put `email_worker.rb` into app/workers and sublcass `SweatShop::Worker`:
+Put `email_worker.rb` into app/workers and sublcass `Sweatshop::Worker`:
 
-    class EmailWorker < SweatShop::Worker
+    class EmailWorker < Sweatshop::Worker
       def send_mail(to)
         user = User.find_by_id(to)
         Mailer.deliver_welcome(to)
@@ -36,7 +36,7 @@ queues.
 
 ## Running the queue
 
-SweatShop has been tested with Rabbit and Kestrel, but it will also work with Starling. Please use the following resources to install the server:
+Sweatshop has been tested with Rabbit and Kestrel, but it will also work with Starling. Please use the following resources to install the server:
 
 Kestrel:
 http://github.com/robey/kestrel/tree/master
@@ -91,7 +91,7 @@ By default, the script will run all workers defined in the app/workers dir. Ever
     script/sweatshop -d
     script/sweatshop -d stop
 
-If you would like to run SweatShop as a daemon on a linux machine, use the initd.sh script provided in the sweat_shop/script dir.
+If you would like to run Sweatshop as a daemon on a linux machine, use the initd.sh script provided in the sweatshop/script dir.
 
 # REQUIREMENTS
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :patch: 0
 :major: 1
-:minor: 4
+:minor: 5

data/bin/sweatd

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/sweat_shop/sweatd'
+require File.dirname(__FILE__) + '/../lib/sweatshop/sweatd'

data/lib/message_queue/base.rb

@@ -5,13 +5,8 @@ module MessageQueue
     def enqueue(queue, data); end
     def dequeue(queue);       end
     def confirm(queue);       end
-    def subscribe(queue);     end
     def delete(queue);        end
     def client;               end
     def stop;                 end
-
-    def subscribe?
-      false
-    end
   end
 end

data/lib/{sweat_shop.rb → sweatshop.rb}

@@ -6,9 +6,9 @@ $:.unshift(File.dirname(__FILE__))
 require 'message_queue/base'
 require 'message_queue/rabbit'
 require 'message_queue/kestrel'
-require 'sweat_shop/worker'
+require 'sweatshop/worker'
 
-module SweatShop
+module Sweatshop
   extend self
 
   def workers
@@ -31,30 +31,22 @@ module SweatShop
   end
 
   def do_tasks(workers)
-    if queue.subscribe?
-      EM.run do
-        workers.each do |worker|
-          worker.subscribe
+    loop do
+      wait = true
+      workers.each do |worker|
+        if task = worker.dequeue
+          worker.do_task(task)
+          wait = false
         end
       end
-    else
-      loop do
-        wait = true
+      if stop?
         workers.each do |worker|
-          if task = worker.dequeue
-            worker.do_task(task)
-            wait = false
-          end
-        end
-        if stop?
-          workers.each do |worker|
-            worker.stop
-          end
-          queue.stop
-          exit 
+          worker.stop
         end
-        sleep 1 if wait
+        queue.stop
+        exit 
       end
+      sleep 1 if wait
     end
   end
 
@@ -89,7 +81,7 @@ module SweatShop
 
   def stop
     @stop = true
-    queue.stop if queue.subscribe?
+    queue.stop
   end
 
   def stop?

data/lib/{sweat_shop → sweatshop}/sweatd.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/daemoned'
 
-module SweatShop
+module Sweatshop
   class Sweatd
     include Daemoned
     queues     = []
@@ -30,12 +30,12 @@ module SweatShop
 
     sig(:term, :int) do
       puts "Shutting down sweatd..."
-      SweatShop.stop
+      Sweatshop.stop
     end
 
     sig(:hup) do
       puts "Received HUP"
-      SweatShop.stop
+      Sweatshop.stop
       remove_pid!
       puts "Restarting sweatd with #{start_cmd}..."
       `#{start_cmd}`        
@@ -46,14 +46,14 @@ module SweatShop
         puts "Loading Rails..."
         require rails_root + '/config/environment' 
       end
-      require File.dirname(__FILE__) + '/../sweat_shop'
+      require File.dirname(__FILE__) + '/../sweatshop'
     end
 
     daemonize(:kill_timeout => 20) do
       workers = []
 
       if groups.any?
-        workers += SweatShop.workers_in_group(groups)
+        workers += Sweatshop.workers_in_group(groups)
       end
 
       if queues.any?
@@ -64,11 +64,11 @@ module SweatShop
         worker_str = workers.join(',')
         puts "Starting #{worker_str}..." 
         $0 = "Sweatd: #{worker_str}"
-        SweatShop.do_tasks(workers)
+        Sweatshop.do_tasks(workers)
       else
         puts "Starting all workers..." 
         $0 = 'Sweatd: all'
-        SweatShop.do_all_tasks
+        Sweatshop.do_all_tasks
       end
     end
 

data/lib/{sweat_shop → sweatshop}/worker.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/metaid'
 
-module SweatShop
+module Sweatshop
   class Worker
     def self.inherited(subclass)
       self.workers << subclass
@@ -34,7 +34,7 @@ module SweatShop
     end
 
     def self.config
-      SweatShop.config
+      Sweatshop.config
     end
 
     def self.queue_name
@@ -61,12 +61,6 @@ module SweatShop
       queue.confirm(queue_name)
     end
 
-    def self.subscribe
-      queue.subscribe(queue_name) do |task|
-        do_task(task)
-      end
-    end
-
     def self.do_tasks
       while task = dequeue
         do_task(task)
@@ -92,19 +86,19 @@ module SweatShop
     end
 
     def self.queue
-      SweatShop.queue(queue_group.to_s)
+      Sweatshop.queue(queue_group.to_s)
     end
 
     def self.workers
-      SweatShop.workers
+      Sweatshop.workers
     end
 
     def self.config
-      SweatShop.config
+      Sweatshop.config
     end
 
     def self.log(msg)
-      SweatShop.log(msg)
+      Sweatshop.log(msg)
     end
 
     def self.call_before_task(task)

data/script/sweatshop

@@ -7,11 +7,11 @@ if ARGV.include?('-d')
   root = File.expand_path(File.dirname(__FILE__) + '/..')
   ARGV << "--rails=#{root}"
 
-  system("ruby #{root}/vendor/gems/sweat_shop/lib/sweat_shop/sweatd.rb #{ARGV.join(' ')}")
+  system("ruby #{root}/vendor/gems/sweatshop/lib/sweatshop/sweatd.rb #{ARGV.join(' ')}")
   exit $?.exitstatus
 else
   puts "Loading Rails..."
   require File.dirname(__FILE__) + '/../config/environment'
   puts "Listening for new tasks..."
-  SweatShop.do_all_tasks
+  Sweatshop.do_all_tasks
 end

data/test/hello_worker.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../lib/sweat_shop'
-class HelloWorker < SweatShop::Worker
+require File.dirname(__FILE__) + '/../lib/sweatshop'
+class HelloWorker < Sweatshop::Worker
   TEST_FILE = File.dirname(__FILE__) + '/test.txt' unless defined?(TEST_FILE)
 
   def hello(name)

data/test/test_functional_worker.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/sweat_shop'
+require File.dirname(__FILE__) + '/../lib/sweatshop'
 require File.dirname(__FILE__) + '/test_helper'
 require File.dirname(__FILE__) + '/hello_worker'
 
@@ -9,20 +9,20 @@ class WorkerTest < Test::Unit::TestCase
   end
 
   def teardown
-    SweatShop.instance_variable_set("@config", nil)
-    SweatShop.instance_variable_set("@queues", nil)
+    Sweatshop.instance_variable_set("@config", nil)
+    Sweatshop.instance_variable_set("@queues", nil)
     File.delete(HelloWorker::TEST_FILE) if File.exist?(HelloWorker::TEST_FILE)
   end
 
   should "daemonize" do
     begin
-      SweatShop.config['enable'] = true
-      SweatShop.logger = :silent
+      Sweatshop.config['enable'] = true
+      Sweatshop.logger = :silent
   
       HelloWorker.async_hello('Amos')
   
       worker = File.expand_path(File.dirname(__FILE__) + '/hello_worker')
-      sweatd = "#{File.dirname(__FILE__)}/../lib/sweat_shop/sweatd.rb"
+      sweatd = "#{File.dirname(__FILE__)}/../lib/sweatshop/sweatd.rb"
   
       `ruby #{sweatd} --worker-file #{worker} start`
       `ruby #{sweatd} stop`
@@ -39,9 +39,9 @@ class WorkerTest < Test::Unit::TestCase
 
   should "connect to fallback servers if the default one is down" do
     begin
-      SweatShop.logger = :silent
-      SweatShop.config['enable'] = true
-      SweatShop.config['default']['cluster'] =
+      Sweatshop.logger = :silent
+      Sweatshop.config['enable'] = true
+      Sweatshop.config['default']['cluster'] =
         [
          'localhost:5671', # invalid
          'localhost:5672'  # valid
@@ -53,7 +53,7 @@ class WorkerTest < Test::Unit::TestCase
       HelloWorker.queue.client = nil
 
       HelloWorker.stop
-      SweatShop.config['default']['cluster'] =
+      Sweatshop.config['default']['cluster'] =
         [
          'localhost:5671',# valid
          'localhost:5672' # invalid

data/test/test_sweatshop.rb

@@ -1,23 +1,23 @@
 require File.dirname(__FILE__) + '/test_helper'
-require File.dirname(__FILE__) + '/../lib/sweat_shop'
+require File.dirname(__FILE__) + '/../lib/sweatshop'
 
-class SweatShopTest < Test::Unit::TestCase
-  SweatShop.workers = []
+class SweatshopTest < Test::Unit::TestCase
+  Sweatshop.workers = []
 
-  class HelloWorker < SweatShop::Worker
+  class HelloWorker < Sweatshop::Worker
     def hello(name)
       "Hi, #{name}"
     end
   end
 
-  class GroupedWorker < SweatShop::Worker
+  class GroupedWorker < Sweatshop::Worker
     queue_group :foo
   end
 
   should "group workers" do
-    assert_equal [HelloWorker, GroupedWorker], SweatShop.workers_in_group(:all)
-    assert_equal [HelloWorker],   SweatShop.workers_in_group(:default)
-    assert_equal [GroupedWorker], SweatShop.workers_in_group(:foo)
+    assert_equal [HelloWorker, GroupedWorker], Sweatshop.workers_in_group(:all)
+    assert_equal [HelloWorker],   Sweatshop.workers_in_group(:default)
+    assert_equal [GroupedWorker], Sweatshop.workers_in_group(:foo)
   end
 
   should "synch call" do
@@ -26,8 +26,8 @@ class SweatShopTest < Test::Unit::TestCase
   end
 
   should "assign a uid" do
-    SweatShop.logger = :silent
-    SweatShop.config['enable'] = false
+    Sweatshop.logger = :silent
+    Sweatshop.config['enable'] = false
     uid = HelloWorker.async_hello('Amos')
     assert_not_nil uid
   end
@@ -47,7 +47,7 @@ class SweatShopTest < Test::Unit::TestCase
   end
 
   should "exception handler" do
-    SweatShop.logger = :silent
+    Sweatshop.logger = :silent
 
     exception = nil
     HelloWorker.on_exception do |e|
@@ -60,7 +60,7 @@ class SweatShopTest < Test::Unit::TestCase
 
   should "chain before tasks" do
     MESSAGES = []
-    class BaseWorker < SweatShop::Worker
+    class BaseWorker < Sweatshop::Worker
       before_task do |task|
         MESSAGES << 'base'
       end
@@ -72,7 +72,7 @@ class SweatShopTest < Test::Unit::TestCase
     end
     SubWorker.call_before_task('foo')
     assert_equal ['base', 'sub'], MESSAGES
-    SweatShop.workers.delete(BaseWorker)
-    SweatShop.workers.delete(SubWorker)
+    Sweatshop.workers.delete(BaseWorker)
+    Sweatshop.workers.delete(SubWorker)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sweatshop
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Amos Elliston
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 -07:00
+date: 2009-10-20 00:00:00 -07:00
 default_executable: sweatd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,11 +43,11 @@ files:
 - lib/message_queue/base.rb
 - lib/message_queue/kestrel.rb
 - lib/message_queue/rabbit.rb
-- lib/sweat_shop.rb
-- lib/sweat_shop/daemoned.rb
-- lib/sweat_shop/metaid.rb
-- lib/sweat_shop/sweatd.rb
-- lib/sweat_shop/worker.rb
+- lib/sweatshop.rb
+- lib/sweatshop/daemoned.rb
+- lib/sweatshop/metaid.rb
+- lib/sweatshop/sweatd.rb
+- lib/sweatshop/worker.rb
 - script/initd.sh
 - script/kestrel
 - script/kestrel.sh