rsc 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115749bd16f1af955ea0e43418bba405759717e0c79dd01fad8949d6a347d919
-  data.tar.gz: e69fdafceb96dccd9e5cd28293bbc34945d434c0dbcebfdf42372e9eed9b8b79
+  metadata.gz: a468303e494872289c8abae2d4423708d53a524321889572d708318a732bf6e3
+  data.tar.gz: cd6be7b4404608866702a991f629a454cc47ff4d0cc50171aa85a8e6178d85ef
 SHA512:
-  metadata.gz: d79d6a669490acf00d80fda396a921aa8999f17e37210ba479085aa0592c05221479475d165eae3b2b27ce60d684261bf141f3d3446b18f5aee59e1545b360ba
-  data.tar.gz: a9da5d5628a9241ae958294122ea5ab24bd2cedb0f2bfb3710a1612fb13ee761dd2249ae0792dbe1a5f3b54f488e7238378bab5feb7d7c6565907f0413bd2f3a
+  metadata.gz: 3c11bb62a6631816aae637fd3e48b95c98cc9e9d4bf08dedb3b9e5525026804a463557643f8008e7ddc3339b152d8b6358d41c4087cbdc3d7040319ae752d218
+  data.tar.gz: 8fe6c91c8b2e0c4fc99866ff613c8b9c0c580708e94d15ebab00c1ebdc88e9a2ae366fd9824391838456a3e512ea67ece0934412ece6c5de5e32abcf3bda1301

data/lib/rsc.rb

@@ -7,59 +7,97 @@ require 'drb'
 require 'rexle'
 
 
-class Rse
-  
-  def self.call(x)        RSC.new.get(x)        end  
+class RseClient
+
+  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.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      
-  
+  def self.put(x, val)    RSC.new.put(x, val)   end
+
 end
 
 class RSC
   using ColouredText
-  
+
   class Package
     using ColouredText
-    
+
     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
 
         methodx = "
-      def %s(*args)
-        @obj.run_job('%s','%s', args)
+      def %s(*args, params: {})
+        @obj.run_job('%s','%s', params, args)
       end" % [method_name, package, method_name]
-        self.instance_eval(methodx)        
-        
+        self.instance_eval(methodx)
+
       end
 
     end
 
   end
 
-  def initialize(drb_hostname='rse', port: '61000', debug: false)
-    
-    @port, @debug = port, debug
-    
-    drb_start(drb_hostname)
-    
+  def initialize(drb_hostname='rse', port: '61000', odrb2: false, debug: false)
+
+    @debug = debug
+    DRb.start_service
+
+
+    if odrb2 or port == '57844' then
+      @port = port =~ /^610[0-9]{2}/ ? '57844' : port
+
+      @obj = DRbObject.new(nil, "druby://#{drb_hostname}:#{@port}")
+      parent = @obj
+      @obj&.services.each do |name, methods|
+
+        class_name = name.capitalize
+        klass = Object.const_set(class_name,Class.new)
+
+        klass.class_eval do
+          methods.each do |method_name|
+            define_method method_name do |*args|
+              parent.call name, method_name, *args
+            end
+          end
+        end
+
+        define_singleton_method name do
+          klass.new
+        end
+
+      end
+
+      @odrb2 = true
+
+    else
+
+      @port = port
+      @obj = DRbObject.new(nil, "druby://#{drb_hostname}:#{@port}")
+
+    end
+
+
+
   end
 
+  # jr: 2022-04-23 the following public methods should be conditionally
+  #                created since they are specific to classic RSC and not odrb2
+
   def delete(s=nil)
     s ? run_uri(s, :delete) :  @obj.delete
   end
-  
+
   def get(s=nil)
     s ? run_uri(s, :get) :  @obj.get
   end
-  
+
   def post(s=nil, val=nil)
     s ? run_uri(s, :post, value: val) :  @obj.post
   end
@@ -67,40 +105,42 @@ class RSC
   def put(s=nil, val=nil)
     s ? run_uri(s, :put, value: val) :  @obj.put
   end
-  
-  
+
+
   def run_job(package, job, params={}, *qargs, package_path: nil)
     @obj.run_job(package, job, params, qargs, package_path)
   end
 
   private
-  
+
   def drb_start(host)
     DRb.start_service
-    @obj = DRbObject.new(nil, "druby://#{host}:#{@port}")    
+    @obj = DRbObject.new(nil, "druby://#{host}:#{@port}")
   end
-  
+
   def method_missing(method_name, *args)
 
     if @debug then
-      puts 'method_missing'.info 
+      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
+
+    if not @odrb2 then
+
+      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
-    
   end
-  
+
   def parse_uri(s)
-    
+
     protocol, _, host, package, raw_job, remaining = s.split('/',6)
-    
+
     if remaining then
-      
+
       job = raw_job
       # split on the 1st question mark
       raw_args, raw_params = if remaining =~ /\?/ then
@@ -108,40 +148,40 @@ class RSC
       else
         remaining
       end
-      
+
     elsif raw_job =~ /\?/
       job, raw_params = raw_job.split('?',2)
     else
       job = raw_job
     end
-    
+
     if raw_args or raw_params then
       args = raw_args.split('/') if raw_args
-      
+
       if raw_params then
-        params = raw_params.split('&').inject({}) do |r,x| 
+        params = raw_params.split('&').inject({}) do |r,x|
           k, v = x.split('=')
           v ? r.merge(k[/\w+$/].to_sym => URI.unescape(v)) : r
-        end          
+        end
       end
 
-    end    
-    
+    end
+
     [host, package, job, args, params]
   end
-  
+
   def run_uri(s, type=:get, value: nil)
-    
+
     host, package, job, args, params = parse_uri(s)
     drb_start host
     @obj.type = type
-    
+
     if value then
-      params ||= {}      
-      params.merge!(value.is_a?(Hash) ? value : {value: value}) 
+      params ||= {}
+      params.merge!(value.is_a?(Hash) ? value : {value: value})
     end
-    
-    @obj.run_job(package, job, params, args)  
-    
+
+    @obj.run_job(package, job, params, args)
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsc
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMzI2MjA1NjMxWhcN
-  MjAwMzI1MjA1NjMxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDvSJmU
-  qBTdAWA7/4oxkIVf/Ge8baeK6aaH3pxZHWB81dJivtIXI/9C3yEwe24W2iWYHq5k
-  A6jSFwA43urOti9384VLBot8c/ZsOlHUzdIv+W1eF4lAdfSjvsVWfH3ql4Ci2nol
-  SeJRKmBaFr8famt7OPOyJgz7idHBJgMmUBaT0XKfATAQ5xP5DVPuzNKGDGH5OazF
-  JdRieAHJ7jFSlVwo9A+eeTmLKUk+eEW0+KAz1bMnbcsp4DyujE6DjkWPjBFiO2OQ
-  n28aWRdbMzMh+9mrv6Gm3EqeQIuat4SwJ1dx/j5kltRO38PXnLFXPrqupXp+ACv6
-  LAfcPNqL2tQ7GrdsUou3vOtr3iPksTPTa1Aetj7CgpIgREUQiK6RJd6MqauIAnHz
-  mPFD+idAoDVxF1XwMiCdOADaWn6k2tNU2hZm0De323NOpg+bfmIXXUWjQ3QBuZfQ
-  ePmCLwAh7XOpqWSZEXsPQzUNnl2RDh5bbS0HjkEGJpZc5zRVjz0xSkT/qg8CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUkXxB0m9n
-  QjQF2pEcLWjIJQQ17OAwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwNDIzMTE1NDE1WhcN
+  MjMwNDIzMTE1NDE1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCzGdti
+  xnY7puzCTL4PaRBaT8BTJWMEl/ovjus4bUaeHre3L75LntQ8cEpUVm12U0AtkCs4
+  yOrIjPzNymrYXyTfDlhS1xvd+lmGC8e4r6UpzKIF4LVQ8ELF+zIT86R1UfH/Wy29
+  zmg4/q/UCxKMA6d/2RjW8IZcnzxnUFr5urGXcUCN5/GaPYhO/af8nOI8l9b+DGy0
+  0l2S7Yp/WymwF7A3Mgw1TKnlqzfuBIrhIzbamTbo6BctawZoV3s2CgxtI4CF1uoG
+  NjyRJ//Xnup8zIOaUIwHECkoX4BYNGncAB822ZNvSaS7tCqm/Q3sMV7cdW3TuPuB
+  gefX/kh2ycyQESJPUMHYwkbjUB8B5oKq5NIkJobzHy+N+Gm7jHiLdZx6gDCQhMhb
+  7n9MKwbMBEOtMHjYaUpj69am2ON6dJj7oUizPVJ3Rqx8qlU6qDoCUSsLKZiZ0fWV
+  hDPy7bnKEC9kkX4IcvwPtlNq8uq4nav06t6eG2RmHRUJg3CQTxySyimxTJkCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU9s8Rbcb4
+  vmzoXwjhAwVA+thCfoYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAX6HnR+X7C+gvITIFX1Phr1q3aQQHdWgkksD28FNz
-  OhReWeEjgGB30Aj2ckvLVfJ90SLMCPG5DgtJH3Fs9XjzhlIGupu7Yvv+0fD8rCYZ
-  Gza8xDRFM9Gau6cg+ffSe0BxgMMrIPc20ZH6Zy2r6veeX1CYGuEI7fwIiCZAJINC
-  42q/+nGi212BAbgFsP/2m/w1jHY5dL9QMfYAcsf99TRkBakk0OUvSa4/uE2M6W4O
-  bmhpLpNRFjGf7DUFBsNvuwsFh69u0BpswPK4rLoHWzvF0PbXPOYdmgGZnSc+Z4nB
-  Yg6KG/j568bsHRPhZdkT47XLkPg0phTCLKdnucv/7ShMuo+H+9pl+5QzrgxQiGCY
-  G0TsddNJlQ7BSvbrcCc/Bj+6DdDNmXcFsb3A1f4f/mOq6BoLjgtZ/BQcF6skvI7i
-  ErJFIoeyeVsFvSBnm5kPCZAp6NFkohs59rEEMVKkj4ZlAkFLyOHJ3sUyedByJwqE
-  zW8gffb/eYXJOnj754Mmtpb4
+  BgkqhkiG9w0BAQsFAAOCAYEAm8KCfzZeyU4a0kDPMxcb8iOTVIoJ8limkG/lYyuo
+  Hz8C9jH6Xwnf4vXCrlgws61KSzK5jgMOq6Kp0pT7cbzo/Q18610THO20z/4/LEe+
+  sIhzxr4qxQP7TJpMmJq4LID//QYT7OY92fj3fkoDkggm85OcVFRPGtTyWpa0dkYL
+  P3O/v5tkIffwiO1gY66UFT0dlPAAkeqhSCGqGiwJ76bPysM0hqOQ71FYPZo9VczD
+  HqSj7ZJVUDPW1iKYvB880LA2xuo8/EIxOwiIBKh/TSS9tfS+cMPuLo2wDN01RJTC
+  02kbvdTC2ZBSjLt1fo5+JWfFJ5yfwoxSsw0MmxXYVqBNlF4CkZU+s9ngXa/sXXZi
+  vB6UTVioVZH0DMsCmInZK1EbAAv3q27SbTyAtG8f3yRjfb9kAGo6zDotHy1oGAiA
+  aXZYTu0wdZCcurVbkjN+dC+imsA1+dCLcoS6yn0qWDfFBE/IJCWIQKNT0YDW0sTw
+  yQTpQzKRnLzRe2Mu66QO3dN3
   -----END CERTIFICATE-----
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2022-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -46,7 +46,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
@@ -56,9 +56,9 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
-description: formerly known as rcscript-client
-email: james@jamesrobertson.eu
+        version: 1.5.14
+description: formerly known as rcscript-client; Now supports OneDRb version2.
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,9 +83,9 @@ 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: Objectifies remote calls to RSF packages and jobs which are run through a
-  DRb server
+summary: Primarily objectifies remote calls to RSF packages and jobs which are run
+  through a DRb server
 test_files: []