drb_fileclient-readwrite 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c907cd7a0b84106eb65ed0c0cffec5529c5842f000995c8d5504d13db63bc2
-  data.tar.gz: e44fec001e94b68e73a9569ecde44fedff79542674ee73769bec909162dadf47
+  metadata.gz: 11f863ffc1e5882397908738f13dcf6b4bbe6f14ef16480393412c40c35f2249
+  data.tar.gz: 5360addc8ee8e86209eaa8fb5afe091b43d8aea9c144c09a93353b64999add3c
 SHA512:
-  metadata.gz: 90a356f7fecd376992afdf45d49ce2c041913970add9f90f5f16b1065d47c94f42dde9e8c75429eef30edc3f2fa660f178582f4cc84b5b98b0bdd436c74b44cf
-  data.tar.gz: ceaf0b22f952a19aed844ba7000533406bc8842fe7ea4524b84ee55a226dbb0e88e114fa008b6c0a9b180581cbc16f56f5c0abf850cdee846cac7cccf2bf900d
+  metadata.gz: 5be78797ca064ded5e1b359ac679d01d8036fdcc308b7c1af03d12d74fdc28560a68da3a64997d0aca1e832ecf0ff4e8f7fa3b11d35f3e55cd2653b358c1df0d
+  data.tar.gz: ac703e2321fe21d8969e6c9e4d940f87778147254a482f46be64ee0d0fe7fef65b4a7cf9e7a163a5ce6fe8238d5ef0379815a50b50ae0a9e33534cf1fe35dfb7

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
+    if @@file.exist? directory then
       @@directory = directory
-      puts '@@directory:' + @@directory.inspect
     else
       'No such file or directory'
     end
@@ -61,27 +60,49 @@ class DRbFileClientReadWrite < DRbFileClientReader
     @@file.glob s2
 
   end
+  
+  def mkdir(raw_path)
+    
+    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
 
-  def mkdir(name)
+      if @@uri_prefix then
+        @@file, filepath = parse_path(File.join(@@uri_prefix, @@directory,
+                                                raw_path))
+      else
+        filepath = File.join(@@directory, raw_path)
+      end
 
-    return FileUtils.mkdir name unless @@directory or name =~ /^dfs:\/\//
+    end
 
-    @@file, path = parse_path(name)
-    @@file.mkdir path
+    @@file.mkdir filepath
   end
-
+  
   def mkdir_p(raw_path)
-
+    
     unless @@directory or raw_path =~ /^dfs:\/\// then
-      return FileUtils.mkdir_p raw_path
-    end
-
+      return FileUtils.mkdir_p raw_path 
+    end    
+    
     if raw_path =~ /^dfs:\/\// then
       @@file, filepath = parse_path(raw_path)
     else
-      filepath = File.join(@@directory, raw_path)
-    end
 
+      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
 
@@ -96,20 +117,20 @@ class DRbFileClientReadWrite < DRbFileClientReader
     '/' + @@directory if @@file
 
   end
-
+  
   def rm(path)
-
+    
     return FileUtils.rm path unless @@directory or path =~ /^dfs:\/\//
-
+    
     if path =~ /^dfs:\/\// then
       @@file, path2 = parse_path( path)
     else
       path2 = File.join(@@directory, path)
     end
-
+      
     @@file.rm  path2
-
-  end
+    
+  end    
 
   def rm_r(path, force: false)
 
@@ -142,31 +163,31 @@ class DRbFileClientReadWrite < DRbFileClientReader
     @@file.touch s2, mtime: mtime
 
   end
-
+  
   def write(filename=@@filename, s)
-
+        
     return File.write filename, s unless @@directory or filename =~ /^dfs:\/\//
-
+    
     if filename =~ /^dfs:\/\// then
       @@file, path = parse_path(filename)
     else
       path = File.join(@@directory, filename)
     end
-
+    
     @@file.write path, s
-
+    
   end
 
-end
+end 
 
 def DfsFile.chdir(path)
   DRbFileClientReadWrite.new.chdir(path)
 end
 
 def DfsFile.directory?(filename)
-  DRbFileClient.new.directory?(filename)
+  DRbFileClientReadWrite.new.directory?(filename)
 end
-
+  
 def DfsFile.glob(s)
   DRbFileClientReadWrite.new.glob(s)
 end

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.8
 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: 2023-01-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.6
   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.6
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -83,7 +83,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: A DRb file reader and writer client to access the DRb_fileserver service.