amqp-utils 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/amqp-utils.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amqp-utils}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Barth"]
-  s.date = %q{2010-09-28}
+  s.date = %q{2010-09-30}
   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

data/bin/amqp-deleteq

@@ -12,7 +12,7 @@ class QueueDeleteCommand < AmqpUtils::Command
   end
 
   def validate
-    raise "need at least one queue name" unless args[0] && !args[0].empty?
+    Trollop::die "need at least one queue name" unless args[0] && !args[0].empty?
   end
 
   def execute
@@ -21,7 +21,7 @@ class QueueDeleteCommand < AmqpUtils::Command
       queue = pop
       if queue
         puts "Deleting #{queue}..."
-        MQ.new.queue(queue).delete
+        MQ.new.queue(queue, :passive => true).delete
         EM.next_tick { delete_or_stop }
       else
         AMQP.stop { EM.stop }

data/bin/amqp-dequeue

@@ -19,12 +19,14 @@ class DequeueCommand < AmqpUtils::Command
   end
 
   def validate
-    raise "need at least one queue name" if args.empty?
+    Trollop::die "need at least one queue name" if args.empty?
+
+    @formatter = AmqpUtils::MessageFormatter.for_type(options[:format])
+    Trollop::die :format, "not an available type: #{AmqpUtils::MessageFormatter.types.join(", ")}" unless @formatter
   end
 
   def execute
     @queues = args
-    @formatter = AmqpUtils::MessageFormatter.for_type(options[:format])
 
     @queues.each do |queue|
       puts "Dequeueing from #{queue} (^C to stop)..." unless options[:quiet]
@@ -34,7 +36,7 @@ class DequeueCommand < AmqpUtils::Command
         puts "(#{queue})" unless options[:quiet]
         @formatter.generate(STDOUT, header, message)
       end
-      mq.queue(queue).subscribe(&process_message)
+      mq.queue(queue, :passive => true).subscribe(&process_message)
     end
   end
 end

data/bin/amqp-enqueue

@@ -25,7 +25,7 @@ class EnqueueCommand < AmqpUtils::Command
         h.split('=')
       end.flatten)]
     end
-    raise "need a queue to publish to" unless args[0] && !args[0].empty?
+    Trollop::die "need a queue to publish to" unless args[0] && !args[0].empty?
   end
 
   def execute

data/bin/amqp-peek

@@ -21,15 +21,17 @@ class PeekCommand < AmqpUtils::Command
   end
 
   def validate
-    raise "need a queue name" unless args[0] && !args[0].empty?
+    Trollop::die "need a queue name" unless args[0] && !args[0].empty?
+
+    @formatter = AmqpUtils::MessageFormatter.for_type(options[:format])
+    Trollop::die :format, "not an available type: #{AmqpUtils::MessageFormatter.types.join(", ")}" unless @formatter
   end
 
   def execute
     @queue = args[0]
-    @formatter = AmqpUtils::MessageFormatter.for_type(options[:format])
 
     mq = MQ.new
-    mq.queue(@queue).pop(:ack => true) do |header, message|
+    mq.queue(@queue, :passive => true).pop(:ack => true) do |header, message|
       if message
         puts "(#{@queue})"
         @formatter.generate(STDOUT, header, message)

data/bin/amqp-pop

@@ -17,15 +17,17 @@ class PopCommand < AmqpUtils::Command
   end
 
   def validate
-    raise "need a queue name" unless args[0] && !args[0].empty?
+    Trollop::die "need a queue name" unless args[0] && !args[0].empty?
+
+    @formatter = AmqpUtils::MessageFormatter.for_type(options[:format])
+    Trollop::die :format, "not an available type: #{AmqpUtils::MessageFormatter.types.join(", ")}" unless @formatter
   end
 
   def execute
     @queue = args[0]
-    @formatter = AmqpUtils::MessageFormatter.for_type(options[:format])
 
     mq = MQ.new
-    mq.queue(@queue).pop do |header, message|
+    mq.queue(@queue, :passive => true).pop do |header, message|
       if message
         puts "(#{@queue})"
         @formatter.generate(STDOUT, header, message)

data/bin/amqp-purge

@@ -12,7 +12,7 @@ class PurgeCommand < AmqpUtils::Command
   end
 
   def validate
-    raise "need at least one queue name" if args.empty?
+    Trollop::die "need at least one queue name" if args.empty?
   end
 
   def execute

data/bin/amqp-statq

@@ -12,7 +12,7 @@ class QueueStatCommand < AmqpUtils::Command
   end
 
   def validate
-    raise "need at least one queue name" unless args[0] && !args[0].empty?
+    Trollop::die "need at least one queue name" unless args[0] && !args[0].empty?
   end
 
   def execute

data/lib/amqp_utils/command.rb

@@ -7,14 +7,15 @@ class AmqpUtils::Command
     def run(args = ARGV)
       command = new(args)
       command.process_options
+      command.validate
 
       begin
-        command.validate
-      rescue RuntimeError => e
-        Trollop::die(e.message)
+        command.go
+      rescue => e
+        STDERR.puts e.message
+        STDERR.puts e.backtrace.join("\n") if command.options.verbose
+        exit 1
       end
-
-      command.go
     end
   end
 
@@ -54,10 +55,10 @@ class AmqpUtils::Command
   end
 
   # Called to validate that the supplied command line options and arguments
-  # are valid. If there is a problem with the supplied values, and exception
-  # should be raised.
+  # are valid. If there is a problem with the supplied values, Trollop::die
+  # should be called.
   #
-  # Subclasses show override this method and do their validation.
+  # Subclasses should override this method and do their validation.
   def validate
   end
 

data/lib/amqp_utils/message_formatter.rb

@@ -3,7 +3,12 @@ class AmqpUtils::MessageFormatter
     @@formatters ||= {}
 
     def for_type(format_type)
-      @@formatters[format_type.downcase].new
+      klass = @@formatters[format_type.downcase]
+      klass && klass.new
+    end
+
+    def types
+      @@formatters.keys
     end
 
     def register_formatter(formatter, format_type)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Doug Barth
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 -05:00
+date: 2010-09-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency