one tube per job instead of priority tubes

Author: Adam Wiggins

bin/stalk

@@ -2,19 +2,15 @@
 
 require File.dirname(__FILE__) + '/../lib/stalker'
 
-usage = "stalk <jobs.rb> [<priority>[,<priority>,..]]"
+usage = "stalk <jobs.rb> [<job>[,<job>,..]]"
 file = ARGV.shift or abort usage
-priorities = (ARGV.shift || 'all').split(',')
+jobs = ARGV.shift.split(',') rescue nil
 
 require file
 
-jobs = Stalker.jobs(priorities)
-puts "Working #{jobs.size} #{priorities.join(', ')} priority jobs: [ #{jobs.join(' ')} ]"
-
 trap('INT') do
 	puts "\rExiting"
 	exit
 end
 
-Stalker.work priorities
-
+Stalker.work jobs

examples/enqueue.rb

@@ -1,8 +1,5 @@
 $LOAD_PATH.unshift '../lib'
 require 'stalker'
 
-require 'jobs'
-
 Stalker.enqueue('send.email', :email => '[email protected]')
 Stalker.enqueue('cleanup.strays')
-

examples/jobs.rb

@@ -3,18 +3,14 @@
 
 include Stalker
 
-priority :high do
-	job 'send.email' do |args|
-		puts "Sending email to args['email']"
-	end
+job 'send.email' do |args|
+	log "Sending email to #{args['email']}"
+end
 
-	job 'transform.image' do |args|
-		puts "Image transform"
-	end
+job 'transform.image' do |args|
+	log "Image transform"
 end
 
-priority :low do
-	job 'cleanup.strays' do |args|
-		puts "Cleaning up"
-	end
+job 'cleanup.strays' do |args|
+	log "Cleaning up"
 end

lib/stalker.rb

@@ -6,40 +6,37 @@ module Stalker
 	extend self
 
 	def enqueue(job, args={})
-		beanstalk.use find_priority(job)
+		beanstalk.use job
 		beanstalk.put [ job, args ].to_json
 	end
 
-	def priority(p, &block)
-		@@priority = p.to_s
-		block.call
-		@@priority = nil
-	end
-
 	def job(j, &block)
-		@@priority ||= 'default'
-		@@priorities ||= {}
-		@@priorities[j] = @@priority
-
 		@@handlers ||= {}
 		@@handlers[j] = block
 	end
 
-	def work(priorities=['all'])
-		if Array(priorities) == [ 'all' ]
-			priorities = @@priorities.values.uniq
+	class NoJobsDefined < RuntimeError; end
+	class NoSuchJob < RuntimeError; end
+
+	def work(jobs=nil)
+		raise NoJobsDefined unless defined?(@@handlers)
+
+		jobs ||= all_jobs
+
+		jobs.each do |job|
+			raise(NoSuchJob, job) unless @@handlers[job]
 		end
 
+		log "Working #{jobs.size} jobs  :: [ #{jobs.join(' ')} ]"
+
 		beanstalk.list_tubes_watched.each { |tube| beanstalk.ignore(tube) }
-		priorities.each { |priority| beanstalk.watch(priority) }
+		jobs.each { |job| beanstalk.watch(job) }
 
 		loop do
 			work_one_job
 		end
 	end
 
-	class NoSuchJob < RuntimeError; end
-
 	def work_one_job
 		job = beanstalk.reserve
 		name, args = JSON.parse job.body
@@ -65,21 +62,6 @@ def log(msg)
 		puts "[#{Time.now}] #{msg}"
 	end
 
-	def jobs(priorities=['all'])
-		jobs = []
-		@@priorities.each do |job, priority|
-			jobs << job if priorities == %w(all) or priorities.include? priority
-		end
-		jobs
-	end
-
-	class NoJobsDefined < RuntimeError; end
-
-	def find_priority(job)
-		raise NoJobsDefined unless defined?(@@priorities)
-		@@priorities[job] or raise(NoSuchJob, job)
-	end
-
 	def beanstalk
 		@@beanstalk ||= Beanstalk::Pool.new([ beanstalk_host_and_port ])
 	end
@@ -106,4 +88,8 @@ def exception_message(e)
 
 		msg.join("\n")
 	end
+
+	def all_jobs
+		@@handlers.keys
+	end
 end