rscript 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcb3dd422f080c1976bc0478fbdc1a433b7e8df117f1f6cb2f9fddbd1d71ea64
-  data.tar.gz: 6d02210b6339ebdf549bb4264e0d88ae57c44e681246d6d17d6014c9ec32ac1f
+  metadata.gz: 4790f50f6b960f81bb273f841ec59e8e6bdc0553d651a6ff0d4ceeb7d8a7bece
+  data.tar.gz: 7ae85febaa15bd76547e2402398df203ff2675021686be3672b101ffdbf68b28
 SHA512:
-  metadata.gz: 7f023d1a1d6be510cf1f12f4f0708145e466883c0523343303952f1cef6dcb5d312ed3895163b3c5d505561e8f5d945ecb59d0d8540c29493e26d2016b95c79e
-  data.tar.gz: 2f7f93846337b081612fdfd35d60086d3e414a786263f612beb6a6343bdb5fc7f459b09cf76f8f6683dca7f86a3878870239b329000d4bb1708c81a55d1672e8
+  metadata.gz: 94de2eb3ee1fe8ce0817c3edd5ef2829ff23efb379ce23292ba738fd5dfb019be34b636bc044b01dd6b2858cc6474ec1390050579fe8a7b660d5fe327a3a64ca
+  data.tar.gz: 1a0493e7665bf829b0f251e92bc226af8a33cd0021050c29942884c8254a89dade8e97950e7cc091c8633578db0613fa2289fb4d994d483b1530d5457c53d618

data/lib/rscript.rb

@@ -3,10 +3,13 @@
 # file: rscript.rb
 
 # created:  1-Jul-2009
-# updated: 05-Mar-2019
+# updated: 22-Feb-2022
 
 # modification:
 
+  # 21-Feb-2022: minor improvement: Replaced RXFHelper with RXFReader
+  # 00-Mar-2019: feature: An explicit path or implicit path now can be 
+  #                       specified in the src attribute
   # 05-Mar-2019: feature: Added the class RScriptRW for :get, :post typed jobs
   # 13-Oct-2018: bug fix: The log is now only written when the log exists
   # 30-Jul-2018: feature: A list of job ids can now be returned
@@ -47,61 +50,6 @@ require 'hashcache'
 require 'rexle'
 
 
-class RScriptRW < RScript
-  
-  attr_accessor :type
-  
-  
-  def read(args=[])
-    
-    puts 'inside read' if @debug
-    @log.info 'RScript/read: args: '  + args.inspect if @log
-    @log.info 'RScript/read: type: '  + type.inspect if @log
-    
-    threads = []
-    
-    if args.to_s[/\/\/job:/] then 
-
-      ajob = ''
-      
-      args.each_index do |i| 
-        if args[i].to_s[/\/\/job:/] then          
-          ajob = $'; args[i] = nil
-        end
-      end
-
-      args.compact!
-      
-      if @debug then
-        puts 'type: ' + self.type.to_s.inspect
-        puts 'self.type: '  + self.type.to_s.inspect
-      end
-
-      a = read_rsfdoc(args)      
-      job = a.find do |xy| 
-        name, x = xy
-        name == ajob.to_sym and 
-            (x[:attributes][:type] || self.type.to_s) == self.type.to_s
-      end.last
-
-      out, attr = job[:code], job[:attributes]      
-      
-      raise "job not found" unless out.length > 0
-      out
-      
-    else    
-      out = read_rsfdoc(args).map {|x| x.last[:code]}.join("\n")
-    end    
-          
-    @log.info 'RScript/read: code: '  + out.inspect if @log
-
-    [out, args]    
-    
-  end
-  
-end
-
-
 class RScript < RScriptBase
 
   def initialize(log: nil, pkg_src: '', cache: 5, debug: false, type: 'job')
@@ -224,19 +172,79 @@ class RScript < RScriptBase
     puts 'args: ' + args.inspect if @debug
     rsfile = args[0]; args.shift
     
+    url = File.dirname  rsfile
+    @url_dir = url[/(?:\w+:\/\/|.*)[^\/]*(\/.*)/,1]
+    @url_base = url[/(\w+:\/\/[^\/]+|.*)/]   
+    
     $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
     
     a = @cache ? @rsf_cache.read(rsfile) { build_a(rsfile) } : build_a(rsfile)
     puts 'read_rsfdoc a: ' + a.inspect if @debug
 
-    @url_base = rsfile[/\w+:\/\/[^\/]+/]
-    
+
+        
     return a
 
   end    
   
 end
 
+
+class RScriptRW < RScript
+  
+  attr_accessor :type
+  
+  
+  def read(args=[])
+    
+    puts 'inside read' if @debug
+    @log.info 'RScript/read: args: '  + args.inspect if @log
+    @log.info 'RScript/read: type: '  + type.inspect if @log
+    
+    threads = []
+    
+    if args.to_s[/\/\/job:/] then 
+
+      ajob = ''
+      
+      args.each_index do |i| 
+        if args[i].to_s[/\/\/job:/] then          
+          ajob = $'; args[i] = nil
+        end
+      end
+
+      args.compact!
+      
+      if @debug then
+        puts 'type: ' + self.type.to_s.inspect
+        puts 'self.type: '  + self.type.to_s.inspect
+      end
+
+      a = read_rsfdoc(args)      
+      job = a.find do |xy| 
+        name, x = xy
+        name == ajob.to_sym and 
+            (x[:attributes][:type] || self.type.to_s) == self.type.to_s
+      end.last
+
+      out, attr = job[:code], job[:attributes]      
+      
+      raise "job not found" unless out.length > 0
+      out
+      
+    else    
+      out = read_rsfdoc(args).map {|x| x.last[:code]}.join("\n")
+    end    
+          
+    @log.info 'RScript/read: code: '  + out.inspect if @log
+
+    [out, args]    
+    
+  end
+  
+end
+
+
 if __FILE__ == $0 then
   raw_args = ARGV
   rs = RScript.new()

data/lib/rscript_base.rb

@@ -3,25 +3,25 @@
 # file: rscript_base.rb
 
 require 'cgi'
-require 'open-uri'
-require 'rxfhelper'
+require 'rxfreader'
 
 class RScriptBase
-  
+  using ColouredText
+
   def initialize(debug: false)
     @debug = debug
   end
-  
+
   def read(doc)
     doc.root.xpath('//script').map {|s| run_script(s)}.join(';')
   end
-  
+
   protected
-  
+
   def read_script(script)
-    puts 'inside read_script' if @debug
+    puts 'inside read_script'.info if @debug
     out_buffer = ''
-    
+
     src = script.attributes[:src]
 
     out_buffer = if src then
@@ -29,14 +29,30 @@ class RScriptBase
     else
       script.texts.join("\n")
     end
-    
+
     out_buffer
   end
-        
+
   def read_sourcecode(rsf)
-    puts 'inside read_sourcecode' if @debug
-    buffer, _ = RXFHelper.read rsf, auto: false
+
+    if @debug then
+      puts 'inside read_sourcecode'.info
+      puts 'detail: ' + [@url_base, @url_dir, rsf].inspect
+    end
+
+    @log.debug 'rsf: ' + rsf.inspect if @log
+    @log.debug 'url_base: ' + @url_base.inspect if @log
+
+    path = case rsf
+    when /^\//
+      @url_base =~ /^\// ? rsf : File.join(@url_base, rsf)
+    when /\w+:/ then rsf
+    else
+      File.join(@url_base, @url_dir, rsf)
+    end
+    puts 'rsf: ' + rsf.inspect
+    buffer, _ = RXFReader.read path
     return buffer
-  end          
-  
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMzA1MTQyMTAzWhcN
-  MjAwMzA0MTQyMTAzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC+8gm3
-  MGnzLHvS5tYK1sHZjqe3618+OQlRvZTcxT+uYNwMtjd1ZSflCNP+C49ljwZCPbs9
-  daItoLolzfcWNUaG+qvawmxKSWDhonZ6n79bsac35+gdAx9K2qeMLI+kEoQcji7J
-  bgNM1iANqCLKZ6MlEdC3W9Zkg/Bficbxg2sqO75rZZHWKH7TnrUNZQwKtruoOJeO
-  prKVcrjjK35CpRI8fOUFmk/MtjCt+rvSaYyNIjxvP8/eYUpgkydClcaAn0Bml0/+
-  LPbYlbCD4CiUH/1rJ0np0PNovnMA2f/+/HLq5MWG4yx1F6a4ylprbmZVfACuuI0J
-  OZzklwlAHHJYKdci0jtemYKbEdi2BiuERWn172lkQNjBPDqoZopvisF6MbrXtJEP
-  66ViGnWAAJJDdOJ0hpiEEfvn8Fg/kqZK7JCmBevOPNEhAJIAz6vO/GS8xEOXDKxy
-  ZT0U+dNY7zIBWNb4IIte9UA9jhtdczV5ZPwYRN7MdyFMf79tLVKZQNdSeQMCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUEQFrgb9v
-  oiCTY8L4C2Cq1Aczvy4wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIxMTUxNjIyWhcN
+  MjMwMjIxMTUxNjIyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCmNvi/
+  gqRQsB2OD7NE/0zxrvwhFxYq+Z0fLcDjH+REsGb6NPoax3KsXjmADEY5P9jCecSE
+  UqH8WthWKd4k5N7L11asxFcqPTA+6sTsY4U8u2fhj7T6fRLzr5X3MYKLzgyL9ZC0
+  PM4rJgmSIsyA27Lg/z3YJV2fpAkeIxkxlatoQVFS1WdRFB6fw4lbb18VRgzHEJ7M
+  keF8PMavxREfxUQOKcxUhwjrwppKFFnRL/9hFm3RunwfCTjqKgVNn0hNHb17PxsX
+  v2LLrwJpJnDjO9XzWZ/mk+pqSzkcA3auoFLjmuzJuwaUTx1lru4B5U5ztH2KEOiI
+  i2MCt2EZS2HwlT9eoP40dY8rLz7+O9vnJKtO/DDCVk3h/VYcomQR7+mLhPVHOkSr
+  nBmKsED8qw7yhegwhYoN80aADMn6/YTKtc5nr3PQ7n4d0YPdX04pB+FwHWJxUZBm
+  T81cSLRlw0Fy+rvMEMGK6eHMsvBzfmxVf2KWH8U0tLjA8WHmfr9eUP9/vkUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU6BYwoiWD
+  zv3hxNhGrvDz9P2GTzMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAe1Uz7X/Oqg4EYP4B+ltZ+MoWa7iwsWuapQVlwKvQ
-  qeekFIE1WmdcbX7RhKKXzLXLwEJENmLtcbLAyufcJcyVNjfaM5VU1mFR4bBUOS2c
-  T/oQWXHPS84hYFVMGSBc2XOLs5vcKyvzCZ8ys934pfY3WmtmIu1PxxBtLxnUpVhZ
-  K+zR7s4006gd1jkJKJTeoAzYGOJ5mKxhmdYOH/Q/rg2LTqmNBBxKP55edd5MIvLw
-  Qddj84Ow5wBSzc8RJ+O6i+Fe+nVEXYa5KxCI9K01XiGZeW24jqst0Nip7p5YiJ0J
-  KQxivUOLSm31ijrOyH5zcVYwStdFZiQhGUw3EeAlrgjsOZ3hTZ8G8+qd5esQ5rRS
-  QYNOyO2N1EBnRIvMd0F3hQB5szfv0hr+LOGkeNn40yZY22NnOB7QN1cN4JKIb1rI
-  H+WbcZlnDVw3xyetJLKgUOqsjkXnFyv2ansbZtghG1wEvnd/0sNdyfRnjXv3gAt2
-  OUyieSgHfrd2srDrlcNHFJY8
+  BgkqhkiG9w0BAQsFAAOCAYEADh1tlIEJCQbDp52DcuI4VtlGxLopLBx5+RR48O2k
+  rC7TS4iN96skEVEuddtdUwR/GV/bY9RN5XUKq6cv7V3dX4UHAZ/V7qVKRGDWtLeR
+  LeG/35jDMWmxZx/BfPwDHburtDVKN3rDls8Ms3udVTEgmGNjejZpUSOOR2NIF7dj
+  i6a6w57f7kwG0pMIMqKD0IohECFc+3mvzQmTX5sOm1o5ITxtBOoWeqWk/SB3uJf3
+  T2Vv48vVRO4SHki9XRZUnuzzpTPEGIXgs/u7IiXy7WwUMKe0A3A9r3MM2/ooOJgZ
+  OYYvbCRN0NfVMAvdW/q5tHioydGQUKrVl7VoJuYaw2KYiLSkRpP09E1cgI4N4Lso
+  Z+jP6eKXREq7KG102Al+w798XKl8ODIo1///pbYPQztK+in5U1BmGTIHaBWghvNU
+  NVWX/OCQ9q6PFpdhMmSrfvWwCgVWyBrDS2VtD1ywkwcKvaWXd5xZDUIirRuvoDRt
+  JVO4YXQhPNQq3usjz6cW4O+B
   -----END CERTIFICATE-----
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -58,25 +58,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.10
 - !ruby/object:Gem::Dependency
-  name: rxfhelper
+  name: rxfreader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,9 +96,9 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.14
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Reads or executes a job contained within a package (XML document), whereby