rxfhelper 1.2.2 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b138d1576463c9bba8e0d18b64e7be0734f2df074854f94fbb4f0efa109d768
-  data.tar.gz: 8b66c19d007599ef84ba0dc2a361e92d93565625c5b1608b10c84d2abc204291
+  metadata.gz: cc08e94405728b8ce7bcd30f2c33736b9f209131caac7d6fded3faf7a5488985
+  data.tar.gz: d1625899121690c01ccb348f42ea31e04445a3177c2841b510222f8f8dd04414
 SHA512:
-  metadata.gz: 75e3dc8373f2571a4222a7992c1490f9fbdfa41ceb920aeb57d12fa5f501f438991ee685316ecab6b31766a7db7d5f102e2d74c7dabb7c9406a3bf41cbbc02ab
-  data.tar.gz: 55b81edb3b58deba0e3148cc2ce314fc45825fed75f5e79951aee77f80593b3eab82552b898fac3e334f9ff69ac5996a65da6e9d78d5cb6d38b86987be063c4b
+  metadata.gz: ed7fd7c023ec9fd526bfa6e6b7347980240ade785bf2dde4f80d0a4ddf5bd6238961e1dc549c0eba773d36dfdaed3f173b71412bb766d62c0e7a0581bb655e2f
+  data.tar.gz: 1c80069ebddf99533700fe872f9b65dc324b2f78481fac3ffe7299ea764eb306e14d053f74c51005b4da22ed3d75e74d1bfe0aa8d069f78fa15def4402d3429a

data/lib/rxfhelper.rb

@@ -110,6 +110,15 @@ 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.rm_r(s, force: false)
+      RXFHelper.rm_r(s, force: force)
+    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
 
@@ -154,7 +163,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
@@ -171,11 +180,11 @@ class RXFHelper
 
     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
 
@@ -190,12 +199,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
@@ -233,12 +252,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
 
@@ -258,7 +277,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
@@ -382,13 +401,75 @@ 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
 
+      if File.basename(filename) =~ /\*/ then
+
+        Dir.glob(filename).each do |file|
+
+          begin
+            FileUtils.rm file
+          rescue
+            puts ('RXFHelper#rm: ' + file + ' is a Directory').warning
+          end
+
+        end
+
+      else
+        FileUtils.rm filename
+      end
+
+    end
+
+  end
+
+  def self.rm_r(filename, force: false)
+
+    case filename[/^\w+(?=:\/\/)/]
+    when 'dfs'
+      DfsFile.rm_r filename, force: force
+    #when 'ftp'
+    #  MyMediaFTP.rm filename
+    else
+
+      if File.basename(filename) =~ /\*/ then
+
+        Dir.glob(filename).each do |file|
+
+          begin
+            FileUtils.rm_r file, force: force
+          rescue
+            puts ('RXFHelper#rm: ' + file + ' is a Directory').warning
+          end
+
+        end
+
+      else
+        FileUtils.rm_r filename, force: force
+      end
+
+    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.2
+  version: 1.2.6
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   MrrH8cS6bqJRPQqEL1FsPmXfQpp86RvPSr0WqNSRnYEUCmqL0l2pYrXdPAyBLcji
   X1jPyhH0sl/QdPdaUnsigze+
   -----END CERTIFICATE-----
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc