drb_fileclient 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f07f8b9d2f18919f368565133d3663baabf745cecf413f46deaf71a139b9637c
-  data.tar.gz: b75a6263ef07725cdbc676ecf9597192f3761119b23ebace0c10f4c31046dd66
+  metadata.gz: 7791032610fc48fbc43c098cfb0c008d1c6e542fd3f3ef1ccda1ba64a0b4befc
+  data.tar.gz: c3f863c1476eb6ac680301ec2f896711ba3bb2c9a58414569a282596c53c0773
 SHA512:
-  metadata.gz: 90d3ea8cbd06e091a310a208f1bf8a2c4aa843f44f40c2c28d197bdab3da2c29c3f36743e759456b7ad371032fe95b26e3f5fceac7b44700d816d5a680850ce6
-  data.tar.gz: f030cef9d5ff09292707acd11a5d576ebe38bc273a1dcccc1ea05094f24dd906dc5086b11df6146e51ba12e6b6755ae1a23cc8064037b6836a428d54b5e6d155
+  metadata.gz: 4aa52bb2efab158d0accaff0081dfe6513b593be515b069952c60b4621151d6607c62f57b3ea7549afbeb99413402ea23a47c8dfc42728ef286b72a661471f54
+  data.tar.gz: aa37deba65cc9b8f7db9e98988244d137d52bd71829a812d8ce53548cfcf0d6491589ae674edfdd6379082a94bf0679bb4c0eb2e523e5da04f877c2a16a37431

data/lib/drb_fileclient.rb

@@ -48,13 +48,31 @@ class DRbFileClient
       return FileUtils.cp 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
+      
+      if raw_path[/^dfs:\/\/([^\/]+)/] == raw_path2[/^dfs:\/\/([^\/]+)/] then
+        
+        _, path = parse_path(raw_path)
+        @file, path2 = parse_path(raw_path2)
+        @file.cp path, path
+        
+      else
+        
+        @file, path = parse_path(raw_path)
+        file2, path2 = parse_path(raw_path2)
+        content = @file.read path
+        
+        file2.write path2, content
+
+      end
+      
     else
-      [File.join(@directory, raw_path), File.join(@directory, raw_path2)]
+      
+      @file.cp File.join(@directory, raw_path), 
+          File.join(@directory, raw_path2)
+      
     end 
       
-    @file.cp path, path2
   end   
   
   def exists?(filename=@filename)  
@@ -211,8 +229,8 @@ class DRbFileClient
     host = filename[/(?<=^dfs:\/\/)[^\/:]+/]
     port = filename[/(?<=^dfs:\/\/)[^:]+:(\d+)/,1]  || '61010'
 
-    @file = DRbObject.new nil, "druby://#{host}:#{port}"
-    filename[/(?<=^dfs:\/\/)[^\/]+\/(.*)/,1]          
+    file_server = DRbObject.new nil, "druby://#{host}:#{port}"
+    [file_server, filename[/(?<=^dfs:\/\/)[^\/]+\/(.*)/,1]]
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileclient
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - James Robertson
@@ -30,8 +30,28 @@ cert_chain:
   2aIZ9lf6/AT4LP07t9jB5oYLHlr2nBLIqtPXdJvg5RKKr79CQVmpJ5LCTjwTg9h+
   g1Q=
   -----END CERTIFICATE-----
-date: 2018-08-21 00:00:00.000000000 Z
-dependencies: []
+date: 2018-08-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 description: 
 email: james@jamesrobertson.eu
 executables: []