rscript 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aec962ed289a675c59189eb2bd7d5c8c28cbdb0e6c35e2fa127f9c7336f181d
-  data.tar.gz: acda35d707dc3d0162b889f4920354de05f3d4621c2f5c8fc04a613bab57b5f2
+  metadata.gz: b07cead05d35529f8891fe210ec1c0b1d49c8cdf153ea67dff5f1e4c1f8e3175
+  data.tar.gz: ab3b6d8d7b72609adb786be4fdc46cc4d867c78a4bbebc1a993a7df8fbad6a8c
 SHA512:
-  metadata.gz: 3432b133427da64d0e5efc87df4907751fe0e906e2bf711e2037fb6fc2d0d5e35a2400ee0e25421b2bc56d06275706b9bbf0ef9070049c823d16a7af1a6c68ea
-  data.tar.gz: 74b615fe0c30f3828fde0f1fb5625f468fa6405ed510ccdc8571893dc9b63d1444d8cbe349cfc555023c26915c1c33081d1e8105f104368fb88a4d4fbce3f8e8
+  metadata.gz: 1d6380efacb9670cf49a7be6ec261b3769d1b813d639365952923b1d47dab024251e5d8050fdde69085d5206f98e0c40ba513a17de6f70cdfa9004414407dcf5
+  data.tar.gz: a880349b7f95b215cdb3589b4915cf39cc562cc22b6f86f0c28e1da84d05bd539dabf825a4121c4c0d44845221634067269e9eac7fdedd56efe57e138323abfd

data/lib/rscript.rb

@@ -3,11 +3,14 @@
 # file: rscript.rb
 
 # created:  1-Jul-2009
-# updated: 11-Aug-2018
+# updated: 00-Mar-2019
 
 # modification:
 
-  # 11-Aug-2018: Added the keyword auto: false to RxfHelper for clarity
+  # 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
   # 28-Jul-2018: feature: Jobs are now looked up from a Hash object
   # 13-Jul-2018: bug fix: The use of a cache is now optional
@@ -25,7 +28,6 @@
   # 08-Aug-2013: re-enabled the hashcache;
   # 24-Jun-2011: disabled the hashcache
 
-
 # description
 #  - This script executes Ruby script contained within an XML file.
 #  - The XML file can be stored locally or on a website.
@@ -42,7 +44,6 @@
 # MIT license - basically you can do anything you like with the script.
 #  http://www.opensource.org/licenses/mit-license.php
 
-
 require 'rscript_base'
 require 'hashcache'
 require 'rexle'
@@ -139,7 +140,7 @@ class RScript < RScriptBase
     rescue Exception => e  
       params = {}
       err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")      
-      @log.debug 'rscrcript/error: ' + err_label
+      @log.debug 'rscrcript/error: ' + err_label if @log
       return err_label
     end
 
@@ -170,19 +171,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

@@ -7,6 +7,7 @@ require 'open-uri'
 require 'rxfhelper'
 
 class RScriptBase
+  using ColouredText
   
   def initialize(debug: false)
     @debug = debug
@@ -19,7 +20,7 @@ class RScriptBase
   protected
   
   def read_script(script)
-    puts 'inside read_script' if @debug
+    puts 'inside read_script'.info if @debug
     out_buffer = ''
     
     src = script.attributes[:src]
@@ -34,8 +35,20 @@ class RScriptBase
   end
         
   def read_sourcecode(rsf)
-    puts 'inside read_sourcecode' if @debug
-    buffer, _ = RXFHelper.read rsf, auto: false
+    
+    puts 'inside read_sourcecode'.info if @debug
+    #@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
+    
+    buffer, _ = RXFHelper.read path, auto: false
     return buffer
   end          
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MTEwNzExMjQwMVoXDTE4MTEwNzExMjQwMVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALgKH/MjSfa8qrRYhFDKWD6qDMnQavDaCv9rxzQW0ku0GRDuf4De9ewMZrYg
-  +ENxRKsYQefyfYL6+ddWhD4K9+rNsEhLasMDIScwthXbWeeCuZvLgYCS5gFp1ciV
-  4aL8S7x2QdephSMOaouhYVYV/2N+uxDhCD9rdB2XCfdjWBg+dSCdbJRO/pQ8vr1j
-  tZE2WaCgvZq6XBB4+pqYsC/ekjRaOGXc1TfwBP/WYmjTYCVYmlhN2rJG0vfp9Zxy
-  xAjliP6u2t4NMZY2kBo3W+bCySwPeZPflgI8MAlBln9y9GHPO3zndD14du5fR9Ui
-  Czd6gzEW6Ra3BoZmK+D6UfUYGh8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUVTzGTFtV6+VIt+oV5ksQmdzKtP4wJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAs93QhCVT
-  FUsRHEhQSWzHXjrz91vttIT2xamtOB/EL6V1pP+lTck8jkuejn0Xh4pv8BrbWsDN
-  XB+0ypuCqjWm6uQfLMaeoCUec0ue+gfyqU6XtosViTyXlIarGr/QSPBaMMamCcFv
-  eApQIEUoxne7bRBHlN9hk+9GDbMhi3gV34pGWwIAEnUzJQgmN/YFy0ix5XJTpfgA
-  xj+tZ4/g/En7EMods00s7POLSpHhvN7LQT8nRttEmIm0AXNeZ7tSfxRZ4n7hgEQM
-  TqGxWMRGelsOt2zNIFH+8d4Yz1dYsNbhK66Q8KRR2vHoT/9T3IJGBPHdsR6Kl6yB
-  e5SlxbsP/R/Leg==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjExMTk1ODQ5WhcN
+  MjEwNjExMTk1ODQ5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCr9LE7
+  DfF2g/RJM4/NLacFBrB8XPH+P4qIJaMFS70S+tc5gp1bs84p3ew9hNPa2ObnqVDN
+  eqsert4yUH+stWv/lYjB3Uv/ieDblRw0IQwd9BXNH+F+VVZ6k5fzWUbBGQFy77kS
+  87HE55uyN6DFqhU7/pJ/0nU5oN6AHjyay6ZeVYSHBY67IvmauB+2O72PtCxVxfsG
+  +3gE2V6MlE+K5ylD/81O67XdL6+apDHir8tvdwmsiRosF/+ChUx/hQCPeibc/FYh
+  Qit56CUAD9RRBn2ORmmXtuuqXTTchJnrph7/fVCTvC7ihqggIDuNj5ny9RT9cylZ
+  POkbDTNS2uZykOsjLU4fyTOyoiIn7f/+MLoKSrLoGQVGYdN0mvJ8Cj9L+c9BuaQi
+  o/NRAqiJnT+zkZ6c5h+/lyRHPnqznqBcfguEX4te5IVeVzWirSmqXIZT1iGtT1XU
+  YMNt/kSxDywzOwL31V5vN8nO21bFQcQayhiynzIl93COIi09dH84/gq2iYUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUPXCcM0IJ
+  4sKYMh8Cb540vFI/NuQwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAnKI3iPdsojq86ufufV61Xkc14mpz+fUWU2VdroG9
+  huoZOAoN0Bb5hH+yUxp74Mdis4Dd/hQR7UmEyI2YenTCQBYVzRKCQn9pM1GNCLFT
+  axEP9+TDEUZ5p3d7zijxUHStLSN3sT07VlPAJi1epgApr1VWUPZeope+LzJ4FgIV
+  yNQvC+tEvCDRt9AlYrqLkBRP/13Y3QzRt9BAHTECvI4w0TFt+QSjsn0/S56lMmMa
+  CZEcadTp4hkcSmMIe7A7vtxVHe849KYfzEYi/qtO4LS982Z+S/ux7FXXUmPDQOwD
+  m5SFg/ZFmb7WExgWgNKbYrUWEmSsm+xe0mlbUGEnWSLt/uNpOBLGM5IJGpX+5JQ3
+  uWeajwwVVZPE2QKim8r6XvB4MTDCnxuvjRopZt7gL5sO7M3Xo6xN9D1lEc38waAp
+  +FYkMWMJr0Q+j8gatLKPMMXUVyXLLdoSrSf7XsgtksSmBAw0g5bWydgHUgly8WES
+  tOpPd7kzbjjcuqoPnHSqclFI
   -----END CERTIFICATE-----
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -57,42 +61,42 @@ dependencies:
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.12
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.12
+        version: 1.5.6
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -121,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Reads or executes a job contained within a package (XML document), whereby