amqp-utils 0.4.3 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/amqp-utils.gemspec

@@ -5,17 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amqp-utils}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Barth"]
-  s.date = %q{2011-08-05}
+  s.date = %q{2011-09-27}
   s.description = %q{Command line utilies for interacting with AMQP compliant queues.
       The intention is provide simple management tools that can be used to complete ad hoc
       housework on an AMQP queue. In addition, simple scripts can be layered over the tools
       when needed.}
   s.email = %q{dougbarth@gmail.com}
-  s.executables = ["amqp-peek", "amqp-deleteq", "amqp-dequeue", "amqp-unbind", "amqp-statq", "amqp-pop", "amqp-enqueue", "amqp-spy", "amqp-purge"]
+  s.executables = ["amqp-exchange", "amqp-delexch", "amqp-peek", "amqp-deleteq", "amqp-dequeue", "amqp-unbind", "amqp-statq", "amqp-pop", "amqp-enqueue", "amqp-spy", "amqp-purge"]
   s.extra_rdoc_files = [
     "README.txt"
   ]
@@ -28,8 +28,10 @@ Gem::Specification.new do |s|
     "VERSION",
     "amqp-utils.gemspec",
     "bin/amqp-deleteq",
+    "bin/amqp-delexch",
     "bin/amqp-dequeue",
     "bin/amqp-enqueue",
+    "bin/amqp-exchange",
     "bin/amqp-peek",
     "bin/amqp-pop",
     "bin/amqp-purge",

data/bin/amqp-delexch

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../lib/amqp_utils/command'
+
+class ExchnageDeleteCommand < AmqpUtils::Command
+
+  def prepare_options(options)
+    options.banner <<-BANNER.unindent
+    Deletes the supplied exchange.
+    WARNING: queue bindings might become obsolete!
+    
+      #{command_name} exchange 
+
+    BANNER
+  end
+
+  def validate
+    Trollop::die "need at least one exchange name" unless args[0] && !args[0].empty?
+  end
+  
+  def execute
+    @exchanges = args
+    def @exchanges.delete_or_stop
+      exchange = pop
+      if exchange
+        conn = AMQP::Channel.new
+        exch = conn.__send__ :topic, exchange, {:passive => true}
+        puts "Deleting exchange #{exchange}" 
+        puts "WARNING: Queues might be left unbound"
+        exch.delete
+        EM.next_tick { delete_or_stop }
+      else
+        AMQP.stop { EM.stop }
+      end
+    end
+
+    EM.next_tick { @exchanges.delete_or_stop }
+  end
+end
+
+ExchnageDeleteCommand.run

data/bin/amqp-exchange

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../lib/amqp_utils/command'
+
+class ExchangeDeclareCommand < AmqpUtils::Command
+  def prepare_options(options)
+    options.banner <<-BANNER.unindent
+    Declares a named exchange.
+
+      #{command_name} <type> <exchange>
+
+    BANNER
+    options.opt :durable, 'Makes the exchange survive across broker restarts',
+      :type => :boolean, :short => :none
+    options.opt :auto_delete, 'Makes the exchange auto_delete after no queues are using it',
+      :type => :boolean, :short => :none
+    options.opt :internal, 'Makes the exchange unusable by publishers. Used for exchange to exchange bindings',
+      :type => :boolean, :short => :none
+    options.opt :passive, 'Passively declares the exchange, which will cause an error if the exchange does not exist',
+      :type => :boolean, :short => :none
+  end
+
+  VALID_TYPES = %w(direct fanout topic)
+
+  def validate
+    @type, @exchange = args
+    Trollop::die "must supply both a type and name" unless @type
+    Trollop::die "must supply a name" unless @exchange
+    Trollop::die "type must be one of <#{VALID_TYPES.inspect}>" unless VALID_TYPES.include?(@type)
+  end
+
+  def execute
+    AMQP::Channel.error do |msg|
+      puts msg
+      EM.next_tick { AMQP.stop { EM.stop } }
+    end
+
+    exchange_options = {
+      :durable => options.durable,
+      :auto_delete => options.auto_delete,
+      :internal => options.internal,
+      :passive => options.passive,
+      :nowait => false
+    }
+    channel.__send__(@type, @exchange, exchange_options) do
+      EM.next_tick { AMQP.stop { EM.stop } }
+    end
+  end
+end
+
+ExchangeDeclareCommand.run

data/bin/amqp-peek

@@ -21,6 +21,7 @@ class PeekCommand < AmqpUtils::Command
       :short => :none, :default => 'pretty'
     options.opt :quiet, 'Suppresses non-message content output',
       :short => 'q', :default => false
+    options.opt :num, 'Number of msgs to peek',:short => 'n', :default => 1 
   end
 
   def validate
@@ -34,17 +35,19 @@ class PeekCommand < AmqpUtils::Command
     @queue = args[0]
 
     mq = MQ.new
-    mq.queue(@queue, :passive => true).pop(:ack => true) do |header, message|
-      if message
-        puts "(#{@queue})" unless options[:quiet]
-        deserialized_message = AmqpUtils::Serialization.deserialize(header.properties[:content_type], message)
-        @formatter.generate(STDOUT, header, deserialized_message)
-      else
-        puts "(#{@queue}) empty"
+    queue = mq.queue(@queue, :passive => true)
+    options[:num].times do
+      queue.pop(:ack => true) do |header, message|
+        if message
+          puts "(#{@queue})" unless options[:quiet]
+          deserialized_message = AmqpUtils::Serialization.deserialize(header.properties[:content_type], message)
+          @formatter.generate(STDOUT, header, deserialized_message)
+        else
+          puts "(#{@queue}) empty"
+        end
       end
-
-      AMQP.stop { EM.stop }
     end
+    AMQP.stop { EM.stop }
   end
 end
 

data/lib/amqp_utils/command.rb

@@ -102,7 +102,8 @@ class AmqpUtils::Command
     @amqp ||= AMQP.start
   end
 
-  def mq
-    @mq ||= MQ.new
+  def channel
+    @channel ||= AMQP::Channel.new(@amqp)
   end
+  alias mq channel
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp-utils
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Doug Barth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 -05:00
+date: 2011-09-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,8 @@ description: |-
         when needed.
 email: dougbarth@gmail.com
 executables: 
+- amqp-exchange
+- amqp-delexch
 - amqp-peek
 - amqp-deleteq
 - amqp-dequeue
@@ -157,8 +159,10 @@ files:
 - VERSION
 - amqp-utils.gemspec
 - bin/amqp-deleteq
+- bin/amqp-delexch
 - bin/amqp-dequeue
 - bin/amqp-enqueue
+- bin/amqp-exchange
 - bin/amqp-peek
 - bin/amqp-pop
 - bin/amqp-purge