rservicebus 0.1.56 → 0.1.57

data/lib/rservicebus/AppResource/ScpUpload.rb

@@ -13,6 +13,7 @@ module RServiceBus
             #opportunity for smarts here. Could tar zip if it was a directory of files
 
 #            Net::SCP.upload!(@uri.host, @uri.user, source, @uri.path, :recursive )
+		RServiceBus.log "Host: #{@uri.host}, User: #{@uri.user}, Source: #{source}, Destination: #{@uri.path}", true
 		Net::SSH.start( @uri.host, @uri.user ) do|ssh|
 			ssh.scp.upload!( source, @uri.path, :recursive => true )
 		end

data/lib/rservicebus/Config.rb

@@ -50,7 +50,7 @@ module RServiceBus
             
             return self
         end
-        
+
         def loadHostSection()
             @appName = self.getValue( "APPNAME", "RServiceBus" )
             @errorQueueName = self.getValue( "ERROR_QUEUE_NAME", "error" )

data/lib/rservicebus/MQ.rb

@@ -29,6 +29,10 @@ module RServiceBus
                 require "rservicebus/MQ/Redis"
                 mq = MQ_Redis.new( uri )
                 
+                when "rabbitmq"
+                require "rservicebus/MQ/RabbitMq"
+                mq = MQ_RabbitMq.new( uri )
+
                 else
                 abort("Scheme, #{uri.scheme}, not recognised when configuring mq, #{string}");
             end

data/lib/rservicebus/MQ/RabbitMq.rb

@@ -0,0 +1,76 @@
+module RServiceBus
+    
+    require "bunny"
+    require "rservicebus/MQ"
+    
+    # Beanstalk client implementation.
+    #
+    class MQ_RabbitMq<MQ
+        
+        # Connect to the broker
+        #
+        def connect( host, port )
+            port ||= 11300
+            string = "#{host}:#{port}"
+
+            begin
+                
+                @conn = Bunny.new
+                @conn.start
+
+                @ch = @conn.create_channel
+                @x = @ch.default_exchange
+
+                rescue Exception => e
+                puts "Error connecting to Beanstalk"
+                puts "Host string, #{string}"
+                if e.message == "Beanstalk::NotConnected" then
+                    puts "***Most likely, beanstalk is not running. Start beanstalk, and try running this again."
+                    puts "***If you still get this error, check beanstalk is running at, #{string}"
+                    else
+                    puts e.message
+                    puts e.backtrace
+                end
+                abort()
+            end
+        end
+        
+        # Connect to the queue
+        #
+        def subscribe( queuename )
+            @q  = @ch.queue( queuename, :durable => true, :auto_delete => false)
+        end
+
+        # Get next msg from queue
+        def pop
+            begin
+                @delivery_info, @properties, @payload = @q.pop(:ack => true)
+                
+                if @delivery_info.nil? then
+                    sleep @timeout
+                    raise NoMsgToProcess.new
+                end
+
+            end
+            return @payload
+        end
+
+        def returnToQueue
+            @ch.reject( @delivery_info.delivery_tag, true )
+        end
+
+        # "Commit" queue
+        def ack
+            @ch.ack( @delivery_info.delivery_tag )
+            @delivery_info = nil
+            @properties = nil
+            @payload = nil
+        end
+
+        # At least called in the Host rescue block, to ensure all network links are healthy
+        def send( queueName, msg )
+            @x.publish(msg, :routing_key => queueName)
+        end
+
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.56
+  version: 0.1.57
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70366139760940 !ruby/object:Gem::Requirement
+  requirement: &70227782467900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366139760940
+  version_requirements: *70227782467900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70366139732260 !ruby/object:Gem::Requirement
+  requirement: &70227782467220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366139732260
+  version_requirements: *70227782467220
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70366139730160 !ruby/object:Gem::Requirement
+  requirement: &70227782466420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366139730160
+  version_requirements: *70227782466420
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70366139667660 !ruby/object:Gem::Requirement
+  requirement: &70227782480800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366139667660
+  version_requirements: *70227782480800
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70366139654920 !ruby/object:Gem::Requirement
+  requirement: &70227782480020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366139654920
+  version_requirements: *70227782480020
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -118,6 +118,7 @@ files:
 - lib/rservicebus/Monitor/XmlDir.rb
 - lib/rservicebus/Monitor.rb
 - lib/rservicebus/MQ/Beanstalk.rb
+- lib/rservicebus/MQ/RabbitMq.rb
 - lib/rservicebus/MQ/Redis.rb
 - lib/rservicebus/MQ.rb
 - lib/rservicebus/Saga.rb