rxfhelper 1.0.3 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dddc2f1479ef7082196cf8328f0fa988848d324356e0e8692ebac079f920089
-  data.tar.gz: 981f3d40416b888d4697e48d2460a6ecadce9cb18854613c647629e3ea3397cd
+  metadata.gz: d3ce97eb0f68b9a2577609e059bf6d00ed84d1ea04a30fb6ed2291bdfed9f67c
+  data.tar.gz: 7f112b413c24d39a2990a0afddf6f85cb0f310ba683a7b26907b48dd7f6cbc0f
 SHA512:
-  metadata.gz: efbfd9e808d5388f6bf0c78a3f919e5a69d7c4ca911b4da8513f169e2189aaac37904b2379c2341683873dddbf4bd6df16ddbc09d0ad09b6ec7a8082be530af3
-  data.tar.gz: 03c2e348e4c6a410d590adea7b006b7ab66e6cfc5026c684bad471b7667283480ca26c827a9958af1fbee906e95774f7a0b4c5ec845119b5897790522e4a7d97
+  metadata.gz: fe8eedf78243fbc605792276e08bd65cca5a4cbaff6c70cd8eba3a0c69e451f0f1441ebe8c3d95bb458732b8368482992c0042f155bfe52096898f3380ca8d78
+  data.tar.gz: a1e8c907aad5ef549a0ac031363cf60b015c928c7ceaecd4c2b378a1f6b5a017f2bc38c5422eceb5c7f898ed99d31a90e036f2e965b1903d3f8ad7444c7a2c89

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 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.respond_to?(: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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfhelper
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.2
 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-20 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: []