bunnish 0.0.7 → 0.0.8

data/README.rdoc

@@ -21,7 +21,7 @@ Publish messages:
  foo
  bar
  baz
- $ cat messages.txt | bunnish publish -h mq-server -p 5672 test-queue
+ $ cat messages.txt | bunnish publish -h mq-server -p 5672 test-queue --verbose
  [2012-12-08 20:33:33](INFO) create direct exchange 'test-queue'
  [2012-12-08 20:33:33](INFO) create queue 'test-queue'
  [2012-12-08 20:33:33](INFO) bind queue 'test-queue' to direct exchange 'test-queue'
@@ -29,7 +29,7 @@ Publish messages:
  [2012-12-08 20:33:33](INFO) published 3 messages into test-queue(3 messages, 0 consumers)
 
 Publish messages to multiple queues:
- $ cat messages.txt | bunnish publish -h mq-server -p 5672 test-queue-1,test-queue-2
+ $ cat messages.txt | bunnish publish -h mq-server -p 5672 test-queue-1,test-queue-2 --verbose
  [2012-12-09 21:10:21](INFO) create direct exchange 'test-queue-1'
  [2012-12-09 21:10:21](INFO) create queue 'test-queue-1'
  [2012-12-09 21:10:21](INFO) bind queue 'test-queue-1' to direct exchange 'test-queue-1'
@@ -42,11 +42,11 @@ Publish messages to multiple queues:
  [2012-12-09 21:10:21](INFO) published 3 messages into test-queue-2(3 messages, 0 consumers)
 
 Check queue status:
- $ bunnish status -h mq-server -p 5672 test-queue
+ $ bunnish status -h mq-server -p 5672 test-queue --verbose
  test-queue : 3 messages, 0 consumers
 
 Check multiple queue status:
- $ bunnish status -h mq-server -p 5672 test-queue-1,test-queue-2
+ $ bunnish status -h mq-server -p 5672 test-queue-1,test-queue-2 --verbose
  test-queue-1 : 3 messages, 0 consumers
  test-queue-2 : 3 messages, 0 consumers
 
@@ -55,7 +55,7 @@ Get queue count:
  3
 
 Subscribe from queue:
- $ bunnish subscribe -h mq-server -p 5672 test-queue
+ $ bunnish subscribe -h mq-server -p 5672 test-queue --verbose
  [2012-12-08 20:35:57](INFO) subscribe from test-queue(3 messages, 0 consumers)
  foo
  bar
@@ -66,11 +66,11 @@ Subscribe from queue:
    test-queue
 
 Delete queue:
- $ bunnish delete -h mq-server -p 5672 test-queue
+ $ bunnish delete -h mq-server -p 5672 test-queue --verbose
  [2012-12-09 21:13:10](INFO) deleted test-queue
 
 Delete multiple queues:
- $ bunnish delete -h mq-server -p 5672 test-queue-1,test-queue-2
+ $ bunnish delete -h mq-server -p 5672 test-queue-1,test-queue-2 --verbose
  [2012-12-09 21:12:34](INFO) deleted test-queue-1
  [2012-12-09 21:12:34](INFO) deleted test-queue-2
 

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bunnish.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bunnish"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenji Hara"]
-  s.date = "2012-12-11"
+  s.date = "2012-12-12"
   s.description = "Command for AMQP access to Message Queue."
   s.email = "haracane@gmail.com"
   s.executables = ["bunnish"]

data/lib/bunnish/core/common.rb

@@ -1,5 +1,126 @@
 module Bunnish::Core
   module Common
+    def self.parse_opts(argv)
+      host = 'localhost'
+      port = 5672
+      user = 'guest'
+      password = 'guest'
+      durable = false
+      ack = true
+      raise_exception_flag = false
+      
+      exchange_name = nil
+      delimiter = nil
+  
+      consumer_tag = nil
+      exclusive = false
+      message_max = nil
+      timeout = 1
+      unit_size = nil
+      min_size = nil
+      current_all_flag = false
+  
+      warn_size = nil
+      error_size = nil
+      
+      log_label = nil
+      log_dir = nil
+      log_path = nil
+      
+      verbose_flag = false
+      
+      next_argv = []
+      
+      while 0 < argv.size do
+        val = argv.shift
+        case val
+        when '-h'
+          host = argv.shift
+        when '-p'
+          port = argv.shift.to_i
+        when '-u'
+          user = argv.shift
+        when '-P'
+          password = argv.shift
+        when '--ack'
+          ack = (argv.shift == 't')
+        when '--delimiter'
+          delimiter = argv.shift
+        when '--durable'
+          durable = (argv.shift == 't')
+        when '--exchange-name'
+          exchange_name = argv.shift
+        when '--unit-size'
+          unit_size = argv.shift.to_i
+        when '--log-label'
+          log_label = argv.shift
+          log_label = "[#{log_label}]"
+        when '--log-dir'
+          log_dir = argv.shift
+        when '--log-file'
+          log_path = argv.shift
+        when '--raise-exception'
+          raise_exception_flag = true
+        when '--consumer-tag'
+          consumer_tag = argv.shift
+        when '--timeout'
+          timeout = argv.shift.to_i
+        when '--exclusive'
+          exclusive = (argv.shift == 't')
+        when '--message-max'
+          message_max = argv.shift
+        when '--current-all'
+          current_all_flag = true
+        when '--min-size'
+          min_size = argv.shift.to_i
+        when '--empty-list-max'
+          empty_list_max = argv.shift.to_i
+        when '--warn'
+          warn_size = argv.shift.to_i
+        when '--error'
+          error_size = argv.shift.to_i
+        when '--verbose'
+          verbose_flag = true
+        else 
+          next_argv.push val
+        end
+      end
+      argv.push(*next_argv)
+      
+      if verbose_flag then
+        Bunnish.logger.level = Logger::INFO
+      else
+        Bunnish.logger.level = Logger::WARN
+      end
+      
+      return {
+        :host=>host,
+        :port=>port,
+        :user=>user,
+        :password=>password,
+        :durable=>durable,
+        :ack=>ack,
+        :exchange_name=>exchange_name,
+        :unit_size=>unit_size,
+        :raise_exception_flag=>raise_exception_flag,
+        :delimiter=>delimiter,
+        :log_label=>log_label,
+        :log_dir=>log_dir,
+        :log_path=>log_path,
+        :consumer_tag=>consumer_tag,
+        :timeout=>timeout,
+        :exclusive=>exclusive,
+        :message_max=>message_max,
+        :current_all_flag=>current_all_flag,
+        :min_size=>min_size,
+        :empty_list_max=>empty_list_max,
+        :warn_size=>warn_size,
+        :error_size=>error_size,
+        :verbose_flag=>verbose_flag
+      }
+      
+    end
+
     def self.output_log(streams, log_level, message)
       case log_level
       when "INFO"

data/lib/bunnish.rb

@@ -3,115 +3,9 @@ require "bunny"
 
 module Bunnish
   def self.parse_opts(argv)
-    host = 'localhost'
-    port = 5672
-    user = 'guest'
-    password = 'guest'
-    durable = false
-    ack = true
-    raise_exception_flag = false
-    
-    exchange_name = nil
-    delimiter = nil
-
-    consumer_tag = nil
-    exclusive = false
-    message_max = nil
-    timeout = 1
-    unit_size = nil
-    min_size = nil
-    current_all_flag = false
-
-    warn_size = nil
-    error_size = nil
-    
-    log_label = nil
-    log_dir = nil
-    log_path = nil
-    
-    next_argv = []
-    
-    while 0 < argv.size do
-      val = argv.shift
-      case val
-      when '-h'
-        host = argv.shift
-      when '-p'
-        port = argv.shift.to_i
-      when '-u'
-        user = argv.shift
-      when '-P'
-        password = argv.shift
-      when '--ack'
-        ack = (argv.shift == 't')
-      when '--delimiter'
-        delimiter = argv.shift
-      when '--durable'
-        durable = (argv.shift == 't')
-      when '--exchange-name'
-        exchange_name = argv.shift
-      when '--unit-size'
-        unit_size = argv.shift.to_i
-      when '--log-label'
-        log_label = argv.shift
-        log_label = "[#{log_label}]"
-      when '--log-dir'
-        log_dir = argv.shift
-      when '--log-file'
-        log_path = argv.shift
-      when '--raise-exception'
-        raise_exception_flag = true
-      when '--consumer-tag'
-        consumer_tag = argv.shift
-      when '--timeout'
-        timeout = argv.shift.to_i
-      when '--exclusive'
-        exclusive = (argv.shift == 't')
-      when '--message-max'
-        message_max = argv.shift
-      when '--current-all'
-        current_all_flag = true
-      when '--min-size'
-        min_size = argv.shift.to_i
-      when '--empty-list-max'
-        empty_list_max = argv.shift.to_i
-      when '--warn'
-        warn_size = argv.shift.to_i
-      when '--error'
-        error_size = argv.shift.to_i
-      else 
-        next_argv.push val
-      end
-    end
-    argv.push(*next_argv)
-    
-    return {
-      :host=>host,
-      :port=>port,
-      :user=>user,
-      :password=>password,
-      :durable=>durable,
-      :ack=>ack,
-      :exchange_name=>exchange_name,
-      :unit_size=>unit_size,
-      :raise_exception_flag=>raise_exception_flag,
-      :delimiter=>delimiter,
-      :log_label=>log_label,
-      :log_dir=>log_dir,
-      :log_path=>log_path,
-      :consumer_tag=>consumer_tag,
-      :timeout=>timeout,
-      :exclusive=>exclusive,
-      :message_max=>message_max,
-      :current_all_flag=>current_all_flag,
-      :min_size=>min_size,
-      :empty_list_max=>empty_list_max,
-      :warn_size=>warn_size,
-      :error_size=>error_size
-    }
-    
+    return Bunnish::Core::Common::parse_opts(argv)
   end
-
+  
   def self.logger
     if @logger.nil?
       @logger = (rails_logger || default_logger)

data/spec/bin/bunnish_spec.rb

@@ -21,14 +21,14 @@ describe "bin/bunnish" do
   end
   describe "count" do
     it "should output valid queue count" do
-      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish count bunnish-test-queue #{@stderr_dst}`
+      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish count bunnish-test-queue --verbose #{@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 #{@stderr_dst}`
+      `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish delete bunnish-test-queue --verbose #{@stderr_dst}`
       result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish count bunnish-test-queue 2> /dev/null`
       result = result.chomp!
       result.should == "0"
@@ -36,7 +36,7 @@ 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 #{@stderr_dst}`
+      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish help bunnish-test-queue --verbose #{@stderr_dst}`
       result.split().size.should > 0
       $?.should == 0
     end
@@ -44,7 +44,7 @@ describe "bin/bunnish" do
   describe "publish" do
     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}`
+        `cat #{@input_file.path} | #{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish publish bunnish-test-queue,bunnish-test-queue-2 --verbose #{@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
@@ -67,7 +67,7 @@ describe "bin/bunnish" do
     
     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}`
+        `cat #{@input_file.path} | #{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish publish --exchange-name bunnish-test-exchange bunnish-test-queue,bunnish-test-queue-2 --verbose #{@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
@@ -90,7 +90,7 @@ describe "bin/bunnish" do
   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 #{@stderr_dst}`
+      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish status bunnish-test-queue --verbose #{@stderr_dst}`
       result = result.split(/\n/)
       # STDERR.puts result.inspect
       result.include?("bunnish-test-queue : 3 messages, 0 consumers").should be_true
@@ -98,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 #{@stderr_dst}`
+      result = `#{Bunnish::RUBY_CMD} #{Bunnish::BIN_DIR}/bunnish subscribe bunnish-test-queue --verbose #{@stderr_dst}`
       result = result.split()
       # result.each do |line| STDERR.puts line end
       result.shift.should == "foo"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bunnish
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Kenji Hara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-11 00:00:00 Z
+date: 2012-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime