rxfhelper 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff43af9d740c441437ba6029e993b8eacd719318a0df57c761663a5c7adc9059
-  data.tar.gz: 31b8aa71e2a26a2f7109ab3e9f79fab44e0b31c96d206a62e6d559d05845cbd1
+  metadata.gz: 9d9916f85a7e959cbbab0b604bc231f3173d0c026978a19a3cd4cc43ad6112f4
+  data.tar.gz: 2858867f4f1886bab3991ba9b9edc7ad2349168c54ffc18acc3802f220a42f49
 SHA512:
-  metadata.gz: dda4a32dbd4520500effc0c9ee57ff5850774756c538428f1ef84e4d0a7d6c5c5abede585085ec3840846ed36a426a8acea3f0f6b6fca1c4cae9b1f4b5d93cd3
-  data.tar.gz: ae428203d8bf52e0e03bcf862beddc62f56351212772dedb475dbb3d29bab57e97786f316d603ffa555f52054e2a518491605f96914ac89650ed4b65c3fbc705
+  metadata.gz: ce8f131cee7742e01ec44919786e2d1b3d30a7b7d09238fb4631b32a6db23b6877ae8c8bbf1ddaa7aac8e8367297087a6ad37522c9ad5f845c7432ec39334bd7
+  data.tar.gz: 107a689c6c6445222df14eda6cbdceda47d6591f1189638e1b90b1f5b3d95f0819ddaf44a56569f38311025606bcdd1158987eb84dea4e4cbcf45256967187f4

data.tar.gz.sig

@@ -1,2 +1,2 @@
-�%���$���*<�I��Ml߇_l=��_ܽX�����v��9Ɨ�e(i`�G�|ᅃ�6�&�?��?�x�j�dG<�8"io��
-”�W�����H����qy�u����T6wZ��d5�7��|�/��
+�6��:4g�R��L�#�������01�|iW�q֍�*~�V3��Μ�a �~_�E���I�.Q�����^ZE���.�Q죿��q�
+�\ٿ����Wɟ����̩�#9��3��U,G:R���i��

data/lib/rxfhelper.rb

@@ -137,7 +137,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)
@@ -162,7 +181,8 @@ class RXFHelper
       
     elsif x[/^reg:\/\//] then
         
-      DRbRegClient.new.get(x).value.to_s
+      r = DRbRegClient.new.get(x)
+      r.is_a?(Rexle::Element::Value) ? r.to_s : r
       
     else
       [x, :unknown]
@@ -172,11 +192,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
   
@@ -269,6 +296,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
         
@@ -276,7 +307,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
         
@@ -306,7 +338,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.1
+  version: 1.1.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   jqz35QOVAJp+XW1qrnZM464OWlao2nDvKZrkO1pC9jbMUo+eLb8FgqycXd26ZpRf
   RXFUTIU85mvSCH+/CcNAooQi
   -----END CERTIFICATE-----
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-09-07 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.3
+        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.3
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
 email: james@jamesrobertson.eu
 executables: []