rservicebus 0.1.70 → 0.1.71

data/lib/rservicebus/AppResource/ScpUpload.rb

@@ -3,50 +3,49 @@ require 'net/sftp'
 
 module RServiceBus
 
-    class ScpUploadHelper
-        attr_reader :uri
+  class ScpUploadHelper
+    attr_reader :uri
 
-        def initialize( uri )
-            @uri = uri
-        end
-
-        def upload( source )
-            #opportunity for smarts here. Could tar zip if it was a directory of files
+    def initialize( uri )
+      @uri = uri
+    end
 
-#            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
+    def upload( source )
+      #opportunity for smarts here. Could tar zip if it was a directory of files
 
-        end
+      #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
+    end
 
-        def close
-        end
+    def close
+    end
 
-        def delete( path, filepattern )
-            RServiceBus.log "Host: #{@uri.host}, User: #{@uri.user}, File Pattern: #{filepattern}, Destination: #{@uri.path}", true
-            Net::SSH.start( @uri.host, @uri.user ) do |ssh|
-                ssh.sftp.connect do |sftp|
-                    sftp.dir.glob(path, filepattern) {
-                        |file|
-                        r = sftp.remove("#{path}/#{file.name}")
-			r.wait
-                    }
-                end
+    def delete( path, filepattern )
+      RServiceBus.log "Host: #{@uri.host}, User: #{@uri.user}, File Pattern: #{filepattern}, Destination: #{@uri.path}", true
+      regexp = Regexp.new filepattern
+      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
+              r = sftp.remove("#{path}/#{entry.name}")
+              r.wait
             end
+          end
         end
-
+      end
     end
+  end
 
-    class AppResource_ScpUpload<AppResource
+  class AppResource_ScpUpload<AppResource
 
-        def connect(uri)
-            return ScpUploadHelper.new( uri )
-
-            return inputDir;
-        end
+    def connect(uri)
+      return ScpUploadHelper.new( uri )
 
+      return inputDir;
     end
 
+  end
 end

data/lib/rservicebus/Message.rb

@@ -1,36 +1,36 @@
 module RServiceBus
-    
+
     require "zlib"
     require "yaml"
     require "uuidtools"
 
     #This is the top level message that is passed around the bus
     class Message
-        
+
         attr_reader :returnAddress, :msgId, :remoteQueueName, :remoteHostName, :lastErrorSourceQueue, :lastErrorString, :correlationId, :sendAt
-        
+
         # Constructor
         #
         # @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 ENV["RSBMSG_COMPRESS"].nil? then
+            if !RServiceBus.checkEnvironmentVariable('RSBMSG_COMPRESS') then
                 @compressed = false
                 @_msg=YAML::dump(msg)
                 else
                 @compressed = true
                 @_msg=Zlib::Deflate.deflate(YAML::dump(msg))
             end
-            
+
             @correlationId = correlationId
             @returnAddress=returnAddress
-            
+
             @createdAt = DateTime.now
-            
+
             @msgId=UUIDTools::UUID.random_create
             @errorList = Array.new
         end
-        
+
         # If an error occurs while processing the message, this method allows details of the error to held
         # next to the msg.
         #
@@ -42,22 +42,22 @@ module RServiceBus
         def addErrorMsg( sourceQueue, errorString )
             @lastErrorSourceQueue = sourceQueue
             @lastErrorString = errorString
-            
+
             @errorList << RServiceBus::ErrorMessage.new( sourceQueue, errorString )
         end
-        
+
         def setRemoteHostName( hostName )
             @remoteHostName = hostName
         end
-        
+
         def setRemoteQueueName( queueName )
             @remoteQueueName = queueName
         end
-        
+
         def sendAt( timestamp )
             @sendAt = timestamp
         end
-        
+
         # @return [Object] The msg to be sent
         def msg
             if @compressed == true then
@@ -67,13 +67,13 @@ module RServiceBus
             end
             rescue ArgumentError => e
             raise e if e.message.index( "undefined class/module " ).nil?
-            
+
             puts e.message
             msg_name = e.message.sub( "undefined class/module ", "" )
-            
+
             raise ClassNotFoundForMsg.new( msg_name )
         end
-        
+
     end
-    
+
 end

data/lib/rservicebus/Monitor/DirNotifier.rb

@@ -1,18 +1,16 @@
 require 'cgi'
-require 'zip/zip'
-require 'zlib'
 
 module RServiceBus
-    
+
     class Monitor_DirNotifier<Monitor
-        
-        @Path
-        
+
+        attr_reader :Path, :ProcessingFolder, :Filter
+
         def connect(uri)
             #Pass the path through the Dir object to check syntax on startup
             begin
-                inputDir = Dir.new( uri.path )
-                if !File.writable?( uri.path ) then
+                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()
@@ -21,27 +19,80 @@ module RServiceBus
                     puts "***** Directory does not exist, #{uri.path}."
                     puts "***** Create the directory, #{uri.path}, and try again."
                     puts "***** eg, mkdir #{uri.path}"
-                    abort();
+                    abort()
                 rescue Errno::ENOTDIR => e
                 puts "***** The specified path does not point to a directory, #{uri.path}."
                 puts "***** Either repoint path to a directory, or remove, #{uri.path}, and create it as a directory."
                 puts "***** eg, rm #{uri.path} && mkdir #{uri.path}"
-                abort();
+                abort()
+            end
+
+            @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 "***** eg, '/#{uri.path}?processing=*ProcessingDir*"
+                abort()
+            else
+                parts = CGI.parse(uri.query)
+
+                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()
+                        end
+                        rescue Errno::ENOENT => e
+                            puts "***** Processing Directory does not exist, #{processingUri.path}."
+                            puts "***** Create the directory, #{processingUri.path}, and try again."
+                            puts "***** eg, mkdir #{processingUri.path}"
+                            abort()
+                        rescue Errno::ENOTDIR => e
+                            puts "***** Processing Directory does not point to a directory, #{processingUri.path}."
+                            puts "***** Either repoint path to a directory, or remove, #{processingUri.path}, and create it as a directory."
+                            puts "***** eg, rm #{processingUri.path} && mkdir #{processingUri.path}"
+                            abort()
+                    end
+
+                    @ProcessingFolder = processingUri.path
+                end
+
+                @Filter = "*"
+                if parts.has_key? "filter" then
+                    @Filter = parts["filter"][0]
+                end
             end
-            
-            @Path = inputDir.path
-            
         end
 
         def Look
-            
-            fileList = Dir.glob( "#{@Path}/*" )
+            fileList = self.get_files
             fileList.each do |filePath|
-                self.send( nil, URI.parse( "file://#{filePath}" ) )
-
+                newPath = self.move_file(filePath, @ProcessingFolder)
+                self.send( nil, URI.parse( "file://#{newPath}" ) )
             end
-            
         end
-        
+
+        def file_writable? path
+            return File.writable? path
+        end
+
+        def open_folder path
+            Dir.new path
+        end
+
+        def move_file src, dest
+            FileUtils.mv(src, dest)
+            filename = Pathname.new(src).basename
+            return Pathname.new(dest).join(filename)
+        end
+
+        def get_files
+            return Dir.glob( Pathname.new("#{@Path}").join(@Filter) ).select { |f| File.file?(f) }
+        end
+
     end
 end

data/lib/rservicebus/helper_functions.rb

@@ -1,59 +1,59 @@
 module RServiceBus
-    
-    
+
+
 	def RServiceBus.convertDTOToHash( obj )
 		hash = {};
 		obj.instance_variables.each {|var| hash[var.to_s.delete("@")] = obj.instance_variable_get(var) }
-        
+
 		return hash
 	end
-    
+
 	def RServiceBus.convertDTOToJson( obj )
 		hash = RServiceBus.convertDTOToHash(obj)
-        
+
 		return hash.to_json
 	end
-    
+
 	def RServiceBus.log(string, ver=false)
-        return unless ENV['TESTING'].nil?
-        
+        return if RServiceBus.checkEnvironmentVariable("TESTING")
+
 		type = ver ? "VERB" : "INFO"
-        if !ENV["VERBOSE"].nil? || !ver then
+        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 !ENV["RSBVERBOSE"].nil? then
+        if RServiceBus.checkEnvironmentVariable("RSBVERBOSE") then
             timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
             puts "[RSB] #{timestamp} :: #{string}"
         end
     end
-    
+
     def RServiceBus.createAnonymousClass( name_for_class )
         newAnonymousClass = Class.new(Object)
         Object.const_set( name_for_class, newAnonymousClass )
         return Object.const_get( name_for_class ).new
     end
-    
+
     def RServiceBus.getValue( name, default=nil )
         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"
         endpointMapping = EndpointMapping.new
         endpointMapping.Configure
         queueName = endpointMapping.get( msg.class.name )
-        
+
         ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
         agent = RServiceBus::Agent.new
         Audit.new( agent ).audit( msg )
         agent.sendMsg(msg, queueName, responseQueue)
-        
+
         rescue QueueNotFoundForMsg=>e
 		msg = "\n"
 		msg = "#{msg}*** Queue not found for, #{e.message}\n"
@@ -61,18 +61,18 @@ module RServiceBus
 		msg = "#{msg}*** MESSAGE_ENDPOINT_MAPPINGS=#{e.message}:<QueueName>\n"
 		raise StandardError.new( msg )
     end
-    
+
     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?
         agent = RServiceBus::Agent.new
         Audit.new( agent ).auditOutgoing( msg )
         agent.sendMsg(msg, queueName, responseQueue)
-        
+
         rescue QueueNotFoundForMsg=>e
 		msg = "\n"
 		msg = "#{msg}*** Queue not found for, #{e.message}\n"
@@ -80,19 +80,24 @@ module RServiceBus
 		msg = "#{msg}*** MESSAGE_ENDPOINT_MAPPINGS=#{e.message}:<QueueName>\n"
 		raise StandardError.new( msg )
     end
-    
+
     def RServiceBus.checkForReply( queueName )
         ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
         agent = RServiceBus::Agent.new
         msg = agent.checkForReply( queueName )
         Audit.new( agent ).auditIncoming( msg )
-        
+
         return msg
     end
-    
+
     def RServiceBus.tick( string )
         puts "[TICK] #{Time.new.strftime( '%Y-%m-%d %H:%M:%S.%6N' )} :: #{caller[0]}. #{string}"
     end
-    
-    
+
+    def RServiceBus.checkEnvironmentVariable( string )
+        return false if ENV[string].nil?
+        return true if ENV[string] == true || ENV[string] =~ (/(true|t|yes|y|1)$/i)
+        return false if ENV[string] == false || ENV[string].blank? || ENV[string] =~ (/(false|f|no|n|0)$/i)
+        raise ArgumentError.new("invalid value for Environment Variable: \"#{string}\"")
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.70
+  version: 0.1.71
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70345483351560 !ruby/object:Gem::Requirement
+  requirement: &70094435904140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345483351560
+  version_requirements: *70094435904140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70345483350000 !ruby/object:Gem::Requirement
+  requirement: &70094435903680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345483350000
+  version_requirements: *70094435903680
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70345483348360 !ruby/object:Gem::Requirement
+  requirement: &70094435903220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345483348360
+  version_requirements: *70094435903220
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70345483363680 !ruby/object:Gem::Requirement
+  requirement: &70094435902780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345483363680
+  version_requirements: *70094435902780
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70345483362840 !ruby/object:Gem::Requirement
+  requirement: &70094435902320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345483362840
+  version_requirements: *70094435902320
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables: