rxfreadwrite 0.1.5 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a5e0be2ab188873e5b66442a41c9323cb2cdc147479a4f345e0bf8f65a5169
-  data.tar.gz: 789b30722ba41958c2583339ae81517a6b9e15add206257962e46487cd30fafc
+  metadata.gz: '0568a7bd949343da576434a90ace51dc73726e21576d5219ba7be4c00487bdcc'
+  data.tar.gz: 27b26cb4c0b15e42724b97be4d77df4487479684a7e60a0605385370eb5eba45
 SHA512:
-  metadata.gz: c4111afd84565a9548023a8986574548332d3f37f3d7fd09da6ac21df8163ff46feb71142694cd45c001878071d945662ebc29a8b7ba4c6f9976db35c3728c89
-  data.tar.gz: 401e36e30e4f859afa88ef3087a73299546431adb139bb8aef1b04b885d5d41a364784cfcc5c47708d6aeb79c597881ebdf5c864633006c5a3e7717fb5c57396
+  metadata.gz: a6145972b5042a8c8d93be494ffbf300e51ee3e0490b6caa240fee03a85384ba31e1cd9e61ea540d668026ff0a5f2089ffeb20ab5139c1bc7cd802f0fb9be828
+  data.tar.gz: d7d50e11a221b906ed746ed3087c73e692c967f25abe0559c9d9a035cd4afd75df447353083be94f0e5f628b9cbbf7421f3c5a6514286be8bd88cc1502c1d901

data/lib/rxfreadwrite.rb

@@ -3,6 +3,7 @@
 # file: rxfreadwrite.rb
 
 require 'rxfreader'
+require 'drb_fileclient-readwrite'
 
 
 module RXFReadWriteModule
@@ -10,20 +11,44 @@ module RXFReadWriteModule
 
   class DirX
 
+    def self.chdir(s)    RXFReadWrite.chdir(s)    end
     def self.glob(s)     RXFReadWrite.glob(s)     end
     def self.mkdir(s)    RXFReadWrite.mkdir(s)    end
     def self.mkdir_p(s)  RXFReadWrite.mkdir_p(s)  end
 
   end
 
-  def FileX.mkdir(s)      RXFReadWrite.mkdir(s)       end
-  def FileX.mkdir_p(s)    RXFReadWrite.mkdir_p(s)     end
-  def FileX.rm(s)         RXFReadWrite.rm(s)          end
+  def FileX.chdir(s)      RXFReadWrite.chdir(s)   end
+
+  def FileX.directory?(filename)
+
+    type = FileX.filetype(filename)
+
+    filex = case type
+    when :file
+      File
+    when :dfs
+      DfsFile
+    else
+      nil
+    end
+
+    return nil unless filex
+
+    filex.directory? filename
+
+  end
+
+  def FileX.mkdir(s)      RXFReadWrite.mkdir(s)   end
+  def FileX.mkdir_p(s)    RXFReadWrite.mkdir_p(s) end
+  def FileX.rm(s)         RXFReadWrite.rm(s)      end
 
   def FileX.rm_r(s, force: false)
     RXFReadWrite.rm_r(s, force: force)
   end
 
+  def File.rm_rf(s)       RXFReadWrite.rm_rf(s)   end
+
   def FileX.touch(s, mtime: Time.now)
     RXFReadWrite.touch(s, mtime: mtime)
   end
@@ -40,6 +65,29 @@ end
 class RXFReadWrite < RXFReader
   using ColouredText
 
+
+  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:\/\//]
+
+      host = x[/(?<=dfs:\/\/)[^\/]+/]
+      @fs = 'dfs://' + host
+      DfsFile.chdir x
+
+    end
+
+  end
+
   def self.glob(s)
 
     if s[/^dfs:\/\//] then
@@ -124,6 +172,10 @@ class RXFReadWrite < RXFReader
 
   end
 
+  def self.rm_rf(filename)
+    rm_r(filename, force: true)
+  end
+
   def self.touch(filename, mtime: Time.now)
 
     case filename[/^\w+(?=:\/\/)/]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfreadwrite
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,10 +35,30 @@ cert_chain:
   gnYmJHVhKvNaFwL4ryulhkA+n8o3Ve6Kzo/AGlO2+Ge6H0bqIUbS8UisqDa7IwlY
   tvleW582+lzMrpAfWdGb4VFX
   -----END CERTIFICATE-----
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfreader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: drb_fileclient-readwrite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -46,7 +66,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +76,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.0
 description: 
 email: digital.robertson@gmail.com
 executables: []