rxfhelper 1.2.1 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29cc7ef15cdde9ea18e774020430180ffaceee84a40a8d2d7a9e4b818128bd02
-  data.tar.gz: 42ba6529130a99530d694edc478687d9d236b41d825567a5e23d4fc3a9f36981
+  metadata.gz: 76dffb3300ae6df8b167768644a86bb625500ac20d71bf5e6f875b5c51678366
+  data.tar.gz: aca01289710acc2d57f1bc96bfa5fbfb411ac72b600aba575fe1855033018464
 SHA512:
-  metadata.gz: d26bcdad8cb81db235287aeaefcb3babf381fa4a00acdf474780c2e587fe9dea63afc3b52f7ca054fd6094815c91246f693e1c25a64955c6b4ea851c4cf12575
-  data.tar.gz: 6a09545d67d56d32022d3d5409f2f9dff07c6f49ec9c4b216275ba3d1aa9139d169af469eef868153cde714ab909501f6745fb359e14d944690837ac34875e4b
+  metadata.gz: 2557f0dae71e0eedbd484597d03eaaf5978fc2fa3b0fc62c63a3357d40b931cf8d319b55ef61a4e0d80a8791077ed25f76406377d16afc88adc7f6bceb2e2ba5
+  data.tar.gz: 9a3eb0e319532abe16aee8dec70c6f576b2c881debe3f5ddad7c76ccdf2c66d9891df87bc785624a67072778169ad0001d01aff756b9570cd402d2e758f94ed7

data/lib/rxfhelper.rb

@@ -12,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
@@ -110,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
 
@@ -154,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
@@ -162,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
 
@@ -187,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
@@ -230,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
 
@@ -255,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
@@ -379,13 +397,36 @@ 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 {|file| FileUtils.rm file }
+      else
+        FileUtils.rm filename
+      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

data.tar.gz.sig

@@ -1,5 +1 @@
-�lë�?_��h/�K0�[�,���x��«ML;&�#F��ދj?��C2v"�;�L�ë�ۭ��^��k)cp���y�']�fq�A�����
oը��`�A2�k�1A�S�f^.�vE�Hw�C��{�d�b=j�Z���KJ.��I�A��/i{���R kf�G0Q�<��_�x.J�R�x-k̭j��A���w�7vBF@�C��|�d��L�&
-�R�=��Q�Og�[8�IIx�]��݋gVh>^� P��گE�b�� f�"EE��1�hWg�3
-	�6���ڡZ@M
-h=����n��/�ͮ����>���K�_^ݡ�$�wޗ���9x��R���_
d
����Xw*�OD��C�
-W��J�ϋ���XT��\���
+&��vY�2t˵r��Rֈ)p!D����/Jӹ/��< I�
�7�,&6�A���Z)~�wp��4�^[��~�g>Q0>7�@=�Z:��@
>����?q=l�D,ۆ��R���R{7�H�Z�QDُ����6�v*�b�����%�8ٰ�l p���^8a;Yej� w�F�k	�h���8v�+,���wʓ�.��U��B_�3�9�⥄۱"��h����@
Ƴ�t��d	��b�yʏ��E+�B���#����4�Rc�9ڹ�ʺ��pW�`�BD����Fԟmh&Ϻ�f���p����Afd��@��ؘ��=��i�mπh���ĎnC���Q��H���z<�T��`������f��{3�(�S�"��)�y�2�

metadata

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