rscript 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98476c04f7d3f5baab79fca79e0acf7694eecf148fbab05133b546a6018b460d
-  data.tar.gz: 74d17b141e498f81b874b4be409105ede004ececf7d23bfbc189debbc591efb8
+  metadata.gz: bcb3dd422f080c1976bc0478fbdc1a433b7e8df117f1f6cb2f9fddbd1d71ea64
+  data.tar.gz: 6d02210b6339ebdf549bb4264e0d88ae57c44e681246d6d17d6014c9ec32ac1f
 SHA512:
-  metadata.gz: 27db0842b7c1534086bd2f66fd1388131bc1c0efc4c50850aaeac03c11219d5a8657c5860be1748c7a5982e031eef0aeaad8cc7fee1aa96820647b75f81c9ce4
-  data.tar.gz: c64c661f6a453563c0f3f3155ec994fdb43971284f071834cf7b8078dbd184a98ce5ff9f1232a232bf44ce0bb9fe3b9bbd1a06a92f915aeebe17268c18d2f596
+  metadata.gz: 7f023d1a1d6be510cf1f12f4f0708145e466883c0523343303952f1cef6dcb5d312ed3895163b3c5d505561e8f5d945ecb59d0d8540c29493e26d2016b95c79e
+  data.tar.gz: 2f7f93846337b081612fdfd35d60086d3e414a786263f612beb6a6343bdb5fc7f459b09cf76f8f6683dca7f86a3878870239b329000d4bb1708c81a55d1672e8

data/lib/rscript.rb

@@ -3,10 +3,11 @@
 # file: rscript.rb
 
 # created:  1-Jul-2009
-# updated: 13-Oct-2018
+# updated: 05-Mar-2019
 
 # modification:
 
+  # 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
@@ -41,17 +42,64 @@
 # MIT license - basically you can do anything you like with the script.
 #  http://www.opensource.org/licenses/mit-license.php
 
-#=begin
-require 'requestor'
+require 'rscript_base'
+require 'hashcache'
+require 'rexle'
 
-code = Requestor.read('http://a0.jamesrobertson.eu/rorb/r/ruby/') do |x|
-  x.require 'rscript_base'
-  x.require 'hashcache'
-  x.require 'rexle'
-end
-eval code
-#=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
 
 
 class RScript < RScriptBase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.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
+  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
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAe1Uz7X/Oqg4EYP4B+ltZ+MoWa7iwsWuapQVlwKvQ
+  qeekFIE1WmdcbX7RhKKXzLXLwEJENmLtcbLAyufcJcyVNjfaM5VU1mFR4bBUOS2c
+  T/oQWXHPS84hYFVMGSBc2XOLs5vcKyvzCZ8ys934pfY3WmtmIu1PxxBtLxnUpVhZ
+  K+zR7s4006gd1jkJKJTeoAzYGOJ5mKxhmdYOH/Q/rg2LTqmNBBxKP55edd5MIvLw
+  Qddj84Ow5wBSzc8RJ+O6i+Fe+nVEXYa5KxCI9K01XiGZeW24jqst0Nip7p5YiJ0J
+  KQxivUOLSm31ijrOyH5zcVYwStdFZiQhGUw3EeAlrgjsOZ3hTZ8G8+qd5esQ5rRS
+  QYNOyO2N1EBnRIvMd0F3hQB5szfv0hr+LOGkeNn40yZY22NnOB7QN1cN4JKIb1rI
+  H+WbcZlnDVw3xyetJLKgUOqsjkXnFyv2ansbZtghG1wEvnd/0sNdyfRnjXv3gAt2
+  OUyieSgHfrd2srDrlcNHFJY8
   -----END CERTIFICATE-----
-date: 2018-10-13 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -59,40 +63,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.4
 - !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.1
   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.1
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -120,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Reads or executes a job contained within a package (XML document), whereby