rservicebus 0.1.74 → 0.1.75

data/bin/ReturnMessagesToSourceQueue

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require "yaml"
-require "beanstalk-client"
-require "rservicebus"
+require 'yaml'
+require 'beanstalk-client'
+require 'rservicebus'
 
 def returnMsg( beanstalk, job, request_nbr )
-    firstMatch = "ruby/object:"
+    firstMatch = 'ruby/object:'
 
             payload = job.body
 
@@ -17,16 +17,16 @@ def returnMsg( beanstalk, job, request_nbr )
             msg = YAML::load(payload)
             if msg.lastErrorString.nil? then
                 puts "*** Requested msg, #{request_nbr}, does not have a sourceQueue to which it can be returned"
-                puts "*** Only errored msgs can be Returned"
-                puts "*** Generally, msgs would not be manually moved between queues"
-                puts "*** If you do need to, try"
-                puts "*** beanstalk-admin-dump <source queue name> | beanstalk-admin-load <destination queue name>"
+                puts '*** Only errored msgs can be Returned'
+                puts '*** Generally, msgs would not be manually moved between queues'
+                puts '*** If you do need to, try'
+                puts '*** beanstalk-admin-dump <source queue name> | beanstalk-admin-load <destination queue name>'
 
                 job.release
                 return
             end
             queueName = msg.lastErrorSourceQueue
-            puts "#" + "#{request_nbr.to_s}: #{msgName} to #{queueName}"
+            puts '#' + "#{request_nbr.to_s}: #{msgName} to #{queueName}"
 
             beanstalk.use( queueName )
             beanstalk.put( payload )
@@ -37,14 +37,14 @@ end
 
 index=nil
 if ARGV.length == 0 then
-        queueName = "error"
+        queueName = 'error'
 elsif ARGV.length == 1 then
         queueName = ARGV[0]
 elsif ARGV.length == 2 then
         queueName = ARGV[0]
         index = ARGV[1].to_i
 else
-        abort( "Usage: ReturnMessagesToSourceQueue [queue name] [index]" )
+        abort('Usage: ReturnMessagesToSourceQueue [queue name] [index]')
 end
 
 begin
@@ -52,12 +52,12 @@ begin
     beanstalk = Beanstalk::Pool.new([host])
     
     tubes = beanstalk.list_tubes[host]
-    if !tubes.include?(queueName) then
-        abort( "Nothing waiting on the Beanstalk queue, #{queueName}" )
+    unless tubes.include?(queueName) then
+      abort("Nothing waiting on the Beanstalk queue, #{queueName}")
     end
     
     tubeStats = beanstalk.stats_tube(queueName)
-    number_of_messages = tubeStats["current-jobs-ready"]
+    number_of_messages = tubeStats['current-jobs-ready']
     if index.nil? then
         puts
         puts "Attempting to return #{number_of_messages} to their source queue"
@@ -71,7 +71,7 @@ begin
                 returnMsg( beanstalk, job, request_nbr )
             end
             rescue Exception => e
-            if e.message == "TIMED_OUT" then
+            if e.message == 'TIMED_OUT' then
                 else
                 raise
             end
@@ -79,7 +79,7 @@ begin
     else
         if index > number_of_messages then
             puts "*** Requested msg, #{index}, is greater than the number of msgs in the queue, #{number_of_messages}"
-            puts "*** Try a smaller index, or remove the index number to return all msgs"
+            puts '*** Try a smaller index, or remove the index number to return all msgs'
             abort();
         end
 
@@ -102,7 +102,7 @@ begin
             end
 
             rescue Exception => e
-            if e.message == "TIMED_OUT" then
+            if e.message == 'TIMED_OUT' then
                 else
                 raise
             end
@@ -110,5 +110,5 @@ begin
     end
     
     rescue Beanstalk::NotConnected=>e
-    puts "Beanstalk not running"
+    puts 'Beanstalk not running'
 end

data/bin/SendEmptyMessage

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "rservicebus"
-require "rservicebus/Agent"
+require 'rservicebus'
+require 'rservicebus/Agent'
 
 
 abort( "Usage: #{File.basename($0)} <Msg Name> <Queue Name> [Response Queue Name] [Beanstalk Host]" ) unless ARGV.length >=2 && ARGV.length <=4
 msg_name = ARGV[0]
 queue_name = ARGV[1]
 response_queue_name = "#{queue_name}Response" if ARGV.length >= 3
-beanstalkHost = "beanstalk://localhost" if ARGV.length <= 4
+beanstalkHost = 'beanstalk://localhost' if ARGV.length <= 4
 
 agent = RServiceBus::Agent.new.getAgent( URI.parse( beanstalkHost) )
 msg = RServiceBus.createAnonymousClass( msg_name )

data/bin/rsb_ctl

@@ -5,33 +5,33 @@
 #
 
 require 'rubygems'
-require "rservicebus"
-require "rservicebus/Agent"
+require 'rservicebus'
+require 'rservicebus/Agent'
 
 
 
 if ARGV.length == 3 then
     queue_name = ARGV[0]
     switch_name = ARGV[1].upcase
-    switch_state = ARGV[2].upcase == "TRUE" || ARGV[2].upcase == "ON"
+    switch_state = ARGV[2].upcase == 'TRUE' || ARGV[2].upcase == 'ON'
 else
-    puts "Usage: rsb_ctl <queue name> <switch> <switch state>"
-    puts "Valid switchs: Stats, Verbose"
-    puts "Valid switch states: On, Off"
+    puts 'Usage: rsb_ctl <queue name> <switch> <switch state>'
+    puts 'Valid switchs: Stats, Verbose'
+    puts 'Valid switch states: On, Off'
     abort()
 end
 
 
-agent = RServiceBus::Agent.new.getAgent( URI.parse( "beanstalk://localhost" ) )
+agent = RServiceBus::Agent.new.getAgent( URI.parse('beanstalk://localhost') )
 obj = nil
 case switch_name
-    when switch_name = "STATS"
+    when switch_name = 'STATS'
         obj = switch_state == true ? RServiceBus::Message_StatisticOutputOn.new : RServiceBus::Message_StatisticOutputOff.new
-    when switch_name = "VERBOSE"
+    when switch_name = 'VERBOSE'
         obj = switch_state == true ? RServiceBus::Message_VerboseOutputOn.new : RServiceBus::Message_VerboseOutputOff.new
     else
         puts "Switch name, #{ARGV[0]}, not recognized"
-        puts "Valid switchs: Stats, Verbose"
+        puts 'Valid switchs: Stats, Verbose'
         abort()
 end
 

data/bin/rservicebus-create

@@ -4,11 +4,11 @@
 # Contract
 def contract( name )
 
-content = %{
+content = '
 class First
 end
 
-}
+'
 
 File.write( "#{name}/Contract.rb", content )
 
@@ -52,7 +52,7 @@ end
 # MessageHandler
 def messagehandler( name )
 
-content = %{
+content = '
 class MessageHandler_First
 
 	def Handle( msg )
@@ -61,7 +61,7 @@ class MessageHandler_First
 
 end
 
-}
+'
 
 Dir.mkdir( "#{name}/MessageHandler" )
 File.write( "#{name}/MessageHandler/First.rb", content )

data/bin/rservicebus-init

@@ -89,13 +89,14 @@ END_DATA
 class Init
     
     def Run
-        IO.write( "README.md", ContentReadMe.string );
-        IO.write( "Client.rb", ContentClient.string );
-        IO.write( "Contract.rb", ContentContract.string );
-        IO.write( "run", ContentRun.string );
+        IO.write( 'README.md', ContentReadMe.string );
+        IO.write( 'Client.rb', ContentClient.string );
+        IO.write( 'Contract.rb', ContentContract.string );
+        IO.write( 'run', ContentRun.string );
         
-        Dir.mkdir( "./MessageHandler" ) unless Dir.exists? "./MessageHandler";
-        IO.write( "MessageHandler/HelloWorld.rb", ContentMessageHandler.string );
+        Dir.mkdir('./MessageHandler') unless Dir.exists? './MessageHandler'
+        ;
+        IO.write( 'MessageHandler/HelloWorld.rb', ContentMessageHandler.string );
     end
     
 end

data/lib/rservicebus.rb

@@ -4,55 +4,55 @@
 #Don't buffer stdout
 $stdout.sync = true
 
-require "rubygems"
-require "yaml"
-require "uuidtools"
-require "json"
-require "uri"
-
-require "rservicebus/helper_functions"
-require "rservicebus/ErrorMessage"
-require "rservicebus/HandlerLoader"
-require "rservicebus/HandlerManager"
-require "rservicebus/ConfigureAppResource"
-require "rservicebus/MQ"
-require "rservicebus/Host"
-require "rservicebus/Config"
-require "rservicebus/EndpointMapping"
-require "rservicebus/Stats"
-require "rservicebus/StatisticManager"
-require "rservicebus/Audit"
-
-require "rservicebus/Message"
-require "rservicebus/Message/Subscription"
-require "rservicebus/Message/StatisticOutput"
-require "rservicebus/Message/VerboseOutput"
-
-require "rservicebus/UserMessage/WithPayload"
-
-require "rservicebus/StateManager"
-require "rservicebus/CronManager"
-require "rservicebus/CircuitBreaker"
-
-require "rservicebus/AppResource"
-require "rservicebus/ResourceManager"
-
-require "rservicebus/SubscriptionManager"
-require "rservicebus/SubscriptionStorage"
-require "rservicebus/ConfigureSubscriptionStorage"
-
-require "rservicebus/ConfigureMonitor"
-
-require "rservicebus/Agent"
-
-require "rservicebus/SagaLoader.rb"
-require "rservicebus/Saga/Manager.rb"
-require "rservicebus/Saga/Data.rb"
-require "rservicebus/Saga/Base.rb"
-
-require "rservicebus/SagaStorage"
-
-require "rservicebus/SendAtManager"
+require 'rubygems'
+require 'yaml'
+require 'uuidtools'
+require 'json'
+require 'uri'
+
+require 'rservicebus/helper_functions'
+require 'rservicebus/ErrorMessage'
+require 'rservicebus/HandlerLoader'
+require 'rservicebus/HandlerManager'
+require 'rservicebus/ConfigureAppResource'
+require 'rservicebus/MQ'
+require 'rservicebus/Host'
+require 'rservicebus/Config'
+require 'rservicebus/EndpointMapping'
+require 'rservicebus/Stats'
+require 'rservicebus/StatisticManager'
+require 'rservicebus/Audit'
+
+require 'rservicebus/Message'
+require 'rservicebus/Message/Subscription'
+require 'rservicebus/Message/StatisticOutput'
+require 'rservicebus/Message/VerboseOutput'
+
+require 'rservicebus/UserMessage/WithPayload'
+
+require 'rservicebus/StateManager'
+require 'rservicebus/CronManager'
+require 'rservicebus/CircuitBreaker'
+
+require 'rservicebus/AppResource'
+require 'rservicebus/ResourceManager'
+
+require 'rservicebus/SubscriptionManager'
+require 'rservicebus/SubscriptionStorage'
+require 'rservicebus/ConfigureSubscriptionStorage'
+
+require 'rservicebus/ConfigureMonitor'
+
+require 'rservicebus/Agent'
+
+require 'rservicebus/SagaLoader.rb'
+require 'rservicebus/Saga/Manager.rb'
+require 'rservicebus/Saga/Data.rb'
+require 'rservicebus/Saga/Base.rb'
+
+require 'rservicebus/SagaStorage'
+
+require 'rservicebus/SendAtManager'
 
 
 module RServiceBus

data/lib/rservicebus/Agent.rb

@@ -10,9 +10,9 @@ end
         @mq
 
         def getAgent( uri )
-            ENV["RSBMQ"] = uri.to_s
+            ENV['RSBMQ'] = uri.to_s
 
-            RServiceBus.rlog "*** Agent.getAgent has been deprecated. Set the environment variable, RSBMQ, and simply create the class"
+            RServiceBus.rlog '*** Agent.getAgent has been deprecated. Set the environment variable, RSBMQ, and simply create the class'
 	    return Agent.new
         end
         
@@ -31,10 +31,10 @@ end
             msg = RServiceBus::Message.new( messageObj, returnAddress )
 
             
-            if queueName.index( "@" ).nil? then
+            if queueName.index('@').nil? then
                 q = queueName
                 else
-                parts = queueName.split( "@" )
+                parts = queueName.split('@')
                 msg.setRemoteQueueName( parts[0] )
                 msg.setRemoteHostName( parts[1] )
                 q = 'transport-out'

data/lib/rservicebus/AppResource.rb

@@ -1,6 +1,6 @@
 module RServiceBus
     
-    require "uri"
+    require 'uri'
     
     # Wrapper base class for resources used by applications, allowing rservicebus to configure the resource
     # - dependency injection.
@@ -12,7 +12,7 @@ module RServiceBus
         # The method which actually connects to the resource.
         #
         def connect(uri)
-            raise "Method, connect, needs to be implemented for resource"
+            raise 'Method, connect, needs to be implemented for resource'
         end
 
         def _connect
@@ -48,8 +48,8 @@ module RServiceBus
             begin
                 self.finished
                 rescue Exception => e
-                puts "** AppResource. An error was raised while closing connection to, " + @uri.to_s
-                puts "Message: " + e.message
+                puts '** AppResource. An error was raised while closing connection to, ' + @uri.to_s
+                puts 'Message: ' + e.message
                 puts e.backtrace
             end
 

data/lib/rservicebus/AppResource/Dir.rb

@@ -5,9 +5,9 @@ module RServiceBus
         def connect(uri)
             begin
                 inputDir = Dir.new( uri.path )
-                if !File.writable?( uri.path ) then
-                    puts "*** Warning. Directory is not writable, #{uri.path}."
-                    puts "*** Warning. Make the directory, #{uri.path}, writable and try again."
+                unless File.writable?(uri.path) then
+                  puts "*** Warning. Directory is not writable, #{uri.path}."
+                  puts "*** Warning. Make the directory, #{uri.path}, writable and try again."
                 end
                 rescue Errno::ENOENT => e
                 puts "***** Directory does not exist, #{uri.path}."

data/lib/rservicebus/AppResource/FluidDb.rb

@@ -1,6 +1,6 @@
 module RServiceBus
     
-    require "FluidDb/Db"
+    require 'FluidDb/Db'
     
     #Implementation of an AppResource - Redis
     class AppResource_FluidDb<AppResource

data/lib/rservicebus/AppResource/FluidDbFirebird.rb

@@ -1,6 +1,6 @@
 module RServiceBus
     
-    require "FluidDb/Firebird"
+    require 'FluidDb/Firebird'
     
     #Implementation of an AppResource - Redis
     class AppResource_FluidDbFirebird<AppResource

data/lib/rservicebus/AppResource/FluidDbMysql.rb

@@ -1,6 +1,6 @@
 module RServiceBus
     
-    require "FluidDb/Mysql"
+    require 'FluidDb/Mysql'
     
     #Implementation of an AppResource - Redis
     class AppResource_FluidDbMysql<AppResource
@@ -11,17 +11,17 @@ module RServiceBus
         
         # Transaction Semantics
         def Begin
-            @connection.execute( "BEGIN", [] )
+            @connection.execute( 'BEGIN', [] )
         end
         
         # Transaction Semantics
         def Commit
-            @connection.execute( "COMMIT", [] )
+            @connection.execute( 'COMMIT', [] )
         end
         
         # Transaction Semantics
         def Rollback
-            @connection.execute( "ROLLBACK", [] )
+            @connection.execute( 'ROLLBACK', [] )
         end
 
     end

data/lib/rservicebus/AppResource/FluidDbMysql2.rb

@@ -1,6 +1,6 @@
 module RServiceBus
     
-    require "FluidDb/Mysql2"
+    require 'FluidDb/Mysql2'
     
     #Implementation ofF an AppResource - Redis
     class AppResource_FluidDbMysql2<AppResource
@@ -11,17 +11,17 @@ module RServiceBus
 
         # Transaction Semantics
         def Begin
-            @connection.execute( "BEGIN", [] )
+            @connection.execute( 'BEGIN', [] )
         end
         
         # Transaction Semantics
         def Commit
-            @connection.execute( "COMMIT", [] )
+            @connection.execute( 'COMMIT', [] )
         end
         
         # Transaction Semantics
         def Rollback
-            @connection.execute( "ROLLBACK", [] )
+            @connection.execute( 'ROLLBACK', [] )
         end
         
     end