drb_fileclient-readwrite 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c907cd7a0b84106eb65ed0c0cffec5529c5842f000995c8d5504d13db63bc2
-  data.tar.gz: e44fec001e94b68e73a9569ecde44fedff79542674ee73769bec909162dadf47
+  metadata.gz: cdee5be8a5a8f50bb64bac4b20be6580f95273a95b95efe1fa662df3c5937a9b
+  data.tar.gz: 9bc4201c35a3ae9745c0fb2c8be06237add99f6dea64c38ea51d1dab76d2b058
 SHA512:
-  metadata.gz: 90a356f7fecd376992afdf45d49ce2c041913970add9f90f5f16b1065d47c94f42dde9e8c75429eef30edc3f2fa660f178582f4cc84b5b98b0bdd436c74b44cf
-  data.tar.gz: ceaf0b22f952a19aed844ba7000533406bc8842fe7ea4524b84ee55a226dbb0e88e114fa008b6c0a9b180581cbc16f56f5c0abf850cdee846cac7cccf2bf900d
+  metadata.gz: 308835d9b6ef51e7ab8f02cc1943057d8168bfaa34d30d1c00d264c8de158d8ec055cb2bfd8f213d98279b5ff05626bed9f8ef7b08fb4f60dd8462fad7fc6405
+  data.tar.gz: 0e2d3ee0d6ec2c0429497b924be7adc7185f7800c6a785f04452ea8ba378dea54b83902c87bcc66aa0a94c90938fa8f939af0f41853386dc4b1f69c5a20eb158

data/lib/drb_fileclient-readwrite.rb

@@ -11,24 +11,23 @@ class DRbFileClientReadWrite < DRbFileClientReader
   def initialize()
     @@directory ||= nil
     @@file ||= nil
+    @@uri_prefix ||= nil
   end
 
   def chdir(raw_path)
-    puts 'inside chdir: ' + raw_path
 
     return Dir.chdir raw_path unless @@directory or raw_path =~ /^dfs:\/\//
 
     if raw_path[0] == '/'  then
       directory = raw_path[1..-1]
     elsif raw_path =~ /^dfs:\/\//
-      @@file, directory = parse_path(raw_path)
+      @@file, directory, @@uri_prefix = parse_path(raw_path)
     else
       directory = File.join(@@directory, raw_path)
     end
 
     if @@file.exists? directory then
       @@directory = directory
-      puts '@@directory:' + @@directory.inspect
     else
       'No such file or directory'
     end
@@ -62,12 +61,26 @@ class DRbFileClientReadWrite < DRbFileClientReader
 
   end
 
-  def mkdir(name)
+  def mkdir(raw_path)
 
-    return FileUtils.mkdir name unless @@directory or name =~ /^dfs:\/\//
+    unless @@directory or raw_path =~ /^dfs:\/\// then
+      return FileUtils.mkdir raw_path
+    end
+
+    if raw_path =~ /^dfs:\/\// then
+      @@file, filepath = parse_path(raw_path)
+    else
 
-    @@file, path = parse_path(name)
-    @@file.mkdir path
+      if @@uri_prefix then
+        @@file, filepath = parse_path(File.join(@@uri_prefix, @@directory,
+                                                raw_path))
+      else
+        filepath = File.join(@@directory, raw_path)
+      end
+
+    end
+
+    @@file.mkdir filepath
   end
 
   def mkdir_p(raw_path)
@@ -79,9 +92,17 @@ class DRbFileClientReadWrite < DRbFileClientReader
     if raw_path =~ /^dfs:\/\// then
       @@file, filepath = parse_path(raw_path)
     else
-      filepath = File.join(@@directory, raw_path)
+
+      if @@uri_prefix then
+        @@file, filepath = parse_path(File.join(@@uri_prefix, @@directory,
+                                                raw_path))
+      else
+        filepath = File.join(@@directory, raw_path)
+      end
+
     end
 
+    puts 'drb_fileclient-readwrite inside mkdir_p: ' + filepath.inspect
     @@file.mkdir_p filepath
   end
 
@@ -164,7 +185,7 @@ def DfsFile.chdir(path)
 end
 
 def DfsFile.directory?(filename)
-  DRbFileClient.new.directory?(filename)
+  DRbFileClientReadWrite.new.directory?(filename)
 end
 
 def DfsFile.glob(s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileclient-readwrite
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   ILzVBTpjvSiaWCjFvxvVJFct97WGSbaR2jPvZ03xyAONtWdKkv2yceiyfAMaldSQ
   eftJvciSPh0DHzyI46OGIkLX
   -----END CERTIFICATE-----
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb_fileclient-reader
@@ -46,7 +46,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 description: 
 email: digital.robertson@gmail.com
 executables: []