rservicebus 0.1.74 → 0.1.75

data/lib/rservicebus/SubscriptionStorage.rb

@@ -1,6 +1,6 @@
 module RServiceBus
 
-require "uri"
+require 'uri'
 
 # Base class for subscription storage
 #
@@ -22,7 +22,7 @@ class SubscriptionStorage
     # @param [String] appName Name of the application, which is used as a Namespace
     # @param [String] uri a location for the resource to which we will attach, eg redis://127.0.0.1/foo
 	def getAll
-		raise "Method, getResource, needs to be implemented for resource"
+		raise 'Method, getResource, needs to be implemented for resource'
 	end
 
     # Add a new subscription
@@ -30,7 +30,7 @@ class SubscriptionStorage
     # @param [String] eventName Name of the event for which the subscriber has asked for notification
     # @param [String] queueName the queue to which the event should be sent
 	def add( eventName, queueName )
-		raise "Method, add, needs to be implemented for this subscription storage"
+		raise 'Method, add, needs to be implemented for this subscription storage'
 	end
 
     # Remove an existing subscription
@@ -38,7 +38,7 @@ class SubscriptionStorage
     # @param [String] eventName Name of the event for which the subscriber has asked for notification
     # @param [String] queueName the queue to which the event should be sent
 	def remove( eventName, queueName )
-		raise "Method, remove, needs to be implemented for this subscription storage"
+		raise 'Method, remove, needs to be implemented for this subscription storage'
 	end
 end
 

data/lib/rservicebus/SubscriptionStorage/File.rb

@@ -14,7 +14,7 @@ class SubscriptionStorage_File<SubscriptionStorage
 	end
 
 	def getAll
-		RServiceBus.log "Load subscriptions"
+		RServiceBus.log 'Load subscriptions'
         return Hash.new unless File.exists?( @uri.path )
         
         return YAML::load( File.open( @uri.path ) )
@@ -32,13 +32,13 @@ class SubscriptionStorage_File<SubscriptionStorage
 		subscriptions[eventName] << queueName
 		subscriptions[eventName] = subscriptions[eventName].uniq
 
-        File.open( @uri.path, "w" ) { |f| f.write( YAML::dump(subscriptions ) ) }
+        File.open( @uri.path, 'w') { |f| f.write( YAML::dump(subscriptions ) ) }
 
 		return subscriptions
 	end
 
 	def remove( eventName, queueName )
-		raise "Method, remove, needs to be implemented for this subscription storage"
+		raise 'Method, remove, needs to be implemented for this subscription storage'
 	end
 
 end

data/lib/rservicebus/SubscriptionStorage/Redis.rb

@@ -1,6 +1,6 @@
 module RServiceBus
 
-require "redis"
+require 'redis'
 
 #Implementation of Subscription Storage to Redis
 class SubscriptionStorage_Redis<SubscriptionStorage
@@ -18,9 +18,9 @@ class SubscriptionStorage_Redis<SubscriptionStorage
 	end
 
 	def getAll
-		RServiceBus.log "Load subscriptions"
+		RServiceBus.log 'Load subscriptions'
 		begin
-			content = @redis.get( @appName + ".Subscriptions" )
+			content = @redis.get( @appName + '.Subscriptions')
 			if content.nil? then
 				subscriptions = Hash.new
 			else
@@ -28,10 +28,10 @@ class SubscriptionStorage_Redis<SubscriptionStorage
 			end
 			return subscriptions
 		rescue Exception => e
-			puts "Error connecting to redis"
-			if e.message == "Redis::CannotConnectError" ||
-					e.message == "Redis::ECONNREFUSED" then
-				puts "***Most likely, redis is not running. Start redis, and try running this again."
+			puts 'Error connecting to redis'
+			if e.message == 'Redis::CannotConnectError' ||
+					e.message == 'Redis::ECONNREFUSED' then
+				puts '***Most likely, redis is not running. Start redis, and try running this again.'
 			else
 				puts e.message
 				puts e.backtrace
@@ -41,7 +41,7 @@ class SubscriptionStorage_Redis<SubscriptionStorage
 	end
 
 	def add( eventName, queueName )
-		content = @redis.get( @appName + ".Subscriptions" )
+		content = @redis.get( @appName + '.Subscriptions')
 		if content.nil? then
 			subscriptions = Hash.new
 		else
@@ -55,13 +55,13 @@ class SubscriptionStorage_Redis<SubscriptionStorage
 		subscriptions[eventName] << queueName
 		subscriptions[eventName] = subscriptions[eventName].uniq
 
-		@redis.set( @appName + ".Subscriptions", YAML::dump(subscriptions ) )
+		@redis.set( @appName + '.Subscriptions', YAML::dump(subscriptions ) )
 
 		return subscriptions
 	end
 
 	def remove( eventName, queueName )
-		raise "Method, remove, needs to be implemented for this subscription storage"
+		raise 'Method, remove, needs to be implemented for this subscription storage'
 	end
 
 end

data/lib/rservicebus/Test.rb

@@ -1,3 +1,3 @@
-require "rservicebus/Test/Bus"
-require "rservicebus/Test/Redis"
+require 'rservicebus/Test/Bus'
+require 'rservicebus/Test/Redis'
 

data/lib/rservicebus/Test/Bus.rb

@@ -30,8 +30,8 @@ class Test_Bus
 
 	def log( string, verbose=false )
 		item = Hash.new
-		item["string"] = string
-		item["verbose"] = verbose
+		item['string'] = string
+		item['verbose'] = verbose
 		@logList << item
 	end
 end

data/lib/rservicebus/Test/Redis.rb

@@ -48,7 +48,7 @@ module RServiceBus
         end
 
         def incr( key )
-			@keyHash[key] = 0 if !@keyHash.has_key?( key )
+			@keyHash[key] = 0 unless @keyHash.has_key?(key)
             
             @keyHash[key] = @keyHash[key] + 1
             return @keyHash[key]

data/lib/rservicebus/Transporter.rb

@@ -15,24 +15,24 @@ module RServiceBus
     class Transporter
         
         def getValue( name, default=nil )
-            value = ( ENV[name].nil?  || ENV[name] == ""  ) ? default : ENV[name];
+            value = ( ENV[name].nil?  || ENV[name] == '') ? default : ENV[name];
             RServiceBus.log "Env value: #{name}: #{value}"
             return value
         end
         
         def connectToSourceBeanstalk
-            sourceQueueName = getValue( 'SOURCE_QUEUE_NAME', "transport-out" )
-            sourceUrl = getValue( 'SOURCE_URL', "127.0.0.1:11300" )
+            sourceQueueName = getValue( 'SOURCE_QUEUE_NAME', 'transport-out')
+            sourceUrl = getValue( 'SOURCE_URL', '127.0.0.1:11300')
             @source = Beanstalk::Pool.new([sourceUrl])
             @source.watch sourceQueueName
             
             RServiceBus.log "Connected to, #{sourceQueueName}@#{sourceUrl}"
             
             rescue Exception => e
-            puts "Error connecting to Beanstalk"
+            puts 'Error connecting to Beanstalk'
             puts "Host string, #{sourceUrl}"
-            if e.message == "Beanstalk::NotConnected" then
-                puts "***Most likely, beanstalk is not running. Start beanstalk, and try running this again."
+            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, #{sourceUrl}"
                 else
                 puts e.message
@@ -72,7 +72,7 @@ module RServiceBus
                     abort()
                 end
                 
-                @localPort = getValue( "LOCAL_PORT", 27018 ).to_i
+                @localPort = getValue( 'LOCAL_PORT', 27018 ).to_i
                 RServiceBus.rlog "Local Port: #{@localPort}"
                 
                 begin
@@ -88,7 +88,7 @@ module RServiceBus
                     abort()
                     rescue Errno::EACCES => e
                     puts "*** Local transport port specified, #{@localPort}, needs sudo access"
-                    puts "*** Change local transport port using format, LOCAL_PORT=27018"
+                    puts '*** Change local transport port using format, LOCAL_PORT=27018'
                     abort()
                     
                 end
@@ -99,7 +99,7 @@ module RServiceBus
                     @destination = Beanstalk::Pool.new([destinationUrl])
                     RServiceBus.rlog "Connected to Remote Beanstalk, #{destinationUrl}"
                     rescue Exception => e
-                    if e.message == "Beanstalk::NotConnected" then
+                    if e.message == 'Beanstalk::NotConnected' then
                         puts "***Could not connect to destination, check beanstalk is running at, #{destinationUrl}"
                         raise CouldNotConnectToDestination.new
                     end
@@ -120,10 +120,10 @@ module RServiceBus
             @destination.use( msg.remoteQueueName )
             @destination.put( job.body )
             RServiceBus.log "Msg put, #{msg.remoteQueueName}"
-            
-            if !ENV['AUDIT_QUEUE_NAME'].nil? then
-                @source.use ENV['AUDIT_QUEUE_NAME']
-                @source.put job.body
+
+            unless ENV['AUDIT_QUEUE_NAME'].nil? then
+              @source.use ENV['AUDIT_QUEUE_NAME']
+              @source.put job.body
             end
             #removeJob
             job.delete
@@ -133,8 +133,8 @@ module RServiceBus
             
             rescue Exception => e
             self.disconnect
-            if e.message == "TIMED_OUT" then
-                RServiceBus.rlog "No Msg"
+            if e.message == 'TIMED_OUT' then
+                RServiceBus.rlog 'No Msg'
                 return
             end
             raise e

data/lib/rservicebus/helper_functions.rb

@@ -3,7 +3,7 @@ module RServiceBus
 
 	def RServiceBus.convertDTOToHash( obj )
 		hash = {};
-		obj.instance_variables.each {|var| hash[var.to_s.delete("@")] = obj.instance_variable_get(var) }
+		obj.instance_variables.each {|var| hash[var.to_s.delete('@')] = obj.instance_variable_get(var) }
 
 		return hash
 	end
@@ -15,18 +15,18 @@ module RServiceBus
 	end
 
 	def RServiceBus.log(string, ver=false)
-        return if RServiceBus.checkEnvironmentVariable("TESTING")
+        return if RServiceBus.checkEnvironmentVariable('TESTING')
 
-		type = ver ? "VERB" : "INFO"
-        if RServiceBus.checkEnvironmentVariable("VERBOSE") || !ver then
-            timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
+		type = ver ? 'VERB' : 'INFO'
+        if RServiceBus.checkEnvironmentVariable('VERBOSE') || !ver then
+            timestamp = Time.new.strftime('%Y-%m-%d %H:%M:%S')
             puts "[#{type}] #{timestamp} :: #{string}"
         end
 	end
 
     def RServiceBus.rlog(string)
-        if RServiceBus.checkEnvironmentVariable("RSBVERBOSE") then
-            timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
+        if RServiceBus.checkEnvironmentVariable('RSBVERBOSE') then
+            timestamp = Time.new.strftime('%Y-%m-%d %H:%M:%S')
             puts "[RSB] #{timestamp} :: #{string}"
         end
     end
@@ -38,18 +38,18 @@ module RServiceBus
     end
 
     def RServiceBus.getValue( name, default=nil )
-        value = ( ENV[name].nil?  || ENV[name] == ""  ) ? default : ENV[name];
+        value = ( ENV[name].nil?  || ENV[name] == '') ? default : ENV[name];
         log "Env value: #{name}: #{value}"
         return value
     end
 
-    def RServiceBus.sendMsg( msg, responseQueue="agent" )
-        require "rservicebus/EndpointMapping"
+    def RServiceBus.sendMsg( msg, responseQueue='agent')
+        require 'rservicebus/EndpointMapping'
         endpointMapping = EndpointMapping.new
         endpointMapping.Configure
         queueName = endpointMapping.get( msg.class.name )
 
-        ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
+        ENV['RSBMQ'] = 'beanstalk://localhost' if ENV['RSBMQ'].nil?
         agent = RServiceBus::Agent.new
         Audit.new( agent ).audit( msg )
         agent.sendMsg(msg, queueName, responseQueue)
@@ -62,13 +62,13 @@ module RServiceBus
 		raise StandardError.new( msg )
     end
 
-    def RServiceBus.sendMsg( msg, responseQueue="agent" )
-        require "rservicebus/EndpointMapping"
+    def RServiceBus.sendMsg( msg, responseQueue='agent')
+        require 'rservicebus/EndpointMapping'
         endpointMapping = EndpointMapping.new
         endpointMapping.Configure
         queueName = endpointMapping.get( msg.class.name )
 
-        ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
+        ENV['RSBMQ'] = 'beanstalk://localhost' if ENV['RSBMQ'].nil?
         agent = RServiceBus::Agent.new
         Audit.new( agent ).auditOutgoing( msg )
         agent.sendMsg(msg, queueName, responseQueue)
@@ -82,7 +82,7 @@ module RServiceBus
     end
 
     def RServiceBus.checkForReply( queueName )
-        ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
+        ENV['RSBMQ'] = 'beanstalk://localhost' if ENV['RSBMQ'].nil?
         agent = RServiceBus::Agent.new
         msg = agent.checkForReply( queueName )
         Audit.new( agent ).auditIncoming( msg )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.74
+  version: 0.1.75
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70137776893800 !ruby/object:Gem::Requirement
+  requirement: &70221541858240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137776893800
+  version_requirements: *70221541858240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70137776898900 !ruby/object:Gem::Requirement
+  requirement: &70221541775440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137776898900
+  version_requirements: *70221541775440
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70137776943820 !ruby/object:Gem::Requirement
+  requirement: &70221541772040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137776943820
+  version_requirements: *70221541772040
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70137776941020 !ruby/object:Gem::Requirement
+  requirement: &70221541770320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137776941020
+  version_requirements: *70221541770320
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70137776947260 !ruby/object:Gem::Requirement
+  requirement: &70221541285600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137776947260
+  version_requirements: *70221541285600
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -89,6 +89,7 @@ files:
 - lib/rservicebus/AppResource/FluidDbTinyTds.rb
 - lib/rservicebus/AppResource/Mysql.rb
 - lib/rservicebus/AppResource/Redis.rb
+- lib/rservicebus/AppResource/ScpDownload.rb
 - lib/rservicebus/AppResource/ScpUpload.rb
 - lib/rservicebus/AppResource/Smb.rb
 - lib/rservicebus/AppResource/SmbDir.rb