hare 1.0.3 → 1.1.0

data/README.md

@@ -25,11 +25,11 @@ Example Usage
 
 We'll send a message over the localhost message bus, exchange 'events', vhost '/' with route-key 'dev.event'. First, get a `hare` into listener mode:
 
-    $ hare --exchange_name events --route_key dev.event
+    $ hare --exchange_name events --exchange_type topic --route_key dev.event
 
 and we'll send a message:
 
-    $ hare --exchange_name events --route_key dev.event --producer "that wasn't so bad"
+    $ hare --exchange_name events --exchange_type topic --route_key dev.event --producer "that wasn't so bad"
 
 Miscellania
 -----------

data/hare.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "bunny", "~> 0.7.8"
+  s.add_runtime_dependency "amqp", '>= 0.9.2'
 end

data/lib/hare/runner.rb

@@ -1,5 +1,6 @@
 require 'optparse'
-require 'bunny'
+require 'amqp'
+require 'eventmachine'
 
 module Hare
   trap(:INT) { puts; exit }
@@ -16,14 +17,17 @@ module Hare
         :publish => false,
         :amqp => {
           :host => 'localhost',
-          :port => '5672',
+          :port => nil,
           :exchange => {
             :name => nil,
-            :kind => :direct,
+            :kind => :topic,
           },
           :queue => '',
           :vhost => '/',
-          :timeout => 0
+          :via_ssl => false,
+          :ssl_cert => nil,
+          :ssl_key => nil,
+          :ssl_verify => false
         }
       }
 
@@ -50,7 +54,7 @@ module Hare
         }
         opts.on("--exchange_type TYPE", "The type of the AMQP exchange on which to connect") do |type|
           if ['topic', 'direct', 'fanout'].member? type
-            @options[:amqp][:exchange][:type] = type.to_sym
+            @options[:amqp][:exchange][:kind] = type.to_sym
           else
             puts "Exchange type must be (topic|direct|fanout), not #{type}."
             exit 1
@@ -68,15 +72,18 @@ module Hare
         opts.on("--logging", "Enable logging of AMQP interactions.") {
           @options[:logging] = true
         }
+        opts.on("--ssl_cert CERT", "Path to SSL chain certificates") do |c|
+          @options[:amqp][:ssl_cert] = c
+        end
+        opts.on("--ssl_key PRIVKEY", "Path to SSL private key") do |k|
+          @options[:amqp][:ssl_key] = k
+        end
 
         opts.separator ""
         opts.separator "Consumer Options: "
         opts.on("--queue QUEUE", "The queue on which to listen.") {
           |q| @options[:amqp][:queue] = q
         }
-        opts.on("--timeout TIME", "The time after which queue subscription will end.") {
-          |t| @options[:amqp][:timeout] = t
-        }
 
         opts.separator ""
         opts.separator "Producer Options: "
@@ -103,24 +110,42 @@ module Hare
     def run!
       amqp = @options[:amqp]
 
-      b = Bunny.new(:host => amqp[:host], :port => amqp[:port], :logging => amqp[:logging])
-      b.start
+      EventMachine.run do
+        AMQP.connect(:host => amqp[:host], :port => amqp[:port], :vhost => amqp[:vhost],
+          :username => amqp[:username], :password => amqp[:password], :ssl => {
+            :cert_chain_file => amqp[:ssl_cert],
+            :private_key_file => amqp[:ssl_key]
+          },
+          :on_tcp_connection_failure => Proc.new { |settings|
+            puts "TCP Connection failure; details:\n\n#{settings.inspect}\n\n"; exit 1
+          },
+          :on_possible_authentication_failure => Proc.new { |settings|
+            puts "Authentication failure, I'm afraid:\n\n#{settings.inspect}\n\n"; exit 1
+          }) do |connection|
+
+          channel  = AMQP::Channel.new(connection)
+          case amqp[:exchange][:kind]
+          when :direct
+            exchange = channel.direct(amqp[:exchange][:name])
+          when :fanout
+            exchange = channel.fanout(amqp[:exchange][:name])
+          when :topic
+            exchange = channel.topic(amqp[:exchange][:name])
+          end
 
-      eopts = amqp[:exchange]
-      exch = b.exchange(eopts[:name], :type => eopts[:type])
+          if @options[:publish]
+            exchange.publish(@arguments[0], :routing_key => amqp[:key]) do
+              connection.disconnect { EM.stop }
+            end
+          else
+            channel.queue(amqp[:queue]).bind(exchange, :key => amqp[:key]).subscribe do |payload|
+              puts payload
+            end
+          end
 
-      if @options[:publish]
-        exch.publish(@arguments[0].rstrip + "\n", :key => amqp[:key])
-      else
-        q = b.queue(amqp[:queue])
-        q.bind(exch, :key => amqp[:key])
-        q.subscribe(:timeout => amqp[:timeout]) do |msg|
-          puts "#{msg[:payload]}"
         end
-      end
-
-      b.stop
-    end
+      end # EM
+    end # run!
 
   end
 end

data/lib/hare/version.rb

@@ -1,3 +1,3 @@
 module Hare
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hare
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000Z
+date: 2012-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bunny
-  requirement: &74244340 !ruby/object:Gem::Requirement
+  name: amqp
+  requirement: &85280730 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *74244340
+  version_requirements: *85280730
 description: The one pain-point I have had with AMQP is the lack of a series of command
   line tools for smoke-testing components or sending my own messages through a queue.
   Hare can be toggled either to produce messages, or to sit and listen/report for
@@ -68,3 +68,4 @@ signing_key:
 specification_version: 3
 summary: A small command-line tool for publishing to and consuming from AMQP queues.
 test_files: []
+has_rdoc: