bunnish 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bunnish.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bunnish"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenji Hara"]
-  s.date = "2012-12-08"
+  s.date = "2012-12-09"
   s.description = "Command for AMQP access to Message Queue."
   s.email = "haracane@gmail.com"
   s.executables = ["bunnish"]
@@ -35,6 +35,10 @@ Gem::Specification.new do |s|
     "lib/bunnish/command/publish.rb",
     "lib/bunnish/command/status.rb",
     "lib/bunnish/command/subscribe.rb",
+    "lib/bunnish/core.rb",
+    "lib/bunnish/core/common.rb",
+    "lib/bunnish/core/publish.rb",
+    "lib/bunnish/core/subscribe.rb",
     "spec/bin/bunnish_spec.rb",
     "spec/lib/bunnish/command/count_spec.rb",
     "spec/lib/bunnish/command/delete_spec.rb",

data/lib/bunnish/command/count.rb

@@ -1,6 +1,6 @@
 module Bunnish::Command
   module Count
-    def self.run(argv, input_stream=$stdin, output_stream=$stdout, error_stream=$stderr)
+    def self.run(argv, input_stream=$stdin, output_stream=$stdout)
       
       params = Bunnish.parse_opts(argv)
       

data/lib/bunnish/command/delete.rb

@@ -16,6 +16,8 @@ module Bunnish::Command
       user = params[:user]
       password = params[:password]
       durable = params[:durable]
+      
+      log_label = params[:log_label]
 
       queue_name_list = argv.shift
       
@@ -34,16 +36,16 @@ module Bunnish::Command
         queue = bunny.queue(queue_name, :durable=>durable)
 
         if queue.nil? then
-          error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO) #{queue_name} does not exist")
+          Bunnish.logger.info "#{log_label} #{queue_name} does not exist"
           next
         end
 
         result = queue.delete
 
         if result == :delete_ok then
-          error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO) deleted #{queue_name}")
+          Bunnish.logger.info "#{log_label} deleted #{queue_name}"
         else
-          error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S](ERROR) failed to #{queue_name}")
+          Bunnish.logger.warn "#{log_label} failed to delete #{queue_name}"
           exit_code = 1
         end
       end

data/lib/bunnish/command/help.rb

@@ -1,11 +1,22 @@
 module Bunnish::Command
   module Help
-    def self.run(argv, input_stream=$stdin, output_stream=$stdout, error_stream=$stderr)
-      output_stream.puts <<EOF
-usage: bunnish COMMAND OPTIONS
-EOF
-
+    def self.run(argv, input_stream=$stdin, output_stream=$stdout)
+      output_stream.puts <<-EOF
+usage: bunnish COMMAND [-h HOST] [-p PORT] [-u USER] [-P PASSWORD]
+            [--durable FLAG] [--ack FLAG] [--raise-exception]
+            [--log-label LABEL] [--log-dir DIR] [--log-file FILE]
+  -h HOST      message queue server address. default is localhost. 
+  -p PORT      port number. default is 5672.
+  -u USER      user name. default is 'guest'.
+  -P PASSWORD  password. default is 'guest'.
+  --durable FLAG   FLAG=t:disk queue; FLAG=f:memory queue(default).
+  --ack FLAG       FLAG=t:enable ack(default); FLAG=t:disable ack.
+  --raise-exception    raise exception.
+  --log-label LABEL    set log label.
+  --log-dir DIR        set log directory.
+  --log-file FILE      set log file.
+      EOF
       return 0
     end
   end
-end
+end

data/lib/bunnish/command/publish.rb

@@ -1,27 +1,6 @@
 module Bunnish::Command
   module Publish
-    def self.output_log(streams, message)
-      streams.each do |stream|
-        if stream then
-          stream.puts message
-          stream.flush
-        end
-      end
-    end
-    
-    def self.output_publish_log(streams, queue, count, log_label)
-      message_count = '?'
-      consumer_count = '?'
-      begin
-        message_count = queue.status[:message_count]
-        consumer_count = queue.status[:consumer_count]
-      rescue Exception=>e
-      end
-    
-      self.output_log streams, Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} published #{count} messages into #{queue.name}(#{message_count} messages, #{consumer_count} consumers)")
-    end
-    
-    def self.run(argv, input_stream=$stdin, output_stream=$stdout, error_stream=$stderr)
+    def self.run(argv, input_stream=$stdin, output_stream=$stdout)
       
       params = Bunnish.parse_opts(argv)
       
@@ -55,60 +34,44 @@ module Bunnish::Command
         if log_path then
           log_stream = open(log_path, "a")
           log_streams[queue_name] = log_stream
-          error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} output log into #{log_path}")
+          Bunnish.logger.info "#{log_label} output log into #{log_path}"
         end
       end
        
       fanout_flag = (exchange_name && exchange_name != '' && 1 < queue_name_list.size)
       
       bunny = nil
-      direct_exchange = nil
       
       publish_flag = false
       
+      exchange_list = []
+      
       begin
-        direct_exchange_list = nil
-        
         # publish message to exchange
         count = 0
         
         lines = []
         
-        
         while line = input_stream.gets do
           if bunny == nil then
             bunny = Bunny.new(:logging => false, :spec => '09', :host=>host, :port=>port, :user=>user, :pass=>password)
-            
             # start a communication session with the amqp server
             bunny.start
-          
             # create/get exchange  
             if fanout_flag then
-              error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S]") + "(INFO)#{log_label} create fanout exchange '#{exchange_name}'"
-              fanout_exchange = bunny.exchange(exchange_name, :type=>:fanout, :persistent=>durable)
-              queue_name_list.each do |queue_name|
-              # create/get queue
-                error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S]") + "(INFO)#{log_label} create queue '#{queue_name}'"
-                queue = bunny.queue(queue_name, :durable=>durable)
-                error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S]") + "(INFO)#{log_label} bind queue '#{queue_name}' to fanout exchange '#{exchange_name}'"
-                queue.bind(fanout_exchange)
-                self.output_log [error_stream, log_streams[queue_name]], Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} publish to #{queue_name}(#{queue.status[:message_count]} messages, #{queue.status[:consumer_count]} consumers)")
-              end
+              fanout_exchange = Bunnish::Core::Publish.create_fanout_exchange(bunny, queue_name_list, log_streams, params)
+              exchange_list.push fanout_exchange
             else
-              direct_exchange_list = queue_name_list.map { |queue_name|
-      
-                error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S]") + "(INFO)#{log_label} create direct exchange '#{queue_name}'"
-                direct_exchange = bunny.exchange(queue_name, :type=>:direct)
-      
-                error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S]") + "(INFO)#{log_label} create queue '#{queue_name}'"
-                queue = bunny.queue(queue_name, :durable=>durable)
-      
-                error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S]") + "(INFO)#{log_label} bind queue '#{queue_name}' to direct exchange '#{queue_name}'"
-                queue.bind(direct_exchange)
-                self.output_log [error_stream, log_streams[queue_name]], Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} publish to #{queue_name}(#{queue.status[:message_count]} messages, #{queue.status[:consumer_count]} consumers)")
-      
-                direct_exchange
+              direct_exchange_list = queue_name_list.map {|queue_name|
+                Bunnish::Core::Publish.create_direct_exchange(bunny, queue_name, log_streams, params)
               }
+              exchange_list = direct_exchange_list
+            end
+            
+            queue_name_list.each do |queue_name|
+              queue = bunny.queue(queue_name, :durable=>durable)
+              message = "#{log_label} publish to #{queue_name}(#{queue.status[:message_count]} messages, #{queue.status[:consumer_count]} consumers)"
+              Bunnish::Core::Common.output_log [log_streams[queue_name]], "INFO", message
             end
           end
         
@@ -121,13 +84,10 @@ module Bunnish::Command
             message = line
           end
         
-          if fanout_flag then
-            fanout_exchange.publish(message)
-          else
-            direct_exchange_list.each do |direct_exchange|
-              direct_exchange.publish(message)
-            end
+          exchange_list.each do |exchange|
+            exchange.publish(message)
           end
+            
           count += 1
           
           if unit_size <= count then
@@ -135,7 +95,7 @@ module Bunnish::Command
             queue_name_list.each do |queue_name|
               queue = bunny.queue(queue_name, :durable=>durable)
               log_stream = log_streams[queue_name]
-              self.output_publish_log [error_stream, log_stream], queue, count, log_label
+              Bunnish::Core::Publish.output_publish_log [log_stream], queue, count, log_label
             end
             count = 0
           end
@@ -147,9 +107,9 @@ module Bunnish::Command
           log_stream = log_streams[queue_name]
           if bunny then
             queue = bunny.queue(queue_name, :durable=>durable)
-            self.output_publish_log [error_stream, log_stream], queue, count, log_label if 0 < count || !publish_flag
+            Bunnish::Core::Publish.output_publish_log [log_stream], queue, count, log_label if 0 < count || !publish_flag
           else
-            self.output_log [error_stream, log_stream], Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} no input for #{queue_name}")
+            Bunnish::Core::Common.output_log [log_stream], "INFO", "#{log_label} no input for #{queue_name}"
           end
         end
         
@@ -160,8 +120,8 @@ module Bunnish::Command
           bunny.stop if bunny
           raise e if raise_exception_flag
         else
-          message = Time.now.strftime("[%Y-%m-%d %H:%M:%S](EXCEPTION)#{log_label} #{e.message}(#{e.class.name}): #{e.backtrace.map{|s| "  #{s}"}.join("\n")}")
-            self.output_log(([error_stream] + log_streams.values), message)
+          message = "#{log_label} #{e.message}(#{e.class.name}): #{e.backtrace.map{|s| "  #{s}"}.join("\n")}"
+          Bunnish::Core::Common.output_log(log_streams.values, "EXCEPTION", message)
         end
       end
       

data/lib/bunnish/command/status.rb

@@ -1,6 +1,6 @@
 module Bunnish::Command
   module Status
-    def self.run(argv, input_stream=$stdin, output_stream=$stdout, error_stream=$stderr)
+    def self.run(argv, input_stream=$stdin, output_stream=$stdout)
       
       params = Bunnish.parse_opts(argv)
       

data/lib/bunnish/command/subscribe.rb

@@ -1,27 +1,6 @@
 module Bunnish::Command
   module Subscribe
-    def self.output_log(streams, message)
-      streams.each do |stream|
-        if stream then
-          stream.puts message
-          stream.flush
-        end
-      end
-    end
-    
-    def self.output_subscribe_log(streams, queue, count, log_label)
-      message_count = '?'
-      consumer_count = '?'
-      begin
-        message_count = queue.status[:message_count]
-        consumer_count = queue.status[:consumer_count]
-      rescue Exception=>e
-      end
-    
-      self.output_log streams, Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} subscribed #{count} messages from #{queue.name}(#{message_count} messages, #{consumer_count} consumers)")
-    end
-    
-    def self.run(argv, input_stream=$stdin, output_stream=$stdout, error_stream=$stderr)
+    def self.run(argv, input_stream=$stdin, output_stream=$stdout)
       params = Bunnish.parse_opts(argv)
       
       host = params[:host]
@@ -51,7 +30,7 @@ module Bunnish::Command
       
       if log_path
         log_stream = open(log_path, "a")
-        error_stream.puts Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} output log into #{log_path}")
+        Bunnish.logger.info "#{log_label} output log into #{log_path}"
       end
       
       exchange_name = queue_name
@@ -79,15 +58,15 @@ module Bunnish::Command
       end
       
       if message_max 
-        self.output_log [error_stream, log_stream],  Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} subscribe #{message_max} messages from #{queue_name}(#{remain_count} messages, #{consumer_count} consumers)")
+        Bunnish::Core::Common.output_log [log_stream], "INFO", "#{log_label} subscribe #{message_max} messages from #{queue_name}(#{remain_count} messages, #{consumer_count} consumers)"
       
         if message_max <= 0
-          self.output_log [error_stream, log_stream],  Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} finished")
+          Bunnish::Core::Common.output_log [log_stream], "INFO", "#{log_label} finished"
           bunny.stop
           return 0
         end
       else
-        self.output_log [error_stream, log_stream],  Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} subscribe from #{queue_name}(#{remain_count} messages, #{consumer_count} consumers)")
+        Bunnish::Core::Common.output_log [log_stream], "INFO", "#{log_label} subscribe from #{queue_name}(#{remain_count} messages, #{consumer_count} consumers)"
       end
       
       if !exchange_name.nil? && exchange_name != '' then
@@ -101,7 +80,7 @@ module Bunnish::Command
       subscribe_flag = false
       
       if remain_count == 0 then
-        self.output_log [error_stream, log_stream], Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} no messages in #{queue_name}(#{remain_count} messages, #{consumer_count} consumers)")
+        Bunnish::Core::Common.output_log [log_stream], "INFO", "#{log_label} no messages in #{queue_name}(#{remain_count} messages, #{consumer_count} consumers)"
       else
         # subscribe to queue
         begin
@@ -116,7 +95,7 @@ module Bunnish::Command
               total_count += 1
               if unit_size <= count then
                 subscribe_flag = true
-                self.output_log [error_stream, log_stream], Time.now.strftime("[%Y-%m-%d %H:%M:%S](INFO)#{log_label} subscribed #{count} messages from #{queue_name}")
+                Bunnish::Core::Common.output_log [log_stream], "INFO", "#{log_label} subscribed #{count} messages from #{queue_name}"
                 count = 0
                 break if min_size && remain_count <= total_count + min_size
               end
@@ -127,14 +106,14 @@ module Bunnish::Command
             bunny.stop if bunny
             raise e if raise_exception_flag
           else
-            self.output_log [error_stream, log_stream],  Time.now.strftime("[%Y-%m-%d %H:%M:%S](EXCEPTION)#{log_label} #{e.message}(#{e.class.name}): #{e.backtrace.map{|s| "  #{s}"}.join("\n")}")
+            Bunnish::Core::Common.output_log [log_stream],  "EXCEPTION", "#{log_label} #{e.message}(#{e.class.name}): #{e.backtrace.map{|s| "  #{s}"}.join("\n")}"
           end
         end
       end
       
       subscribe_flag = true if 0 < count
       
-      self.output_subscribe_log [error_stream, log_stream], queue, count, log_label # if 0 < count || subscribe_flag
+      Bunnish::Core::Subscribe.output_subscribe_log [log_stream], queue, count, log_label # if 0 < count || subscribe_flag
       
       if log_stream then
         log_stream.close

data/lib/bunnish/core/common.rb

@@ -0,0 +1,19 @@
+module Bunnish::Core
+  module Common
+    def self.output_log(streams, log_level, message)
+      case log_level
+      when "INFO"
+        Bunnish.logger.info(message)
+      when "EXCEPTION"
+        Bunnish.logger.warn(message)
+      end
+      message =  Time.now.strftime("[%Y-%m-%d %H:%M:%S](#{log_level})#{message}")
+      streams.each do |stream|
+        if stream then
+          stream.puts message
+          stream.flush
+        end
+      end
+    end
+  end
+end

data/lib/bunnish/core/publish.rb

@@ -0,0 +1,50 @@
+module Bunnish::Core
+  module Publish
+    def self.output_publish_log(streams, queue, count, log_label)
+      message_count = '?'
+      consumer_count = '?'
+      begin
+        message_count = queue.status[:message_count]
+        consumer_count = queue.status[:consumer_count]
+      rescue Exception=>e
+      end
+      
+      message = "#{log_label} published #{count} messages into #{queue.name}(#{message_count} messages, #{consumer_count} consumers)"
+      Bunnish::Core::Common.output_log(streams, "INFO", message)
+    end
+    
+    def self.create_fanout_exchange(bunny, queue_name_list, log_streams={}, options={})
+      durable = options[:durable]
+      log_label = options[:log_label]
+      exchange_name = options[:exchange_name]
+      
+      Bunnish.logger.info "#{log_label} create fanout exchange '#{exchange_name}'"
+      fanout_exchange = bunny.exchange(exchange_name, :type=>:fanout, :persistent=>durable)
+      
+      queue_name_list.each do |queue_name|
+      # create/get queue
+        Bunnish.logger.info "#{log_label} create queue '#{queue_name}'"
+        queue = bunny.queue(queue_name, :durable=>durable)
+        Bunnish.logger.info "#{log_label} bind queue '#{queue_name}' to fanout exchange '#{exchange_name}'"
+        queue.bind(fanout_exchange)
+      end
+      return fanout_exchange
+    end
+    
+    def self.create_direct_exchange(bunny, queue_name, log_streams={}, options={})
+      durable = options[:durable]
+      log_label = options[:log_label]
+
+      Bunnish.logger.info "#{log_label} create direct exchange '#{queue_name}'"
+      direct_exchange = bunny.exchange(queue_name, :type=>:direct)
+
+      Bunnish.logger.info "#{log_label} create queue '#{queue_name}'"
+      queue = bunny.queue(queue_name, :durable=>durable)
+
+      Bunnish.logger.info "#{log_label} bind queue '#{queue_name}' to direct exchange '#{queue_name}'"
+      queue.bind(direct_exchange)
+
+      return direct_exchange
+    end
+  end
+end

data/lib/bunnish/core/subscribe.rb

@@ -0,0 +1,16 @@
+module Bunnish::Core
+  module Subscribe
+    def self.output_subscribe_log(streams, queue, count, log_label)
+      message_count = '?'
+      consumer_count = '?'
+      begin
+        message_count = queue.status[:message_count]
+        consumer_count = queue.status[:consumer_count]
+      rescue Exception=>e
+      end
+    
+      message = "#{log_label} subscribed #{count} messages from #{queue.name}(#{message_count} messages, #{consumer_count} consumers)"
+      Bunnish::Core::Common.output_log(streams, "INFO", message)
+    end
+  end
+end

data/lib/bunnish/core.rb

@@ -0,0 +1,3 @@
+require "bunnish/core/common"
+require "bunnish/core/publish"
+require "bunnish/core/subscribe"

data/lib/bunnish.rb

@@ -111,6 +111,27 @@ module Bunnish
     }
     
   end
+
+  def self.logger
+    @logger ||= (rails_logger || default_logger)
+  end
+
+  def self.rails_logger
+    (defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger) ||
+    (defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER.respond_to?(:debug) && RAILS_DEFAULT_LOGGER)
+  end
+
+  def self.default_logger
+    require 'logger'
+    l = Logger.new(STDERR)
+    l.level = Logger::INFO
+    l
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
 end
 
 require "bunnish/command"
+require "bunnish/core"

data/spec/bin/bunnish_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "bin/bunnish" do
   before :all do
-    @stderr = Bunnish::REDIRECT[:stderr]
+    @stderr_dst = Bunnish::REDIRECT[:stderr]
     @input_file = Tempfile.new("bunnish")
     @input_file.puts "foo"
     @input_file.puts "bar"
@@ -17,18 +17,18 @@ describe "bin/bunnish" do
     `cat #{@input_file.path} | #{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish publish bunnish-test-queue 2> /dev/null`
   end
   after :each do
-    `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish delete bunnish-test-queue 2> /dev/null`
+    `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish delete bunnish-test-queue,bunnish-test-queue-2 2> /dev/null`
   end
   describe "count" do
     it "should output valid queue count" do
-      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish count bunnish-test-queue 2> #{@stderr}`
+      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish count bunnish-test-queue #{@stderr_dst}`
       result.chomp!
       result.should == "3"
     end
   end
   describe "delete" do
     it "should delete queue" do
-      `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish delete bunnish-test-queue 2> #{@stderr}`
+      `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish delete bunnish-test-queue #{@stderr_dst}`
       result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish count bunnish-test-queue 2> /dev/null`
       result = result.chomp!
       result.should == "0"
@@ -36,27 +36,61 @@ describe "bin/bunnish" do
   end
   describe "help" do
     it "should delete queue" do
-      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish help bunnish-test-queue 2> #{@stderr}`
+      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish help bunnish-test-queue #{@stderr_dst}`
       result.split().size.should > 0
       $?.should == 0
     end
   end
   describe "publish" do
-    it "should publish valid messages" do
-      `echo qux | #{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish publish bunnish-test-queue 2> #{@stderr}`
-      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish subscribe bunnish-test-queue 2> /dev/null`
-      result = result.split()
-      # result.each do |line| STDERR.puts line end
-      result.shift.should == "foo"
-      result.shift.should == "bar"
-      result.shift.should == "baz"
-      result.shift.should == "qux"
-      result.size.should == 0
+    context "when exchange-name is not set" do
+      it "should publish valid messages with direct exchange" do
+        `cat #{@input_file.path} | #{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish publish bunnish-test-queue,bunnish-test-queue-2 #{@stderr_dst}`
+        result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish subscribe bunnish-test-queue 2> /dev/null`
+        result = result.split()
+        # result.each do |line| STDERR.puts line end
+        result.shift.should == "foo"
+        result.shift.should == "bar"
+        result.shift.should == "baz"
+        result.shift.should == "foo"
+        result.shift.should == "bar"
+        result.shift.should == "baz"
+        result.size.should == 0
+
+        result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish subscribe bunnish-test-queue-2 2> /dev/null`
+        result = result.split()
+        result.shift.should == "foo"
+        result.shift.should == "bar"
+        result.shift.should == "baz"
+        result.size.should == 0
+      end
+    end
+    
+    context "when exchange-name is set" do
+      it "should publish valid messages with fanout exchange" do
+        `cat #{@input_file.path} | #{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish publish --exchange-name bunnish-test-exchange bunnish-test-queue,bunnish-test-queue-2 #{@stderr_dst}`
+        result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish subscribe bunnish-test-queue 2> /dev/null`
+        result = result.split()
+        # result.each do |line| STDERR.puts line end
+        result.shift.should == "foo"
+        result.shift.should == "bar"
+        result.shift.should == "baz"
+        result.shift.should == "foo"
+        result.shift.should == "bar"
+        result.shift.should == "baz"
+        result.size.should == 0
+
+        result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish subscribe bunnish-test-queue-2 2> /dev/null`
+        result = result.split()
+        result.shift.should == "foo"
+        result.shift.should == "bar"
+        result.shift.should == "baz"
+        result.size.should == 0
+      end
     end
   end
   describe "status" do
     it "should print valid status of message queue" do
-      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish status bunnish-test-queue 2> #{@stderr}`
+      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish status bunnish-test-queue #{@stderr_dst}`
       result = result.split(/\n/)
       # STDERR.puts result.inspect
       result.include?("bunnish-test-queue : 3 messages, 0 consumers").should be_true
@@ -64,7 +98,7 @@ describe "bin/bunnish" do
   end
   describe "subscribe" do
     it "should subscribe valid messages" do
-      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish subscribe bunnish-test-queue 2> #{@stderr}`
+      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish subscribe bunnish-test-queue #{@stderr_dst}`
       result = result.split()
       # result.each do |line| STDERR.puts line end
       result.shift.should == "foo"

data/spec/spec_helper.rb

@@ -17,5 +17,14 @@ module Bunnish
   BIN_DIR = "#{BUNNISH_HOME}/bin"
   LIB_DIR = "#{BUNNISH_HOME}/lib"
   RUBY_CMD = "/usr/bin/env ruby -I #{LIB_DIR}"
-  REDIRECT = {:stderr=>"/dev/null"}
+  REDIRECT = {:stderr=>"2> /dev/null"}
+end
+
+Bunnish.logger = Logger.new(STDERR)
+if File.exist?('/tmp/bunnish.debug') then
+  Bunnish.logger.level = Logger::DEBUG
+  Bunnish::REDIRECT[:stderr] = nil
+else
+  Bunnish.logger.level = Logger::ERROR
+  Bunnish::REDIRECT[:stderr] = "2> /dev/null"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bunnish
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Kenji Hara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-08 00:00:00 Z
+date: 2012-12-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -147,6 +147,10 @@ files:
 - lib/bunnish/command/publish.rb
 - lib/bunnish/command/status.rb
 - lib/bunnish/command/subscribe.rb
+- lib/bunnish/core.rb
+- lib/bunnish/core/common.rb
+- lib/bunnish/core/publish.rb
+- lib/bunnish/core/subscribe.rb
 - spec/bin/bunnish_spec.rb
 - spec/lib/bunnish/command/count_spec.rb
 - spec/lib/bunnish/command/delete_spec.rb