drb_fileserver_plus 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a343182e14b15cd40f4d6ada733281b605d7dfb7f174acb852b43877b748d0c
-  data.tar.gz: 40c2706d369d419221e20e4253e9e6a60b5c84a33afeafc6abaf49d55678cb44
+  metadata.gz: 920882a50cd419bef05ecb0c67c2dbe51742c4669b48d30d286fc15271885609
+  data.tar.gz: 2f5785281225cf121c05f7a323e5e84304f3c0deab856eb4287cacec24e06311
 SHA512:
-  metadata.gz: 63e58db0c8d5c62d1d729f5f2ff4eaef82df0973bb49bb1f1f92615a33383b5c8f499c7a7751372adb9f28f2ae4db08321c3757d9cb917f6b4f94a12170c4237
-  data.tar.gz: 0552fe49e183609e497e57f20be29856ddf987ccc93dbd23839de186d4d147912abc0bc91fc59abaf6a5adce63adeca64b4d890ec723bbfd030294ec313e2213
+  metadata.gz: a7631f9ac2ba21c3361b710264b9ce20803a4f4c02fe57d0217e28e3c8290b84f5ba1e106f1d158c648d34804ed240b27067d95a14216c46b3c26755b59348ac
+  data.tar.gz: ddd5c5191228f7884e2f91a6c6f9eacec531d55807cdaabab8a40442cc4486c7eace00df7db05c0a773f1f9d0896aa653a5ed0b4a1c9d5d024d88d4298fbfd29

data/lib/drb_fileserver_plus.rb

@@ -11,108 +11,176 @@ 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 chmod(permissions, fname)
+
+    node = ''
+
+    file_op do |f|
+      node = 'dfs://' + @nodes.first
+      f.chmod permissions, File.join(node, fname)
+    end
+
+    if @sps then
+      @sps.notice "%s/chmod: %d %s" % [@topic, permissions,
+                                       File.join(node, fname)]
+    end
+
   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    
+  end
+
+  def directory?(fname)
+
+    file_op do |f|
+      node = 'dfs://' + @nodes.first
+      f.directory? File.join(node, fname)
+    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
 
-  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
 
-  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   
-  
+  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   
+  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  
-  
+
+  end
+
 
   private
 
@@ -123,11 +191,12 @@ class DRbFileServer
       @failcount = 0
       r
     rescue
+      raise $! if ($!).inspect =~ /No such file or directory/
       puts 'warning: ' + ($!).inspect
       @nodes.rotate!
       @failcount += 1
       retry unless @failcount > @nodes.length
-      raise 'DRbFileServerPlus nodes exhausted'
+      raise 'DRbFileServerPlus nodes exhausted2'
     end
 
   end
@@ -137,21 +206,21 @@ end
 class DRbFileServerPlus
 
 
-  def initialize(host: 'localhost', port: '61010', nodes: [], sps_host: nil, 
+  def initialize(host: 'localhost', port: '61010', nodes: [], sps_host: nil,
                  sps_port: '59010', sps_topic: 'file')
 
     @host, @port, @nodes = host, port, nodes
-    
+
     if sps_host then
-      @sps = SPSPub.new(host: sps_host, port: sps_port) 
+      @sps = SPSPub.new(host: sps_host, port: sps_port)
       @topic = sps_topic
     end
 
   end
 
   def start()
-    
-    DRb.start_service "druby://#{@host}:#{@port}", 
+
+    DRb.start_service "druby://#{@host}:#{@port}",
         DRbFileServer.new(@nodes, sps: @sps, topic: @topic)
     DRb.thread.join
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileserver_plus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -11,52 +11,52 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwODIyMTAzMzQ3WhcN
-  MTkwODIyMTAzMzQ3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQClKaO5
-  OJW0sxpai9US4G/mLYTlk/F0KsII6NStyEmHkwFj8iWodj7eGZ60UQ1ZC38IcyBG
-  62sCsnjMUZOC1h3Ss9mIp8fYJfHPC9AxC71jMClbbTDBNGs/aBaIrvjcQ0qpmVh1
-  wE+rC5K/Knt/r7/OHiMwX1NmOINAyidT1N2EGXCKB5VTH2GrmRHi4B9PTQ7FFdYW
-  R9duTW7ka36Rh6eCOfpEr/icTxcUxAg6YuEgPlKw8qgbGl2T9FFQZtjplQg/UlOM
-  dcGBIMojDDK/4A4dnHNLMYtchHssd7pVZ8eamgz/3rrJbzC7PFjIHc1Yh9rQ9/+z
-  I3Js8CVNe4M8neCgtlploxC2XnbcPdrytRqYZUWYvL7i8LUvI3vYivGePSAZ9zej
-  +LMlZhGDXu6ZgdbZ6EofLIiFuBGHxH/caD5hl1x5pIn+jL16DQhTMcIv/gGa6BYs
-  2zlhDk1fReBUXX+acDxFOhSnWlImNBZyJjrOwnPiGCwGQ3+YI1C8278lnukCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU+LOUDasm
-  JdneaJyCt2Cd55sH7a4wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMTE3MjExODE0WhcN
+  MjMwMTE3MjExODE0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDJmoH7
+  qtUrW6rfbZ7EC29fiedZY/da3pB3Y22dyx493ue53m7ijEIC9tVCja+3T7sQ7DOe
+  hAabX4KwhWTbq3SOHEzPeLqOgtciZPNRVo5g5UdOEp/7+ZSeBlm/BJO+RMbYfME+
+  NxpJB9BfW4vKgdYUU0mKZZhld6iFfpe/L9C7/OKXGy2EtHqs5/iHZcuhqC9c9dkS
+  zDR0FEWgRFvB2ZHoq0V5VmBeuC/0izTZMToYV2B/hQjSenkMSIO6s39Omf1ciRfs
+  wbZItRzNHfDgPJL4cuxWbNqrICluAP97a1k7FT/huhsjIIhFotw4fg7Z0Y9RkDZz
+  3p3Zd+nK7sBQFHMIejdmCZAQ1L+hNYEoSKJgaaVWN1Edz0tIzPaepW42Jlc8czPi
+  XZI5Gpal/sobpP4b2PbD+101ZXALel9+VBdUoM4hJohlKbV6BB9TZ+ZKdZAu4G34
+  LqsTiUuPYVpifonAvvCK/sHZFv06rkPr+bJJwzSUBIDK3WnHKl2ak7iLy28CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUMqiMl7vY
+  doLRPPh2YANnlg4pBAAwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAoiyX2/xwOsj7KOku/r5y9ViD1yhaMUBBwhmIIvge
-  EnMZt+FPBZmy1pz9+eIKBAWz6uCGRz2aAtnCwYVO+3QidMNQzDXTZZW7MzpT8APQ
-  kV7FlzXcZI3+lXq9n+QQiHUKt3kwSY2+XXH8vPfCC0bZuRMNeJ/qXICnosuCkXhB
-  ncMc3qbCU4Za/kPrYX++Z4fH1k2YxZ11yaZ02KYoLaoXlc2haApI44QtO6JQgw69
-  Zd6EtP36AxDx32jZpfMCs8TVJZru0FD9BtonYIRc1iwm2pxoXNP8zbfyjgWyO+bu
-  ZuhpGaqTxZeyrMDu5n3pdStASltSTpEXW7a+8PHsMHb+FKBCoQm/aAqoNj/HGe1c
-  9Q9C3/cpFcqxt4w1h99W8wKDVa7LxIxOurF/jTJCzUFVpbWw2keJvUvRHaZwkDci
-  IzajbtHbQOY56M17vmJw7Y9ei8bGWzjVxfRUg33mVpGQQIWHA2JpaJ8+jpwrxdbF
-  DfzPJWgIRbTOgE4v1XGQcqsO
+  BgkqhkiG9w0BAQsFAAOCAYEAcwXlaQYBtgbcM3aGSuse6SyR6v+PPcdAKj9l2JCa
+  0E1ziB1NZdFe71iuA24zAmkWfMr1dvlsuQ5W1ETPO67yyxOw7MZzjTomLlhKW3Bv
+  FDbU8D7hoMjjTfOsdSWjwly/j8b2WnYOwFYHKqgc/Zj4J2PE13v4t44CQV1ofnd9
+  bvgUHjEWElZL8j/ADbNcc5b8NrOzq3lI9J3rQ2dyEOX00eRLMrOK9Gc3jLpn4vrP
+  ej8MaD6CTt/k36lVZTFOeBOzbulRTCfBct+ILDXpvCotrKgOqUa5Phyza1/k9+5k
+  eqd0/0Hhn955Wvk9EEElxPHTDfdMGxw6/wk2hhqG8RKPJONr67wbZVV8jTGqoZ8O
+  LXnxD2cEcXYHq0H40uYhF0kT+DClasFvaoKsHcfls3AwshME9UPCpIXZ9yqwWB5v
+  c2ssLUM61klg6aqPwYrT/aNWFy0+dGbhfdCqFHED5VAqdJ9CDJK+ftycl4+P8wjl
+  BN8isQ//6vwALlrUdDbZ2v7l
   -----END CERTIFICATE-----
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb_fileclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: sps-pub
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.5
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Designed to provide fault tolerant access to a DRb file server when 2 or