rservicebus 0.1.35 → 0.1.36

data/lib/rservicebus/CronManager.rb

@@ -2,55 +2,88 @@ module RServiceBus
     
     require 'parse-cron'
     
-    class CronManager
-        
-        def initialize( host )
-            @Bus = host
-            
-            @Bus.log "Load Cron", true
-            @list = Array.new
-            ENV.each do |k,v|
-                if k.start_with?( "RSBCRON_" ) then
-                    hash = Hash.new
-					hash['name'] = k.sub( "RSBCRON_", "" )
-					hash['last'] = Time.now
-					hash['v'] = v
-					hash['cron'] = CronParser.new(v)
-					hash['next'] = hash['cron'].next(Time.now)
-                    @list << hash
-                    @Bus.log( "Cron set for, #{hash['name']}, #{v}" )
-                    elsif k.start_with?( "RSBCRON" ) then
-                    v.split( ";" ).each do |v|
-                        parts = v.split( " ", 6 )
-                        name = parts.pop
-                        cron_string = parts.join( " " )
-                        hash = Hash.new
-                        hash['name'] = name
-                        hash['last'] = Time.now
-                        hash['v'] = cron_string
-                        hash['cron'] = CronParser.new(cron_string)
-                        hash['next'] = hash['cron'].next(Time.now)
-                        @list << hash
-                        @Bus.log( "Cron set for, #{hash['name']}, #{v}" )
-                    end
-                end
-                
+    class Globber
+        def self.parse_to_regex(str)
+        escaped = Regexp.escape(str).gsub('\*','.*?')
+        Regexp.new "^#{escaped}$", Regexp::IGNORECASE
+    end
+    
+    def initialize(str)
+        @regex = self.class.parse_to_regex str
+    end
+    
+    def =~(str)
+    !!(str =~ @regex)
+end
+end
+
+class NoMatchingMsgForCron<StandardError
+end
+
+class CronManager
+    
+    
+    def getMatchingMsgNames( name )
+        list = Array.new
+        @msgNames.each do |n|
+            if Globber.new( name ) =~ n then
+                list << n
             end
         end
+        if list.length == 0 then
+            raise NoMatchingMsgForCron.new( name )
+        end
+
+        return list
+    end
+    
+    def addCron( name, cron_string )
+        
+        self.getMatchingMsgNames( name ).each do |n|
+            hash = Hash.new
+            hash['name'] = n
+            hash['last'] = Time.now
+            hash['v'] = cron_string
+            hash['cron'] = CronParser.new(cron_string)
+            hash['next'] = hash['cron'].next(Time.now)
+            @list << hash
+            @Bus.log( "Cron set for, #{name}, #{cron_string}" )
+        end
+    end
+    
+    def initialize( host, msgNames=Array.new )
+        @Bus = host
+        @msgNames = msgNames
         
-        def Run
-            now = Time.now
-            @list.map! do |v|
-                if now > v['next'] then
-                    @Bus.log "CronManager.Send, #{v['name']}", true
-                    @Bus.Send( RServiceBus.createAnonymousClass( v['name'] ) )
-                    v['next'] = v['cron'].next(now)
+        @Bus.log "Load Cron", true
+        @list = Array.new
+        ENV.each do |k,v|
+            if k.start_with?( "RSBCRON_" ) then
+                self.addCron( k.sub( "RSBCRON_", "" ), v )
+                elsif k.start_with?( "RSBCRON" ) then
+                v.split( ";" ).each do |v|
+                    parts = v.split( " ", 6 )
+                    
+                    self.addCron( parts.pop, parts.join( " " ) )
                 end
-                return v
             end
+            
         end
-        
     end
     
+    def Run
+        now = Time.now
+        @list.map! do |v|
+            if now > v['next'] then
+                @Bus.log "CronManager.Send, #{v['name']}", true
+                @Bus.Send( RServiceBus.createAnonymousClass( v['name'] ) )
+                v['next'] = v['cron'].next(now)
+            end
+            return v
+        end
+    end
+    
+end
+
 end
 

data/lib/rservicebus/HandlerManager.rb

@@ -5,7 +5,7 @@ module RServiceBus
     #	handlernames, and
     #	loading handlers
     class HandlerManager
-
+        
         # Constructor
         #
         # @param [RServiceBus::Host] host instance
@@ -18,8 +18,8 @@ module RServiceBus
             @handlerList = Hash.new
             @resourceListByHandlerName = Hash.new
         end
-
-
+        
+        
         # setBusAttributeIfRequested
         #
         # @param [RServiceBus::Handler] handler
@@ -31,7 +31,7 @@ module RServiceBus
             
             return self
         end
-
+        
         # setStateAttributeIfRequested
         #
         # @param [RServiceBus::Handler] handler
@@ -71,7 +71,7 @@ module RServiceBus
         def addHandler( msgName, handler )
             @handlerList[msgName] = Array.new if @handlerList[msgName].nil?
             return unless @handlerList[msgName].index{ |x| x.class.name == handler.class.name }.nil?
-
+            
             @handlerList[msgName] << handler
             self.setBusAttributeIfRequested( handler )
             self.checkIfStateAttributeRequested( handler )
@@ -110,7 +110,7 @@ module RServiceBus
         def setResourcesForHandlersNeededToProcessMsg( msgName )
             @handlerList[msgName].each do |handler|
                 self.setStateAttributeIfRequested( handler )
-
+                
                 next if @resourceListByHandlerName[handler.class.name].nil?
                 @resourceListByHandlerName[handler.class.name].each do |k|
                     handler.instance_variable_set( "@#{k}", @appResources[k].getResource() )
@@ -122,7 +122,7 @@ module RServiceBus
         
         def getHandlerListForMsg( msgName )
             raise NoHandlerFound.new( msgName ) if @handlerList[msgName].nil?
-
+            
             @stateManager.Begin
             list = self.getListOfResourcesNeededToProcessMsg( msgName )
             list.each do |resourceName|
@@ -141,10 +141,10 @@ module RServiceBus
             @host.log "HandlerManager.commitResourcesUsedToProcessMsg, #{msgName}", true
             list = self.getListOfResourcesNeededToProcessMsg( msgName )
             list.each do |resourceName|
-                    r = @appResources[resourceName]
-                    @host.log "Commit resource, #{r.class.name}", true
-                    r.Commit
-                    r.finished
+                r = @appResources[resourceName]
+                @host.log "Commit resource, #{r.class.name}", true
+                r.Commit
+                r.finished
             end
             @stateManager.Commit
         end
@@ -181,5 +181,11 @@ module RServiceBus
             
             return list
         end
+        
+        def getListOfMsgNames
+            return @handlerList.keys
+        end
+        
+        
     end
 end

data/lib/rservicebus/Host.rb

@@ -58,13 +58,6 @@ module RServiceBus
             return self;
         end
         
-        #Thin veneer for Configuring Cron
-        #
-        def configureCronManager
-            @cronManager = CronManager.new( self )
-            return self;
-        end
-
         #Thin veneer for Configuring Cron
         #
         def configureCircuitBreaker
@@ -112,6 +105,13 @@ module RServiceBus
             return self
         end
         
+        #Thin veneer for Configuring Cron
+        #
+        def configureCronManager
+            @cronManager = CronManager.new( self, @handlerManager.getListOfMsgNames )
+            return self;
+        end
+        
         #Load Contracts
         #
         def loadContracts()
@@ -171,10 +171,10 @@ module RServiceBus
             .loadLibs()
 			.configureAppResource()
             .configureStateManager()
-            .configureCronManager()
             .configureCircuitBreaker()
 			.configureMonitors()
 			.loadHandlers()
+            .configureCronManager()
 			.connectToMq()
 			.configureSubscriptions()
 			.sendSubscriptions()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70175686418460 !ruby/object:Gem::Requirement
+  requirement: &70240671828320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175686418460
+  version_requirements: *70240671828320
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70175686417980 !ruby/object:Gem::Requirement
+  requirement: &70240671827840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175686417980
+  version_requirements: *70240671827840
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70175686417560 !ruby/object:Gem::Requirement
+  requirement: &70240671827400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175686417560
+  version_requirements: *70240671827400
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70175686417100 !ruby/object:Gem::Requirement
+  requirement: &70240671826940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175686417100
+  version_requirements: *70240671826940
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70175686416520 !ruby/object:Gem::Requirement
+  requirement: &70240671826460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175686416520
+  version_requirements: *70240671826460
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables: