rxfreadwrite 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0568a7bd949343da576434a90ace51dc73726e21576d5219ba7be4c00487bdcc'
-  data.tar.gz: 27b26cb4c0b15e42724b97be4d77df4487479684a7e60a0605385370eb5eba45
+  metadata.gz: 2f072cce5e865d662597df89db26a0ad9fce1ceed1458c1c9ca8a40125d44fb6
+  data.tar.gz: 82f22f143b6010841cd1078d2f5e926968bc6be0f6b4ccd0f97b5b8b36e83a3b
 SHA512:
-  metadata.gz: a6145972b5042a8c8d93be494ffbf300e51ee3e0490b6caa240fee03a85384ba31e1cd9e61ea540d668026ff0a5f2089ffeb20ab5139c1bc7cd802f0fb9be828
-  data.tar.gz: d7d50e11a221b906ed746ed3087c73e692c967f25abe0559c9d9a035cd4afd75df447353083be94f0e5f628b9cbbf7421f3c5a6514286be8bd88cc1502c1d901
+  metadata.gz: fc7863e1530a609729b92d7df0ad2f3d4515398ba4bf0f755100b077b393c746c36303f29dfe462dedc8d585095fd26ecb4e73b8c09eeb3915879e52b4225b55
+  data.tar.gz: c27d5699d06c1c86dc611a9537c06b64b8fc1a216f7d060c483407b7075739ad70fa32df0b05f85bdca6d4838095693119ff8b2791d62bff07a3541698f1a225

data/lib/rxfreadwrite.rb

@@ -15,6 +15,7 @@ module RXFReadWriteModule
     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
+    def self.pwd()       RXFReadWrite.pwd()       end
 
   end
 
@@ -39,8 +40,10 @@ module RXFReadWriteModule
 
   end
 
+  def FileX.exists?(s)    RXFReadWrite.exists?(s) end
   def FileX.mkdir(s)      RXFReadWrite.mkdir(s)   end
   def FileX.mkdir_p(s)    RXFReadWrite.mkdir_p(s) end
+  def FileX.pwd()         RXFReadWrite.pwd()      end
   def FileX.rm(s)         RXFReadWrite.rm(s)      end
 
   def FileX.rm_r(s, force: false)
@@ -65,33 +68,74 @@ end
 class RXFReadWrite < RXFReader
   using ColouredText
 
+  @@fs = :local
+
+  # identifies the working file system
+  def self.fs()
+    @@fs
+  end
 
   def self.chdir(x)
 
-    # We can use @fs within chdir() to flag the current file system.
+    # 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
+      @@fs = :local
       FileUtils.chdir x
 
     elsif x[/^dfs:\/\//]
 
       host = x[/(?<=dfs:\/\/)[^\/]+/]
-      @fs = 'dfs://' + host
+      @@fs = 'dfs://' + host
       DfsFile.chdir x
 
     end
 
   end
 
+  def self.exists?(filename)
+    puts 'inside readwrite exists?'
+    type = self.filetype(filename)
+
+    filex = case type
+    when :file
+      File
+    when :dfs
+      DfsFile
+    else
+      nil
+    end
+
+    return nil unless filex
+
+    filex.exists? filename
+
+  end
+
+  def self.filetype(x)
+
+    return :string if x.lines.length > 1
+    return :dfs if @@fs[0..2] == 'dfs'
+    RXFReader.filetype(x)
+
+  end
+
   def self.glob(s)
 
     if s[/^dfs:\/\//] then
-      DfsFile.glob(s)
+
+      basepath = s[/^(dfs:\/\/[^\/]+)/,1]
+      pos = s.length - basepath.length
+
+      DfsFile.glob(s).map do |x|
+        pos2 = x =~ /#{s[pos..-1]}/
+        basepath + x[pos2..-1]
+      end
+
     else
       Dir.glob(s)
     end
@@ -118,6 +162,10 @@ class RXFReadWrite < RXFReader
 
   end
 
+  def self.pwd()
+    DfsFile.pwd
+  end
+
   def self.rm(filename)
 
     case filename[/^\w+(?=:\/\/)/]

metadata

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