make all utilities and examples work

examples/direct/TextConsumer.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.push File.dirname(__FILE__) + '/../../gen-rb/'
-require 'job_pool'
+$LOAD_PATH.push File.dirname(__FILE__) + '/../../lib/rb/'
+require 'jp/thrift'
 include Jp
 
 socket = Thrift::Socket.new 'localhost', 9090

examples/direct/TextProducer.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.push File.dirname(__FILE__) + '/../../gen-rb/'
-require 'job_pool'
+$LOAD_PATH.push File.dirname(__FILE__) + '/../../lib/rb/'
+require 'jp/thrift'
 include Jp
 
 socket = Thrift::Socket.new 'localhost', 9090

examples/simple/JsonConsumer.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.push '../../lib/rb'
-require 'consumer'
+require 'jp/consumer'
 
 c = Jp::JsonConsumer.new 'json' do |message|
 	print "I consumed:\n%s\n" % message.inspect

examples/simple/JsonProducer.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.push '../../lib/rb'
-require 'producer'
+require 'jp/producer'
 
 p = Jp::JsonProducer.new 'json'
 doc = {

examples/simple/TextConsumer.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.push '../../lib/rb'
-require 'consumer'
+require 'jp/consumer'
 
 c = Jp::TextConsumer.new 'text' do |message|
 	print "I consumed a %s.\n" % message

examples/simple/TextProducer.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.push '../../lib/rb'
-require 'producer'
+require 'jp/producer'
 
 p = Jp::TextProducer.new 'text'
 p.add 'simple pie'

examples/simple/ThriftConsumer.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.push '../../lib/rb/'
 $LOAD_PATH.push '../gen-rb/'
-require 'consumer'
+require 'jp/consumer'
 require 'example_types'
 
 c = Jp::ThriftConsumer.new 'thrift', ExampleData do |message|

examples/simple/ThriftProducer.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.push '../../lib/rb'
 $LOAD_PATH.push '../gen-rb/'
-require 'producer'
+require 'jp/producer'
 require 'example_types'
 
 p = Jp::ThriftProducer.new 'thrift'

lib/rb/jp/consumer.rb

@@ -2,9 +2,10 @@
 
 require 'jp/client'
 
-autoload :Rev, 'rev'
+require 'rev'
 autoload :JSON, 'json'
 
+
 module Jp
 	class AbstractConsumer < AbstractClient
 		def initialize queue, options = {}, &block

lib/rb/jp/thrift.rb

@@ -1,3 +1,4 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/gen-rb'
 require 'job_pool'
+require 'job_pool_instrumented'
 $LOAD_PATH.shift

utils/jp-pool-size.rb

@@ -1,37 +1,27 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.push File.dirname(__FILE__) + '/../classes/'
+$LOAD_PATH.push File.dirname(__FILE__) + '/../lib/rb/'
 
-require 'ruby-1.9.0-compat'
-require 'jp_config_loader'
+require 'jp/server/configuration_loader'
+require 'jp/server/handler'
 require 'mongo'
 
 
 module Jp
 	def self.pool_sizes
-		# Load options & defaults
-		options = Jp::load_server_config
-
-		options[:mongo_uri] ||= 'mongodb://localhost'
-		raise ArgumentError.new "mongo_db option must be specified" unless options[:mongo_db]
-		raise ArgumentError.new "pools option must be specified" unless options[:pools]
-		raise ArgumentError.new "pools option must not be empty" unless ! options[:pools].empty?
-
-		# Connect to mongodb
-		connection = Mongo::Connection.from_uri options[:mongo_uri]
-		database = connection.db options[:mongo_db]
+		options = Jp::Server::ConfigurationLoader.server_config
+    server = Jp::Server::Handler.new(options)
 
 		out = Hash.new
-		options[:pools].each do |name, data|
-			out[name] = database[name].count
+		server.pools.each do |name, data|
+			out[name] = server.database[name].count
 		end
 		out
 	end
 end
 
 if File.expand_path($0) == File.expand_path(__FILE__)
 	Jp.pool_sizes.each do |name, size|
-		next if ARGV[0] && ARGV[0] != name
 		print "%s: %d\n" % [name, size]
 	end
 end

utils/jp-stats.rb

@@ -1,14 +1,13 @@
-#!/usr/bin/env ruby1.9
+#!/usr/bin/env ruby
 # Requires:
 # - Thrift
+$LOAD_PATH.push File.dirname(__FILE__) + '/../lib/rb'
+require 'jp/thrift'
 
 module Jp
 	def self.stats host, port
 		##### Thrift setup #####
 
-		$LOAD_PATH.push File.dirname(__FILE__) + '/../gen-rb/'
-		require 'job_pool_instrumented'
-
 		transport = Thrift::BufferedTransport.new(Thrift::Socket.new(host, port))
 		client = JobPoolInstrumented::Client.new(Thrift::BinaryProtocol.new(transport))
 		transport.open