spstrigger_execute 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d3d0d1d6818d68617cac9656b9a3efd61df3e02
-  data.tar.gz: 44ee8692afb3cad3c46f95f6c5f492a12d106296
+  metadata.gz: 37e6cc9ce29fd8d990464781f453c43cc63e0cb8
+  data.tar.gz: bf224caaaaa1a60e8bb9ce82420acc086cff0211
 SHA512:
-  metadata.gz: b4a28108f49d4a45a37d9a5f6e865f83de6c3feb4b7f08bac6c99e6b38e473ac2ac9f034dd98b914ff95cbfea6549bb5c7f40ee8fb4068a52c0605a0325d9c90
-  data.tar.gz: 9a69d1711f09c3271f78455c6da9a33067b55ecf41d21a3333c8105a81e31208461aae0a0177cd4f6894e54b609cbaefe773de27c0cbf4d97f947d669d38fac9
+  metadata.gz: 3c0541a03d545717c9c239cd33475762f799dd16f6fa2e71622ad5e80780cb270b65a5c3eef5c9f416810deb3bea9c63ade3851647436d82c3aeaecc24381a11
+  data.tar.gz: 7f60069dba09e5d58f135a69f7cb0b006b55f9117e86ff1467d461cc2519788590e7e6204eda6edc4b22769866ab8849246b367cd07a13405ecd1bdac750f171

data/lib/spstrigger_execute.rb

@@ -9,9 +9,9 @@ require 'xmlregistry_objects'
 
 class SPSTriggerExecute
 
-  def initialize(x, reg=nil, polyrexdoc=nil)
-    
+  def initialize(x, reg=nil, polyrexdoc=nil, logfile: nil)
     
+    @log = Logger.new logfile,'daily' if logfile
     dx = if x.is_a? Dynarex then
     
       x
@@ -24,15 +24,15 @@ class SPSTriggerExecute
     end
     
     @patterns = dx.to_h
-    
+        
     if reg and polyrexdoc then
-      
+          
       xro = XMLRegistryObjects.new(reg, polyrexdoc)
       
       @h = xro.to_h      
       define_methods = @h.keys.map {|x| "def #{x}() @h[:#{x}] end"}      
       instance_eval define_methods.join("\n")      
-      
+      log 'define_methods : ' + self.public_methods.sort.inspect
     end
 
   end
@@ -43,6 +43,11 @@ class SPSTriggerExecute
   end
 
   alias mae match_and_execute
+  
+  def run(s)
+    instance_eval s
+  end
+    
 
   private
 
@@ -81,7 +86,9 @@ class SPSTriggerExecute
 
       if result and conditions.length > 0 then
         
+        log 'conditions: ' + conditions.inspect
         success = eval conditions
+        log 'success : '  + success.inspect
         result = nil unless success
       end
 
@@ -90,6 +97,12 @@ class SPSTriggerExecute
     end
   end
 
+  def log(s)
+    if @log then
+      @logger.debug s
+    end
+  end
+  
   def prepare_jobs(results)
 
     results.inject([]) do |r,h|
@@ -98,33 +111,39 @@ class SPSTriggerExecute
       a += h[:topic].captures if h[:topic] && h[:topic].captures.any?
       a += h[:msg].captures if h[:msg]
       
-      job = @patterns[h[:index].to_i - 1][:job]
-      job_args = job.split + a
-      
-      if job[/^\/\//] then
+      jobs = @patterns[h[:index].to_i - 1][:job]
+
+      jobs.split(/\s*;\s*/).each do |job|
 
-        r << [:rse, job_args]
+        job_args = job.split + a
         
-      else
+        if job[/^\/\//] then
 
-        topic_message = job.gsub(/\$\d/) do |x| 
+          r << [:rse, job_args]
+          
+        elsif job[/^[\w\/]+:/]
 
-          i = x[/\d$/].to_i - 1
-          x.sub(/\$\d/, a[i])
-        end
+          topic_message = job.gsub(/\$\d/) do |x| 
 
-        topic_message = topic_message\
-          .gsub(/![Tt]ime/,Time.now.strftime("%a %H:%M%P"))\
-          .gsub(/![Dd]ate/,Time.now.strftime("%d %b"))        
+            i = x[/\d$/].to_i - 1
+            x.sub(/\$\d/, a[i])
+          end
 
-        topic_message.split(/\s*;\s*/).each do |m|
-          
-          r << [:sps, m]
+          topic_message = topic_message\
+            .gsub(/![Tt]ime/,Time.now.strftime("%a %H:%M%P"))\
+            .gsub(/![Dd]ate/,Time.now.strftime("%d %b"))        
 
+          
+          r << [:sps, topic_message]          
+        else
+          
+          r << [:ste, job]
+          
         end
-        
       end
+
       r  
+      
     end
   end
 
@@ -138,4 +157,5 @@ class SPSTriggerExecute
 
     t
   end
+    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spstrigger_execute
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   rlSMrvljzPJPts27UIPIfU02mkTZzELneWPUEQlIK/ADjdiGu2uxlWT5g77gwM+g
   fYtWdC+NEqa0rg==
   -----END CERTIFICATE-----
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -59,40 +59,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.22
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.22
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: xmlregistry_objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
 description: 
 email: james@r0bertson.co.uk
 executables: []