rxfhelper 0.9.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e1e52810e2517ff7876a47943781bf3fd7ff1220d883f0eb78a380d5e58e0d8
-  data.tar.gz: 4e3ba3c6dcc781f6fd497caf5dad53c6b7f67312c7a6c7d3ffff07ecc3a67745
+  metadata.gz: ff43af9d740c441437ba6029e993b8eacd719318a0df57c761663a5c7adc9059
+  data.tar.gz: 31b8aa71e2a26a2f7109ab3e9f79fab44e0b31c96d206a62e6d559d05845cbd1
 SHA512:
-  metadata.gz: 5627fe3e97c9453fa1dac8ce8ffaa140be430096a9492306830ffb0578c138be9e6ba47e73b56179640ad44378b71e3638566a772846b41b808ccade77c5f4e4
-  data.tar.gz: 4aaba1cd307cc62420ea24cc25f2032a2c044c260302d32987c4f3aac4339b2372800563d7867a6b2e790546e52e7059558f6959b0e40a20b9e679f494384caf
+  metadata.gz: dda4a32dbd4520500effc0c9ee57ff5850774756c538428f1ef84e4d0a7d6c5c5abede585085ec3840846ed36a426a8acea3f0f6b6fca1c4cae9b1f4b5d93cd3
+  data.tar.gz: ae428203d8bf52e0e03bcf862beddc62f56351212772dedb475dbb3d29bab57e97786f316d603ffa555f52054e2a518491605f96914ac89650ed4b65c3fbc705

data/lib/rxfhelper.rb

@@ -6,14 +6,37 @@ require 'rsc'
 #require 'gpd-request'
 require 'drb_fileclient'
 require 'remote_dwsregistry'
+require 'drb_reg_client'
 
 
+# Setup: Add a local DNS entry called *reg.lookup* if you are planning on 
+#        using the Registry feaure to look up objects automatically.
+
 module RXFHelperModule
   
   class FileX
 
     def self.chdir(s)  RXFHelper.chdir(s)   end
 
+    def self.directory?(filename)
+      
+      type = self.filetype(filename)
+      
+      filex = case type
+      when :file
+        File
+      when :dfs
+        DfsFile
+      else
+        nil
+      end
+
+      return nil unless filex
+      
+      filex.directory? filename
+      
+    end
+    
     def self.exists?(filename)
       
       type = self.filetype(filename)
@@ -94,9 +117,25 @@ end
 # Read XML File Helper
 #
 class RXFHelper
+  using ColouredText
   
   @fs = :local
   
+  def self.call(s)
+    
+    if s =~ /=/ then
+      
+      uri, val = s.split(/=/)
+      self.set uri, val
+      
+    else
+      
+      self.get s
+      
+    end
+    
+  end
+  
   def self.cp(s1, s2)
     DfsFile.cp(s1, s2)
   end
@@ -118,7 +157,13 @@ class RXFHelper
     raise RXFHelperException, 'nil found, expected a string' if x.nil?    
           
     if x[/^rse:\/\//] then
+      
       RSC.new.get x
+      
+    elsif x[/^reg:\/\//] then
+        
+      DRbRegClient.new.get(x).value.to_s
+      
     else
       [x, :unknown]
     end
@@ -159,6 +204,23 @@ class RXFHelper
     DfsFile.mv(s1, s2)
   end  
   
+  # used by self.read
+  #  
+  def self.objectize(contents)
+    
+    doctype = contents.lines.first[/(?<=^<\?)\w+/]
+    reg = RemoteDwsRegistry.new domain: 'reg.lookup', port: '9292'
+    r = reg.get_key 'hkey_gems/doctype/' + doctype
+        
+    return contents unless r
+
+    require r.text('require')
+    
+    obj = Object.const_get(r.text('class')).new
+    obj.import contents
+    obj    
+  end
+  
   def self.pwd()
     
     DfsFile.pwd
@@ -168,6 +230,8 @@ class RXFHelper
   def self.read(x, h={})   
     
     opt = {debug: false, auto: false}.merge(h)
+    
+    debug = opt[:debug]
 
     puts 'x: ' + x.inspect if opt[:debug]
     raise RXFHelperException, 'nil found, expected a string' if x.nil?
@@ -182,8 +246,12 @@ class RXFHelper
       
     elsif x.lines.length == 1 then
       
+      puts 'x.lines == 1'.info if debug
+      
       if x[/\bhttps?:\/\//] then
         
+        puts 'before GPDRequest'.info if debug
+        
         r = GPDRequest.new(opt[:username], opt[:password]).get(x)
         
         case r.code
@@ -193,16 +261,23 @@ class RXFHelper
           raise(RXFHelperException, "401 %s unauthorized access" % x)        
         end
         
-        [r.body, :url]
+        obj = opt[:auto] ? objectize(r.body) :   r.body
+        
+        [obj, :url]
         
       elsif  x[/^dfs:\/\//] then
         
-        [DfsFile.read(x), :dfs]        
+        r = DfsFile.read(x)
+        [opt[:auto] ? objectize(r) : r, :dfs]        
                 
       elsif x[/^rse:\/\//] then
         
          [RSC.new.get(x), :rse]
          
+      elsif x[/^reg:\/\//] then
+        
+         [DRbRegClient.new.get(x).value.to_s, :reg]
+         
       elsif x[/^file:\/\//] or File.exists?(x) then
         
         puts 'RXFHelper.read before File.read' if opt[:debug]
@@ -212,27 +287,7 @@ class RXFHelper
         
         puts 'opt: ' + opt.inspect if opt[:debug]
         
-        obj = if opt[:auto] then
-
-          doctype = contents.lines.first[/(?<=^<\?)\w+/]
-          reg = RemoteDwsRegistry.new domain: 'reg', port: '9292'
-          r = reg.get_key 'hkey_gems/doctype/' + doctype
-          
-          puts 'r: '  + r.inspect if opt[:debug]
-          
-          return contents unless r
-
-          require r.text('require')
-          
-          obj = Object.const_get(r.text('class')).new
-          obj.import contents
-          obj
-          
-        else
-          
-          contents
-          
-        end
+        obj = opt[:auto] ? objectize(contents) :   contents
         
         [obj, :file]
         
@@ -264,6 +319,10 @@ class RXFHelper
     when /^rse:\/\//
       
       RSC.new.post(location, s)
+
+    when /^reg:\/\//
+        
+      DRbRegClient.new.set(location, s)
       
     else
       
@@ -315,11 +374,32 @@ class RXFHelper
           
     if uri[/^rse:\/\//] then
       RSC.new.post uri, x
+      
+    elsif uri[/^reg:\/\//]
+        
+      DRbRegClient.new.set(uri, x)      
     else
       [uri, :unknown]
     end
 
   end
+  
+  def self.set(uri, x=nil)   
+
+    raise RXFHelperException, 'nil found, expected a string' if uri.nil?    
+    puts 'uri: ' + uri.inspect
+          
+    if uri[/^rse:\/\//] then
+      RSC.new.post uri, x
+      
+    elsif uri[/^reg:\/\//]
+        
+      DRbRegClient.new.set(uri, x)      
+    else
+      [uri, :unknown]
+    end
+
+  end  
 
   def self.zip(filename, a)
     DfsFile.zip(filename, a)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfhelper
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgxMDE0MTQ0MzAzWhcN
-  MTkxMDE0MTQ0MzAzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCsJLak
-  8x/bQsFPNMV6KHIGMdMX58UFTgMRgOU2tjkpsSZcWVUmVnrBLCtOIFSC4zF2LYn3
-  HWkSUSK1wj8waTLd5bLP6QM3qXRFA80gVhLDbR1z16bt3mk2fxilO+QT4vNj9jsU
-  avjB5ph5mbnYFOldHjrTzLCIBC3z/Ro8X8w+pa4IReqthCl+veI/w6/q6cfkpW1H
-  76+rYsLRXYo2Dq6U3Z5g5ZYmu6niybN2Y0jr5ieDPdcNQA/xAOQSZ+t+tyIpGUPd
-  9Tkzy3HvwAAsUWIpjYb63ZG7NmybFaP1NBDHq39Y2kXHn6Xmj2amHeQNVrORvbg8
-  v5pWvss1GVnu0k8GjuycoAQHo/iD9IUPyjrdPHN1wb0kgYYItb5jy3YcfG2YsOjg
-  MR2bJoV6W97vvwleyc+aWmbjs5WtMAjXiUZ/1KCDYNaD882neNz5TfxnNM75L2sN
-  K2uAmU88+FDLAlUbZxeErS6CWbqvzhlXPX/FXG6a+8tcy6/Jcz9VOe5EM9ECAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUIg3HQhnA
-  HF18doUJT4j5ccKsG9gwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjA4MjEzODA0WhcN
+  MjEwNjA4MjEzODA0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDWQmov
+  AqYmuHk/CZu9teuGVYLNhzptyj60X8IkJoiHwxOJ6zZuZbABjPnugfUXSp6BWHZC
+  V4oTccB75gyQj4Ll7seKsavlOyi5Ongnx9OQQF/OkHRh/h/NmXZDsoqCTit3rGWP
+  8RvduvxRd75eGvDOh6SM5/1BN8TwffzBJ76oy4Ds3x/FbQM/1Q3PH2yadwlte3ms
+  M/tOLGZcsTWGXQryxJ7b0tI6qlvZeeF0y9223iEi8lbc+2LTJsvueNdteskp/62/
+  lyC8XKuH5rNsDcGYe0fLEToKt1ihm+h974HE2clgGBaHgyjqce8uajRfJ22Jv5Hw
+  53QTFq0GkljEMBhCkdCCXBoCaAXxPtI1ddSspJwY/co0QLTkmW9D2pm11mdOYKH/
+  pNNlfPCHBvPav/db0vWJFR9CzG9JF4OeuTM8GdD0YXJ9+36rw3+zKDzrqEr4R+B4
+  Nqxn8ECkwgCYYrNoqOUqh+nglLwQcVRBkuFIh8HZLLqFeqD6VfqAXUWHti0CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUYYjTrG21
+  hWBRLARkj0MHpV5VMeAwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAbiPFko0Oz4Oz1UqwFrLsYg4LrQ8H0VD55YJYIC4T
-  xfnpsZJ70cawmbdGj3VkNvVo9ZnueSmamPXrYldhXqyG45HPtwFAi9wCjZaIjOsN
-  6lySiollr6LOOflbv0jJyxLJpnJf9d9RR64Jn5i4ypwWWgE/eDwWYTKH9MROCE8x
-  JPNcYFRwzpAGVKPrmElN0WtzWDiSkQM1pnhD00uBFAXzHwni1zVBUeIGHchcA53/
-  QqTIEl4aitO+5uQbSfuRpOfvmVWSSq91Bon3VBa6FyjwOJMpik+8/06NpJcMLUBw
-  mXRrg7LY28CNtewINGhRcFYN4puwy/hw9srqLfDjE8TfZst8mg1yIAz5jOa1TUn2
-  Cv5RLCA9jbkQUIUcftF9CEHTIJh1zQJbAWFabOm0hR6E0x8awDXr+EEkTOwYeWSv
-  +rB3ZZRITz3UYJX4CRAhjbCFz5Cxnpy9Vak6Qd9BWwl5Zv09QPxO3W+CIFDO+VpN
-  MnDB4XRJPLbz3OzpiLtqEWES
+  BgkqhkiG9w0BAQsFAAOCAYEAbFZxX9OnCmYMpYDx7687JBRHdse2aegPHz9ikdkq
+  CY8aRsfKnomGy7tVz/Peb3o+CR7f4fZmxFL7H/eAx5clIaDnEYwoy9v5zEODp6rP
+  l7pHGM+nOFZ8XBtuxobHeab20cmvWrsRhqU41+8TN5PTeiu+6YKzMIUDhquTLD4p
+  7945EAFx5FR++oaAaQ8mvE1UaszulxRUYMD1fdhwmU0/MNyVmsxkA6Z73pnH5+9r
+  vQg/xEWCISwNPDQ8QkREppd8R15YZoUK+McO0DKdJNKHvLeBpTAtzniHKhSJWIJs
+  3Y7aVjx4ObmwUZSTacnTquQMf/TamZ/T0Ve4THAillF+cXFbXwmWGsoSQbAL7dnx
+  qwgCPezsVLzI8dyGDAaKwdnIItN+vIp0EL3/bE1XUY1QwIKGbbI7inSO1Fs0IKFS
+  jqz35QOVAJp+XW1qrnZM464OWlao2nDvKZrkO1pC9jbMUo+eLb8FgqycXd26ZpRf
+  RXFUTIU85mvSCH+/CcNAooQi
   -----END CERTIFICATE-----
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc
@@ -46,7 +46,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,27 +56,27 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: drb_fileclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: remote_dwsregistry
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,27 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: drb_reg_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -123,8 +143,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.3
 signing_key: 
 specification_version: 4
 summary: Helpful library for primarily reading the contents of a file either from