rxfreadwrite 0.1.4 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f590af109926771c33146cd9d67028c7265dc21b1325d73db1030ffe9b986c60
-  data.tar.gz: 98b4786889d566036dd90f2fe2f742f88a9aca70bb1d2a90b494d932e9728bc9
+  metadata.gz: ce12d520fd0882b7a49194ef341ff80d14551b9d3a32773605f74a3203a0bdda
+  data.tar.gz: 60579f92af1b9bd7e430521d22de70be7ae40f1d646e878decc0e66b56fe1ca8
 SHA512:
-  metadata.gz: c4fa55f10256f185dbf553ae60b089536481f35211ba69cfe78fed0242f79144c4dd3d31d5af969209e2eb9c8c3ba071ef263009977de7c1a97d4e825e31d1f5
-  data.tar.gz: f79b56d926a4020edebfc687863d38e2ed7d92da233d6e0b36856a9d8d12df9f04e08e7933d9f99687112a26a5bf76e59d40ffa1c38515fd7cd18746cb34f3a2
+  metadata.gz: 26a3ac804405987b43ca015325c8b24e8d03db18713905e381f3631152f0c3f370e4ed9b372affea51106d222beafefd410f2f654690193e4c17c60507afd864
+  data.tar.gz: e6759d75ea0ec5009d0662ab46007cd4cc0c3a8f53d0c827f3f9aa160478b2c0e70ec4828b70c14ac35e59433533f095d685385aecc56339a566809de67a91b7

data/lib/rxfreadwrite.rb

@@ -3,71 +3,32 @@
 # file: rxfreadwrite.rb
 
 require 'rxfreader'
+require 'drb_fileclient-readwrite'
 
 
 module RXFReadWriteModule
   include RXFRead
 
-
   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.exists?(filename)
-
-    type = FileX.filetype(filename)
-
-    filex = case type
-    when :file
-      File
-    when :dfs
-      DfsFile
-    else
-      nil
-    end
-
-    return nil unless filex
-
-    filex.exists? filename
-
-  end
-
-
-  def FileX.filetype(x)
-
-    return :string if x.lines.length > 1
-
-    case x
-    when /^https?:\/\//
-      :http
-    when /^dfs:\/\//
-      :dfs
-    when /^file:\/\//
-      :file
-    else
-
-      if File.exists?(x) then
-        :file
-      else
-        :text
-      end
-
-    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.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
@@ -84,6 +45,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
@@ -168,6 +152,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.4
+  version: 0.2.1
 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-22 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: []