rsc 0.4.0 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: abd05c2d664728dadb702b64f048d4464a3fcdae
-  data.tar.gz: f3e3fecec0cc821b87bc448eed133fb7e789b07a
+SHA256:
+  metadata.gz: b01f72dfa760e286914b6c423cbf9724deb0eb47edcf7fcb3ad110eb12a67922
+  data.tar.gz: bf1e28da451ab37f4708a7d1a96c02739752fdf8d2475a0c3c3674e9e03a53f4
 SHA512:
-  metadata.gz: 668c6a4e39dc1a5c11aa6f55ec92c1cc30a42fbfd6568d4913b923cb3074eb727b84c074141d0f7104d4b9cb95e331a8a1f424453b92b29a653dd386b817890f
-  data.tar.gz: f2dfbf1cf9d33c162754d33c0a06f105b43952431bc305d30ebf70b0ce48574110f99043e752ee8cb8ac819c70dfa1e2b92ffb518d5fce9f79e21b9b57b61985
+  metadata.gz: 1edee6d3f54ad895aaf0a6a87b0e078b6dc68f3ba5d9f31dc00e946d66878304af643c2acba4229cd8f9483002dabb3e59080e53032d838efc4dd32a5c380dc1
+  data.tar.gz: 18ca4264549c16234606ad3772c4fbfefe94baceb9b9b5a0f8e47a05c699277f883c63fbfdda5250d4fc3968b82cb8c4ae1b17261c8226dff48176bff4ab0751

data/lib/rsc.rb

@@ -7,55 +7,48 @@ require 'drb'
 require 'rexle'
 
 
-class Rse
+class RseClient
   
-  def self.call(x)
-    RSC.new.get(x)
-  end
+  def self.call(x)        RSC.new.get(x)        end  
+  def self.get(x)         RSC.new.get(x)        end
+  def self.post(x, val)   RSC.new.post(x, val)  end  
+  def self.delete(x)      RSC.new.delete(x)     end
+  def self.put(x, val)    RSC.new.put(x, val)   end      
   
 end
 
 class RSC
+  using ColouredText
   
   class Package
+    using ColouredText
     
-    def initialize(drb_obj, parent_url, package)
+    def initialize(drb_obj, package, debug: false)
+      
+      @debug = debug
 
       @obj = drb_obj
+      drb_obj.package_methods(package).each do |method_name|
+        
+        puts ('creating method ' + method_name).info if @debug
 
-      @url = File.join(parent_url, package + '.rsf')
-      doc = Rexle.new open(@url, 'UserAgent' => 'ClientRscript').read
-      a = doc.root.xpath 'job/attribute::id'
-      
-      a.each do |attr|
-        method_name = attr.value.gsub('-','_') 
-        method = "def %s(*args); run_job('%s', args) ; end" % \
-                                                            ([method_name] * 2)
-        self.instance_eval(method)
+        methodx = "
+      def %s(*args, params: {})
+        @obj.run_job('%s','%s', params, args)
+      end" % [method_name, package, method_name]
+        self.instance_eval(methodx)        
+        
       end
 
     end
 
-    private
-    
-    def run_job(method_name, *args)
-      
-      args.flatten!(1)
-      params = args.pop if args.find {|x| x.is_a? Hash}
-      a = ['//job:' + method_name, @url, args].flatten(1)
-      params ? @obj.run(a, params) : @obj.run(a)     
-    end
-
   end
 
-  def initialize(drb_hostname='rse', parent_url=nil, port: '61000')
+  def initialize(drb_hostname='rse', port: '61000', debug: false)
     
-    @port = port
+    @port, @debug = port, debug
     
-    if parent_url then
-      @parent_url = parent_url
-      drb_start(drb_hostname)
-    end
+    drb_start(drb_hostname)
     
   end
 
@@ -71,7 +64,7 @@ class RSC
     s ? run_uri(s, :post, value: val) :  @obj.post
   end
 
-  def put(s)
+  def put(s=nil, val=nil)
     s ? run_uri(s, :put, value: val) :  @obj.put
   end
   
@@ -88,7 +81,18 @@ class RSC
   end
   
   def method_missing(method_name, *args)
-    Package.new @obj, @parent_url, method_name.to_s
+
+    if @debug then
+      puts 'method_missing'.info 
+      puts ('method_name: ' + method_name.inspect).debug
+    end
+    
+    begin
+      Package.new @obj, method_name.to_s, debug: @debug
+    rescue
+      # nil will be returned if there is no package by that name
+    end
+    
   end
   
   def parse_uri(s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.5
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzIyMTE1OTEyWhcN
-  MTkwMzIyMTE1OTEyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIHgN1
-  uIkVDcT1aZ5MJTDaLtAljRnojAKWiabiMrVxFxd1ub8nC24p9CExttTKYE8IrGH0
-  3MjvXlZhRhk3MQopSziiqji0BvrQjjPLA57QRxSIbfsJs6++2XlYcwsCNO6i56W6
-  Anp0qYWqwH5OEMAgKywpQ4f4kUocOy5zYJga2WvAOOhLcGIq8eiwzo9IlnGIg8sk
-  S73EBod3OO2TBnlvvWbHmNjv/sr+2g2CzSfrHVL2XAPCNIosntDE/Ocq0Myi3Q4c
-  NQSuZ7zyWeI96HlA2APuZGZqWdmDAqfXRVxp4RZDZ4L5hQNP3gOEKqUMinrZl1rd
-  TgFcSS5K+inoYRavAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFPYYE4Xh0Ws9wEWVrTVigOfwCtXkMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAKedVycTGeHIPJwYSPtr
-  gr8NVUYArb0iRCgr+Ly9C6elzhBEfe9sYoVT0qUpq8sCq3rDwZuZyQR7oH04tmZR
-  znLaXpqRagRWM7mJ4yV2kCTbR0Dev+KTqxNYd/qL3THn7DoeHuA4ayLNFdfx1Ols
-  TSNbzsE7V0KvpcqfGsYsXCyPo+E+OgrTLHUflh99wrbyVu7MMyVkOpItfHsXiaLn
-  KcajS0aeWWGcuR7OcRAjr5CpmYbptWCfDzIxaArlVpW0zWlBHKoxSGvfkyHPTJog
-  o+hpgqEdXScsw0ZCQMvy0aH5DiiF2mtGr84n+mevsXQKg0IsjBEvA6StSJ63eMpL
-  dTs=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAxMTIyMjExMDI0WhcN
+  MjExMTIyMjExMDI0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDj/1eB
+  V/C3L3qsRlMSobUmyRpRU6HQ4Quzmry9InuiKs6txHLjFrkXQWUHlgrYtEBMywX7
+  RcgyE/Yx2DSCklLVbavB+YAj6LfJJBptlDSHS23M2ZZnslU6KbsKh9YJNXBqw+d7
+  14sedBv8N2brHptbw6izLmDCYRkoy01RCS42z2WO/Lo3Lk+JUF7x/MEEObxkA63j
+  ggKVMKMA7ANhYqO9u9QLUU5E/TKiH7yVCdXNQmexiqaju5dK4RUZC3xQXrDtvVcs
+  +yYaXKoJvZY3tBBx7wFqaqWZ17zJqoMqLiDiQTY7YIKgPxUpRTmVemtFERc5jorn
+  8bDIaJYk7LszOMBkVbuxgBsSL5Cec/q7fkTyknZPgBN0a3r9so7N3YiEAwBQ/A2F
+  5VVLwGq2jDYj2LMuBCRvjt9REl36wB4JImFsoPtUYnSqrYsVQSQHb+H+K2DGD6vG
+  Q2/GdaqRYXKN0oJ+2Xr8Mnc91X2L3rDlUcK55gdexIVbZ9jEA2uCsweySPUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUQBYglk+n
+  HK7psgxrsKRLJAQHz/YwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAnjAxN/om8X2AifS/HOazKoNeS3Gn88Tnju7jfk3+
+  i2uZepYvw/lcaUf/hqKoZUdQJYQ1IgpOZR6+4PTiv71B0Hk9wy/w1jO5JcyTZg5j
+  /W8zgc310xbZmRgCahJdXbMU9uDWAGINzotTJb5uU/16PF06JjtoPSyEsPiR7+es
+  BfMskPZ7Xe3PxHz+cKvhmZ6Th8PC3rOdo8Qjgmp589Et8TcHhb6NkkKCpcI8s06c
+  qPKOre+KV2qgCAJbFLPBcOb0ra20Ze2Rfy3QMmSSH6T3gC2UzRq2arvpJ6XEKiAU
+  wun2n+XzOSh5y7/zKlrSTahPyR3Uafi35zyi3tQoCVsYvbn2ZaZoW/vLBxOzBhmd
+  1xuKzyqnn5CkXGlSZbB0zTZpog6L+x4MJdZAEb5DFcso/ZnGeNn0Bpr1N4lg547P
+  BxBwmRZJ2RVS09pLv4ZwZ9VG6pxhnhbGZhRvgwfpH8yzFxyix3K8FwNQcSUw+Qzs
+  sq6tf27j+XsE4ORGUcdVfJFm
   -----END CERTIFICATE-----
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -38,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        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.0'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.12
+        version: 1.5.1
 description: formerly known as rcscript-client
 email: james@jamesrobertson.eu
 executables: []
@@ -78,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Objectifies remote calls to RSF packages and jobs which are run through a