rxfhelper 1.1.4 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b2b3cae6cf8bea604db55ccbbcaaaa66d0520beda41c176bcda8c7e9ddcc4df
-  data.tar.gz: e20c05524b6824edfb440ce5ef94938bc00bb189f2251e9005b1bbb0c218b719
+  metadata.gz: 28e436ed54b4585bc6386e61934df9ef818720c3bda4948df520c44c9d0671bc
+  data.tar.gz: bed423faffffcee3e793eb0e2c739302a65f8e4d36241a4902c337bb07bb455f
 SHA512:
-  metadata.gz: c856678181998759bfeb49ab9e70ee3d2ba3d493a1c08005bfef02857add70a5bd98fbf9d6564058a7f0c8fefd3d70d99a7ba17d693591d111665082f860850b
-  data.tar.gz: 35350a3aa442e65836e1331ecad56883373ff7820f26b775ade08888e72c5ed316c9587eacda8c2a016ca8016603fb754b6fa0dc66b1c29c0468b8ec886db567
+  metadata.gz: c13aa7cd67307d6b551fe77d56e326f077f47ab84f1ca1343ec60891b94545957d8d858884296d7c19118bda9d343bbad890deb97b245d58bcfc62f36e4ca74c
+  data.tar.gz: 8369514628a2a8993ea66fb7fb8623ed0771818df78dad09b6bc1c3ea7bfd4b7b230a39504c762d18c6aca4537f0b7af4c56499ee7c578b1445aec59d2c06e28

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,7 @@ 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)      RXFHelper.touch(s)       end
     def self.write(x, s)   RXFHelper.write(x, s)    end
     def self.zip(s, a)     RXFHelper.zip(s, a)      end
 
@@ -153,7 +155,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 +163,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 +191,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 +244,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 +269,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
@@ -314,7 +329,11 @@ class RXFHelper
 
         puts 'before GPDRequest'.info if debug
 
-        r = GPDRequest.new(opt[:username], opt[:password]).get(x)
+        r = if opt[:username] and opt[:password] then
+          GPDRequest.new(opt[:username], opt[:password]).get(x)
+        else
+          response = RestClient.get(x)
+        end
 
         case r.code
         when '404'
@@ -374,13 +393,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)
+
+    if @fs[0..2] == 'dfs' then
+      return DfsFile.touch(@fs + pwd + '/' + filename)
+    end
+
+    case filename[/^\w+(?=:\/\/)/]
+    when 'dfs'
+      DfsFile.touch filename
+    when 'ftp'
+      MyMediaFTP.touch filename
+    else
+      FileUtils.touch filename
     end
 
   end

data.tar.gz.sig

@@ -1,3 +1 @@
-o+%wk����PX�SG�������x�k�A�$k_w��ޣ�k-�k2���?�
-�Ų&�=pL�1(���8��&�i�@S�����Ϧ�#�D�JO�D��M0tÔj�����5 ��S�48�������u���q���0#�6ET�h#<�
-ͯ���������� �r�3��p$���/��,�|�.���5�E�zU�g���2]q���V�4d��Y&I���g&�-�JK��蓐�\Q8i�ȼ���.fsW����q�-���u����E��Ee_W_k3w`�c�����ή�Z����-��D*Y	#4�"�!s$P]iEB���IP�G=C���j[�̢�E��
+&��=
�;���o��Ȇ���X��0äVX6,Uݍ��R�i�m��L���F�R��]+�*i8˯*
�vf"Ӯ �M����\�|�G�e��4Zv�[V�cLC��L�w')B��y,Ę+wM'��g�ֵ��@�\���ҕ\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfhelper
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   MrrH8cS6bqJRPQqEL1FsPmXfQpp86RvPSr0WqNSRnYEUCmqL0l2pYrXdPAyBLcji
   X1jPyhH0sl/QdPdaUnsigze+
   -----END CERTIFICATE-----
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc
@@ -137,6 +137,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: 
 email: digital.robertson@gmail.com
 executables: []