drb_fileserver_plus 0.3.5 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddf53d1ba8eb5eceeee7b82bcb1349d98c7a74894897fc3065f67f50505e8016
-  data.tar.gz: 8f867dfcdb2269d5edc2069fed2b3737278fe719987a34395619e8d1cbc1b372
+  metadata.gz: 45b978bb65e30e30be027dde50d7fb2dc74c827187b48c3b9d329a1e4db47135
+  data.tar.gz: 8658d87c9d8c999655e114610c412851a67ab015e11c364bfdc62db8cbff6dad
 SHA512:
-  metadata.gz: f8fd8b711587995368338d0d68b278a0afe2c206f86ea9849dabc8d6a67b4cafa51296e1a5cbb5dd740f974d6b00501bfeaeaf54199494bdce8bfebae9fb120c
-  data.tar.gz: badbae8b42d177c68ad2750cb01ba61d6e2bdddd1875d1723884efa250e221395af051347d6f52fbae76139008021794ca6d8122c07c15c7a78c94640c741db5
+  metadata.gz: c449a64827a526009e8a78a09471f9c50ff6494cec76a0dcd71d21ad1d86442aad8cca528ed4a734022cbddb39e3bb8345f692e2d93213f07265d9f639739c7f
+  data.tar.gz: 375c3ad38607edfa37e0553453d500752e96b79b348b8ab017fccd63e89ad29256d013db57326af9bfb3862c63c6512c1dd3ab3d4738d611e694276cb6f506ff

data/lib/drb_fileserver_plus.rb

@@ -10,15 +10,15 @@ require 'drb_fileclient'
 
 
 class DRbFileServer
-
+  
   attr_accessor :nodes
 
   def initialize(nodes, sps: nil, topic: 'file')
-
+    
     @nodes = nodes
     @failcount = 0
     @sps, @topic = sps, topic
-
+    
   end
 
   def chmod(permissions, fname)
@@ -37,41 +37,43 @@ class DRbFileServer
 
   end
 
-
+  
   def cp(path, path2)
-
+       
     node = ''
-
+    
     file_op do |f|
-      node = 'dfs://' + @nodes.first
+      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(node, path),
+      @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|
+        
+    file_op do |f| 
       node = 'dfs://' + @nodes.first
-      f.directory? File.join(node, fname)
+      f.directory? File.join(node, fname) 
     end
 
-  end
-
-  def exists?(fname)
+  end    
 
-    file_op do |f|
+  def exist?(fname)
+        
+    file_op do |f| 
       node = 'dfs://' + @nodes.first
-      f.exists? File.join(node, fname)
+      f.exist? File.join(node, fname) 
     end
 
   end
 
+  alias exists? exist?
+
   def glob(path)
 
     file_op do |f|
@@ -81,85 +83,85 @@ class DRbFileServer
 
   end
 
-
+  
   def ls(path)
-
-    file_op do |f|
+    
+    file_op do |f| 
       node = 'dfs://' + @nodes.first
       f.ls File.join(node, path)
     end
 
-  end
-
+  end  
+  
   def mkdir(path)
 
     node = ''
-
-    file_op do |f|
+    
+    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(node, path)]
+      @sps.notice "%s/mkdir: %s" % [@topic, File.join(node, path)]    
     end
 
   end
-
+  
   def mkdir_p(path)
 
-    node = ''
+    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(node, path)]
     end
-
+    
   end
-
+  
   def mv(path, path2)
 
     node = ''
-
+    
     file_op do |f|
       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(node, path),
+      @sps.notice "%s/mv: %s %s" % [@topic, File.join(node, path), 
                                File.join(node, path2)]
     end
 
-  end
-
+  end   
+  
   def read(fname)
-
+    
     file_op do |f|
       node = 'dfs://' + @nodes.first
       f.read File.join(node, fname)
     end
 
   end
-
+  
   def rm(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(node, fname)]
     end
 
-  end
+  end   
 
   def rm_r(fname, force: false)
 
@@ -176,51 +178,81 @@ class DRbFileServer
 
   end
 
-  def touch(fname, mtime: Time.now)
+  def ru(path)
 
     node = ''
 
     file_op do |f|
       node = 'dfs://' + @nodes.first
-      f.touch File.join(node, fname), mtime: mtime
+      f.rm File.join(node, path)
     end
 
     if @sps then
-      @sps.notice "%s/touch: %s" % [@topic, File.join(node, fname)]
+      @sps.notice "%s/ru: %s" % [@topic, File.join(node, path)]
     end
 
   end
 
-  def write(fname, content)
+  def ru_r(path)
 
     node = ''
 
     file_op do |f|
       node = 'dfs://' + @nodes.first
-      f.write File.join(node, fname), content
+      f.rm_r File.join(node, path)
     end
 
     if @sps then
-      @sps.notice("%s/write: %s" % [@topic, File.join(node, fname)])
+      @sps.notice "%s/ru_r: %s" % [@topic, File.join(node, path)]
     end
 
   end
 
-  def zip(fname, a)
+  def touch(fname, mtime: Time.now)
 
     node = ''
 
     file_op do |f|
       node = 'dfs://' + @nodes.first
-      f.zip File.join(node, fname), a
+      f.touch File.join(node, fname), mtime: mtime
     end
 
     if @sps then
-      @sps.notice "%s/zip: %s" % [@topic, File.join(node, fname)]
+      @sps.notice "%s/touch: %s" % [@topic, File.join(node, fname)]
     end
 
   end
 
+  def write(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(node, fname)])
+    end
+    
+  end
+  
+  def zip(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(node, fname)]
+    end
+    
+  end  
+  
 
   private
 
@@ -246,21 +278,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.3.5
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,53 +10,54 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  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
-  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
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTIzMDEyNTIxMjEwOFoXDTI0MDEyNTIxMjEwOFowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBAKUhddvwozZjtYVEj/yqjWLKzvpRMU1wRBd6PWCCK/+t9hgMYt46lhP5GHsY
+  zM2OevMekeNKBEd5JSZketiK1ghbRlfALh1ONST6PKWNnt3BnikLEXK0xlWZbOGz
+  0S7Yca2p34exICkIu1wHOctvhSdNMe2NUybYjKHsef6qAxx43gySgnSgFS9FcGlm
+  oVtH0ugZQHU12fE6vhK4BJlFjMgyuLAMIMRM+BotlwoIEM8QY9ZMwY2MlN1ljOVA
+  e3/1mAvk4dZqj+J8CX58djzOGH0XUFw6tq9LO081yEb6Ca0pPONoDqQeU+NdyU0y
+  Ep/P683ESZQpjbBgB9OUI4dDD0x2N5ab1mN4OO/eBmE0ZDGcSCH0VVM5FJGVwJiT
+  7T74fzDX/diDutvMLnkgDTUMIntcbn/ruPjbnmYKB0ZoeXiacZ5RPm9LD9sQns9G
+  20sMOc8m6eSKK7T9VO77SjAYyQh7mArYDtkRRCI0h1lmr/WesFfmiUylSiAIEVyd
+  InhSpQIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBQ0U9w98+0gW/IyGjq0uaw4cZ6tGjAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQA3mG7NrH1mUM8L9IAlkwLZQuUhJ7GS
+  2V6uiTo9+5GZnBdLDddogVzl2TJxibaSjBHsD4q9cqlU0Q/zc6yWjE1S564ixxgO
+  Z+reN+03uJW278dgt6xCPElAevlyKzFSRIAJDGMTbyUasKQa5EyvkhzJmRlHlB2G
+  2h8glYWurSEMAEW3MwAlnM/dx9xY5ZPZmm7mrYibZyZ14VBFvhjDb8N5f0b1fFGk
+  hsKTNGtZsX2ZtEKdppb243kEDSB42H1j+rUJ+buhnNEInYPVJUssxBdGvT/dx6lH
+  hnWcmRcU24PREmDrkjS68yye9Q2zdxTRy0h6vfPoNj5OFYP5BRdnojw0FNIInawG
+  SUzB/uXV+0btPu9UxE7axB0CsLZc/HTEEHwVf2LXn/f64Hc4geyDFCmsVTYHbHG1
+  4AI2oRADnvq+nYMWGxnDYHN4TsTgfn4kn21RVrSj4UENz+KinmDEJgGqpWXmYMzh
+  zw/9Ryb7BSzoMUXa+KmdyeiL9ArhU9YQh7s=
   -----END CERTIFICATE-----
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2023-01-25 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.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: sps-pub
   requirement: !ruby/object:Gem::Requirement
@@ -103,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Designed to provide fault tolerant access to a DRb file server when 2 or