rxfhelper 1.0.4 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 001e941016c3041868f7c869a254d5912495dd8a2361b7a0d20e503aa10da006
-  data.tar.gz: c601f1433aee4502bb7d24e9ba53fd2fb630b7941646656e64bb973e10ba0635
+  metadata.gz: 15e51d65e2c274288df6b6c790800fba692215ad63c114c9c0243eb0b0e913ab
+  data.tar.gz: e39a926abe5b4930743c8dde084d5b06990383e26f8c0f84145c735783c3ce7d
 SHA512:
-  metadata.gz: 41bfc64eade2060a6824e55d55a98f69fa6ac6b5b9924622410451f3a8ef58e5703d69676bac74ff07a23e4c86bc813192beffa1669a1dca84d74201d5ccb688
-  data.tar.gz: b29017e8982cad106589e3ae111360f4d5db55bbfe44992fc69b27d21519398db49e276bed834235c1cea754cf72a1e43024b4217030f4074d18a80fc3b701c8
+  metadata.gz: 9269bde13f6557dd9a8b03ccb56b5062d0cba79447cc68560b4cbf6328fc7476ee2d583605837a86498221ab213c1986dc91438699fe5f54c06c709d65255db8
+  data.tar.gz: c656ea9a5646cf97072a4f49e777a6c10a98a16bf50c99257aab2d9c63f2ee8eebb27d2a2650f48b9657307a0676540bb7b6a6e6a3e3227247485f9d5cf8e004

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.is_a?(Rexle::Element::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 x[/^\w+(?=:\/\/)/].to_sym
+    when :file
       Dir[x]
-    elsif x[/^dfs:\/\//]
+    when :dfs
       DfsFile.ls x
-    end    
+    when :ftp
+      MyMediaFTP.ls x
+    else
+    
+    end       
     
   end
   
@@ -249,7 +277,7 @@ class RXFHelper
       
       puts 'x.lines == 1'.info if debug
       
-      if x[/\bhttps?:\/\//] then
+      if x[/^https?:\/\//] then
         
         puts 'before GPDRequest'.info if debug
         
@@ -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
         
@@ -278,7 +310,7 @@ class RXFHelper
       elsif x[/^reg:\/\//] then
         
         r = DRbRegClient.new.get(x)        
-        [r.is_a?(Rexle::Element::Value) ? r.value.to_s : r, :reg]
+        [r.is_a?(Rexle::Element::Value) ? r.to_s : r, :reg]
          
       elsif x[/^file:\/\//] or File.exists?(x) then
         
@@ -308,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)
@@ -318,6 +359,10 @@ class RXFHelper
       
       DfsFile.write location, s
       
+    when  /^ftp:\/\// then
+        
+      MyMediaFTP.write location, s
+      
     when /^rse:\/\//
       
       RSC.new.post(location, s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfhelper
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   jqz35QOVAJp+XW1qrnZM464OWlao2nDvKZrkO1pC9jbMUo+eLb8FgqycXd26ZpRf
   RXFUTIU85mvSCH+/CcNAooQi
   -----END CERTIFICATE-----
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-23 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