drb_fileclient-readwrite 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c11f979d3129017d789fb09a7022af2104de1c2fb35d385128a5cf53afe726c9
-  data.tar.gz: b93252e86f9579821ef68b2ec9a6c46be15835210d50ffb30dd53b5b9cfa1b15
+  metadata.gz: 81c907cd7a0b84106eb65ed0c0cffec5529c5842f000995c8d5504d13db63bc2
+  data.tar.gz: e44fec001e94b68e73a9569ecde44fedff79542674ee73769bec909162dadf47
 SHA512:
-  metadata.gz: 63e76494d108d9ceca15c7a51764d2f920c9a3f1305dfa7d8cd167324c579d76b6c35c52046d005ff072c7420852a76933c165a55f5bc811ec07c0c1a8345018
-  data.tar.gz: 25855a03faf8552963945e3a7d765ff8b363fdd936be76159a3b97fc2a394391279d16dfb847577650a9f567d4c4ce2632ebed4457620bfa98aea8145bf8e9ea
+  metadata.gz: 90a356f7fecd376992afdf45d49ce2c041913970add9f90f5f16b1065d47c94f42dde9e8c75429eef30edc3f2fa660f178582f4cc84b5b98b0bdd436c74b44cf
+  data.tar.gz: ceaf0b22f952a19aed844ba7000533406bc8842fe7ea4524b84ee55a226dbb0e88e114fa008b6c0a9b180581cbc16f56f5c0abf850cdee846cac7cccf2bf900d

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-ʦ1���:Q��UbfK�Di?V����(p[UiXsw�B�.I�ab&Ab=&:���0�&���A!`L~V����F�ȹ����w�5��X 0�jR�
-V��a�����i�y���
�ch�L�E���V�K�c��΍c�h���}�����	�Ʀ���!��>s,���K�����^/�Z��Ǻ�L��C��c�v�[��*��՛V�%�o�G��#�F��?�����C��ۅ�Q�P��7�A��~m�,:���;f
-�_�~��Z�������Ũ�C5����3/�(��'���c�nb��x���9쓴�];����ujg��}��-e���
+�L��,|�?
+���C��	��
+��<7]~큀m�d/N���Ƿ+�H���؝_�@�åO��z�y�BZ&��#��S���lŽ5%A��]1�B~#d���},	��riX����F��
�b�\�9*�|��Q)%�ܨG��?���~�_�A�6�f=�L�v1����&?�o��F�����no��,(+C1W�&|����L�Lmj���ok|�ױ��Y�RߗHQ

data/lib/drb_fileclient-readwrite.rb

@@ -8,118 +8,152 @@ require 'drb_fileclient-reader'
 class DRbFileClientReadWrite < DRbFileClientReader
   using ColouredText
 
+  def initialize()
+    @@directory ||= nil
+    @@file ||= nil
+  end
+
   def chdir(raw_path)
+    puts 'inside 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 = 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
+      puts '@@directory:' + @@directory.inspect
     else
       'No such file or directory'
     end
 
   end
 
+  def directory?(filename=@@filename)
+
+    return File.directory? filename unless @@directory or filename =~ /^dfs:\/\//
+
+    if filename =~ /^dfs:\/\// then
+      @@file, filename2 = parse_path(filename)
+    else
+
+      filename2 = File.join(@@directory, filename)
+    end
+
+    @@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)
 
-    return FileUtils.mkdir name unless @directory or name =~ /^dfs:\/\//
+    return FileUtils.mkdir name unless @@directory or name =~ /^dfs:\/\//
 
-    @file, path = parse_path(name)
-    @file.mkdir path
+    @@file, path = parse_path(name)
+    @@file.mkdir path
   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)
+      filepath = File.join(@@directory, raw_path)
     end
 
-    @file.mkdir_p filepath
+    @@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
 
@@ -129,6 +163,10 @@ def DfsFile.chdir(path)
   DRbFileClientReadWrite.new.chdir(path)
 end
 
+def DfsFile.directory?(filename)
+  DRbFileClient.new.directory?(filename)
+end
+
 def DfsFile.glob(s)
   DRbFileClientReadWrite.new.glob(s)
 end
@@ -141,6 +179,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileclient-readwrite
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   ILzVBTpjvSiaWCjFvxvVJFct97WGSbaR2jPvZ03xyAONtWdKkv2yceiyfAMaldSQ
   eftJvciSPh0DHzyI46OGIkLX
   -----END CERTIFICATE-----
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-02-23 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.1
   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.1
 description: 
 email: digital.robertson@gmail.com
 executables: []