amqpcat 0.0.1 → 0.0.2

data/bin/amqpcat

@@ -16,13 +16,13 @@ Usage: #{$0} [options] amqp-url
   'user:pass' : optional. Default: guest:guest
   'host'      : required.
   'port'      : optional. Default: 5672 (amqp), 5671 (amqps)
-  'vhost      : optional. Default: /
+  'vhost'     : optional. Default: /
 
 Options:
 EOS
 
   opts.on('-h', '--help', 'Display usage') { puts opts; exit 0 }
-  
+
   options[:mode] = nil
   opts.on('-c', '--consumer', 'Read data from the queue specified by -n and write to STDOUT') do
     options[:mode] = :consumer
@@ -39,42 +39,46 @@ EOS
   opts.on('-r', '--ssl-cert FILE', 'Use SSL cert in FILE.') do |f|
     options[:ssl_cert] = f
   end
-  
+
   options[:verify_ssl] = true
   opts.on('y', '--[no-]verify-ssl', 'Verify server SSL certficiate. (Default: true)') do |y|
     options[:verify_ssl] = y
   end
-  
+
   options[:prefix] = ''
   opts.on('-s', '--string STRING', "prefix output with STRING") do |s|
      options[:prefix] = s
    end
-  
+
   options[:once] = false
   opts.on('-o', '--once', "Read/Write one message then exit. (Default: false)") do
     options[:once] = true
   end
-  
+
   options[:name] = 'amqpcat.default'
   opts.on('-n', '--name NAME', "Queue and Exchange NAME to use. (Default: amqpcat.default)") do |name|
     options[:name] = name
   end
-  
+
   options[:type] = 'direct'
   opts.on('-t', '--type TYPE', "Exchange type: direct, fanout. (Default: direct)") do |type|
     options[:type] = type
   end
-  
+
   options[:durable] = true
   opts.on('--[no-]durable', "Enable/Disable durable messages. (Default: durable=true)") do |d|
     options[:durable] = d
   end
-  
+
   options[:auto_delete] = false
   opts.on('--[no-]auto_delete', "Enable/Disable auto_delete. (Default: auto_delete=false)") do |d|
     options[:auto_delete] = d
   end
-  
+
+  opts.on('--routing-key KEY', "Bind or publish to the exchange with a routing key.") do |k|
+    options[:routing_key] = k
+  end
+
 end
 optparse.parse!
 
@@ -84,7 +88,7 @@ if ARGV.size < 1
 end
 
 if options[:mode].nil?
-  puts "Must specify --consumer or --producer. --help for help"
+  puts "Must specify --consumer or --publisher. --help for help"
   exit 1
 end
 
@@ -111,4 +115,4 @@ case options[:mode]
     end
 end
 
-amqpcat.finish
+amqpcat.finish

data/lib/amqpcat.rb

@@ -6,58 +6,49 @@ class Amqpcat
 
   def initialize(url, options={})
     parse_amqp_url(url)
-    
-    @@opts = {:type => 'direct',
-        :name => DEFAULT_QUEUE,
-        :durable => true,
-        :auto_delete => false,
-        :ssl_key => nil,
-        :ssl_cert => nil,
-        :verify_ssl => true,
-       }.merge(options)
-    
-    @@amqp_settings.merge!(@@opts)
-    @@amqp = Bunny.new(@@amqp_settings)
-    @@amqp.start
 
-    name = @@opts[:name]
-    type = @@opts[:type]
-    durable = @@opts[:durable]
-    auto_delete = @@opts[:auto_delete]
-    
-    if type == 'fanout'
-      @@queue = @@amqp.queue(:durable => durable, :auto_delete => auto_delete)
-    else
-      @@queue = @@amqp.queue(name, :durable => durable, :auto_delete => auto_delete)
-    end
-    @@exch = @@amqp.exchange(name, :type => type, :durable => durable, :auto_delete => auto_delete)
-    @@queue.bind(@@exch)
+    @opts = {
+      :type => 'direct',
+      :name => DEFAULT_QUEUE,
+      :durable => true,
+      :auto_delete => false,
+      :persistent => true,
+      :ssl_key => nil,
+      :ssl_cert => nil,
+      :verify_ssl => true,
+    }.merge(options)
+
+    @amqp_settings.merge!(@opts)
+    @amqp = Bunny.new(@amqp_settings)
+    @amqp.start
   end
-  
+
   def publish(msg)
-    @@exch.publish(msg)
+    exchange.publish(msg, :persistent => @opts[:persistent], :key => @opts[:routing_key])
   end
-  
+
   def message_count
-    @@queue.message_count
+    queue.message_count
   end
-  
+
   def fetch
-    @@queue.pop[:payload]
+    queue.pop[:payload]
   end
-  
+
   def subscribe(&block)
-    @@queue.subscribe(&block)
+    queue.subscribe(&block)
   end
-  
+
   def finish
-    @@amqp.stop
+    @amqp.stop
   end
-    
+
+  private
+
   def parse_amqp_url(str)
     url = URI.parse(str)
     use_ssl = url.scheme.downcase == 'amqps'
-    @@amqp_settings = {
+    @amqp_settings = {
       :host => url.host,
       :port => url.port || (use_ssl ? 5671 : 5672),
       :user => url.user || 'guest',
@@ -67,4 +58,29 @@ class Amqpcat
     }
   end
 
+  def exchange
+    return @exchange if @exchange
+    options = {
+      :type => @opts[:type],
+      :durable => @opts[:durable],
+      :auto_delete => @opts[:auto_delete]
+    }
+    @exchange = @amqp.exchange(@opts[:name], options)
+  end
+
+  def queue
+    return @queue if @queue
+    options = {
+      :durable => @opts[:durable],
+      :auto_delete => @opts[:auto_delete]
+    }
+    @queue = case @opts[:type]
+    when 'fanout'
+      @amqp.queue(options)
+    else
+      @amqp.queue(@opts[:name], options)
+    end
+    @queue.bind(exchange, :routing_key => @opts[:routing_key])
+    @queue
+  end
 end

data/lib/amqpcat/version.rb

@@ -1,3 +1,3 @@
 module Amqpcat
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,27 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: amqpcat
 version: !ruby/object:Gem::Version
-  version: 0.0.1
   prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Joe Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000Z
+date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bunny
-  requirement: &70278690104680 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.7.8
-  type: :runtime
   prerelease: false
-  version_requirements: *70278690104680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.8
+  name: bunny
 description: ! 'A netcat inspired command line tool for reading and writing simple
 
   messages to AMQP based message brokers such as RabbitMQ.
@@ -30,22 +35,18 @@ description: ! 'A netcat inspired command line tool for reading and writing simp
 email: joeym@joeym.net
 executables:
 - amqpcat
-- amqpcat.bak
 extensions: []
 extra_rdoc_files: []
 files:
-- amqpcat.gemspec
-- bin/amqpcat
-- bin/amqpcat.bak
-- examples/client_cert.pem
-- examples/client_key.pem
-- examples/test_direct.sh
-- examples/test_fanout.sh
-- examples/test_ssl.sh
 - Gemfile
 - Gemfile.lock
+- bin/amqpcat
 - lib/amqpcat/version.rb
 - lib/amqpcat.rb
+- examples/test_ssl.sh
+- examples/test_direct.sh
+- examples/test_fanout.sh
+- amqpcat.gemspec
 - README.md
 homepage: https://github.com/joemiller/amqpcat
 licenses: []
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Netcat-like tool for reading and writing messages to AMQP message brokers

data/bin/amqpcat.bak

@@ -1,115 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'optparse'
-require 'amqpcat'
-
-options = {}
-optparse = OptionParser.new do |opts|
-  opts.banner = <<-EOS
-Usage: #{$0} [options] amqp-url
-
-  amqp-url format: 'amqp://user:pass@host:port/vhost'
-
-  'amqp'      : required. Either amqp or amqps (SSL)
-  'user:pass' : optional. Default: guest:guest
-  'host'      : required.
-  'port'      : optional. Default: 5672 (amqp), 5671 (amqps)
-  'vhost      : optional. Default: /
-
-Options:
-EOS
-
-  opts.on('-h', '--help', 'Display usage') { puts opts; exit 0 }
-  
-  options[:mode] = nil
-  opts.on('-c', '--consumer', 'Read data from the queue specified by -n and write to STDOUT') do
-    options[:mode] = :consumer
-  end
-
-  opts.on('-p', '--publisher', 'Read data from STDIN and publish to the exchange specified by -n') do
-    options[:mode] = :publisher
-  end
-  
-  
-  opts.on('-k', '--ssl-key FILE', 'Use SSL key in FILE.') do |f|
-    options[:ssl_key] = f
-  end
-
-  opts.on('-r', '--ssl-cert FILE', 'Use SSL cert in FILE.') do |f|
-    options[:ssl_cert] = f
-  end
-  
-  options[:ssl_verify] = true
-  opts.on('y', '--[no-]ssl-verify', 'Verify server SSL certficiate. (Default: true)') do |y|
-    options[:ssl_verify] = y
-  end
-  
-  options[:prefix] = ''
-  opts.on('-s', '--string STRING', "prefix output with STRING") do |s|
-     options[:prefix] = s
-   end
-  
-  options[:once] = false
-  opts.on('-o', '--once', "Read/Write one message then exit. (Default: false)") do
-    options[:once] = true
-  end
-  
-  options[:name] = 'amqpcat.default'
-  opts.on('-n', '--name NAME', "Queue and Exchange NAME to use. (Default: amqpcat.default)") do |name|
-    options[:name] = name
-  end
-  
-  options[:type] = 'direct'
-  opts.on('-t', '--type TYPE', "Exchange type: direct, fanout. (Default: direct)") do |type|
-    options[:type] = type
-  end
-  
-  options[:durable] = true
-  opts.on('--[no-]durable', "Enable/Disable durable messages. (Default: durable=true)") do |d|
-    options[:durable] = d
-  end
-  
-  options[:auto_delete] = false
-  opts.on('--[no-]auto_delete', "Enable/Disable auto_delete. (Default: auto_delete=false)") do |d|
-    options[:auto_delete] = d
-  end
-  
-end
-optparse.parse!
-
-if ARGV.size < 1
-  puts "Must specify amqp-url. --help for help"
-  exit 1
-end
-
-if options[:mode].nil?
-  puts "Must specify --consumer or --producer. --help for help"
-  exit 1
-end
-
-amqp_url = ARGV[0]
-amqpcat = Amqpcat.new(amqp_url, options)
-
-trap 'SIGINT', proc { amqpcat.finish; exit 0 }
-
-# case options[:mode]
-#   when :consumer
-    amqpcat.subscribe do |msg|
-      $stdout.write options[:prefix] + msg[:payload]
-      $stdout.flush
-      if options[:once]
-         amqpcat.finish
-         exit
-      end
-    end
-  # when :publisher
-    if options[:once]
-      amqpcat.publish $stdin.read
-    else
-      $stdin.each_line { |l| amqpcat.publish(l) }
-    end
-# end
-
-amqpcat.finish

data/examples/client_cert.pem

@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC4zCCAcugAwIBAgIBAjANBgkqhkiG9w0BAQUFADARMQ8wDQYDVQQDEwZUZXN0
-Q0EwHhcNMTIwMTE1MDAwMjE1WhcNMTMwMTE0MDAwMjE1WjAoMRUwEwYDVQQDEwxz
-ZW5zdS1zZXJ2ZXIxDzANBgNVBAoTBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAM3Ib3MoKvu4CsEzGcQDN0u7Vo+7Pt7c6imcIg8Mktastbzl
-BhWjZt9nBdQZ9tL6Cj/HMnhw3FsfQ4kmNgcoFDmoaFqi0oHVAD0xXauu2LF3G1aq
-Qr2e02hqnrvc2BKDnoW4n9h+AfmNiAQ3bb572jJv49NDHRscuxD+4/ZJCH+uN5lp
-uuME/HvhNjR9yo3kc8mK1iUNpYa25qmoE/3Ao26FUrAgSbLG6RP3uXuXZlWrfnAt
-pyz+r0PPDYTttwIc1bPPBIbACiHtqYfz0nudikF2VOUiCiSl/Ld61ZHS1Bnudz0p
-Ah6ZjIYrw/QUS3d78F4G3xf9u5LF3wSwmlrW2gUCAwEAAaMvMC0wCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEF
-BQADggEBAMKB03m8K5Ub+mII/WbRyjVrEIL2cbOs9TQvvRfHCQ3P38+3NcYIzDOB
-dX3/HoEyFjjSSA0rzLIaT6rHF2faZL6JPyovyhAewOOOgI5DFOurSP/10P8m5GSk
-0WuYMqs5VZbDuaVxthflPmvLgYOPurwIdg5G5egAxYNSEy4Kprk7n8x6wlJTrL3q
-36DQDOAt5lZqFd6/5ulvLUHDPgqN5HOUbkLTVDN2GiktdOHBOgXH44en14YqCsMs
-qahqsTokTLMY4ofl8EMly10eDEUBkfqCpEDczWe1f7oGBC0VvhiXXl7VgYzHx4en
-WAbyHQ9diSqsPaEO9WW54NLwpZI4obc=
------END CERTIFICATE-----

data/examples/client_key.pem

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAzchvcygq+7gKwTMZxAM3S7tWj7s+3tzqKZwiDwyS1qy1vOUG
-FaNm32cF1Bn20voKP8cyeHDcWx9DiSY2BygUOahoWqLSgdUAPTFdq67YsXcbVqpC
-vZ7TaGqeu9zYEoOehbif2H4B+Y2IBDdtvnvaMm/j00MdGxy7EP7j9kkIf643mWm6
-4wT8e+E2NH3KjeRzyYrWJQ2lhrbmqagT/cCjboVSsCBJssbpE/e5e5dmVat+cC2n
-LP6vQ88NhO23AhzVs88EhsAKIe2ph/PSe52KQXZU5SIKJKX8t3rVkdLUGe53PSkC
-HpmMhivD9BRLd3vwXgbfF/27ksXfBLCaWtbaBQIDAQABAoIBAHZZDtfAwy+vgefo
-9qmHW/bfEAJrotXTYYx6sg/LoGt8Oq0fXid1qUVUX8LDB/QAP4K8kic4aVKyoUmw
-QyRMhY0/cHyn5b8rfA61ZHTHgvJVWNC37NhXDqifoRjUAyRqs/Gd47hDh+k433/l
-TOVfH3cgaHtovsWH+YHlxb8v84ZR6CY4/YrIhvPGqA9zkVwd361DeR3+MK1a+5/v
-LWGEHe2Oxko6KcHh8iLd44PmcHlcw3SxB+Y25/+8yDehw9LjivJa/IZBdd8cXRcd
-kOOOhVg7xftywwFXBIczB1hObHPu3qUNXJgFZSTfuO0SKqz8mR9kr5a0W0ci8B/9
-PLVkbyUCgYEA9ZKvhbV7vgQS2s4sSLnove55sizJHydseRvmp4KnoMTY1sha1jLL
-38mJsnzPSAtM6CjXnNQ0L10oTNskIh06sqNdOBGmnEB4CcBMkVwVysUctpqO3jyC
-dc4phMeAdhPkEcUCwPTtu9wwmwFyp5fTDnFb+HpUfRGgIVlB8048tOMCgYEA1oU+
-Cx92ZBnOdAbppOCWdlzNIry9Z9hOsYlA9pDV8wJfmwbQlV8mVeuQk3TsXzJnyqD8
-9xU2Ei1u3GY02IE1CsiEVcVm8II9ZCYnXc4lFkbJd/1DMRhh+WWoBP0PYq/0qGYh
-SP+L+sJpv/UTb6zxAb0VaE7ONqm/vFv54qG90fcCgYEA9BAbHfpmx0zpKElsPcN3
-Cv0uOeTE5o+aASu3q5fw3ZmGIMDzdpr5gKqejaP5ppKElt+wmo9UZhZh7TCG0tjV
-86DlDsqMGhMAukBCWN16UxJgHSOzBjCBQG/rV6mnhLL0Iqz4tak3dVO7gvKHbwU3
-n80OKP/7ZGnWCg7ZuuRw9R0CgYAGsZ+u/ytVkkyT6EdQIsXvKZQpGlSasfA6r/q7
-9ucGLzPGhZ7qmk567d/UChj6G3uLohxipWHLjWlhLTtG6jk6felLN96vcJDz2BDw
-Z2dW25ybxuZa2NTt0FM+3JqnTLBItO8i9P5sM7bTC5WwrWfT0w+g8pySrhdSjFgu
-zzc6HwKBgQCtyYw6gqqo0a7iYulVYXXHLJ/TYcw3qNdLz5bRTu7yFlMlLQXJ3XFk
-svUKHnx9AMIFQ+Dz02WFVckeVqarJ7T2ENPmHem64TAP2yblfThfc0XZYbHQRMwj
-qc5KkG+5BxWBpLqYxYPz68M6l5P1OX5pudC5XfFSFz2KkLyQFq8lYw==
------END RSA PRIVATE KEY-----