drb_fileclient 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2acd6009e3a7703f659abb25bfa4ec482669bede
-  data.tar.gz: 58e4aa65be961f907f19c8ba5bcf9476b0351bce
+SHA256:
+  metadata.gz: b2a277d060d30cdf5174b0d76f89a0cec60e6ff399f183165022b584e4ec1fbe
+  data.tar.gz: 4393a67153df3e323ae422f6d9acac44aed1cc6f32a9037571fb0a735191cd49
 SHA512:
-  metadata.gz: 01dd234914af6e493790eeb66787fbcca94278cd27bf0a4942bf8f5619c99ae7d345122adbf1b909fccb1b8082d93288e4cbe3215c71340f807b207102b70ebd
-  data.tar.gz: 03aaf68ad10862a095409a1080f44e3c35d85897cd25c816c58d90de7a8c2d9ccbe3598ed6302bdbb3265c8a22d441fa4186b269bb74d502d5d6cffde2dfc72e
+  metadata.gz: 16593a3b669406cb2b2ee8f6d6ed53240110ef8fc51ee7cd0ecbc88f079b6273b77901add42949d8ec9aa60d5975fa3d6140bec222d03e331a948cdc3f0a5991
+  data.tar.gz: 33b4810bfbbb01403fd8153ea9af854e806f2196822b27a687230b1861c52c59073f67ff8593ff966e90283f520df6710b655f49fac7370ab77673bc58ed8fe4

data/lib/drb_fileclient.rb

@@ -13,72 +13,127 @@ class DRbFileClient
       
       host = location[/(?<=^dfs:\/\/)[^\/:]+/]
       port = location[/(?<=^dfs:\/\/)[^:]+:(\d+)/,1]  || '61010'
-      @filename = location[/(?<=^dfs:\/\/)[^\/]+\/(.*)/,1]
+      @directory = location[/(?<=^dfs:\/\/)[^\/]+\/(.*)/,1]
       
     end
     
     DRb.start_service
-
-    # attach to the DRb server via a URI given on the command line
-    @file = DRbObject.new nil, "druby://#{host}:#{port}" if host
     
   end
   
+  def chdir(raw_path)
+    
+    directory = if raw_path[0] == '/'  then
+      raw_path[1..-1]
+    elsif raw_path =~ /^dfs:\/\//
+      parse_path(raw_path)
+    else      
+      File.join(@directory, raw_path)
+    end    
+    
+    if @file.exists? directory then
+      @directory = directory
+    else
+      'No such file or directory'
+    end
+    
+  end  
+  
   def exists?(filename=@filename)  
     
-    filename2 = parse_path(filename)
-    @file.exists? filename2
+    filename2 = if filename =~ /^dfs:\/\// then
+      parse_path(filename)
+    else
+      filename
+    end
+
+    @file.exists? File.join(@directory, filename2)
     
   end
+  
+  def mkdir(name)
+    path = parse_path(name)
+    @file.mkdir path
+  end
+  
+  def mkdir_p(raw_path)
+    path = parse_path(raw_path)
+    @file.mkdir_p path
+  end  
+  
+  def pwd()
+    
+    '/' + @directory if @file
+    
+  end  
 
   def read(filename=@filename)
     
-    filename2 = parse_path(filename)
-    @file.read filename2
+    path = if filename =~ /^dfs:\/\// then
+      parse_path(filename)
+    else
+      File.join(@directory, filename)
+    end
     
+    @file.read path
   end
   
   def write(filename=@filename, s)
+        
+    path = if filename =~ /^dfs:\/\// then
+      parse_path(filename)
+    else
+      File.join(@directory, filename)
+    end
     
-    filename2 = parse_path(filename)
-    @file.write filename2, s
+    @file.write path, s     
     
   end
 
   private
   
   def parse_path(filename)
-    
-    if @file then
-      
-      filename
-      
-    else
-      
-      host = filename[/(?<=^dfs:\/\/)[^\/:]+/]
-      port = filename[/(?<=^dfs:\/\/)[^:]+:(\d+)/,1]  || '61010'
 
-      @file = DRbObject.new nil, "druby://#{host}:#{port}"
-      filename[/(?<=^dfs:\/\/)[^\/]+\/(.*)/,1]      
-      
-    end    
-    
+    host = filename[/(?<=^dfs:\/\/)[^\/:]+/]
+    port = filename[/(?<=^dfs:\/\/)[^:]+:(\d+)/,1]  || '61010'
+
+    @file = DRbObject.new nil, "druby://#{host}:#{port}"
+    filename[/(?<=^dfs:\/\/)[^\/]+\/(.*)/,1]          
+
   end
 
 end 
 
 class DfsFile
   
+  @client = DRbFileClient.new
+  
   def self.exists?(filename)
-    DRbFileClient.new(filename).exists?
+    @client.exists?(filename)
   end
   
+  def self.chdir(path)
+    @client.chdir(path)
+  end    
+    
+  def self.mkdir(name)
+    @client.mkdir(name)
+  end  
+  
+  def self.mkdir_p(path)
+    @client.mkdir_p(path)
+  end       
+  
+  def self.pwd()
+    @client.pwd()
+  end     
+  
   def self.read(filename)
-    DRbFileClient.new.read(filename)
+    @client.read(filename)
   end
   
   def self.write(filename, s)
-    DRbFileClient.new.write(filename, s)
+    @client.write(filename, s)
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileclient
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   2aIZ9lf6/AT4LP07t9jB5oYLHlr2nBLIqtPXdJvg5RKKr79CQVmpJ5LCTjwTg9h+
   g1Q=
   -----END CERTIFICATE-----
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Reads or writes files from a remote DRb server. Simple as DfsFile.read  or