stormmq-client 0.0.4 → 0.0.5

data/CHANGELOG

@@ -0,0 +1,13 @@
+0.0.5
+
+  * Re-implemented our AMQP client wrapper so we now use the Bunny
+    client for RabbitMQ. Bunny is a synchronous client built upon
+    QRack.  Our wrapper provides simple convenience methods for
+    obtaining a client instance which is configured with the proper
+    vhost based on the StormMQ companyName, systemName and
+    environmentName parameters.  Our wrapper returns an instance of
+    the Bunny client.
+
+    See: http://github.com/celldee/bunny for details.
+
+0.0.4 - Initial Public Release.

data/bin/stormmq-amqp-echo-test

@@ -65,46 +65,45 @@ class StormMQ::Application::AMQPEchoTest < StormMQ::Application
 
   def main
 
-    EM.run do
-
-      puts "creating connection"
-      connection = StormMQ::AMQPClient.connect(
-        :user        => opt.amqpUser,
-        :password    => opt.amqpPassword,
-        :company     => opt.company,
-        :system      => opt.system,
-        :environment => opt.environment,
-        :host        => opt.host,
-        :port        => opt.port,
-        :logging     => opt['--debug']
-      )
-
-      puts "opening a channel on the A MQP connection"
-      channel = MQ.new(connection)
-
-      puts "declaring a queue on the channel"
-      queue = MQ::Queue.new(channel, 'test queue')
-
-      puts "creating a test exchange"
-      exchange = MQ::Exchange.new(channel, :direct, 'test exchange')
-
-      puts "binding the queue the the exchange"
-      queue.bind(exchange)
-
-      puts "publishing test message to the exchange"
-      exchange.publish('hello world')
-
-      puts "subsribing to the queue"
-      queue.subscribe do |headers, msg|
-        puts "recevied message from the queue:"
-        pp headers
-        puts msg
-        puts msg == 'hello world' ? 'Succeeded' : 'Failed'
-        connection.close{ EM.stop_event_loop }
+    retval = nil
+
+    client_options = {
+      :user        => opt.amqpUser,
+      :pass        => opt.amqpPassword,
+      :company     => opt.company,
+      :system      => opt.system,
+      :environment => opt.environment,
+      :host        => opt.host,
+      :port        => opt.port,
+      :logging     => opt['--debug']
+    }
+
+    test_message = 'Hello World!'
+
+    puts "setting up client and connection"
+    StormMQ::AMQPClient.run(client_options) do |client|
+
+      puts "declaring a queue"
+      queue = client.queue('test1')
+
+      puts "publishing test message '#{test_message}'"
+      queue.publish(test_message)
+
+      puts "Receiving message from the queue"
+      msg = queue.pop[:payload]
+
+      if msg == test_message
+        puts "\nSUCESS: received test message '#{msg}'"
+        retval = 0
+      else
+        puts "\nFAILURE: expected test message, but got '#{msg}' instead"
+        retval = 1
       end
 
     end
 
+    exit(retval)
+
   end
 
   def man

data/lib/stormmq/amqp.rb

@@ -6,78 +6,29 @@
 # for terms of use and redistribution.
 #++
 
-require 'mq'
-require 'pp'
 
-module StormMQ
-
-  module AMQPClientImplementation
-
-    VERSION = '0.0.4'
-
-    def process_frame frame
-      if mq = channels[frame.channel]
-        mq.process_frame(frame)
-        return
-      end
-
-      case frame
-      when Frame::Method
-        case method = frame.payload
-        when Protocol::Connection::Start
-          send Protocol::Connection::StartOk.new(
-            {
-              :platform    => 'Ruby/EventMachine',
-              :product     => 'StormMQ AMQP',
-              :information => 'http://github.com/tonybyrne/StormMQ-Ruby-Client/',
-              :version     => VERSION
-            },
-            'AMQPLAIN',
-            {
-              :LOGIN => @settings[:user],
-              :PASSWORD => @settings[:password]
-            },
-            'en_US'
-          )
-
-        when Protocol::Connection::Tune
-          send Protocol::Connection::TuneOk.new(
-            :channel_max => 0,
-            :frame_max   => 131072,
-            :heartbeat   => 0
-          )
+require 'bunny'
+require 'stormmq/version'
 
-          send Protocol::Connection::Open.new(
-            :virtual_host => @settings[:vhost],
-            :capabilities => '',
-            :insist       => @settings[:insist]
-          )
-
-        when Protocol::Connection::OpenOk
-          succeed(self)
+module StormMQ
 
-        when Protocol::Connection::Close
-          STDERR.puts "#{method.reply_text} in #{Protocol.classes[method.class_id].methods[method.method_id]}"
+  module AMQPClient
 
-        when Protocol::Connection::CloseOk
-          @on_disconnect.call if @on_disconnect
-        end
-      end
+    def self.instance(options={})
+      Bunny.new(self.add_stormmq_options(options))
     end
-  end
 
-  module AMQPClient
+    def self.run(options={}, &block)
+      Bunny.run(self.add_stormmq_options(options), &block)
+    end
 
-    def self.connect(options={})
-      AMQP.client = AMQPClientImplementation
-      AMQP.connect(
-        {
-          :vhost   => self.vhost_from_options(options),
-          :host    => 'amqp.stormmq.com',
-          :port    => 443,
-          :ssl     => true
-        }.merge(options)
-      )
+    def self.add_stormmq_options(options={})
+      {
+        :vhost   => self.vhost_from_options(options),
+        :host    => 'amqp.stormmq.com',
+        :port    => 443,
+        :ssl     => true
+      }.merge(options)
     end
 
     def self.vhost_from_options(options)

data/lib/stormmq/rest.rb

@@ -9,6 +9,7 @@
 require 'stormmq/url'
 require 'stormmq/errors'
 require 'stormmq/secret_keys'
+require 'stormmq/utils'
 require 'json'
 require 'rest_client'
 
@@ -27,7 +28,7 @@ module StormMQ
 
   class Rest
 
-    RestClient.proxy = ENV['http_proxy'] unless ENV['http_proxy'].nil?
+    RestClient.proxy = ENV['http_proxy'] unless ENV['http_proxy'].blank?
 
     def initialize(options={})
       unless @user = options.delete(:user)

data/lib/stormmq/utils.rb

@@ -8,9 +8,6 @@
 
 module StormMQ
   module Utils
-    # def self.stormmq_credentials_string(user, password)
-    #   "\0#{user}\0#{password}"
-    # end
   end
 end
 

data/lib/stormmq/version.rb

@@ -0,0 +1,3 @@
+module StormMQ
+  VERSION = '0.0.5'
+end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: stormmq-client
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tony Byrne
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-06-07 00:00:00 +01:00
+date: 2010-06-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,7 @@ files:
 - lib/stormmq/secret_keys.rb
 - lib/stormmq/url.rb
 - lib/stormmq/utils.rb
+- lib/stormmq/version.rb
 - bin/stormmq-amqp-echo-test
 - bin/stormmq-create-system
 - bin/stormmq-delete-system
@@ -212,6 +213,7 @@ files:
 - spec/stormmq/secret_keys_spec.rb
 - spec/stormmq/url_spec.rb
 - spec/stormmq/utils_spec.rb
+- CHANGELOG
 - LICENSE
 - Rakefile
 - README