rservicebus 0.1.74 → 0.1.75

data/lib/rservicebus/AppResource/FluidDbPgsql.rb

@@ -1,6 +1,6 @@
 module RServiceBus
     
-    require "FluidDb/Pgsql"
+    require 'FluidDb/Pgsql'
     
     #Implementation of an AppResource - Redis
     class AppResource_FluidDbPgsql<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/FluidDbTinyTds.rb

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

data/lib/rservicebus/AppResource/Mysql.rb

@@ -1,13 +1,13 @@
 module RServiceBus
     
-    require "mysql2"
+    require 'mysql2'
     
     #Implementation of an AppResource - Redis
     class AppResource_Mysql<AppResource
         
         def connect(uri)
             return Mysql2::Client.new(:host => uri.host,
-                                             :database => uri.path.sub( "/", "" ),
+                                             :database => uri.path.sub( '/', ''),
                                              :username => uri.user )
         end
 

data/lib/rservicebus/AppResource/Redis.rb

@@ -1,6 +1,6 @@
 module RServiceBus
     
-    require "redis"
+    require 'redis'
     
     #Implementation of an AppResource - Redis
     class AppResource_Redis<AppResource

data/lib/rservicebus/AppResource/ScpDownload.rb

@@ -0,0 +1,51 @@
+require 'net/scp'
+require 'net/sftp'
+
+module RServiceBus
+
+  class ScpDownloadHelper
+    attr_reader :uri
+
+    def initialize( uri )
+      @uri = uri
+    end
+
+    def download( destination )
+      RServiceBus.log "Host: #{@uri.host}, User: #{@uri.user}, Source: #{@uri.path}, Destination: #{destination}", true
+      Net::SCP.start( @uri.host, @uri.user ) do |scp|
+        scp.download( @uri.path, destination, :recursive => true )
+      end
+    end
+
+    def close
+    end
+
+    def delete( filepattern )
+      RServiceBus.log "Host: #{@uri.host}, User: #{@uri.user}, File Pattern: #{filepattern}, Source: #{@uri.path}", true
+      regexp = Regexp.new filepattern unless filepattern.nil?
+
+      Net::SSH.start( @uri.host, @uri.user ) do |ssh|
+        ssh.sftp.connect do |sftp|
+          sftp.dir.foreach(@uri.path) do |entry|
+            next if entry.name == '.' || entry.name == '..'
+            if filepattern.nil? || entry.name =~ regexp then
+              puts "#{@uri.path}/#{entry.name}"
+              r = sftp.remove("#{@uri.path}/#{entry.name}")
+              r.wait
+            end
+          end
+        end
+      end
+    end
+  end
+
+  class AppResource_ScpDownload<AppResource
+
+    def connect(uri)
+      return ScpDownloadHelper.new( uri )
+
+      return inputDir;
+    end
+
+  end
+end

data/lib/rservicebus/AppResource/ScpUpload.rb

@@ -25,11 +25,12 @@ module RServiceBus
 
     def delete( path, filepattern )
       RServiceBus.log "Host: #{@uri.host}, User: #{@uri.user}, File Pattern: #{filepattern}, Destination: #{@uri.path}", true
-      regexp = Regexp.new filepattern
+      regexp = Regexp.new filepattern unless filepattern.nil?
       Net::SSH.start( @uri.host, @uri.user ) do |ssh|
         ssh.sftp.connect do |sftp|
           sftp.dir.foreach(path) do |entry|
-            if entry.name =~ regexp then
+            next if entry.name == '.' || entry.name == '..'
+            if filepattern.nil? || entry.name =~ regexp then
               r = sftp.remove("#{path}/#{entry.name}")
               r.wait
             end

data/lib/rservicebus/AppResource/Smb.rb

@@ -1,5 +1,5 @@
 module RServiceBus
-require "net/smb"
+require 'net/smb'
 
 
     class AppResource_Smb<AppResource
@@ -7,10 +7,10 @@ require "net/smb"
 	def processUri
 		host = @uri.host
 
-		parts = @uri.path.split( "/" )
+		parts = @uri.path.split('/')
 		parts.shift
 		share = parts.shift
-		path = parts.join( "/" )
+		path = parts.join('/')
 		
 		@clean_path = "smb://#{host}/#{share}/#{URI.decode(path)}"
 

data/lib/rservicebus/AppResource/SmbDir.rb

@@ -1,12 +1,12 @@
 module RServiceBus
 
-require "rservicebus/AppResource/Smb"
+require 'rservicebus/AppResource/Smb'
 
     class AppResource_SmbDir<AppResource_Smb
 
 	def connect(uri)
 		self.processUri
-        remote = SMB.opendir( s, "b" )
+        remote = SMB.opendir( s, 'b')
 		return remote	
 	end
 

data/lib/rservicebus/AppResource/SmbFile.rb

@@ -1,6 +1,6 @@
 module RServiceBus
 
-require "rservicebus/AppResource/Smb"
+require 'rservicebus/AppResource/Smb'
 
     class AppResource_SmbFile<AppResource_Smb
 

data/lib/rservicebus/Audit.rb

@@ -4,10 +4,10 @@ class Audit
 
     def initialize( mq )
         @mq = mq
-        auditQueueName = RServiceBus.getValue( "AUDIT_QUEUE_NAME" )
+        auditQueueName = RServiceBus.getValue('AUDIT_QUEUE_NAME')
         if auditQueueName.nil? then
-                @forwardSentMessagesTo = RServiceBus.getValue( "FORWARD_SENT_MESSAGES_TO" )
-                @forwardReceivedMessagesTo = RServiceBus.getValue( "FORWARD_RECEIVED_MESSAGES_TO" )
+                @forwardSentMessagesTo = RServiceBus.getValue('FORWARD_SENT_MESSAGES_TO')
+                @forwardReceivedMessagesTo = RServiceBus.getValue('FORWARD_RECEIVED_MESSAGES_TO')
             else
                 @forwardSentMessagesTo = auditQueueName
                 @forwardReceivedMessagesTo = auditQueueName
@@ -19,14 +19,14 @@ class Audit
     end
 
     def auditOutgoing( obj )
-        if !@forwardSentMessagesTo.nil? then
-            self.auditToQueue( obj )
-        end
+      unless @forwardSentMessagesTo.nil? then
+        self.auditToQueue(obj)
+      end
     end
     def auditIncoming( obj )
-        if !@forwardReceivedMessagesTo.nil? then
-            self.auditToQueue( obj )
-        end
+      unless @forwardReceivedMessagesTo.nil? then
+        self.auditToQueue(obj)
+      end
     end
 
 

data/lib/rservicebus/CircuitBreaker.rb

@@ -21,10 +21,10 @@ module RServiceBus
 
         def initialize( host )
             @host = host
-            @maxNumberOfFailures = RServiceBus.getValue( "RSBCB_MAX", 5 )
-            @secondsToBreak = RServiceBus.getValue( "RSBCB_SECONDS_TO_BREAK", 60 ).to_i
-            @secondsToReset = RServiceBus.getValue( "RSBCB_SECONDS_TO_RESET", 60 ).to_i
-            @resetOnSuccess = RServiceBus.getValue( "RSBCB_RESET_ON_SUCCESS", false )
+            @maxNumberOfFailures = RServiceBus.getValue( 'RSBCB_MAX', 5 )
+            @secondsToBreak = RServiceBus.getValue( 'RSBCB_SECONDS_TO_BREAK', 60 ).to_i
+            @secondsToReset = RServiceBus.getValue( 'RSBCB_SECONDS_TO_RESET', 60 ).to_i
+            @resetOnSuccess = RServiceBus.getValue( 'RSBCB_RESET_ON_SUCCESS', false )
             
             self.reset
         end

data/lib/rservicebus/Config.rb

@@ -19,9 +19,9 @@ module RServiceBus
         @mq
 
         def initialize()
-            puts "Cannot instantiate config directly."
-            puts "For production, use ConfigFromEnv."
-            puts "For debugging or testing, you could try ConfigFromSetter"
+            puts 'Cannot instantiate config directly.'
+            puts 'For production, use ConfigFromEnv.'
+            puts 'For debugging or testing, you could try ConfigFromSetter'
             abort()
         end
 
@@ -30,7 +30,7 @@ module RServiceBus
         end
 
         def 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
@@ -42,10 +42,10 @@ module RServiceBus
         #Expected format;
         #	<path 1>;<path 2>
         def loadHandlerPathList()
-            path = self.getValue( "MSGHANDLERPATH", "./MessageHandler" )
+            path = self.getValue( 'MSGHANDLERPATH', './MessageHandler')
             @handlerPathList = Array.new
-            path.split( ";" ).each do |path|
-                path = path.strip.chomp( "/" )
+            path.split(';').each do |path|
+                path = path.strip.chomp('/')
                 @handlerPathList << path
             end
 
@@ -53,10 +53,10 @@ module RServiceBus
         end
 
         def loadSagaPathList()
-            path = self.getValue( "SAGAPATH", "./Saga" )
+            path = self.getValue( 'SAGAPATH', './Saga')
             @sagaPathList = Array.new
-            path.split( ";" ).each do |path|
-                path = path.strip.chomp( "/" )
+            path.split(';').each do |path|
+                path = path.strip.chomp('/')
                 @sagaPathList << path
             end
 
@@ -64,16 +64,16 @@ module RServiceBus
         end
 
         def loadHostSection()
-            @appName = self.getValue( "APPNAME", "RServiceBus" )
-            @errorQueueName = self.getValue( "ERROR_QUEUE_NAME", "error" )
-            @maxRetries = self.getValue( "MAX_RETRIES", "5" ).to_i
-            @statOutputCountdown = self.getValue( "STAT_OUTPUT_COUNTDOWN", "100" ).to_i
-            @subscriptionUri = self.getValue( "SUBSCRIPTION_URI", "file:///tmp/#{appName}_subscriptions.yaml" )
+            @appName = self.getValue( 'APPNAME', 'RServiceBus')
+            @errorQueueName = self.getValue( 'ERROR_QUEUE_NAME', 'error')
+            @maxRetries = self.getValue( 'MAX_RETRIES', '5').to_i
+            @statOutputCountdown = self.getValue( 'STAT_OUTPUT_COUNTDOWN', '100').to_i
+            @subscriptionUri = self.getValue( 'SUBSCRIPTION_URI', "file:///tmp/#{appName}_subscriptions.yaml" )
 
-            auditQueueName = self.getValue( "AUDIT_QUEUE_NAME" )
+            auditQueueName = self.getValue('AUDIT_QUEUE_NAME')
             if auditQueueName.nil? then
-                @forwardSentMessagesTo = self.getValue( "FORWARD_SENT_MESSAGES_TO" )
-                @forwardReceivedMessagesTo = self.getValue( "FORWARD_RECEIVED_MESSAGES_TO" )
+                @forwardSentMessagesTo = self.getValue('FORWARD_SENT_MESSAGES_TO')
+                @forwardReceivedMessagesTo = self.getValue('FORWARD_RECEIVED_MESSAGES_TO')
                 else
                 @forwardSentMessagesTo = auditQueueName
                 @forwardReceivedMessagesTo = auditQueueName
@@ -83,17 +83,17 @@ module RServiceBus
         end
 
         def ensureContractFileExists( path )
-            if !( File.exists?( path ) ||
-                 File.exists?( "#{path}.rb" ) ) then
-                 puts "Error while processing contracts"
-                 puts "*** path, #{path}, provided does not exist as a file"
-                 abort()
+            unless File.exists?(path) ||
+                File.exists?("#{path}.rb") then
+              puts 'Error while processing contracts'
+              puts "*** path, #{path}, provided does not exist as a file"
+              abort()
             end
-            if !( File.extname( path ) == "" ||
-                 File.extname( path ) == ".rb" ) then
-                 puts "Error while processing contracts"
-                 puts "*** path, #{path}, should point to a ruby file, with extention .rb"
-                 abort()
+            unless File.extname(path) == "" ||
+                File.extname(path) == ".rb" then
+              puts 'Error while processing contracts'
+              puts "*** path, #{path}, should point to a ruby file, with extention .rb"
+              abort()
             end
         end
 
@@ -108,11 +108,11 @@ module RServiceBus
 
             #This is a guard clause in case no Contracts have been specified
             #If any guard clauses have been specified, then execution should drop to the second block
-            if self.getValue( "CONTRACTS" ).nil? then
+            if self.getValue('CONTRACTS').nil? then
                 return self
             end
 
-            self.getValue( "CONTRACTS", "./Contract" ).split( ";" ).each do |path|
+            self.getValue( 'CONTRACTS', './Contract').split(';').each do |path|
                 self.ensureContractFileExists( path )
                 @contractList << path
             end
@@ -128,19 +128,19 @@ module RServiceBus
         def loadLibs()
             @libList = Array.new
 
-            path = self.getValue( "LIB" )
-            path = "./lib" if path.nil? and File.exists?( "./lib" )
+            path = self.getValue('LIB')
+            path = './lib' if path.nil? and File.exists?('./lib')
             if path.nil? then
                 return self
             end
 
-            path.split( ";" ).each do |path|
+            path.split(';').each do |path|
                 log "Loading libs from, #{path}"
-                if !File.exists?( path ) then
-                    puts "Error while processing libs"
-                    puts "*** path, #{path}, should point to a ruby file, with extention .rb, or"
-                    puts "*** path, #{path}, should point to a directory than conatins ruby files, that have extention .rb"
-                    abort()
+                unless File.exists?(path) then
+                  puts 'Error while processing libs'
+                  puts "*** path, #{path}, should point to a ruby file, with extention .rb, or"
+                  puts "*** path, #{path}, should point to a directory than conatins ruby files, that have extention .rb"
+                  abort()
                 end
                 @libList << path
             end
@@ -148,7 +148,7 @@ module RServiceBus
         end
 
         def configureMq
-            @mqHost = self.getValue( "MQ", "beanstalk://localhost" )
+            @mqHost = self.getValue( 'MQ', 'beanstalk://localhost')
             return self
         end
 
@@ -159,17 +159,17 @@ module RServiceBus
         #Expected format;
         #	<path 1>;<path 2>
         def loadWorkingDirList()
-            pathList = self.getValue( "WORKING_DIR" )
+            pathList = self.getValue('WORKING_DIR')
             return self if pathList.nil?
 
-            pathList.split( ";" ).each do |path|
+            pathList.split(';').each do |path|
 
-                path = path.strip.chomp( "/" )
+                path = path.strip.chomp('/')
 
-                if !Dir.exists?( "#{path}" ) then
-                    puts "Error while processing working directory list"
-                    puts "*** path, #{path}, does not exist"
-                    next
+                unless Dir.exists?("#{path}") then
+                  puts 'Error while processing working directory list'
+                  puts "*** path, #{path}, does not exist"
+                  next
                 end
 
                 if Dir.exists?( "#{path}/MessageHandler" ) then

data/lib/rservicebus/ConfigureAppResource.rb

@@ -1,71 +1,72 @@
 module RServiceBus
-    
-    require "uri"
-    
-    #Configure AppResources for an rservicebus host
-    class ConfigureAppResource
+  require 'uri'
+  #Configure AppResources for an rservicebus host
+  class ConfigureAppResource
 
-        def getResources( env, host, stateManager, sagaStorage )
-            resourceManager = ResourceManager.new( stateManager, sagaStorage )
+    def getResources( env, host, stateManager, sagaStorage )
+      resourceManager = ResourceManager.new( stateManager, sagaStorage )
 
 
-            env.each do |k,v|
-                if v.is_a?(String) and
-					k.start_with?( "RSBFDB_" ) then
-                    uri = URI.parse( v )
-                    require "rservicebus/AppResource/FluidDb"
-                    resourceManager.add k.sub( "RSBFDB_", "" ), AppResource_FluidDb.new( host, uri )
-                elsif v.is_a?(String) and
-					k.start_with?( "RSB_" ) then
-                    uri = URI.parse( v )
-                    case uri.scheme
-                        when "redis"
-                    require "rservicebus/AppResource/Redis"
-						resourceManager.add k.sub( "RSB_", "" ), AppResource_Redis.new( host, uri )
-                        
-                        when "mysql"
-                        require "rservicebus/AppResource/Mysql"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_Mysql.new( host, uri )
-                        
-                        when "fluiddbmysql"
-                        require "rservicebus/AppResource/FluidDbMysql"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbMysql.new( host, uri )
-                        when "fluiddbmysql2"
-                        require "rservicebus/AppResource/FluidDbMysql2"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbMysql2.new( host, uri )
-                        when "fluiddbpgsql"
-                        require "rservicebus/AppResource/FluidDbPgsql"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbPgsql.new( host, uri )
-                        when "fluiddbtinytds"
-                        require "rservicebus/AppResource/FluidDbTinyTds"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbTinyTds.new( host, uri )
+      env.each do |k,v|
+        if v.is_a?(String) and
+          k.start_with?('RSBFDB_') then
+          uri = URI.parse( v )
+          require 'rservicebus/AppResource/FluidDb'
+          resourceManager.add k.sub( 'RSBFDB_', ''), AppResource_FluidDb.new( host, uri )
+        elsif v.is_a?(String) and
+          k.start_with?('RSB_') then
+          uri = URI.parse( v )
+          case uri.scheme
+          when 'redis'
+            require 'rservicebus/AppResource/Redis'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_Redis.new( host, uri )
 
-                        when "fluiddbfirebird"
-                        require "rservicebus/AppResource/FluidDbFirebird"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_FluidDbFirebird.new( host, uri )
-                        
-                        when "dir"
-                        require "rservicebus/AppResource/Dir"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_Dir.new( host, uri )
-                        when "file"
-                        require "rservicebus/AppResource/File"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_File.new( host, uri )
-                        when "scpupload"
-                        require "rservicebus/AppResource/ScpUpload"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_ScpUpload.new( host, uri )
-                        when "smbfile"
-                        require "rservicebus/AppResource/SmbFile"
-                        resourceManager.add k.sub( "RSB_", "" ), AppResource_SmbFile.new( host, uri )
-                        else
-						abort("Scheme, #{uri.scheme}, not recognised when configuring app resource, #{k}=#{v}");
-                    end
-                end
-                
-            end
-            
-            return resourceManager
+          when 'mysql'
+            require 'rservicebus/AppResource/Mysql'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_Mysql.new( host, uri )
+
+          when 'fluiddbmysql'
+            require 'rservicebus/AppResource/FluidDbMysql'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_FluidDbMysql.new( host, uri )
+          when 'fluiddbmysql2'
+            require 'rservicebus/AppResource/FluidDbMysql2'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_FluidDbMysql2.new( host, uri )
+          when 'fluiddbpgsql'
+            require 'rservicebus/AppResource/FluidDbPgsql'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_FluidDbPgsql.new( host, uri )
+          when 'fluiddbtinytds'
+            require 'rservicebus/AppResource/FluidDbTinyTds'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_FluidDbTinyTds.new( host, uri )
+
+          when 'fluiddbfirebird'
+            require 'rservicebus/AppResource/FluidDbFirebird'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_FluidDbFirebird.new( host, uri )
+
+          when 'dir'
+            require 'rservicebus/AppResource/Dir'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_Dir.new( host, uri )
+          when 'file'
+            require 'rservicebus/AppResource/File'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_File.new( host, uri )
+          when 'scpdownload'
+            require 'rservicebus/AppResource/ScpDownload'
+            resourceManager.add k.sub( 'RSB_', '' ), AppResource_ScpDownload.new( host, uri )
+          when 'scpupload'
+            require 'rservicebus/AppResource/ScpUpload'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_ScpUpload.new( host, uri )
+          when 'smbfile'
+            require 'rservicebus/AppResource/SmbFile'
+            resourceManager.add k.sub( 'RSB_', ''), AppResource_SmbFile.new( host, uri )
+          else
+            abort("Scheme, #{uri.scheme}, not recognised when configuring app resource, #{k}=#{v}");
+          end
         end
-        
+
+      end
+
+      return resourceManager
     end
-    
+
+  end
+
 end