rsf_services 0.8.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f3295b4e18362f1dd8fd40e6b5ee3c11a4870d034b31ce14e8334cbdf893c21
-  data.tar.gz: cd5ad559a93cce749fc86226324563ead5bd7ac8357e4a72ce04014ad834d4b8
+  metadata.gz: 2cd819806f4a458659043fdc38a40a25c32f6f15a66cb1bfc01a87f5fe8c6497
+  data.tar.gz: 19b7384f350e1f2ca9bfb09e74f191ec4a59b51f28e3753241bd506c831e1346
 SHA512:
-  metadata.gz: 110099a3dbcfd6f6b81ed03662ef60ee8d245a3bc612a623388f1ed08431c9bf6d500698452ffc26da74a4376283015d90023828dcede094c08be1bbbda99413
-  data.tar.gz: 59ce7f17319da3153bef072bd4adbc802290eb421ff5513ec40c9a4ece5e3fb817e913813b6aa0f87954b955c20c7b5c223d91be2fd6af551b7646963182586f
+  metadata.gz: 64aedfc889982e3153ccc5a6871a1f14c4848bdcc6c130047a0f0cb5543acead72aa91d8fc7110f635c3ec0e19a3df4db93d3e2fc4ce8baa4e8b9121641e6518
+  data.tar.gz: d31711894bd0ed72e6d0258346e85a5ce637d37182e58deef657ee629202a7d5205b51cdc6272b6a80020fec729b7e3f2f1e1e1d5819fbec0ba82011bddd3aa1

data/lib/rsf_services.rb

@@ -7,7 +7,6 @@ require 'app-mgr'
 require 'dws-registry'
 
 
-
 class RSFServices < RScriptRW
   
   class PackageMethod
@@ -28,13 +27,24 @@ class RSFServices < RScriptRW
   
   class Package
     
-    def initialize(obj, package, debug: debug)
+    def initialize(obj, package, debug: false)
 
+      
+      puts 'inside Package#initialize' if debug
+      
       @obj, @package, @debug = obj, package, debug
 
       @url = File.join(@obj.package_basepath, package + '.rsf')
-      doc = Rexle.new open(@url, 
-                           'UserAgent' => 'RSFServices::Package reader').read
+      
+      puts 'before Rexle' if @debug
+      puts '@url: ' + @url.inspect if @debug
+      
+      s, _ = RXFHelper.read(@url)
+      puts 's: ' + s.inspect if @debug
+      
+      doc = Rexle.new  s
+      puts 'before xpath' if @debug
+      
       a = doc.root.xpath 'job/attribute::id'
       
       a.each do |attr|
@@ -79,9 +89,11 @@ class RSFServices < RScriptRW
     
     puts 'inside RSF_services' if @debug
 
-    super(log: log)
+    super(log: log, debug: debug)
 
     @package_basepath, @services = package_basepath, {}
+    
+    @initialized = {}
 
     if reg then
 
@@ -128,28 +140,48 @@ class RSFServices < RScriptRW
     PackageMethod.new self, type: :post
   end
 
-  def run_job(package, jobs, params={}, *qargs, 
-                  package_path: ("%s/%s.rsf" % [@package_basepath, package]))
+  def run_job(package, jobs, params={}, *qargs)
+    
+    puts 'inside run_job' #if @debug
 
-    if @log then
-      @log.info 'RSFServices/run job: ' + 
+    package_path = "%s/%s.rsf" % [@package_basepath, package]
+                   
+    if @log or @debug then
+      msg = 'RSFServices/run job: ' + 
           ("package: %s jobs: %s params: %s qargs: %s " + \
             " package_path: %s" % [package, jobs, params, qargs, package_path])
+      @log.info msg if @log
+      puts msg if @debug
     end
     
     yield(params) if block_given?    
     
-    a = [package_path, jobs.split(/\s/).map{|x| "//job:%s" % x} ,qargs].flatten
-
-    c, args = read(a)
+    a = [package_path, jobs.split(/\s/).map{|x| "//job:%s" % x} ,qargs].flatten(2)
+    
+    puts 'a: ' + a.inspect if @debug
 
+    c, args, _ = read(a)
+    puts 'c: ' + c.inspect if @debug
     rws, reg, app = self, @registry, @app
 
     begin
       
       @log.info 'RSFServices/run job: code: ' + c if @log and c.is_a? String
 
+      # if there is a job id called *initialize* then execute if it hasn't 
+      # already been executed
+
+      if self.jobs(package_path).include? :initialize and 
+          !@initialized[package_path]  and jobs != 'initialize' then
+        run_job(package, 'initialize')
+        @initialized[package_path] = true
+      end
+
       r = eval c
+      puts 'r: ' + r.inspect if @debug
+      #thread = Thread.new {Thread.current[:v] = eval c}
+      #thread.join
+      #r = thread[:v] 
       
       @log.info 'RSFServices/run job: result: ' + r if @log and r.is_a? String
       
@@ -162,7 +194,7 @@ class RSFServices < RScriptRW
       @log.debug 'RSFServices/run_job/error: ' + err_label if @log
 
     end
-    
+  
   end
   
   def package_methods(package)
@@ -176,6 +208,8 @@ class RSFServices < RScriptRW
   private
   
   def method_missing(method_name, *args)
+    
+    puts 'inside method_missing' if @debug
     self.type = :get
     Package.new self, method_name.to_s, debug: @debug
   end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsf_services
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.4
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMzA1MTU1MzUxWhcN
-  MjAwMzA0MTU1MzUxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDlYGvg
-  qZvJhIVpFp3bf26jf3rf4pDQBpTzGZu9M99OZHuVFBaMDm3ogTSe8DTlEPmgNMkB
-  pguoBZn18Xp+v/XXNHBKtQc/YVj/jdhfwpMvXRsM8kqkPYMne8CK1HMKaIi0xgRC
-  5FWiTc04g10M04CES0Eh14zq1bbsXZqSTNN950+vvKq0th7i/pySEZHqXWu5Q0lz
-  cKtHW5o3BUJoVOKMVO6p2dUk0LjFx5uXHc5Bbxl4uQ2jCTV5tdxYHeP7qXAZI/FE
-  2dzF4zb8lWxKt/99C+grAhySE+JOz8WWE4hGU7754nBX0wOT1jrjAKQ+m11FcKBb
-  TuCw0BR9ZOGqz9KX96NBAfVcH4ooNy7tHYXWg2OwpkSKbmtBblFzwwKYIOSChe82
-  uygIU3vpoKQs15QWqh+4kMKaZx1i8CXQ9B4d2x/f0sOWSC+yk7jYoXPOTnKlHwXG
-  gipDR3kb6u5B1wYcbTFpvaKvIE5lUWKxuaReaO0mhPyb73q6kJNCMhyYCbcCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUmh+ZCLo+
-  R6uGgkNB3fXye9k/jJcwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjI4MTAzODExWhcN
+  MjEwNjI4MTAzODExWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDihlal
+  S7Ayw88OOfbgDNcfYFIBkwJsw1K7lnTkQ33d3CjfHjkHpwue+BPZrqNDDkzkq72C
+  GH24K4vhz9xeQ+sc+eAiSk0iARvNxFUXe/4JpZmo1A9u3fLCNbA7bL2IQIQqyBWY
+  /KgltVLGWau1X4rxuIS00TXrpUeG5pUeol/kUeDhmS8XmdU4rTbB62cz5RH/J2Zb
+  cDMx8jiap1BqyxU0qcJLoe0yJzwCNqrX3UmakhaFjv+5IHH0z+GP3evQ1Z/toY+G
+  MYrAFJ3cGjnk0s712KOa4W+tIW+q5FKjEwY5cGE/mbPh6cjZ+BYuYeSVqDrCY98d
+  a0I7JVRG6V/h+K8++OlSQ8dT4V0Yl7S6Nj21Yd9hmS/BXKbkq81J2zEF3mxHJZN7
+  AMKJE8m7jz+TLFX1f7+wIUrslfIJXqwXbThIGAqhFUb8+Ec0AuKs2F4lYNyS+TJP
+  8AjcZKx4u5J5q0bTSPCuS/inCrs3HoSvGPnhyJLUSHVlDr3vi3llx+AZW6kCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUWpAdER9r
+  XGcB19WXnvY8bjqVIFIwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAexzHDV6eIRhis6p41h5+Di9ZyvH5FxgiBm+YNI4a
-  tNBdSswgjC1aXeIU4fYvNbQP8pHniZROmb9yH7cmhrBtwXaOYcngVZ7Xwr4YNxIt
-  jl+tBE7N8OMsdmBnpvggoFppbHjsKPTo4onhlnVKEtX27jrsZmcNBspsAk4syiBf
-  XLOwawB7JruVFdQCo8nkUme9yTZEoorcbjcGpPo6uT2qj/WYoFsBsNGQHbyPyNOU
-  bwnvncOpN5mpELWljiXd7mPuQPT/huUU7+baFdePYWi6dUH9Fk29H6M+A7qmLDv2
-  EumJXbKH5urom837kyJ9AkdQdi56cFStG+qqxXKgH1KS+X1iTHXw853DRcP9923m
-  CWVwD3m+MD/Gd+edfQglT9iUA3zQT/V+x017P1VuUIHC0Qm9KnvNPK7fWllRAxuI
-  TzPyehx6p7LChUaBmyE7SRvWaKlbo/eDnysj1W6WNc4T4qxomWkSLhWro07+9Kwj
-  C8jWoNPtodHbGSeGdryPP4JV
+  BgkqhkiG9w0BAQsFAAOCAYEAqfwg7zu3Btv6tGegDZ8tLTHf4WsswPXoOgh4iKyh
+  cFndGfA5c2cZEc9eTv9duBvTzmp4+uKhhCM4jkzBeRdrN+l9vnV4NZ2OjWiA9M3c
+  PpYG3LR4PaM9syzMLATGWctofw6EhsT7NbdSMBJ9nAuJbcFYXshWIJr11CgrSekM
+  66idwveobI9GeVzWHWI9KmnM6r7Th2dK4lS5y42y4pACzRSTacBVF2lylu2/X8oS
+  nzHN7yMdXRhdvboDI3Etq10pLs+e7cmB/6MkWV9Ba6kOMbJeeXokdjo6A03w/CXW
+  kSCp6ydjpEAtQhXpTOOWQfMXwafnNXvcVyh5mtQvSluCdVy0Qf5dHZuMaF+iIdtM
+  mS6T6oPPYAVaC+9DHMD5+hJRIo/U5sb+ZUQaHaME8XNCuHGxPbL2WmZr92iKZVCu
+  MxhWn7Vf3TxD/7nwBz7wR+H2ONNwWRWmRA7g+Os9YvLEB6LNsJfo+Tyer6bVsSBz
+  EOn2RvkdKH17/N7rqiDFRtI2
   -----END CERTIFICATE-----
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dws-registry
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Runs within a DRb server to run RSF jobs, as well as other services.