rservicebus 0.0.79 → 0.1.0

data/bin/ReturnErroredMessagesToSourceQueue

@@ -1,4 +1,49 @@
 #!/usr/bin/env ruby
 
-puts `ReturnErroredMessagesToSourceQueueBeanstalk`
-puts `ReturnErroredMessagesToSourceQueueBunny`
+require "yaml"
+
+require "beanstalk-client"
+
+require "rservicebus"
+
+begin
+    host = 'localhost:11300'
+    errorQueueName = "error"
+    beanstalk = Beanstalk::Pool.new([host])
+    
+    tubes = beanstalk.list_tubes[host]
+    if !tubes.include?(errorQueueName) then
+        abort( "Nothing waiting on the Beanstalk error queue" )
+    end
+    
+    tubeStats = beanstalk.stats_tube(errorQueueName)
+    number_of_messages = tubeStats["current-jobs-ready"]
+    puts
+    puts "Attempting to return #{number_of_messages} to their source queue"
+    puts
+    
+    begin
+        beanstalk.watch(errorQueueName)
+        1.upto(number_of_messages) do |request_nbr|
+            job = beanstalk.reserve 1
+            payload = job.body
+            
+            puts "#" + request_nbr.to_s + ": " + payload
+            msg = YAML::load(payload)
+            queueName = msg.getLastErrorMsg.sourceQueue
+            
+            beanstalk.use( queueName )
+            beanstalk.put( payload )
+            
+            job.delete
+        end
+        rescue Exception => e
+        if e.message == "TIMED_OUT" then
+            else
+            raise
+        end
+    end
+    
+    rescue Beanstalk::NotConnected=>e
+    puts "Beanstalk not running"
+end

data/lib/rservicebus/Agent.rb

@@ -8,13 +8,10 @@ module RServiceBus
             if uri.scheme == "beanstalk" then
                 require "rservicebus/Agent/Beanstalk"
                 return Agent_Beanstalk.new()
-                elsif uri.scheme == "bunny" then
-                require "rservicebus/Agent/Bunny"
-                return Agent_Bunny.new()
                 else
                 raise StandardError.new( "Scheme not recognised" )
                 
             end
         end
     end
-end
+end

data/lib/rservicebus/Agent/Beanstalk.rb

@@ -17,19 +17,18 @@ class Agent_Beanstalk
 # @param [String] returnAddress the name of a queue to send replies to
 	def sendMsg(messageObj, queueName, returnAddress=nil)
 		msg = RServiceBus::Message.new( messageObj, returnAddress )
-        
-        
+
+
         if queueName.index( "@" ).nil? then
             q = queueName
-	else
+            else
             parts = queueName.split( "@" )
             msg.setRemoteQueueName( parts[0] )
             msg.setRemoteHostName( parts[1] )
-	    q = 'transport-out'
+            q = 'transport-out'
         end
-        
-        
-        		serialized_object = YAML::dump(msg)
+
+        serialized_object = YAML::dump(msg)
 
 		@beanstalk.use( q )
 		@beanstalk.put( serialized_object )

data/lib/rservicebus/ConfigureMQ.rb

@@ -13,10 +13,6 @@ module RServiceBus
                 require "rservicebus/MQ/Beanstalk"
                 mq = MQ_Beanstalk.new( uri, timeout )
 
-                when "bunny"
-                require "rservicebus/MQ/Bunny"
-                mq = MQ_Bunny.new( uri, timeout )
-
                 else
                 abort("Scheme, #{uri.scheme}, not recognised when configuring mq, #{string}");
             end

data/lib/rservicebus/Host.rb

@@ -330,11 +330,11 @@ module RServiceBus
             # @param [String] queueName endpoint to which the msg will be sent
             def _SendAlreadyWrappedAndSerialised( serialized_object, queueName )
                 log "Bus._SendAlreadyWrappedAndSerialised", true
-                
+
                 if !@config.forwardSentMessagesTo.nil? then
                     @mq.send( @config.forwardSentMessagesTo, serialized_object )
                 end
-                
+
                 @mq.send( queueName, serialized_object )
             end
             

data/lib/rservicebus/MQ.rb

@@ -11,7 +11,7 @@ module RServiceBus
         
         # Resources are attached resources, and can be specified using the URI syntax.
         #
-        # @param [URI] uri the type and location of queue, eg bunny://127.0.0.1/foo
+        # @param [URI] uri the type and location of queue, eg beanstalk://127.0.0.1/foo
         # @param [Integer] timeout the amount of time to wait for a msg to arrive
         def initialize( uri, timeout )
             @timeout = timeout

data/lib/rservicebus/Transporter.rb

@@ -52,7 +52,7 @@ class Transporter
 		#Get the next job from the source queue
         job = @source.reserve @timeout
         msg = YAML::load(job.body)
-        
+
         log "job: #{job.body}", true
         
         
@@ -63,7 +63,7 @@ class Transporter
         
         # Open port 27018 to forward to 127.0.0.11300 on the remote host
         gateway.open('127.0.0.1', 11300, 27018)
-        
+
 		log "Connect to destination beanstalk"
         begin
             destinationUrl = '127.0.0.1:27018'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.79
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -17,15 +17,12 @@ executables:
 - rservicebus
 - rservicebus-init
 - ReturnErroredMessagesToSourceQueue
-- ReturnErroredMessagesToSourceQueueBeanstalk
-- ReturnErroredMessagesToSourceQueueBunny
 - SendEmptyMessage
 - rservicebus-transport
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/rservicebus/Agent/Beanstalk.rb
-- lib/rservicebus/Agent/Bunny.rb
 - lib/rservicebus/Agent.rb
 - lib/rservicebus/AppResource/Dir.rb
 - lib/rservicebus/AppResource/File.rb
@@ -58,7 +55,6 @@ files:
 - lib/rservicebus/Monitor/XmlDir.rb
 - lib/rservicebus/Monitor.rb
 - lib/rservicebus/MQ/Beanstalk.rb
-- lib/rservicebus/MQ/Bunny.rb
 - lib/rservicebus/MQ.rb
 - lib/rservicebus/Saga.rb
 - lib/rservicebus/Stats.rb
@@ -72,8 +68,6 @@ files:
 - lib/rservicebus/Transporter.rb
 - lib/rservicebus.rb
 - bin/ReturnErroredMessagesToSourceQueue
-- bin/ReturnErroredMessagesToSourceQueueBeanstalk
-- bin/ReturnErroredMessagesToSourceQueueBunny
 - bin/rservicebus
 - bin/rservicebus-init
 - bin/rservicebus-transport

data/bin/ReturnErroredMessagesToSourceQueueBeanstalk

@@ -1,49 +0,0 @@
-#!/usr/bin/env ruby
-
-require "yaml"
-
-require "beanstalk-client"
-
-require "rservicebus"
-
-begin
-    host = 'localhost:11300'
-    errorQueueName = "error"
-    beanstalk = Beanstalk::Pool.new([host])
-    
-    tubes = beanstalk.list_tubes[host]
-    if !tubes.include?(errorQueueName) then
-        abort( "Nothing waiting on the Beanstalk error queue" )
-    end
-    
-    tubeStats = beanstalk.stats_tube(errorQueueName)
-    number_of_messages = tubeStats["current-jobs-ready"]
-    puts
-    puts "Attempting to return #{number_of_messages} to their source queue"
-    puts
-    
-    begin
-        beanstalk.watch(errorQueueName)
-        1.upto(number_of_messages) do |request_nbr|
-            job = beanstalk.reserve 1
-            payload = job.body
-            
-            puts "#" + request_nbr.to_s + ": " + payload
-            msg = YAML::load(payload)
-            queueName = msg.getLastErrorMsg.sourceQueue
-            
-            beanstalk.use( queueName )
-            beanstalk.put( payload )
-            
-            job.delete
-        end
-        rescue Exception => e
-        if e.message == "TIMED_OUT" then
-            else
-            raise
-        end
-    end
-    
-    rescue Beanstalk::NotConnected=>e
-    puts "Beanstalk not running"
-end

data/bin/ReturnErroredMessagesToSourceQueueBunny

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-
-require "yaml"
-
-require "bunny"
-
-require "rservicebus"
-
-host = 'localhost'
-port = '5672'
-errorQueueName = "error"
-
-begin
-    bunny = Bunny.new(:host=>host, :port=>port)
-    bunny.start
-    direct_exchange = bunny.exchange('rservicebus.agent')
-    
-    q = bunny.queue(errorQueueName)
-    
-    number_of_messages = 0
-    loop = true
-    while loop do
-        msg = q.pop[:payload]
-        if msg == :queue_empty then
-            loop = false
-            else
-            number_of_messages++
-            
-            msg = YAML::load(msg)
-            
-            queueName = msg.getLastErrorMsg.sourceQueue
-            sq = bunny.queue(queueName)
-            sq.bind(@direct_exchange)
-            #q.publish( serialized_object )
-            
-            @direct_exchange.publish(msg)
-        end
-    end
-        
-        
-        if number_of_messages == 0 then
-            puts "Nothing waiting on RabbitMq error queue"
-            else
-            
-            puts "Returned #{number_of_messages} to their source queue"
-            
-        end
-        
-        rescue Bunny::ConnectionError, Bunny::ServerDownError => e
-        abort( "RabbitMq not running" )
-    end

data/lib/rservicebus/Agent/Bunny.rb

@@ -1,48 +0,0 @@
-module RServiceBus
-require 'bunny'
-
-#A means for a stand-alone process to interact with the bus, without being a full
-#rservicebus application
-class Agent_Bunny
-	@bunny
-
-	def initialize(host='localhost')
-		@bunny = Bunny.new(:host=>host)
-        @bunny.start
-        @direct_exchange = @bunny.exchange('rservicebus.agent')
-	end
-
-# Put a msg on the bus
-#
-# @param [Object] messageObj The msg to be sent
-# @param [String] queueName the name of the queue to be send the msg to
-# @param [String] returnAddress the name of a queue to send replies to
-	def sendMsg(messageObj, queueName, returnAddress=nil)
-		msg = RServiceBus::Message.new( messageObj, returnAddress )
-		serialized_object = YAML::dump(msg)
-
-        q = @bunny.queue(queueName)
-        q.bind(@direct_exchange)
-        #q.publish( serialized_object )
-
-        @direct_exchange.publish(serialized_object)
-	end
-
-# Gives an agent a mean to receive replies
-#
-# @param [String] queueName the name of the queue to monitor for messages
-	def checkForReply( queueName )
-        q = @bunny.queue(queueName)
-
-        loop = true
-        while loop do
-            msg = q.pop[:payload]
-            loop = ( msg == :queue_empty )
-        end
-
-		@msg = YAML::load(msg)
-		return @msg.msg
-	end
-end
-
-end

data/lib/rservicebus/MQ/Bunny.rb

@@ -1,54 +0,0 @@
-module RServiceBus
-    
-    require "bunny"
-    require "rservicebus/MQ"
-    
-    # RabbitMQ client implementation.
-    #
-    class MQ_Bunny<MQ
-        @uri
-        
-        # Connect to the broker
-        #
-        def connect( host, port )
-            port ||= 5672
-            
-            @bunny = Bunny.new(:host=>host, :port=>port)
-            @bunny.start
-            @pop_exch = @bunny.exchange('rservicebus.pop')
-            @send_exch = @bunny.exchange('rservicebus.send')
-        end
-
-        # Connect to the queue
-        #
-        def subscribe( queueName )
-            @queue = @bunny.queue( queueName )
-            @queue.bind( @pop_exch );
-        end
-
-        # Get next msg from queue
-        def pop
-            msg = @queue.pop(:ack => true)[:payload]
-
-            if msg == :queue_empty then
-                raise NoMsgToProcess.new
-            end
-
-            return msg
-        end
-        
-        # "Commit" the pop to the queue
-        def ack
-            @queue.ack
-        end
-
-        # Send a msg to a queue
-        def send( queueName, msg )
-            queue = @bunny.queue(queueName)
-            queue.bind(@send_exch)
-            @send_exch.publish(msg)
-            queue.unbind(@send_exch)
-        end
-        
-    end
-end