drb_fileclient 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7791032610fc48fbc43c098cfb0c008d1c6e542fd3f3ef1ccda1ba64a0b4befc
-  data.tar.gz: c3f863c1476eb6ac680301ec2f896711ba3bb2c9a58414569a282596c53c0773
+  metadata.gz: aac4c5bf2603750af085ade9036fd20874b0cca8cbfbbb36e51a774c5943cc3f
+  data.tar.gz: fb4483969bc3717fa84838f2a636de99c8b97f8e0e56b3736190b7f9a4ec5250
 SHA512:
-  metadata.gz: 4aa52bb2efab158d0accaff0081dfe6513b593be515b069952c60b4621151d6607c62f57b3ea7549afbeb99413402ea23a47c8dfc42728ef286b72a661471f54
-  data.tar.gz: aa37deba65cc9b8f7db9e98988244d137d52bd71829a812d8ce53548cfcf0d6491589ae674edfdd6379082a94bf0679bb4c0eb2e523e5da04f877c2a16a37431
+  metadata.gz: f697ca6f319dda244a197c48911f91697b17c7deaf920d54ec03bcbc04ff31ad1236f3e547370d16635baa2ef70eabbce2c10b3767828316bd44a3a4cc1cbad8
+  data.tar.gz: 0ae4f1f63619bf461d5e39fa602194f2cbe24c81d742a01ae9c8d91dd17ee8b376fc13a0ec3929b2eb43fc2eb74af63028e72ca39a4021fc24d3a0f85b61c35a

data/lib/drb_fileclient.rb

@@ -26,12 +26,12 @@ class DRbFileClient
     
     return Dir.chdir raw_path unless @directory or raw_path =~ /^dfs:\/\//
     
-    directory = if raw_path[0] == '/'  then
-      raw_path[1..-1]
+    if raw_path[0] == '/'  then
+      directory = raw_path[1..-1]
     elsif raw_path =~ /^dfs:\/\//
-      parse_path(raw_path)
+      @file, directory = parse_path(raw_path)
     else      
-      File.join(@directory, raw_path)
+      directory = File.join(@directory, raw_path)
     end    
     
     if @file.exists? directory then
@@ -79,11 +79,11 @@ class DRbFileClient
     
     return File.exists? filename unless @directory or filename =~ /^dfs:\/\//
     
-    filename2 = if filename =~ /^dfs:\/\// then
-      parse_path(filename)
+    if filename =~ /^dfs:\/\// then
+      @file, filename2 = parse_path(filename)
     else
 
-      File.join(@directory, filename)
+      filename2 = File.join(@directory, filename)
     end
 
     @file.exists?(filename2)
@@ -96,12 +96,12 @@ class DRbFileClient
     
     return Dir[raw_path] unless @directory or raw_path =~ /^dfs:\/\//
     
-    path = if raw_path[0] == '/'  then
-      raw_path[1..-1]
+    if raw_path[0] == '/'  then
+      path = raw_path[1..-1]
     elsif raw_path =~ /^dfs:\/\//
-      parse_path(raw_path)
+      @file, path = parse_path(raw_path)
     else      
-      File.join(@directory, raw_path)
+      path = File.join(@directory, raw_path)
     end    
     
     @file.ls path
@@ -112,7 +112,7 @@ class DRbFileClient
     
     return FileUtils.mkdir name unless @directory or name =~ /^dfs:\/\//
     
-    path = parse_path(name)
+    @file, path = parse_path(name)
     @file.mkdir path
   end
   
@@ -122,10 +122,10 @@ class DRbFileClient
       return FileUtils.mkdir_p raw_path 
     end    
     
-    filepath = if raw_path =~ /^dfs:\/\// then
-      parse_path(raw_path)
+    if raw_path =~ /^dfs:\/\// then
+      @file, filepath = parse_path(raw_path)
     else
-      File.join(@directory, raw_path)
+      filepath = File.join(@directory, raw_path)
     end
     
     @file.mkdir_p filepath
@@ -137,10 +137,12 @@ class DRbFileClient
       return FileUtils.mv raw_path, raw_path2  
     end
     
-    path, path2 = if raw_path =~ /^dfs:\/\// then
-      [parse_path(raw_path), parse_path(raw_path2)]
+    if raw_path =~ /^dfs:\/\// then
+      _, path = parse_path(raw_path)
+      @file, path2 = parse_path(raw_path2)
     else
-      [File.join(@directory, raw_path), File.join(@directory, raw_path2)]
+      path = File.join(@directory, raw_path)
+      path2 = File.join(@directory, raw_path2)
     end 
       
     @file.mv path, path2
@@ -158,10 +160,10 @@ class DRbFileClient
     
     return File.read filename, s unless @directory or filename =~ /^dfs:\/\//
     
-    path = if filename =~ /^dfs:\/\// then
-      parse_path(filename)
+    if filename =~ /^dfs:\/\// then
+      @file, path = parse_path(filename)
     else
-      File.join(@directory, filename)
+      path = File.join(@directory, filename)
     end
     
     @file.read path
@@ -171,10 +173,10 @@ class DRbFileClient
     
     return FileUtils.rm path unless @directory or path =~ /^dfs:\/\//
     
-    path2 = if path =~ /^dfs:\/\// then
-      parse_path( path)
+    if path =~ /^dfs:\/\// then
+      @file, path2 = parse_path( path)
     else
-      File.join(@directory, path)
+      path2 = File.join(@directory, path)
     end
       
     @file.rm  path2
@@ -185,13 +187,12 @@ class DRbFileClient
         
     return File.write filename, s unless @directory or filename =~ /^dfs:\/\//
     
-    path = if filename =~ /^dfs:\/\// then
-      parse_path(filename)
+    if filename =~ /^dfs:\/\// then
+      @file, path = parse_path(filename)
     else
-      File.join(@directory, filename)
+      path = File.join(@directory, filename)
     end
     
-    
     @file.write path, s     
     
   end
@@ -212,10 +213,10 @@ class DRbFileClient
       
     end
     
-    filepath = if filename_zip =~ /^dfs:\/\// then
-      parse_path(filename_zip)
+    if filename_zip =~ /^dfs:\/\// then
+      @file, filepath = parse_path(filename_zip)
     else
-      File.join(@directory, filename_zip)
+      filepath = File.join(@directory, filename_zip)
     end
 
     @file.zip filepath, a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileclient
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - James Robertson