rxfhelper 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c65e20595f63007371c48c8a6c3dec5da0224d339f072fcc31e9574d94493c
-  data.tar.gz: 2f4b6e8820bf0513e1c248d1b866adc2be5b39f73abc5fa3ffa7c75efa91a4f4
+  metadata.gz: 1f9b53a2bc741320bf27a06159c47b922c4c0f8b3d58996425e4929ba4b14410
+  data.tar.gz: 68b6743cef0e1dd85a3ac152a5f2f0010eecb5c2ffb8254237ea46941e8f94cb
 SHA512:
-  metadata.gz: 6fa85e0747f6c5dc533fbeb6a1a02085ebd3e092bbdef74338cf0534bca854ba56d23e03bc4144eb5fb316a6a492bb9c4896288751425612cc1e0be26474958d
-  data.tar.gz: 87eb2233f2c1b164082027e785589147897196ba3d35b930df5d708ac8f8a6149a3983c891ea58b5fbc76140084a1e70454b887029e377c2402426c30b5a12cf
+  metadata.gz: 2c4933309436bdfd524918b59d8dac011d0d980319daffb5b412eb600a2246a94ff3447bb0a4b4c474bdb2bf584374f942ea98d7674db909512aeb9bed28ff3b
+  data.tar.gz: f053f1e95ae0a4b0c55d877b375a7811a4366e955dbab3cd81bbf07c4c21e12e8934bd3d69e30ee699674c529baae96df37de30f0f6dca328427e64e19df21c7

data/lib/rxfhelper.rb

@@ -4,9 +4,11 @@
 
 require 'rsc'
 #require 'gpd-request'
+require 'mymedia_ftp'
 require 'drb_fileclient'
-require 'remote_dwsregistry'
 require 'drb_reg_client'
+require 'remote_dwsregistry'
+
 
 
 # Setup: Add a local DNS entry called *reg.lookup* if you are planning on 
@@ -137,7 +139,26 @@ class RXFHelper
   end
   
   def self.cp(s1, s2)
-    DfsFile.cp(s1, s2)
+    
+    found = [s1,s2].grep /^\w+:\/\//
+    
+    if found then
+      
+      case found.first[/^\w+(?=:\/\/)/].to_sym
+
+      when :dfs
+        DfsFile.cp(s1, s2)
+      when :ftp
+        MyMediaFTP.cp s1, s2
+      else
+      
+      end 
+      
+    else
+      
+      FileUtils.cp s1, s2
+      
+    end
   end
   
   def self.chdir(x)
@@ -163,7 +184,7 @@ class RXFHelper
     elsif x[/^reg:\/\//] then
         
       r = DRbRegClient.new.get(x)
-      r.respond_to? :value ? r.value.to_s : r
+      r.is_a?(Rexle::Element::Value) ? r.to_s : r
       
     else
       [x, :unknown]
@@ -173,11 +194,18 @@ class RXFHelper
   
   def self.ls(x='*')
     
-    if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
+    return Dir[x] if File.exists?(File.dirname(x))
+    
+    case filename[/^\w+(?=:\/\/)/].to_sym
+    when :file
       Dir[x]
-    elsif x[/^dfs:\/\//]
+    when :dfs
       DfsFile.ls x
-    end    
+    when :ftp
+      MyMediaFTP.ls x
+    else
+    
+    end       
     
   end
   
@@ -270,6 +298,10 @@ class RXFHelper
         
         r = DfsFile.read(x)
         [opt[:auto] ? objectize(r) : r, :dfs]        
+        
+      elsif  x[/^ftp:\/\//] then
+        
+        [MyMediaFTP.read(x), :ftp]                
                 
       elsif x[/^rse:\/\//] then
         
@@ -277,7 +309,8 @@ class RXFHelper
          
       elsif x[/^reg:\/\//] then
         
-         [DRbRegClient.new.get(x).value.to_s, :reg]
+        r = DRbRegClient.new.get(x)        
+        [r.is_a?(Rexle::Element::Value) ? r.to_s : r, :reg]
          
       elsif x[/^file:\/\//] or File.exists?(x) then
         
@@ -307,7 +340,16 @@ class RXFHelper
   end
   
   def self.rm(filename)
-    DfsFile.rm filename
+        
+    case filename[/^\w+(?=:\/\/)/].to_sym
+    when :dfs
+      DfsFile.rm filename
+    when :ftp
+      MyMediaFTP.rm filename      
+    else
+    
+    end    
+    
   end
   
   def self.write(location, s=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfhelper
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   jqz35QOVAJp+XW1qrnZM464OWlao2nDvKZrkO1pC9jbMUo+eLb8FgqycXd26ZpRf
   RXFUTIU85mvSCH+/CcNAooQi
   -----END CERTIFICATE-----
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc
@@ -77,6 +77,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
+- !ruby/object:Gem::Dependency
+  name: mymedia_ftp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: remote_dwsregistry
   requirement: !ruby/object:Gem::Requirement
@@ -101,22 +121,22 @@ dependencies:
   name: drb_reg_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   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.4
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
 email: james@jamesrobertson.eu
 executables: []