bugs_bunny 0.0.9 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.1.0

data/bin/bbunny

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
-# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
 require 'optparse'
 require 'bugs_bunny'
+include BugsBunny
 
 opt = OptionParser.new do |o|
     o.banner = <<BANNER
@@ -33,6 +34,7 @@ Options:
 BANNER
   o.on('-c CONFIG', "Config file path") { |path| Opt[:config] = path }
   o.on('-p PATH', "Output path for config file") { |path| Opt[:out] = path }
+  o.on('-m MODE', "marshal, json or plain") { |m| Opt[:mode] = m }
   o.on('-v', "--verbose") { |b| Opt[:verbose] = true }
   o.on('-f', "--force") { |b| Opt[:force] = true }
   o.on('-h') { puts o; exit }

data/bugs_bunny.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bugs_bunny}
-  s.version = "0.0.9"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-03-05}
   s.default_executable = %q{bbunny}
   s.description = %q{Play/Manage RabbitMQ. Vhosts, queues.}
   s.email = %q{x@nofxx.com}
@@ -35,9 +35,10 @@ Gem::Specification.new do |s|
      "features/support/env.rb",
      "lib/bugs_bunny.rb",
      "lib/bugs_bunny/cli.rb",
+     "lib/bugs_bunny/helper.rb",
+     "lib/bugs_bunny/queue.rb",
      "lib/bugs_bunny/rabbit.rb",
      "lib/bugs_bunny/rabbitmq.yml",
-     "lib/bugs_bunny/record.rb",
      "spec/bugs_bunny/cli_spec.rb",
      "spec/bugs_bunny/rabbit_spec.rb",
      "spec/bugs_bunny_spec.rb",

data/features/queues.feature

@@ -8,7 +8,7 @@ Feature: Managing queues
     Then I should have 1 queues
     When I run "queues"
     Then I should see "todo"
-    And  I should see "0 messages"
+    And  I should see "0"
 
   Scenario: Show queues
     Given a queue "crucification" with 3 messages
@@ -19,10 +19,14 @@ Feature: Managing queues
   Scenario: List queues
     Given I run "queues"
     Then I should see "Queues"
+    And  I should see "Name"
     And  I should see "todo"
+    And  I should see "(V)"
     And  I should see "crucification"
-    And  I should see "0 messages"
-    And  I should see "3 messages"
+    And  I should see "Msgs"
+    And  I should see "3"
+    And  I should see "Users"
+    And  I should see "0"
 
   Scenario: Add to queue
     Given a queue "works"
@@ -75,3 +79,10 @@ Feature: Managing queues
     And  I should see "0 messages"
     When I run "queue crucification"
     Then I should see "0 messages"
+
+  Scenario: JSON queues
+    When I run 'queue works add "{\"foo\": 2}"'
+    And  I run "queue works list -m json"
+    Then I should see "QUEUE 1"
+    And  I should see "works"
+    And  I should see "Body"

data/features/step_definitions/bugs_bunny_steps.rb

@@ -1,4 +1,4 @@
-When /^I run "([^\"]*)"$/ do |comm|
+When /^I run [\"|\'](.*)[\"|\']$/ do |comm|
   @out = `bin/bbunny #{comm}`
 end
 

data/features/step_definitions/queue_steps.rb

@@ -16,5 +16,5 @@ end
 
 Then /^I should have (\d+) queues*$/ do |n|
   Given 'I run "queues"'
-  @out.split("\n").length.should eql(n.to_i+1)
+  @out.split("\n").length.should eql(n.to_i+6) #table adds 6 lines
 end

data/lib/bugs_bunny.rb

@@ -9,9 +9,10 @@ rescue LoadError
 end
 
 module BugsBunny
-  Opt = {:verbose => false, :force => false, :rabbit => {}}
+  Opt = {:verbose => false, :force => false, :rabbit => {}, :mode => :marshal}
 end
 
+require "bugs_bunny/helper"
 require "bugs_bunny/cli"
 require "bugs_bunny/rabbit"
-require "bugs_bunny/record"
+require "bugs_bunny/queue"

data/lib/bugs_bunny/helper.rb

@@ -0,0 +1,55 @@
+module BugsBunny
+  module Helper
+
+    def print_queue(h, body)
+      print ["-------\n", "QUEUE #{h.delivery_tag} (#{h.content_type}): ",
+            ("Redelivered " if h.redelivered), "Mode #{h.delivery_mode}",
+            "\nConsumer: #{h.consumer_tag} \nExchange: #{h.exchange}",
+            "\n\nBody:", read_dump(body), "\n"].reject(&:nil?).join
+    end
+
+    def read_dump(dump)
+      case BugsBunny::Opt[:mode].to_sym
+      when :marshal then Marshal.load(dump)
+      when :json    then JSON.load(dump)
+      else dump
+      end
+    rescue
+      dump
+    end
+
+    # http://gist.github.com/72234
+    def print_table(title, items, *fields)
+      return if items.empty?
+      puts title
+      #find max length for each field; start with the field names themselves
+      fields = items.first.class.column_names unless fields.any?
+      max_len = Hash[*fields.map {|f| [f, f.to_s.length]}.flatten]
+      items.each do |item|
+        fields.each do |field|
+          len = item.send(field).to_s.length
+          max_len[field] = len if len > max_len[field]
+        end
+      end
+
+      border = '+-' + fields.map {|f| '-' * max_len[f] }.join('-+-') + '-+'
+      title_row = '| ' + fields.map do |f|
+        sprintf("%-#{max_len[f]}s", f.to_s.split("_")[0].capitalize)
+      end.join(' | ') + ' |'
+
+      puts border
+      puts title_row
+      puts border
+
+      items.each do |item|
+        row = '| ' + fields.map do |f|
+          sprintf("%-#{max_len[f]}s", item.send(f))
+        end.join(' | ') + ' |'
+        puts row
+      end
+
+      puts border
+      puts "#{items.length} rows in set\n"
+    end
+  end
+end

data/lib/bugs_bunny/{record.rb → queue.rb}

@@ -1,15 +1,16 @@
 module BugsBunny
-  class Record
-    attr_reader :name, :msgs, :users
-    @records = []
+  class Queue
+    include Helper
+    attr_reader :name, :msgs, :users, :ready, :noack, :commit, :acts, :memory
+    @queues = []
 
     def self.all
       # possible with amqp?
       `rabbitmqctl list_queues -p #{Opt[:rabbit][:vhost]} name durable auto_delete arguments node messages_ready messages_unacknowledged messages_uncommitted messages consumers transactions memory`.split("\n").each do |l|
         next if l =~ /Listing|\.\./
-        @records << BugsBunny::Record.new(*l.split("\t"))
+        @queues << BugsBunny::Queue.new(*l.split("\t"))
       end
-      @records
+      @queues
     end
 
     def self.create(name)
@@ -19,8 +20,8 @@ module BugsBunny
     end
 
     def initialize(*params)
-      @name, d, a,_,_,ready,_,all,@users, @transactions, @mem = *params
-      @msgs = ready.to_i + all.to_i
+      @name, d, a, args, @node, @ready, @noack, @commit, @msgs,
+        @users, @acts, @memory = *params
       @durable = eval(d) if d #ugly
       @auto_delete = eval(a) if a #more ugly
       @mq = MQ.queue(@name, :passive => true)
@@ -42,15 +43,7 @@ module BugsBunny
     def inspect
       puts ""
       @mq.bind(MQ.fanout(@name)).subscribe(:ack => true) do |h, body| #, :nowait => false
-        puts "-------\n"
-        print "QUEUE #{h.delivery_tag} (#{h.content_type}): "
-        print "Redelivered " if h.redelivered
-        puts  "Mode #{h.delivery_mode}"
-        puts  "Consumer: #{h.consumer_tag} Exchange: #{h.exchange}"
-        txt = read(body)
-        puts "\nBody:"
-        puts txt
-        puts
+        print_queue(h, body)
       end
     end
     alias :live :inspect
@@ -83,7 +76,7 @@ module BugsBunny
     end
 
     def to_s
-      "#{@name} #{durable}: #{@msgs} messages"
+      "#{@name} #{kind}: #{@msgs} messages"
     end
 
     def <=>(other)
@@ -91,18 +84,10 @@ module BugsBunny
     end
 
     private
-
-    def read(dump, mode=:marshal)
-      case mode
-      when :marshal then Marshal.load(dump)
-      when :json    then JSON.load(dump)
-      else dump
-      end
-    rescue
-      dump
+    def name_kind
+      "(#{kind[0].chr}) #{@name}"
     end
-
-    def durable
+    def kind
       @durable ? "Durable" : "Volatile"
     end
 

data/lib/bugs_bunny/rabbit.rb

@@ -2,6 +2,7 @@
 module BugsBunny
 
   class Rabbit
+    include Helper
 
     def initialize(params=nil)
     end
@@ -18,12 +19,13 @@ module BugsBunny
     def queues(param=nil,name=nil)
       if param == "new"
         return halt("new <name>") unless name
-        BugsBunny::Record.create(name)
+        BugsBunny::Queue.create(name)
         return halt
       end
-      qs = BugsBunny::Record.all
+      qs = BugsBunny::Queue.all
       unless param
-        print_table "Queues", qs.sort_by { |r| r.msgs }
+        print_table "Queues", qs.sort_by { |r| r.msgs }, :msgs, :name_kind,
+        :users, :ready, :noack, :commit, :acts, :memory
       else
         qs.each(&:"#{param}")
       end
@@ -31,7 +33,7 @@ module BugsBunny
     end
 
     def queue(q, action="info", *params)
-      rec = BugsBunny::Record.new(q)
+      rec = BugsBunny::Queue.new(q)
       if rec.respond_to?(action)
         rec.send(action, *params)
       else
@@ -44,13 +46,6 @@ module BugsBunny
       print_table "Queues", @mq.exchanges
     end
 
-    def print_table(title, arr)
-      return if arr.empty?
-      puts title
-      arr.each do |q|
-        puts q
-      end
-    end
 
     def halt(msg=nil)
       BugsBunny::Rabbit.halt(msg)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -03:00
+date: 2010-03-05 00:00:00 -03:00
 default_executable: bbunny
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,9 +83,10 @@ files:
 - features/support/env.rb
 - lib/bugs_bunny.rb
 - lib/bugs_bunny/cli.rb
+- lib/bugs_bunny/helper.rb
+- lib/bugs_bunny/queue.rb
 - lib/bugs_bunny/rabbit.rb
 - lib/bugs_bunny/rabbitmq.yml
-- lib/bugs_bunny/record.rb
 - spec/bugs_bunny/cli_spec.rb
 - spec/bugs_bunny/rabbit_spec.rb
 - spec/bugs_bunny_spec.rb