rservicebus 0.1.74 → 0.1.75

data/lib/rservicebus/MQ.rb

@@ -1,6 +1,6 @@
 module RServiceBus
     
-    require "uri"
+    require 'uri'
     
     class JobTooBigError<StandardError
     end
@@ -17,20 +17,20 @@ module RServiceBus
         
         
         def MQ.get
-            mqString = RServiceBus.getValue( "RSBMQ", "beanstalk://localhost" );
+            mqString = RServiceBus.getValue( 'RSBMQ', 'beanstalk://localhost');
             uri = URI.parse( mqString )
             
             case uri.scheme
-                when "beanstalk"
-                require "rservicebus/MQ/Beanstalk"
+                when 'beanstalk'
+                require 'rservicebus/MQ/Beanstalk'
                 mq = MQ_Beanstalk.new( uri )
                 
-                when "redis"
-                require "rservicebus/MQ/Redis"
+                when 'redis'
+                require 'rservicebus/MQ/Redis'
                 mq = MQ_Redis.new( uri )
                 
-                when "rabbitmq"
-                require "rservicebus/MQ/RabbitMq"
+                when 'rabbitmq'
+                require 'rservicebus/MQ/RabbitMq'
                 mq = MQ_RabbitMq.new( uri )
 
                 else
@@ -49,26 +49,26 @@ module RServiceBus
             if uri.is_a? URI then
                 @uri = uri
                 else
-                puts "uri must be a valid URI"
+                puts 'uri must be a valid URI'
                 abort()
             end
 
-            if uri.path == "" || uri.path == "/" then
-                @localQueueName = RServiceBus.getValue( "APPNAME", "RServiceBus" )
+            if uri.path == '' || uri.path == '/' then
+                @localQueueName = RServiceBus.getValue( 'APPNAME', 'RServiceBus')
                 else
                 @localQueueName = uri.path
-                @localQueueName[0] = ""
+                @localQueueName[0] = ''
             end
 
-            if @localQueueName == "" then
+            if @localQueueName == '' then
                 puts "@localQueueName: #{@localQueueName}"
-                puts "Queue name must be supplied "
+                puts 'Queue name must be supplied '
                 puts "*** uri, #{uri}, needs to contain a queue name"
-                puts "*** the structure is scheme://host[:port]/queuename"
+                puts '*** the structure is scheme://host[:port]/queuename'
                 abort()
             end
             
-            @timeout = RServiceBus.getValue( "QUEUE_TIMEOUT", "5" ).to_i
+            @timeout = RServiceBus.getValue( 'QUEUE_TIMEOUT', '5').to_i
             self.connect(uri.host, uri.port)
             self.subscribe( @localQueueName )
         end
@@ -78,24 +78,24 @@ module RServiceBus
         # @param [String] host machine runnig the mq
         # @param [String] port port the mq is running on
         def connect( host, port )
-            raise "Method, connect, needs to be implemented"
+            raise 'Method, connect, needs to be implemented'
         end
         
         # Connect to the receiving queue
         #
         # @param [String] queuename name of the receiving queue
         def subscribe( queuename )
-            raise "Method, subscribe, needs to be implemented"
+            raise 'Method, subscribe, needs to be implemented'
         end
         
         # Get next msg from queue
         def pop
-            raise "Method, pop, needs to be implemented"
+            raise 'Method, pop, needs to be implemented'
         end
         
         # "Commit" the pop
         def ack
-            raise "Method, ack, needs to be implemented"
+            raise 'Method, ack, needs to be implemented'
         end
         
         # At least called in the Host rescue block, to ensure all network links are healthy
@@ -106,7 +106,7 @@ module RServiceBus
             begin
                 @connection.close
                 rescue
-                puts "AppResource. An error was raised while closing connection to, " + @uri.to_s
+                puts 'AppResource. An error was raised while closing connection to, ' + @uri.to_s
             end
             
         end

data/lib/rservicebus/MQ/Beanstalk.rb

@@ -1,7 +1,7 @@
 module RServiceBus
     
-    require "beanstalk-client"
-    require "rservicebus/MQ"
+    require 'beanstalk-client'
+    require 'rservicebus/MQ'
     
     # Beanstalk client implementation.
     #
@@ -16,16 +16,16 @@ module RServiceBus
             begin
                 @beanstalk = Beanstalk::Pool.new([string])
                 
-                @max_job_size = @beanstalk.stats["max-job-size"]
+                @max_job_size = @beanstalk.stats['max-job-size']
                 if @max_job_size < 4194304 then
                     puts "***WARNING: Lowest recommended.max-job-size is 4m, current max-job-size, #{@max_job_size.to_f / (1024*1024)}m"
-                    puts "***WARNING: Set the job size with the -z switch, eg /usr/local/bin/beanstalkd -z 4194304"
+                    puts '***WARNING: Set the job size with the -z switch, eg /usr/local/bin/beanstalkd -z 4194304'
                 end
                 rescue Exception => e
-                puts "Error connecting to Beanstalk"
+                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."
+                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
@@ -46,7 +46,7 @@ module RServiceBus
             begin
                 @job = @beanstalk.reserve @timeout
                 rescue Exception => e
-                if e.message == "TIMED_OUT" then
+                if e.message == 'TIMED_OUT' then
                     raise NoMsgToProcess.new
                 end
                 raise e
@@ -68,7 +68,7 @@ module RServiceBus
         # At least called in the Host rescue block, to ensure all network links are healthy
         def send( queueName, msg )
             if msg.length > @max_job_size then
-                puts "***Attempting to send a msg which will not fit on queue."
+                puts '***Attempting to send a msg which will not fit on queue.'
                 puts "***Msg size, #{msg.length}, max msg size, #{@max_job_size}."
                 raise JobTooBigError.new( "Msg size, #{msg.length}, max msg size, #{@max_job_size}" )
             end

data/lib/rservicebus/MQ/RabbitMq.rb

@@ -1,7 +1,7 @@
 module RServiceBus
     
-    require "bunny"
-    require "rservicebus/MQ"
+    require 'bunny'
+    require 'rservicebus/MQ'
     
     # Beanstalk client implementation.
     #
@@ -22,10 +22,10 @@ module RServiceBus
                 @x = @ch.default_exchange
 
                 rescue Exception => e
-                puts "Error connecting to Beanstalk"
+                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."
+                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

data/lib/rservicebus/MQ/Redis.rb

@@ -1,7 +1,7 @@
 module RServiceBus
     
-    require "rservicebus/MQ"
-    require "redis"
+    require 'rservicebus/MQ'
+    require 'redis'
     
     # Beanstalk client implementation.
     #
@@ -18,7 +18,7 @@ module RServiceBus
 
                 rescue Exception => e
                 puts e.message
-                puts "Error connecting to Redis for mq"
+                puts 'Error connecting to Redis for mq'
                 puts "Host string, #{string}"
                 abort()
             end

data/lib/rservicebus/Message.rb

@@ -1,8 +1,8 @@
 module RServiceBus
 
-    require "zlib"
-    require "yaml"
-    require "uuidtools"
+    require 'zlib'
+    require 'yaml'
+    require 'uuidtools'
 
     #This is the top level message that is passed around the bus
     class Message
@@ -14,12 +14,12 @@ module RServiceBus
         # @param [Object] msg The msg to be sent
         # @param [Object] returnAddress A queue to which the destination message handler can send replies
         def initialize( msg, returnAddress, correlationId=nil )
-            if !RServiceBus.checkEnvironmentVariable('RSBMSG_COMPRESS') then
-                @compressed = false
-                @_msg=YAML::dump(msg)
-                else
-                @compressed = true
-                @_msg=Zlib::Deflate.deflate(YAML::dump(msg))
+            unless RServiceBus.checkEnvironmentVariable('RSBMSG_COMPRESS') then
+              @compressed = false
+              @_msg=YAML::dump(msg)
+            else
+              @compressed = true
+              @_msg=Zlib::Deflate.deflate(YAML::dump(msg))
             end
 
             @correlationId = correlationId
@@ -66,10 +66,10 @@ module RServiceBus
                 return YAML::load( @_msg )
             end
             rescue ArgumentError => e
-            raise e if e.message.index( "undefined class/module " ).nil?
+            raise e if e.message.index('undefined class/module ').nil?
 
             puts e.message
-            msg_name = e.message.sub( "undefined class/module ", "" )
+            msg_name = e.message.sub( 'undefined class/module ', '')
 
             raise ClassNotFoundForMsg.new( msg_name )
         end

data/lib/rservicebus/Monitor.rb

@@ -12,18 +12,18 @@ 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
         
         # The method which actually connects to the resource.
         #
         def Look
-            raise "Method, Look, needs to be implemented for the Monitor"
+            raise 'Method, Look, needs to be implemented for the Monitor'
         end
         
         def _connect
             @connection = self.connect(@uri)
-            @Bus.log "#{self.class.name}. Connected to, #{@uri.to_s}" unless !ENV["QUIET"].nil?
+            @Bus.log "#{self.class.name}. Connected to, #{@uri.to_s}" if ENV['QUIET'].nil?
         end
         
         # Resources are attached resources, and can be specified using the URI syntax.
@@ -49,8 +49,8 @@ module RServiceBus
             begin
                 self.finished
                 rescue Exception => e
-                puts "** Monitor. An error was raised while closing connection to, " + @uri.to_s
-                puts "Message: " + e.message
+                puts '** Monitor. An error was raised while closing connection to, ' + @uri.to_s
+                puts 'Message: ' + e.message
                 puts e.backtrace
             end
             

data/lib/rservicebus/Monitor/CsvDir.rb

@@ -8,9 +8,9 @@ module RServiceBus
 
         def checkPayloadForNumberOfColumns( payload )
             return if @QueryStringParts.nil?
-            return unless @QueryStringParts.has_key?("cols")
+            return unless @QueryStringParts.has_key?('cols')
             
-            cols = @QueryStringParts["cols"][0].to_i
+            cols = @QueryStringParts['cols'][0].to_i
             payload.each_with_index do |row, idx|
                 if row.length != cols then
                     raise "Expected number of columns, #{cols}, Actual number of columns, #{row.length}, on line, #{idx}"
@@ -20,9 +20,9 @@ module RServiceBus
         end
 
         def checkSendHash
-            if !@QueryStringParts.nil? && @QueryStringParts.has_key?("hash") then
-                flag = @QueryStringParts["hash"][0]
-                return flag == "Y"
+            if !@QueryStringParts.nil? && @QueryStringParts.has_key?('hash') then
+                flag = @QueryStringParts['hash'][0]
+                return flag == 'Y'
             end
             
             return false

data/lib/rservicebus/Monitor/CsvPerLine.rb

@@ -6,9 +6,9 @@ module RServiceBus
     class Monitor_CsvPerLineDir<Monitor_Dir
         
         def checkPayloadForNumberOfColumns( payload )
-            if !@QueryStringParts.nil? && @QueryStringParts.has_key?("cols") then
+            if !@QueryStringParts.nil? && @QueryStringParts.has_key?('cols') then
                 
-                cols = @QueryStringParts["cols"][0].to_i
+                cols = @QueryStringParts['cols'][0].to_i
                 payload.each_with_index do |row, idx|
                     if row.length != cols then
                         raise "Expected number of columns, #{cols}, Actual number of columns, #{row.length}, on line, #{idx}"
@@ -19,9 +19,9 @@ module RServiceBus
         end
         
         def checkSendHash
-            if !@QueryStringParts.nil? && @QueryStringParts.has_key?("hash") then
-                flag = @QueryStringParts["hash"][0]
-                return flag == "Y"
+            if !@QueryStringParts.nil? && @QueryStringParts.has_key?('hash') then
+                flag = @QueryStringParts['hash'][0]
+                return flag == 'Y'
             end
             
             return false

data/lib/rservicebus/Monitor/Dir.rb

@@ -15,10 +15,10 @@ module RServiceBus
             #Pass the path through the Dir object to check syntax on startup
             begin
                 inputDir = Dir.new( uri.path )
-                if !File.writable?( uri.path ) then
-                    puts "***** Directory is not writable, #{uri.path}."
-                    puts "***** Make the directory, #{uri.path}, writable and try again."
-                    abort()
+                unless File.writable?(uri.path) then
+                  puts "***** Directory is not writable, #{uri.path}."
+                  puts "***** Make the directory, #{uri.path}, writable and try again."
+                  abort()
                 end
                 rescue Errno::ENOENT => e
                     puts "***** Directory does not exist, #{uri.path}."
@@ -38,32 +38,32 @@ module RServiceBus
             return if uri.query.nil?
             parts = CGI.parse(uri.query)
             @QueryStringParts = parts
-            if parts.has_key?("archive") then
-                archiveUri = URI.parse( parts["archive"][0] )
-                if !File.directory?( archiveUri.path ) then
-                    puts "***** Archive file name templating not yet supported."
-                    puts "***** Directory's only."
-                    abort()
+            if parts.has_key?('archive') then
+                archiveUri = URI.parse( parts['archive'][0] )
+                unless File.directory?(archiveUri.path) then
+                  puts '***** Archive file name templating not yet supported.'
+                  puts "***** Directory's only."
+                  abort()
                 end
                 @ArchiveDir = archiveUri.path
             end
             
-            if parts.has_key?("inputfilter") then
-                if parts["inputfilter"].count > 1 then
-                    puts "Too many inputfilters specified."
-                    puts "*** ZIP, or GZ are the only valid inputfilters."
+            if parts.has_key?('inputfilter') then
+                if parts['inputfilter'].count > 1 then
+                    puts 'Too many inputfilters specified.'
+                    puts '*** ZIP, or GZ are the only valid inputfilters.'
                     abort();
                 end
                 
-                if parts["inputfilter"][0] == "ZIP" then
-                    elsif parts["inputfilter"][0] == "GZ" then
-                    elsif parts["inputfilter"][0] == "TAR" then
+                if parts['inputfilter'][0] == 'ZIP' then
+                    elsif parts['inputfilter'][0] == 'GZ' then
+                    elsif parts['inputfilter'][0] == 'TAR' then
                     else
-                    puts "Invalid inputfilter specified."
-                    puts "*** ZIP, or GZ are the only valid inputfilters."
+                    puts 'Invalid inputfilter specified.'
+                    puts '*** ZIP, or GZ are the only valid inputfilters.'
                     abort();
                 end
-                @InputFilter << parts["inputfilter"][0]
+                @InputFilter << parts['inputfilter'][0]
             end
             
             
@@ -88,15 +88,15 @@ module RServiceBus
         end
         
         def ReadContentFromTarFile( filePath )
-            raise "Not supported yet"
-            content = ""
+            raise 'Not supported yet'
+            content = ''
             #            Gem::Package::TarReader.new( filePath ).each do |entry|
             #    content = entry.read
             return content
         end
         
         def ReadContentFromFile( filePath )
-            content = ""
+            content = ''
             if @InputFilter.length > 0 then
                 if @InputFilter[0] == 'ZIP' then
                     entry, content = self.ReadContentFromZipFile( filePath )
@@ -129,17 +129,17 @@ module RServiceBus
             fileList.each do |filePath|
                 RServiceBus.log "Ready to process, #{filePath}"
                 content = self.ProcessPath( filePath )
-                
-                if !@ArchiveDir.nil? then
-                    basename = File.basename( filePath )
-                    newFilePath = @ArchiveDir + "/" + basename + "." + DateTime.now.strftime( "%Y%m%d%H%M%S%L") + ".zip"
-                    RServiceBus.log "Writing to archive, #{newFilePath}"
-                    
-                    Zip::ZipOutputStream.open(newFilePath) {
-                        |zos|
-                        zos.put_next_entry(basename)
-                        zos.puts content
-                    }
+
+                unless @ArchiveDir.nil? then
+                  basename = File.basename(filePath)
+                  newFilePath = @ArchiveDir + '/' + basename + '.' + DateTime.now.strftime('%Y%m%d%H%M%S%L') + '.zip'
+                  RServiceBus.log "Writing to archive, #{newFilePath}"
+
+                  Zip::ZipOutputStream.open(newFilePath) {
+                      |zos|
+                    zos.put_next_entry(basename)
+                    zos.puts content
+                  }
                 end
                 File.unlink( filePath )
                 

data/lib/rservicebus/Monitor/DirNotifier.rb

@@ -10,10 +10,10 @@ module RServiceBus
             #Pass the path through the Dir object to check syntax on startup
             begin
                 self.open_folder uri.path
-                if !self.file_writable?( uri.path ) then
-                    puts "***** Directory is not writable, #{uri.path}."
-                    puts "***** Make the directory, #{uri.path}, writable and try again."
-                    abort()
+                unless self.file_writable?(uri.path) then
+                  puts "***** Directory is not writable, #{uri.path}."
+                  puts "***** Make the directory, #{uri.path}, writable and try again."
+                  abort()
                 end
                 rescue Errno::ENOENT => e
                     puts "***** Directory does not exist, #{uri.path}."
@@ -30,21 +30,21 @@ module RServiceBus
             @Path = uri.path
 
             if uri.query.nil?
-                puts "***** Processing Directory is not specified."
-                puts "***** Specify the Processing Directory as a query string in the Path URI"
+                puts '***** Processing Directory is not specified.'
+                puts '***** Specify the Processing Directory as a query string in the Path URI'
                 puts "***** eg, '/#{uri.path}?processing=*ProcessingDir*"
                 abort()
             else
                 parts = CGI.parse(uri.query)
 
-                if parts.has_key? "processing" then
-                    processingUri = URI.parse parts["processing"][0]
+                if parts.has_key? 'processing' then
+                    processingUri = URI.parse parts['processing'][0]
                     begin
                         self.open_folder processingUri.path
-                        if !self.file_writable?( processingUri.path ) then
-                            puts "***** Processing Directory is not writable, #{processingUri.path}."
-                            puts "***** Make the directory, #{processingUri.path}, writable and try again."
-                            abort()
+                        unless self.file_writable?(processingUri.path) then
+                          puts "***** Processing Directory is not writable, #{processingUri.path}."
+                          puts "***** Make the directory, #{processingUri.path}, writable and try again."
+                          abort()
                         end
                         rescue Errno::ENOENT => e
                             puts "***** Processing Directory does not exist, #{processingUri.path}."
@@ -61,9 +61,9 @@ module RServiceBus
                     @ProcessingFolder = processingUri.path
                 end
 
-                @Filter = "*"
-                if parts.has_key? "filter" then
-                    @Filter = parts["filter"][0]
+                @Filter = '*'
+                if parts.has_key? 'filter' then
+                    @Filter = parts['filter'][0]
                 end
             end
         end