droid 1.0.2pre → 1.0.2

data/Rakefile

@@ -2,35 +2,35 @@ require 'rubygems'
 require 'rake'
 
 begin
-	require 'jeweler'
-	Jeweler::Tasks.new do |gem|
-		gem.name = "droid"
-		gem.summary = %Q{AMQP Wrapper Library}
-		gem.description = %Q{Easy to use AMQP Library with constructs for typical usage patterns}
-		gem.email = "ricardo@heroku.com"
-		gem.homepage = "http://heroku.com"
-		gem.authors = ["Ricardo Chimal, Jr."]
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "droid"
+    gem.summary = %Q{AMQP Wrapper Library}
+    gem.description = %Q{Easy to use AMQP Library with constructs for typical usage patterns}
+    gem.email = "ricardo@heroku.com"
+    gem.homepage = "http://heroku.com"
+    gem.authors = ["Ricardo Chimal, Jr."]
 
-		gem.add_development_dependency "baconmocha", ">= 0"
+    gem.add_development_dependency "baconmocha", ">= 0"
 
-		# gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-		gem.add_dependency 'json_pure', '>= 1.2.0'
-		gem.add_dependency 'rest-client', '>= 1.2.0'
-		gem.add_dependency 'amqp', '0.6.7'
-		gem.add_dependency 'bunny', '~> 0.6.0'
-		gem.add_dependency 'SystemTimer', '~> 1.2.0'
-		gem.add_dependency 'eventmachine_httpserver', '0.2.0'
-	end
-	Jeweler::GemcutterTasks.new
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency 'json_pure', '>= 1.2.0'
+    gem.add_dependency 'rest-client', '>= 1.2.0'
+    gem.add_dependency 'amqp', '0.6.7'
+    gem.add_dependency 'bunny', '~> 0.6.0'
+    gem.add_dependency 'SystemTimer', '~> 1.2.0'
+    gem.add_dependency 'eventmachine_httpserver', '0.2.0'
+  end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-	puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 require 'rake/testtask'
 Rake::TestTask.new(:spec) do |spec|
-	spec.libs << 'lib' << 'spec'
-	spec.pattern = 'spec/**/*_spec.rb'
-	spec.verbose = true
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.verbose = true
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-1.0.2pre
+1.0.2

data/bin/bleedq

@@ -13,7 +13,7 @@ q = b.queue(queue_name)
 puts "Bleeding queue #{queue_name}"
 
 while ((msg = q.pop)[:payload] != :queue_empty) do
-	pp msg
+  pp msg
 end
 
 puts "done."

data/droid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{droid}
-  s.version = "1.0.2pre"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ricardo Chimal, Jr."]
-  s.date = %q{2010-11-12}
+  s.date = %q{2011-07-29}
   s.default_executable = %q{bleedq}
   s.description = %q{Easy to use AMQP Library with constructs for typical usage patterns}
   s.email = %q{ricardo@heroku.com}

data/examples/async_reply.rb

@@ -2,24 +2,24 @@ $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'droid'
 
 def log
-	Droid.log
+  Droid.log
 end
 
 Droid.new('Example Reply') do |droid|
-	droid.worker('example.target').subscribe do |req|
-		log.debug "headers: #{req.header.headers.inspect}"
-		log.debug "event_hash should be woot -> #{req.droid_headers[:event_hash]}"
-		req.reply(:target_received_at => Time.now.to_i)
-		req.ack
-	end
+  droid.worker('example.target').subscribe do |req|
+    log.debug "headers: #{req.header.headers.inspect}"
+    log.debug "event_hash should be woot -> #{req.droid_headers[:event_hash]}"
+    req.reply(:target_received_at => Time.now.to_i)
+    req.ack
+  end
 
-	droid.listener('example.check.target').subscribe do |req|
-		req.publish('example.target', { :checking => Time.now.to_i }) do |req2|
-			log.debug "event_hash should be woot -> #{req2.droid_headers[:event_hash]}"
-			log.info "We're done checking!"
-			Droid.stop_safe
-		end
-	end
+  droid.listener('example.check.target').subscribe do |req|
+    req.publish('example.target', { :checking => Time.now.to_i }) do |req2|
+      log.debug "event_hash should be woot -> #{req2.droid_headers[:event_hash]}"
+      log.info "We're done checking!"
+      Droid.stop_safe
+    end
+  end
 
-	droid.timer(2) {  Droid.publish('example.check.target', {:sent_at => Time.now.to_i}, {:event_hash => "woot"}) }
+  droid.timer(2) {  Droid.publish('example.check.target', {:sent_at => Time.now.to_i}, {:event_hash => "woot"}) }
 end

data/examples/heroku_async_reply.rb

@@ -2,21 +2,21 @@ $:.unshift File.dirname(__FILE__) + '/../lib/'
 require 'heroku_droid'
 
 def log
-	Droid.log
+  Droid.log
 end
 
 HerokuDroid.new('Example Reply') do |droid|
-	droid.worker('example.target').subscribe do |req|
-		req.reply(:target_received_at => Time.now.to_i)
-		req.ack
-	end
+  droid.worker('example.target').subscribe do |req|
+    req.reply(:target_received_at => Time.now.to_i)
+    req.ack
+  end
 
-	droid.listener('example.check.target').subscribe do |req|
-		req.publish('example.target', { :checking => Time.now.to_i }) do |req2|
-			log.info "We're done checking!"
-			Droid.stop_safe
-		end
-	end
+  droid.listener('example.check.target').subscribe do |req|
+    req.publish('example.target', { :checking => Time.now.to_i }) do |req2|
+      log.info "We're done checking!"
+      Droid.stop_safe
+    end
+  end
 
-	EM.add_timer(2) { Droid.publish('example.check.target', :sent_at => Time.now.to_i ) }
+  EM.add_timer(2) { Droid.publish('example.check.target', :sent_at => Time.now.to_i ) }
 end

data/examples/sync.rb

@@ -2,22 +2,22 @@ $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'droid'
 
 def log
-	Droid.log
+  Droid.log
 end
 
 if ARGV[0] == 'listen'
-	Droid.new('Example Worker') do |droid|
-		droid.worker('example.bunny.worker').subscribe do |req|
-			req.ack
-			log.info "Work done, replying..."
-			req.reply(:t => Time.now.to_i)
-		end
-
-		droid.listener('example.bunny.listener').subscribe do |req|
-			log.info "I heard #{req['t']}"
-		end
-	end
-	exit(0)
+  Droid.new('Example Worker') do |droid|
+    droid.worker('example.bunny.worker').subscribe do |req|
+      req.ack
+      log.info "Work done, replying..."
+      req.reply(:t => Time.now.to_i)
+    end
+
+    droid.listener('example.bunny.listener').subscribe do |req|
+      log.info "I heard #{req['t']}"
+    end
+  end
+  exit(0)
 end
 
 

data/examples/worker.rb

@@ -2,7 +2,7 @@ $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'droid'
 
 def log
-	Droid.log
+  Droid.log
 end
 
 @gum_chews = 0
@@ -10,49 +10,49 @@ end
 
 Droid.new('Example Worker') do |droid|
 
-	# auto acks the message
-	@gum = droid.worker('example.chew.gum').subscribe do |req|
-		log.info "flavor: #{req['flavor']}, packs: #{req['packs']}"
-		log.info req.msg.inspect
-		log.info req.droid_headers
-
-		@gum_chews += 1
-	end
-
-	# explicit ack
-	@toffee = droid.worker('example.chew.toffee').subscribe(:auto_ack => false) do |req|
-		log.info "flavor: #{req['flavor']}"
-		log.info req.msg.inspect
-		log.info req.droid_headers
-
-		req.ack
-
-		@toffee_chews += 1
-	end
-
-	droid.periodic_timer(2) do
-		log.debug "checking gum & toffee chews"
-
-		if @gum_chews == 3 && @gum
-			@gum.destroy
-			@gum = nil
-		end
-
-		if @toffee_chews == 2 && @toffee
-			@toffee.destroy
-			@toffee = nil
-		end
-
-		if @toffee.nil? && @gum.nil?
-			Droid.stop_safe
-		end
-	end
-
-	droid.timer(2) do
-		droid.publish('example.chew.gum', :flavor => 'spearmint', :packs => 2)
-		droid.publish('example.chew.gum', :flavor => 'bubblegum', :packs => 3)
-		droid.publish('example.chew.gum', :flavor => 'peppermint', :packs => 1)
-		droid.publish('example.chew.toffee', :flavor => 'caramel')
-		droid.publish('example.chew.toffee', :flavor => 'licorish')
-	end
+  # auto acks the message
+  @gum = droid.worker('example.chew.gum').subscribe do |req|
+    log.info "flavor: #{req['flavor']}, packs: #{req['packs']}"
+    log.info req.msg.inspect
+    log.info req.droid_headers
+
+    @gum_chews += 1
+  end
+
+  # explicit ack
+  @toffee = droid.worker('example.chew.toffee').subscribe(:auto_ack => false) do |req|
+    log.info "flavor: #{req['flavor']}"
+    log.info req.msg.inspect
+    log.info req.droid_headers
+
+    req.ack
+
+    @toffee_chews += 1
+  end
+
+  droid.periodic_timer(2) do
+    log.debug "checking gum & toffee chews"
+
+    if @gum_chews == 3 && @gum
+      @gum.destroy
+      @gum = nil
+    end
+
+    if @toffee_chews == 2 && @toffee
+      @toffee.destroy
+      @toffee = nil
+    end
+
+    if @toffee.nil? && @gum.nil?
+      Droid.stop_safe
+    end
+  end
+
+  droid.timer(2) do
+    droid.publish('example.chew.gum', :flavor => 'spearmint', :packs => 2)
+    droid.publish('example.chew.gum', :flavor => 'bubblegum', :packs => 3)
+    droid.publish('example.chew.gum', :flavor => 'peppermint', :packs => 1)
+    droid.publish('example.chew.toffee', :flavor => 'caramel')
+    droid.publish('example.chew.toffee', :flavor => 'licorish')
+  end
 end

data/lib/droid.rb

@@ -3,7 +3,7 @@ require 'amqp'
 require 'mq'
 
 if !defined?(JSON) && !defined?(JSON_LOADED)
-	require 'json/pure'
+  require 'json/pure'
 end
 
 require 'droid/monkey'
@@ -16,126 +16,126 @@ require 'droid/queue'
 require 'droid/em'
 
 class Droid
-	def self.version
-		@@version ||= File.read(File.dirname(__FILE__) + '/../VERSION').strip
-	end
-
-	def self.name
-		@@name
-	end
-
-	def self.name=(name)
-		@@name = name
-	end
-
-	def self.log=(log)
-		@@log = log
-	end
-
-	def self.log
-		@@log ||= begin
-			require 'logger'
-			Logger.class_eval <<EORUBY
-				alias_method :notice, :info
-
-				alias_method :error_og, :error
-				def error(err, opts={})
-					e = opts[:exception]
-					if e.respond_to?(:backtrace)
-						err += "\n" + e.backtrace.join("\n  ")
-					end
-					error_og(err)
-				end
+  def self.version
+    @@version ||= File.read(File.dirname(__FILE__) + '/../VERSION').strip
+  end
+
+  def self.name
+    @@name
+  end
+
+  def self.name=(name)
+    @@name = name
+  end
+
+  def self.log=(log)
+    @@log = log
+  end
+
+  def self.log
+    @@log ||= begin
+      require 'logger'
+      Logger.class_eval <<EORUBY
+        alias_method :notice, :info
+
+        alias_method :error_og, :error
+        def error(err, opts={})
+          e = opts[:exception]
+          if e.respond_to?(:backtrace)
+            err += "\n" + e.backtrace.join("\n  ")
+          end
+          error_og(err)
+        end
 EORUBY
-			Logger.new($stderr)
-		end
-	end
-
-	def self.default_config
-		uri = URI.parse(ENV["AMQP_URL"] || 'amqp://guest:guest@localhost:5672/')
-		{
-			:vhost => uri.path,
-			:host => uri.host,
-			:user => uri.user,
-			:port => uri.port || 5672,
-			:pass => uri.password
-		}
-	rescue Object => e
-		raise "invalid AMQP_URL: (#{uri.inspect}) #{e.class} -> #{e.message}"
-	end
-
-	def self.start(opts={})
-		config = opts[:config] || self.default_config
-
-		wait_for_tcp_port(config[:host], config[:port])
-
-		begin
-			::Signal.trap('INT') { ::AMQP.stop{ ::EM.stop } }
-			::Signal.trap('TERM'){ ::AMQP.stop{ ::EM.stop } }
-
-			::AMQP.start(config) do
-				yield if block_given?
-			end
-		rescue ::AMQP::Error => e
-			log.debug "Caught #{e.class}, sleeping to avoid inittab thrashing"
-			sleep 5
-			log.debug "Done."
-			raise
-		end
-	end
-
-	def self.stop_safe
-		::EM.add_timer(0.2) { ::AMQP.stop { ::EM.stop } }
-	end
-
-	def self.closing?
-		::AMQP.closing?
-	end
-
-	def self.handle_error(err)
-		log.error "#{err.class}: #{err.message}", :exception => err
-	end
-
-	def self.wait_for_tcp_port(host, port, opts={})
-		require 'system_timer'
-		require 'socket'
-
-		opts[:retries] ||= 6
-		opts[:timeout] ||= 5
-
-		opts[:retries].times do
-			begin
-				SystemTimer::timeout(opts[:timeout]) do
-					TCPSocket.new(host.to_s, port).close
-				end
-				return
-			rescue Object => e
-				log.info "#{host}:#{port} not available, waiting... #{e.class}: #{e.message}"
-				sleep 1
-			end
-		end
-
-		raise "#{host}:#{port} did not come up after #{opts[:retries]} retries"
-	end
-
-	def initialize(name, opts={})
-		log.info "=== #{name} droid initializing"
-
-		self.class.name = name
-		self.class.start do
-			yield self if block_given?
-		end
-	end
-
-	def publish(*args)
-		Droid.publish(*args)
-	end
-
-	def log
-		self.class.log
-	end
-
-	include Droid::QueueMethods
-	include Droid::BackwardsCompatibleMethods
-	include Droid::EMTimerUtils
+      Logger.new($stderr)
+    end
+  end
+
+  def self.default_config
+    uri = URI.parse(ENV["AMQP_URL"] || 'amqp://guest:guest@localhost:5672/')
+    {
+      :vhost => uri.path,
+      :host => uri.host,
+      :user => uri.user,
+      :port => uri.port || 5672,
+      :pass => uri.password
+    }
+  rescue Object => e
+    raise "invalid AMQP_URL: (#{uri.inspect}) #{e.class} -> #{e.message}"
+  end
+
+  def self.start(opts={})
+    config = opts[:config] || self.default_config
+
+    wait_for_tcp_port(config[:host], config[:port])
+
+    begin
+      ::Signal.trap('INT') { ::AMQP.stop{ ::EM.stop } }
+      ::Signal.trap('TERM'){ ::AMQP.stop{ ::EM.stop } }
+
+      ::AMQP.start(config) do
+        yield if block_given?
+      end
+    rescue ::AMQP::Error => e
+      log.debug "Caught #{e.class}, sleeping to avoid inittab thrashing"
+      sleep 5
+      log.debug "Done."
+      raise
+    end
+  end
+
+  def self.stop_safe
+    ::EM.add_timer(0.2) { ::AMQP.stop { ::EM.stop } }
+  end
+
+  def self.closing?
+    ::AMQP.closing?
+  end
+
+  def self.handle_error(err)
+    log.error "#{err.class}: #{err.message}", :exception => err
+  end
+
+  def self.wait_for_tcp_port(host, port, opts={})
+    require 'system_timer'
+    require 'socket'
+
+    opts[:retries] ||= 6
+    opts[:timeout] ||= 5
+
+    opts[:retries].times do
+      begin
+        SystemTimer::timeout(opts[:timeout]) do
+          TCPSocket.new(host.to_s, port).close
+        end
+        return
+      rescue Object => e
+        log.info "#{host}:#{port} not available, waiting... #{e.class}: #{e.message}"
+        sleep 1
+      end
+    end
+
+    raise "#{host}:#{port} did not come up after #{opts[:retries]} retries"
+  end
+
+  def initialize(name, opts={})
+    log.info "=== #{name} droid initializing"
+
+    self.class.name = name
+    self.class.start do
+      yield self if block_given?
+    end
+  end
+
+  def publish(*args)
+    Droid.publish(*args)
+  end
+
+  def log
+    self.class.log
+  end
+
+  include Droid::QueueMethods
+  include Droid::BackwardsCompatibleMethods
+  include Droid::EMTimerUtils
 end