disbatch 0.0.9 → 0.0.10

data/bin/disbatchd

@@ -46,13 +46,13 @@ def update_queues
 			next if @runners.has_key?(queue.id)
 
 			# node configured to ignore
-			# next if queue.nodes_ignore.include?(node.id)
+			next if queue.nodes_ignore.include?(Disbatch.node_id)
 
 			# node pinned but not on this node
-			# next if !queue.nodes_ignore.empty? && !queue.nodes_ignore.include?(node.id)
+			next if !queue.nodes_pin.empty? && !queue.nodes_pin.include?(Disbatch.node_id)
 
 			# no plugin for queue
-			next unless Disbatch::Plugin[queue.plugin]
+			next unless Disbatch::Plugin.exists?(queue.plugin)
 
 			puts "Adding #{queue.plugin} runner for #{queue.id}"
 

data/lib/disbatch.rb

@@ -30,7 +30,13 @@ module Disbatch
 
 	# Return and cache the MongoDB connection pool
 	def db
-		@db ||= Mongo::Connection.new(@mongo_host, @mongo_port).db(@mongo_db)
+		begin
+			@db ||= Mongo::Connection.new(@mongo_host, @mongo_port).db(@mongo_db)
+		rescue
+			raise Disbatch::NoDatabaseError
+		end
+
+		@db
 	end
 
 	# Return and cache the local node object

data/lib/disbatch/error.rb

@@ -15,10 +15,14 @@ module Disbatch
 	# Raised when specifying a non-existant plugin
 	class NoPluginError < RuntimeError; end
 
-	# Raised when specifying an invalid plugin
-	class InvalidPluginError < RuntimeError; end
+	# Raised when failing to load a plugin
+	class FailedLoadPluginError < RuntimeError; end
 
-	# Raised when specifying a non-existent queue
+	# Raised when specifying a non-existant plugin
 	class NoQueueError < RuntimeError; end
 
+	# Raised on failure to connect or open mongo
+	class NoDatabaseError < RuntimeError; end
+
 end
+

data/lib/disbatch/plugin.rb

@@ -20,18 +20,23 @@ module Disbatch::Plugin
 		@plugins[name]
 	end
 
+	# Check for existance of plugin
+	def exists?(name)
+		@plugins.has_key?(name)
+	end
+
 	# Attempt to load a plugin file
 	def init(file)
 		begin
 			load file
-		rescue
-			puts "Error loading #{file}"
+		rescue => e
+			raise Disbatch::FailedLoadPluginError, file
 		end
 	end
 
-	# Attempt to load all plugin files in a directory
-	def init_all(path)
-		Dir[path].each { |file| init(file) }
+	# Attempt to load all plugin files matched by a glob
+	def init_all(glob)
+		Dir[glob].each { |file| init(file) }
 	end
 
 	extend self

data/lib/disbatch/queue.rb

@@ -25,6 +25,8 @@ class Disbatch::Queue
 		end
 
 		raise Disbatch::NoQueueError if doc.nil?
+
+		new(doc['class'], doc['_id'])
 	end
 
 	# Get all existing queues
@@ -85,6 +87,18 @@ class Disbatch::Queue
 		Disbatch::Task.take(self)
 	end
 
+	def nodes_pin
+		doc = Disbatch.db[:queues].find_one({:_id => self.id}, {:fields=> [ :nodes_pin ] })
+
+		return doc['nodes_pin'] || []
+	end
+
+	def nodes_ignore
+		doc = Disbatch.db[:queues].find_one({:_id => self.id}, {:fields=> [ :nodes_ignore ] })
+
+		return doc['nodes_ignore'] || []
+	end
+
 	# Check equality with another queue object
 	#
 	# @param[Disbatch::Queue] queue another queue to compare against

data/lib/disbatch/task.rb

@@ -1,6 +1,8 @@
 # Represents a Disbatch task
 class Disbatch::Task
 
+	require 'pp'
+
 	attr_reader :queue, :parameters, :id
 
 	private_class_method :new
@@ -126,17 +128,17 @@ class Disbatch::Task
 
 	# Fail task
 	def fail
-		self.status=-3
+		self.status=Status::TERMINATED
 	end
 
 	# Release task
 	def release
-		self.status=-2
+		self.status=Status::CREATED
 	end
 
 	# Conclude task
 	def conclude
-		self.status=1
+		self.status=Status::CONCLUDED
 	end
 
 	# Execute the task

metadata

@@ -2,7 +2,7 @@
 name: disbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
   - Matthew Berg
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 -05:00
-default_executable: 
+date: 2012-06-29 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: bson
@@ -115,7 +114,6 @@ files:
   - README
   - LICENSE
   - disbatch_specification.txt
-has_rdoc: true
 homepage: http://disbatch.org/projects/disbatch-ruby
 licenses: []
 
@@ -139,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Distributed batch processing package