drb_fileclient-readwrite 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b75b32f3dacb08f9e07f4e372e8fdefdd593f5091c79a9eea168d92d75e859d4
-  data.tar.gz: fa8f294001ea716daeacac43a9c27ecbd66b30ad9bbb4ecd53968c9eeb8eaebd
+  metadata.gz: cdee5be8a5a8f50bb64bac4b20be6580f95273a95b95efe1fa662df3c5937a9b
+  data.tar.gz: 9bc4201c35a3ae9745c0fb2c8be06237add99f6dea64c38ea51d1dab76d2b058
 SHA512:
-  metadata.gz: b935abfca5cb54d65bc2fecf8fc4545b6e1c185276d44c9fe517d798b675cd34494aac872098d79710c6489cacd65eab186ef60f84506e1c470961b780694a60
-  data.tar.gz: 21edf6b3edc0a65fb5aee6252a3de64097bfa7d34265b3ceae181ceb0b2255f1e4dacaea425e307503d4906a501263299533298236299fb3377b13115dc2afac
+  metadata.gz: 308835d9b6ef51e7ab8f02cc1943057d8168bfaa34d30d1c00d264c8de158d8ec055cb2bfd8f213d98279b5ff05626bed9f8ef7b08fb4f60dd8462fad7fc6405
+  data.tar.gz: 0e2d3ee0d6ec2c0429497b924be7adc7185f7800c6a785f04452ea8ba378dea54b83902c87bcc66aa0a94c90938fa8f939af0f41853386dc4b1f69c5a20eb158

data/lib/drb_fileclient-readwrite.rb

@@ -8,133 +8,173 @@ require 'drb_fileclient-reader'
 class DRbFileClientReadWrite < DRbFileClientReader
   using ColouredText
 
+  def initialize()
+    @@directory ||= nil
+    @@file ||= nil
+    @@uri_prefix ||= nil
+  end
+
   def chdir(raw_path)
 
-    return Dir.chdir raw_path unless @directory or raw_path =~ /^dfs:\/\//
+    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)
+      directory = File.join(@@directory, raw_path)
     end
 
-    if @file.exists? directory then
-      @directory = directory
+    if @@file.exists? directory then
+      @@directory = directory
     else
       'No such file or directory'
     end
 
   end
 
-  def directory?(filename=@filename)
+  def directory?(filename=@@filename)
 
-    return File.directory? filename unless @directory or filename =~ /^dfs:\/\//
+    return File.directory? filename unless @@directory or filename =~ /^dfs:\/\//
 
     if filename =~ /^dfs:\/\// then
-      @file, filename2 = parse_path(filename)
+      @@file, filename2 = parse_path(filename)
     else
 
-      filename2 = File.join(@directory, filename)
+      filename2 = File.join(@@directory, filename)
     end
 
-    @file.directory?(filename2)
+    @@file.directory?(filename2)
 
   end
 
   def glob(s)
 
     if s =~ /^dfs:\/\// then
-      @file, s2 = parse_path(s)
+      @@file, s2 = parse_path(s)
     else
-      s2 = File.join(@directory, s)
+      s2 = File.join(@@directory, s)
     end
 
-    @file.glob s2
+    @@file.glob s2
 
   end
 
-  def mkdir(name)
+  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
 
-    return FileUtils.mkdir name unless @directory or name =~ /^dfs:\/\//
+      if @@uri_prefix then
+        @@file, filepath = parse_path(File.join(@@uri_prefix, @@directory,
+                                                raw_path))
+      else
+        filepath = File.join(@@directory, raw_path)
+      end
 
-    @file, path = parse_path(name)
-    @file.mkdir path
+    end
+
+    @@file.mkdir filepath
   end
 
   def mkdir_p(raw_path)
 
-    unless @directory or raw_path =~ /^dfs:\/\// then
+    unless @@directory or raw_path =~ /^dfs:\/\// then
       return FileUtils.mkdir_p raw_path
     end
 
     if raw_path =~ /^dfs:\/\// then
-      @file, filepath = parse_path(raw_path)
+      @@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
 
-    @file.mkdir_p filepath
+    puts 'drb_fileclient-readwrite inside mkdir_p: ' + filepath.inspect
+    @@file.mkdir_p filepath
+  end
+
+  def pwd()
+
+    puts 'inside pwd'
+    puts '@@directory: ' + @@directory.inspect
+    puts '@@file: ' + @@file.inspect
+
+    return Dir.pwd unless @@directory
+
+    '/' + @@directory if @@file
+
   end
 
   def rm(path)
 
-    return FileUtils.rm path unless @directory or path =~ /^dfs:\/\//
+    return FileUtils.rm path unless @@directory or path =~ /^dfs:\/\//
 
     if path =~ /^dfs:\/\// then
-      @file, path2 = parse_path( path)
+      @@file, path2 = parse_path( path)
     else
-      path2 = File.join(@directory, path)
+      path2 = File.join(@@directory, path)
     end
 
-    @file.rm  path2
+    @@file.rm  path2
 
   end
 
   def rm_r(path, force: false)
 
-    unless @directory or path =~ /^dfs:\/\// then
+    unless @@directory or path =~ /^dfs:\/\// then
       return FileUtils.rm_r(path, force: force)
     end
 
     if path =~ /^dfs:\/\// then
-      @file, path2 = parse_path( path)
+      @@file, path2 = parse_path( path)
     else
-      path2 = File.join(@directory, path)
+      path2 = File.join(@@directory, path)
     end
 
-    @file.rm_r(path2, force: force)
+    @@file.rm_r(path2, force: force)
 
   end
 
   def touch(s, mtime: Time.now)
 
-    unless @directory or s =~ /^dfs:\/\// then
+    unless @@directory or s =~ /^dfs:\/\// then
       return FileUtils.touch(s, mtime: mtime)
     end
 
     if s =~ /^dfs:\/\// then
-      @file, s2 = parse_path(s)
+      @@file, s2 = parse_path(s)
     else
-      s2 = File.join(@directory, s)
+      s2 = File.join(@@directory, s)
     end
 
-    @file.touch s2, mtime: mtime
+    @@file.touch s2, mtime: mtime
 
   end
 
-  def write(filename=@filename, s)
+  def write(filename=@@filename, s)
 
-    return File.write filename, s unless @directory or filename =~ /^dfs:\/\//
+    return File.write filename, s unless @@directory or filename =~ /^dfs:\/\//
 
     if filename =~ /^dfs:\/\// then
-      @file, path = parse_path(filename)
+      @@file, path = parse_path(filename)
     else
-      path = File.join(@directory, filename)
+      path = File.join(@@directory, filename)
     end
 
-    @file.write path, s
+    @@file.write path, s
 
   end
 
@@ -145,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)
@@ -160,6 +200,10 @@ def DfsFile.mkdir_p(filename)
   DRbFileClientReadWrite.new.mkdir_p(filename)
 end
 
+def DfsFile.pwd()
+  DRbFileClientReadWrite.new.pwd()
+end
+
 def DfsFile.rm(filename)
   DRbFileClientReadWrite.new.rm(filename)
 end

data.tar.gz.sig

@@ -1,6 +1 @@
-_w�z&I���L�
-�6]�}mT\�_7�rTf/�l�]j`���r|TK�D�����̩˨�G
-��Z��Rn9v���L��5��F?�2Q���X��ĺ�
-��2��Ԕ�I��!0Ӆ+��j�F!�Q�/n�ea�h�s�{o
-k���?��D�>�0���W
-o���9��U��j%��*<?p����<Q4��;U���ކd_s�#W5�^�Z�x�3�Uw�V�s���%��x��G;CJ}X�&&�������p��ۤ��*�p��>�e8�aY�l���)/@��Iә��pQ�A�l�r>h�g6XPm��W!z~ ]?�L�(c�,��&�L�8~f��_9(���?�
+ŧU�^h~L��:K��4��6��D'�ŕL��/~�-]'���6��k�1�����S}��<�D��*Ml�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileclient-readwrite
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  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.0
+        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.0
+        version: 0.1.3
 description: 
 email: digital.robertson@gmail.com
 executables: []