rxfreadwrite 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62d72dbfd84621d305b00946635142609412712280a7599af53ef4842cec1a77
-  data.tar.gz: 5b12835da2134372f6264dbc10a0ccb450da111a31d3379d1bd5f1d30f944ba9
+  metadata.gz: 5ce3e2d94948e994649b37b42b231ff4a153b9966b34df1a52b5a4ab384dfe15
+  data.tar.gz: 62b36ab4f5b3a394ad8e022c5bea9cc6f6457411858c4d370c5653a14c6c6977
 SHA512:
-  metadata.gz: '09fa98a6465a9ca7b63b7318732212d6eb0452571db8d66e5c726d5aade15b87c823710eae87074f328a31f2d0bf98209fd5e19fc4ae5f2fe821a71677fd2d83'
-  data.tar.gz: 67f699c23379f6a72ddd8884ebc06a312cf4365798b511344501b25403699e3bf8a30017830d6d226689b28f9539dd1db128c9260ebc75afbfb1137a2de2ae89
+  metadata.gz: a37ea0d264edf3531b18e335b693d6e452d7f7a492e97dbf94211a321a751c53ed9b1880ebc1366fceb1992934e710ba8a733f7bc444675e5c9a6f3ae15a1a01
+  data.tar.gz: fe40d75490bdab065e8146f1de7e60a0b0b0f8c9c636f9bf22cbe80777d013e97a56dec7062a8d223bba4339a2a44d934d0e6d628917dabab7bd12a4ed6f0060

data/lib/rxfreadwrite.rb

@@ -3,81 +3,164 @@
 # file: rxfreadwrite.rb
 
 require 'rxfreader'
+require 'drb_fileclient-readwrite'
 
 
 module RXFReadWriteModule
   include RXFRead
 
-
   class DirX
 
-    def self.glob(s)   RXFReadWrite.glob(s)    end
+    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)
+  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 FileX.touch(s, mtime: Time.now)
+    RXFReadWrite.touch(s, mtime: mtime)
+  end
+
+  def FileX.write(x, s)
+    RXFReadWrite.write(x, s)
+  end
+end
+
+
+class RXFReadWriteException < Exception
+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
 
-    type = FileX.filetype(filename)
+    elsif x[/^dfs:\/\//]
 
-    filex = case type
-    when :file
-      File
-    when :dfs
-      DfsFile
+      host = x[/(?<=dfs:\/\/)[^\/]+/]
+      @fs = 'dfs://' + host
+      DfsFile.chdir x
+
+    end
+
+  end
+
+  def self.glob(s)
+
+    if s[/^dfs:\/\//] then
+      DfsFile.glob(s)
     else
-      nil
+      Dir.glob(s)
     end
 
-    return nil unless filex
+  end
+
+  def self.mkdir(x)
 
-    filex.exists? filename
+    if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
+      FileUtils.mkdir x
+    elsif x[/^dfs:\/\//]
+      DfsFile.mkdir x
+    end
 
   end
 
+  def self.mkdir_p(x)
 
-  def FileX.filetype(x)
+    if x[/^dfs:\/\//] then
+      DfsFile.mkdir_p x
+    else
+      FileUtils.mkdir_p x
+    end
 
-    return :string if x.lines.length > 1
+  end
 
-    case x
-    when /^https?:\/\//
-      :http
-    when /^dfs:\/\//
-      :dfs
-    when /^file:\/\//
-      :file
+  def self.rm(filename)
+
+    case filename[/^\w+(?=:\/\/)/]
+    when 'dfs'
+      DfsFile.rm filename
     else
 
-      if File.exists?(x) then
-        :file
+      if File.basename(filename) =~ /\*/ then
+
+        Dir.glob(filename).each do |file|
+
+          begin
+            FileUtils.rm file
+          rescue
+            puts ('RXFReadWrite#rm: ' + file + ' is a Directory').warning
+          end
+
+        end
+
       else
-        :text
+        FileUtils.rm filename
       end
 
     end
-  end
 
-  def FileX.write(x, s)
-    RXFReadWrite.write(x, s)
   end
-end
 
+  def self.rm_r(filename, force: false)
 
-class RXFReadWriteException < Exception
-end
+    case filename[/^\w+(?=:\/\/)/]
+    when 'dfs'
+      DfsFile.rm_r filename, force: force
+    else
 
-class RXFReadWrite < RXFReader
-  using ColouredText
+      if File.basename(filename) =~ /\*/ then
 
-  def self.glob(s)
+        Dir.glob(filename).each do |file|
 
-    if s[/^dfs:\/\//] then
-      DfsFile.glob(s)
+          begin
+            FileUtils.rm_r file, force: force
+          rescue
+            puts ('RXFReadWrite#rm_r: ' + file + ' is a Directory').warning
+          end
+
+        end
+
+      else
+        FileUtils.rm_r filename, force: force
+      end
+
+    end
+
+  end
+
+  def self.touch(filename, mtime: Time.now)
+
+    case filename[/^\w+(?=:\/\/)/]
+    when 'dfs'
+      DfsFile.touch filename, mtime: mtime
     else
-      Dir.glob(s)
+      FileUtils.touch filename, mtime: mtime
     end
 
   end
+
   def self.write(location, s=nil)
 
     case location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfreadwrite
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,10 +35,30 @@ cert_chain:
   gnYmJHVhKvNaFwL4ryulhkA+n8o3Ve6Kzo/AGlO2+Ge6H0bqIUbS8UisqDa7IwlY
   tvleW582+lzMrpAfWdGb4VFX
   -----END CERTIFICATE-----
-date: 2022-02-20 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: []