rxfhelper 1.2.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5bce02c273b620b22c57b8192108217b65dbf4c217aa9e364df125a460b110
-  data.tar.gz: 24b8c9d64daf26dce1892ae54cfd2922de66550102656ef7094af606914fbc5e
+  metadata.gz: 0b78603e8153b7dea1846f2eb4d0ea043f57b57482884427b6aace2084bbaf3e
+  data.tar.gz: 587c9eaacf707615a39dbad35b2710e90a1ca4210e9b9ec0fa10ccaddb32f23c
 SHA512:
-  metadata.gz: 61441bfad8795084bccf21f8ff5f18b79d3b9800712ee1b25559edb4b6c5b260d708fd211f0c18c3f2976e7ad8cefc55b39cd960ad18c027552d791bf63b3c88
-  data.tar.gz: 85499a15be83ef2094c9fa75252b6cae89a2bc4c0c9ac3ea10ce9214a140646f87338b4c239c30bf51c2bff5e3bb3032a82102be232c3c49021f24264ca5e720
+  metadata.gz: 1dda34bd5be25db3997aad0e216c16f96de4634079d595b58a0856b64d731040e51aae82eaa159b43f27980170dcb99244ca3a90e487141e1963858a54f458d7
+  data.tar.gz: 40e54dc7853bd4bbe6745ede8dd815aa8eb5f2f41be39f265d4e47ee1a9cdf55664abf8ea30deb86325487b2f2c1b408842f873053f7ffdc025fc02e4b8c99f3

data/lib/rxfhelper.rb

@@ -4,6 +4,7 @@
 
 require 'rsc'
 #require 'gpd-request'
+require 'rest-client'
 require 'mymedia_ftp'
 require 'drb_fileclient'
 require 'drb_reg_client'
@@ -11,7 +12,7 @@ require 'remote_dwsregistry'
 
 
 
-# Setup: Add a local DNS entry called *reg.lookup* if you are planning on 
+# 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
@@ -109,6 +110,11 @@ module RXFHelperModule
     def self.pwd()         RXFHelper.pwd()          end
     def self.read(x)       RXFHelper.read(x).first  end
     def self.rm(s)         RXFHelper.rm(s)          end
+
+    def self.touch(s, mtime: Time.now)
+      RXFHelper.touch(s, mtime: mtime)
+    end
+
     def self.write(x, s)   RXFHelper.write(x, s)    end
     def self.zip(s, a)     RXFHelper.zip(s, a)      end
 
@@ -153,7 +159,7 @@ class RXFHelper
     return unless permissions.is_a? Integer
     return unless s.is_a? String
 
-    if s[/^dfs:\/\//] or @fs == :dfs then
+    if s[/^dfs:\/\//] or @fs[0..2] == 'dfs' then
       DfsFile.chmod permissions, s
     else
       FileUtils.chmod permissions, s
@@ -161,17 +167,20 @@ class RXFHelper
 
   end
 
-  def self.cp(s1, s2)
+  def self.cp(s1, s2, debug: false)
+
+    puts 'inside RXFHelper.cp' if debug
 
     found = [s1,s2].grep /^\w+:\/\//
+    puts 'found: ' + found.inspect if debug
 
-    if found then
+    if found.any? then
 
-      case found.first[/^\w+(?=:\/\/)/].to_sym
+      case found.first[/^\w+(?=:\/\/)/]
 
-      when :dfs
+      when 'dfs'
         DfsFile.cp(s1, s2)
-      when :ftp
+      when 'ftp'
         MyMediaFTP.cp s1, s2
       else
 
@@ -186,12 +195,22 @@ class RXFHelper
 
   def self.chdir(x)
 
+    # We can use @fs within chdir() to flag the current file system.
+    # Allowing us to use relative paths with FileX operations instead
+    # of explicitly stating the path each time. e.g. touch 'foo.txt'
+    #
+
     if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
+
       @fs = :local
       FileUtils.chdir x
+
     elsif x[/^dfs:\/\//]
-      @fs = :dfs
+
+      host = x[/(?<=dfs:\/\/)[^\/]+/]
+      @fs = 'dfs://' + host
       DfsFile.chdir x
+
     end
 
   end
@@ -229,12 +248,12 @@ class RXFHelper
 
     return Dir[x] if File.exists?(File.dirname(x))
 
-    case x[/^\w+(?=:\/\/)/].to_sym
-    when :file
+    case x[/^\w+(?=:\/\/)/]
+    when 'file'
       Dir[x]
-    when :dfs
+    when 'dfs'
       DfsFile.ls x
-    when :ftp
+    when 'ftp'
       MyMediaFTP.ls x
     else
 
@@ -254,7 +273,7 @@ class RXFHelper
 
   def self.mkdir_p(x)
 
-    if x[/^dfs:\/\//] or @fs == :dfs then
+    if x[/^dfs:\/\//] or @fs[0..2] == 'dfs' then
       DfsFile.mkdir_p x
     else
       FileUtils.mkdir_p x
@@ -378,13 +397,30 @@ class RXFHelper
 
   def self.rm(filename)
 
-    case filename[/^\w+(?=:\/\/)/].to_sym
-    when :dfs
+    case filename[/^\w+(?=:\/\/)/]
+    when 'dfs'
       DfsFile.rm filename
-    when :ftp
+    when 'ftp'
       MyMediaFTP.rm filename
     else
+      FileUtils.rm
+    end
+
+  end
 
+  def self.touch(filename, mtime: Time.now)
+
+    if @fs[0..2] == 'dfs' then
+      return DfsFile.touch(@fs + pwd + '/' + filename, mtime: mtime)
+    end
+
+    case filename[/^\w+(?=:\/\/)/]
+    when 'dfs'
+      DfsFile.touch filename, mtime: mtime
+    #when 'ftp'
+    #  MyMediaFTP.touch filename
+    else
+      FileUtils.touch filename, mtime: mtime
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfhelper
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   MrrH8cS6bqJRPQqEL1FsPmXfQpp86RvPSr0WqNSRnYEUCmqL0l2pYrXdPAyBLcji
   X1jPyhH0sl/QdPdaUnsigze+
   -----END CERTIFICATE-----
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc