rxfreadwrite 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a413b0dff84c4e2bcbad1dd82fc0050ee3528a90c8ec47cd0cc5c80dec1d61cb
-  data.tar.gz: 8a348a14dcafca0f419327e67ffe4a2bdbfc684125778726805c45dd64f75cba
+  metadata.gz: 105da8f9e3330a77c1c273dc69436ae00f0f6d5542985f6c6e6d5f5406d0e869
+  data.tar.gz: f11935bba72bac57e3f0de3239f51daa4df6401ce3e4ac914bcc1b278e67174c
 SHA512:
-  metadata.gz: 2f13199d4ac7d9cde364173b822281c80f73445806413c7fd6d2172de1a1bbe2ea5f3e4ce3981305b55f5ee266e397267ca04e0f66b397e5bbb1580275fc4884
-  data.tar.gz: ecfc56805572a2dd2571c4bdf866effb587b0f85583579ae99a5a7f2009f11b7acfd6572f87255d6b4bbe9b9a1273a72f5b99619b6ddc0efba0bb31fb6396a3a
+  metadata.gz: c0cd7c3ea7a12f2229843bac64b36f99c35fbf4d511b42c4b0c62fdc5e48e6459f110a49d770c20b2188fc63d9c766636aacba9f99b271a0c7282795668d247a
+  data.tar.gz: 453e21fb3744a626221591773696849eb800ad2613f026f5808c48d2c3e68233f01bf64c40459510ac6911fafb11909a3849b6e22eee55488e3029bf22d0b015

data/lib/rxfreadwrite.rb

@@ -40,7 +40,8 @@ module RXFReadWriteModule
 
   end
 
-  def FileX.exists?(s)    RXFReadWrite.exists?(s) end
+  def FileX.exist?(s)    RXFReadWrite.exist?(s)   end
+  def FileX.exists?(s)    RXFReadWrite.exist?(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
@@ -82,7 +83,7 @@ class RXFReadWrite < RXFReader
     # of explicitly stating the path each time. e.g. touch 'foo.txt'
     #
 
-    if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
+    if x[/^file:\/\//] or File.exist?(File.dirname(x)) then
 
       @@fs = :local
       FileUtils.chdir x
@@ -97,8 +98,8 @@ class RXFReadWrite < RXFReader
 
   end
 
-  def self.exists?(filename)
-
+  def self.exist?(filename)
+    #puts 'inside readwrite exists?'
     type = self.filetype(filename)
 
     filex = case type
@@ -112,9 +113,13 @@ class RXFReadWrite < RXFReader
 
     return nil unless filex
 
-    filex.exists? filename
+    filex.exist? filename
 
   end
+  
+  def self.exists?(filename)
+    self.exist?(filename)
+  end
 
   def self.filetype(x)
 
@@ -127,7 +132,15 @@ class RXFReadWrite < RXFReader
   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
@@ -136,7 +149,7 @@ class RXFReadWrite < RXFReader
 
   def self.mkdir(x)
 
-    if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
+    if x[/^file:\/\//] or File.exist?(File.dirname(x)) then
       FileUtils.mkdir x
     elsif x[/^dfs:\/\//]
       DfsFile.mkdir x
@@ -236,7 +249,7 @@ class RXFReadWrite < RXFReader
 
     else
 
-      if DfsFile.exists?(File.dirname(location)) then
+      if DfsFile.exist?(File.dirname(location)) then
         DfsFile.write location, s
       else
         File.write(location, s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfreadwrite
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   gnYmJHVhKvNaFwL4ryulhkA+n8o3Ve6Kzo/AGlO2+Ge6H0bqIUbS8UisqDa7IwlY
   tvleW582+lzMrpAfWdGb4VFX
   -----END CERTIFICATE-----
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2023-01-19 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.4
+        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.4
+        version: 0.1.6
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Read and write files from remote locations (using the DFS protocol) as well