rsf_services 0.8.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f51d0994c00d6db8190833b97c33fdda4ff750f1bb613f8e0193b8c8ff68b78b
-  data.tar.gz: 361f9d646e608efcb006f229aac37315d203501c4798a154d02398f1cd704929
+  metadata.gz: 86fb1a368503749f11101ebc687aaf588fd0af90ebf6687ca90f5a67f67036e5
+  data.tar.gz: 6abdb89a27223598d3c82e65b63d38c326de50503f83727d8dac29985df8c3c7
 SHA512:
-  metadata.gz: 9056e3107d591acdc78c903995086519bb7e1aab0152b5685edad6022a9e45b597a2f8f7d77054253b6ef27a6c9f3d08aa5b35688d4e55a04a081c32e3579fd9
-  data.tar.gz: ec647817e1d121e363174a259bfa2c4aedfa4d22f77a867a8be7d7ad9bc22d125eb44856d92e2a83c4465e059f534a4f00d485ce4e761b632dc521d70c0922ee
+  metadata.gz: 8ab2aec2be43819469b9cacea29e19fa41218e61b571c325138e0c486dcf69f0c025c9daad929e8039678df1d61ccbb3a504d500f970821abbfcebfb404137f6
+  data.tar.gz: 191df149e75687e22308c912e2e9acc43d91bd00c998bba54edaad468dfc87e1c0b8c82620a12bb83a1d5c1ca60c70e3f8c35936ccb13d123dd2de0e18a9dace

data/lib/rsf_services.rb

@@ -28,7 +28,7 @@ class RSFServices < RScriptRW
   
   class Package
     
-    def initialize(obj, package, debug: debug)
+    def initialize(obj, package, debug: false)
 
       @obj, @package, @debug = obj, package, debug
 
@@ -79,9 +79,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,30 +130,50 @@ 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 
+      @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 
+      @log.info 'RSFServices/run job: result: ' + r if @log and r.is_a? String
       
       return r
 
@@ -162,7 +184,7 @@ class RSFServices < RScriptRW
       @log.debug 'RSFServices/run_job/error: ' + err_label if @log
 
     end
-    
+  
   end
   
   def package_methods(package)
@@ -175,7 +197,7 @@ class RSFServices < RScriptRW
   
   private
   
-  def method_missing(method_name, *args)
+  def method_missing2(method_name, *args)
     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.1
+  version: 0.9.3
 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-26 00:00:00.000000000 Z
+date: 2020-06-28 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.