rsf_services 0.9.1 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e88296fc206a405c9481936297b10d651cc20bde62ffa5da5d1c9cb0bd7a01ce
-  data.tar.gz: 22ffe21c8ee86214ffadb6682d3dbcbafaca674fd7b8f1bb72da43f0a0b985d1
+  metadata.gz: 43feef11d6b29d948bffbd0b15dbb6ffc0824ccc300710c2c00a53cbcbddddd7
+  data.tar.gz: 960d006b9687bd9c11ef998750b83555b0a065f4348983c882b9ba41d5c9779b
 SHA512:
-  metadata.gz: 2c92e3c7e898f340b8050f67cd10904ba5f02ae908af9ffcbee1e39e8499776e8d6693f29788774d49a3e59d3eda6478b614dc327e546705ba626219f6d2fc6b
-  data.tar.gz: a4585d138ce856bc2ed457c07dc3addf77a4138cfc70edc9ad6f811fea5db1dc8de34d3b8baf4d2c03626cf3a4768108efe1223855dd000db7948ffd0fa8b7e9
+  metadata.gz: 32c7760f8ddb53a3f81f54dba12dbe742502ab80de5d241391a7123474667d64f928a7751068f9ba63d195e4290429500ebf515e04a3f135a7d1874e9bc30a52
+  data.tar.gz: fb07b09dd1db29349bdf876528b9b143b4f0265c9c872607dc9db26a3002f2a28943ff28e9ea6860d12ae2d401694134a0eaf5407cb235aee827ea3213028b04

data/lib/rsf_services.rb

@@ -7,39 +7,49 @@ require 'app-mgr'
 require 'dws-registry'
 
 
-
 class RSFServices < RScriptRW
-  
+
   class PackageMethod
-    
-    def initialize(parent, type: :get)      
+
+    def initialize(parent, type: :get)
       @parent = parent
       @parent.type = type
     end
-    
+
     private
-    
+
     def method_missing(method_name, *args)
       Package.new @parent, method_name.to_s
-    end        
-    
-  end  
-  
-  
+    end
+
+  end
+
+
   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|
-        
-        method_name = attr.value.gsub('-','_') 
+
+        method_name = attr.value.gsub('-','_')
 
         define_singleton_method method_name.to_sym do |*args|
           run_job method_name, args
@@ -50,39 +60,41 @@ class RSFServices < RScriptRW
     end
 
     private
-    
+
     def run_job(method_name, *args)
-      
+
       puts 'inside Package::run_job: args: ' + args.inspect if @debug
-      
+
       args.flatten!(1)
       params = args.find {|x| x.is_a? Hash} ? args.pop : {}
       a = ['//job:' + method_name, @url, args].flatten(1)
-      
+
       if @debug then
         puts 'a: ' + a.inspect
         puts 'params: ' + params.inspect
       end
-      
+
       @obj.run a, params
     end
-    
 
-  end  
+
+  end
 
   attr_reader :services, :package_basepath, :registry
 
-  def initialize(reg=nil, package_basepath: '', log: nil, debug: false, 
+  def initialize(reg=nil, package_basepath: '', log: nil, debug: false,
                  app_rsf: nil)
-    
+
     @log, @debug = log, debug
-    
+
     puts 'inside RSF_services' if @debug
 
-    super(log: log)
+    super(log: log, debug: debug)
 
     @package_basepath, @services = package_basepath, {}
 
+    @initialized = {}
+
     if reg then
 
       @registry = @services['registry'] = if reg.is_a? String then
@@ -90,98 +102,117 @@ class RSFServices < RScriptRW
       else
         reg
       end
-      
+
       # load the system/startup RSF jobs
 
       startup = reg.get_key('system/startup')
-      
+
       jobs =  startup.xpath('*[load="1"]').inject({}) do |r, job|
         settings = reg.get_keys("system/packages/#{job.name}/*")\
                           .inject({}){|r,x| r.merge(x.name.to_sym => x.text) }
         r.merge(job.name => settings)
       end
-      
-      jobs.each do |package, settings| 
-        r = run_job(package.to_s, 'load', settings, 
+
+      jobs.each do |package, settings|
+        r = run_job(package.to_s, 'load', settings,
                                                 package_path: settings[:url])
       end
     end
-    
+
     @app = AppMgr.new(rsf: app_rsf, reg: reg, rsc: self) if app_rsf
 
   end
-  
-  
+
+
   def delete()
     PackageMethod.new self, type: :delete
-  end    
-  
+  end
+
   def get()
     PackageMethod.new self
-  end  
-  
+  end
+
   def put()
     PackageMethod.new self, type: :put
-  end  
-  
+  end
+
   def post()
     PackageMethod.new self, type: :post
   end
 
   def run_job(package, jobs, params={}, *qargs)
 
+    puts 'inside run_job' #if @debug
+
     package_path = "%s/%s.rsf" % [@package_basepath, package]
-                   
-    if @log then
-      @log.info 'RSFServices/run job: ' + 
+
+    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?    
-    
+
+    yield(params) if block_given?
+
     a = [package_path, jobs.split(/\s/).map{|x| "//job:%s" % x} ,qargs].flatten(2)
+    @log.info 'RSFServices/run job: a: ' + a.inspect if @log
 
-    c, args, _ = read(a)
+    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
 
-      r = eval c
+      # 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 = instance_eval c
+      puts 'r: ' + r.inspect if @debug
       #thread = Thread.new {Thread.current[:v] = eval c}
       #thread.join
-      #r = thread[:v] 
-      
+      #r = thread[:v]
+
       @log.info 'RSFServices/run job: result: ' + r if @log and r.is_a? String
-      
+
       return r
 
-    rescue Exception => e  
-      
+    rescue Exception => e
+
       params = {}
-      err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")            
+      err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")
       @log.debug 'RSFServices/run_job/error: ' + err_label if @log
 
     end
-    
+
   end
-  
+
   def package_methods(package)
-    
-    url = File.join(@package_basepath, package + '.rsf')    
-    doc = Rexle.new open(url, 'UserAgent' => 'ClientRscript').read    
+
+    url = File.join(@package_basepath, package + '.rsf')
+    doc = Rexle.new URI.open(url, 'UserAgent' => 'ClientRscript').read
     doc.root.xpath('job/attribute::id').map {|x| x.value.to_s.gsub('-','_') }
 
   end
-  
+
   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    
-  
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsf_services
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.5
 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
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMTE4MTEyMDIxWhcN
+  MjIxMTE4MTEyMDIxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDK496w
+  8Wo4lOqJB1ND/vi4gyws3E8jHUqWt1YyV2YHL/+P2UUiili7z4qohHstpgBUUQtY
+  ve6g602bAmxayqqRYUTugyi/R6LRL5GSiKBFpfxWj5tUJh41frNoVjZk6AKoti4K
+  gU0ZdMhcz56zaDNQM/QDH8vaMrbs/+AcsTVKeZ+Sw930NI2QPuzyF3vgp1lGAqY8
+  j8BmT9mWzyXjjsrGV1hfzFYwoObk9SE6clyF5K6CrCsoqVzhwOhGvJShOr0kQWUo
+  x0MalRtTvMnUrtjveFmQTJhEGNjIkPiYsiSP+50otwlRqvUbY2NRkL9bq/YPQj9s
+  clxIRLdok0XE6Z6C83yHKbhSFp0WfygOM2oGFiVM1Fsaok6XKimTNj8Q5koS523a
+  pega/q9X9tHyPzeAMGTKymJteEcR7qdDYrXxOcHWVna68btSL5gaIlWCQPvyLZ+P
+  f7UVDsRCQttoB+arcmEy4JmiwHnG/6tWs+bfyhPf86uEErNBm24IkEgPLnMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUT1Vuql+w
+  8qUbu0Amwqd3msON9YswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   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
+  BgkqhkiG9w0BAQsFAAOCAYEAUQLpouWyYhkD5a18Z7qbypaOD3nnc4YXMdUdB9Qy
+  01NARPgklfbwJKImoq2VMT96JbBZX9nOdC2MAjo+0cK9duApEA6Sm+0n71Fub5Xn
+  9K43tJLAe3DPsW5CY4b/e1nxEiSQYntRF6tSQvjjpEHdSNyPYsvt7dN9ZwjaMo8U
+  8DeKxPlN+7fHcGZP3p4oYlRg0bRGwueO7aX8BYGzuOYrsmoq3swsE2/rz6zlC0DX
+  QyaSxFtZFOYYc4GrcixS2kX5i54MYZNpiRYMVJT3/ICbyIwtorKezJxkO7vKQiQj
+  OosD65e1Gn1rhQW6mAcblsvvMHvdfFA/uTvD77A8MgCYQa5llIZEx0Bd7ExPDPZn
+  e86Mje12aZQAyilVfeqbv5u3EZlw6kLbigLmw7BlUk7Zi2X84+iz7W8EdU3GSv8a
+  y347QSdvzPRHMpmi1wAJh+koAo4s8Noi64GU5+4xUDRUh02AV/sXFxRdJne2WDW0
+  4wvjYJ8JEXo2AHNQSXG3FQmn
   -----END CERTIFICATE-----
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dws-registry
@@ -78,7 +78,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -103,7 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Runs within a DRb server to run RSF jobs, as well as other services.