drb_fileserver_plus 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a343182e14b15cd40f4d6ada733281b605d7dfb7f174acb852b43877b748d0c
-  data.tar.gz: 40c2706d369d419221e20e4253e9e6a60b5c84a33afeafc6abaf49d55678cb44
+  metadata.gz: 17d1dddceaf3c825e2da89a9a9dc96ac2d86fab7839d44a544af74db8a7581f2
+  data.tar.gz: f9d8147a5c84c69427292c23d4dece3fb0902da8d7d2ae1c4abba65e4df6793b
 SHA512:
-  metadata.gz: 63e58db0c8d5c62d1d729f5f2ff4eaef82df0973bb49bb1f1f92615a33383b5c8f499c7a7751372adb9f28f2ae4db08321c3757d9cb917f6b4f94a12170c4237
-  data.tar.gz: 0552fe49e183609e497e57f20be29856ddf987ccc93dbd23839de186d4d147912abc0bc91fc59abaf6a5adce63adeca64b4d890ec723bbfd030294ec313e2213
+  metadata.gz: 28f129af88a0a6c18c87758830a6e92ae33a707ac7f24c91fb90e4fef6ffdba9ce3da22bce4cb7a05bd11c7233835599f543dfa84a96dd0bca53aefb0e8653cb
+  data.tar.gz: f1bfc398a716f146db25d51d8355627f79d549899370e87b47368a5ca601883806b1065fc3799c86ba1a36bdd2d3b8ca180ed4d7cd37da0b15e3af4c90b6beb0

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-z���W`����Q�@��	�:�Z*c��b�(px�hm��.�.�)�Д(��=�a�i���Ctb��odSCa�)5��&��q�g)B�/��~��3�D)�wcI� 0������>m��p�
-�v\�;ܛZwD[�L��S��z��M�3�]���O�H����'���p͟K�������
-�0�)����ʍ��v�:`����i��S:���2N%dT�����u8k�Ay�Jl}�̕�#Dzb�It����1}�P��8v�H�
+:��|�+��Gx�u����ڗw��Ɣ|��7
@�Pѳ9
+}�e%���ŧ׈\�#�� 1����	��\xS�<��HI�Y�6�7ڜ>�G%��6�%���6/&N`Ս�����̬Y�yT��g�G����vp&���_�5zŬ�����È�d�؍y�`F	W��&s/?�z\���E�,��)����%�mf4Z��/�ۖ��<�x�h�u�h�S?�lr���D��vt

data/lib/drb_fileserver_plus.rb

@@ -10,105 +10,147 @@ require 'drb_fileclient'
 
 
 class DRbFileServer
+  
+  attr_accessor :nodes
 
   def initialize(nodes, sps: nil, topic: 'file')
     
-    @nodes = nodes.map {|x| 'dfs://' + x}
+    @nodes = nodes
     @failcount = 0
     @sps, @topic = sps, topic
     
   end
   
   def cp(path, path2)
+       
+    node = ''
     
     file_op do |f|
-      f.cp File.join(@nodes.first, path), File.join(@nodes.first, path2)
+      node = 'dfs://' + @nodes.first      
+      f.cp File.join(node, path), File.join(node, path2)
     end
     
     if @sps then
-      @sps.notice "%s/copy: %s %s" % [@topic, File.join(@nodes.first, path), 
-                               File.join(@nodes.first, path2)]
+      @sps.notice "%s/copy: %s %s" % [@topic, File.join(node, path), 
+                               File.join(node, path2)]
     end
 
   end    
 
   def exists?(fname)
-
-    file_op {|f| f.exists? File.join(@nodes.first, fname) }
+        
+    file_op do |f| 
+      node = 'dfs://' + @nodes.first
+      f.exists? File.join(node, fname) 
+    end
 
   end  
   
   def ls(path)
-
-    file_op {|f| f.ls File.join(@nodes.first, path) }
+    
+    file_op do |f| 
+      node = 'dfs://' + @nodes.first
+      f.ls File.join(node, path)
+    end
 
   end  
   
   def mkdir(path)
 
-    file_op {|f| f.mkdir File.join(@nodes.first, path) }
+    node = ''
+    
+    file_op do |f| 
+      node = 'dfs://' + @nodes.first
+      f.mkdir File.join(node, path)
+    end
     
     if @sps then
-      @sps.notice "%s/mkdir: %s" % [@topic, File.join(@nodes.first, path)]    
+      @sps.notice "%s/mkdir: %s" % [@topic, File.join(node, path)]    
     end
 
   end
   
   def mkdir_p(path)
 
-    file_op {|f| f.mkdir_p File.join(@nodes.first, path) }
+    node = ''    
+
+    file_op do |f|
+      node = 'dfs://' + @nodes.first
+      f.mkdir_p File.join(node, path)
+    end
     
     if @sps then
-      @sps.notice "%s/mkdir_p: %s" % [@topic, File.join(@nodes.first, path)]
+      @sps.notice "%s/mkdir_p: %s" % [@topic, File.join(node, path)]
     end
     
   end
   
   def mv(path, path2)
 
+    node = ''
+    
     file_op do |f|
-      f.mv File.join(@nodes.first, path), File.join(@nodes.first, path2)
+      node = 'dfs://' + @nodes.first
+      f.mv File.join(node, path), File.join(node, path2)
     end
     
     if @sps then
-      @sps.notice "%s/mv: %s %s" % [@topic, File.join(@nodes.first, path), 
-                               File.join(@nodes.first, path2)]
+      @sps.notice "%s/mv: %s %s" % [@topic, File.join(node, path), 
+                               File.join(node, path2)]
     end
 
   end   
   
   def read(fname)
-
-    file_op {|f| f.read File.join(@nodes.first, fname) }
+    
+    file_op do |f|
+      node = 'dfs://' + @nodes.first
+      f.read File.join(node, fname)
+    end
 
   end
   
   def rm(fname)
 
-    file_op {|f| f.rm File.join(@nodes.first, fname) }
+    node = ''
+    
+    file_op do |f|
+      node = 'dfs://' + @nodes.first
+      f.rm File.join(node, fname)
+    end
     
     if @sps then
-      @sps.notice "%s/rm: %s" % [@topic, File.join(@nodes.first, fname)]
+      @sps.notice "%s/rm: %s" % [@topic, File.join(node, fname)]
     end
 
   end   
 
   def write(fname, content)
 
-    file_op {|f| f.write File.join(@nodes.first, fname), content }
+    node = ''
+    
+    file_op do |f|
+      node = 'dfs://' + @nodes.first
+      f.write File.join(node, fname), content
+    end
     
     if @sps then
-      @sps.notice("%s/write: %s" % [@topic, File.join(@nodes.first, fname)])
+      @sps.notice("%s/write: %s" % [@topic, File.join(node, fname)])
     end
     
   end
   
   def zip(fname, a)
-
-    file_op {|f| f.zip File.join(@nodes.first, fname), a }
+    
+    node = ''
+    
+    file_op do |f|
+      node = 'dfs://' + @nodes.first
+      f.zip File.join(node, fname), a
+    end
     
     if @sps then
-      @sps.notice "%s/zip: %s" % [@topic, File.join(@nodes.first, fname)]
+      @sps.notice "%s/zip: %s" % [@topic, File.join(node, fname)]
     end
     
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileserver_plus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   IzajbtHbQOY56M17vmJw7Y9ei8bGWzjVxfRUg33mVpGQQIWHA2JpaJ8+jpwrxdbF
   DfzPJWgIRbTOgE4v1XGQcqsO
   -----END CERTIFICATE-----
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb_fileclient