drb_fileclient 0.5.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb18a2fe46c0d601bbfffee7c7cbd1ebed33586abe3241ca821fbbb2ac680c1
-  data.tar.gz: e8812a2688db89ff2ecf0bd8d7ca8161cea0fe005592146239d66ae9c0c6bf69
+  metadata.gz: 11e459b03b12daa5f495705cfe50f05e054c273a31fc1e6f71ba919fc24070b3
+  data.tar.gz: 6b38f58bbdbff1b4da1129f70087cb2c7f60454d9ad4a7b9d44300a5a93eaa17
 SHA512:
-  metadata.gz: 9cbb3e0ed60f00426e83f31f10fd0c2962ffa2da2c1ea5043ee0f5c7cc98d1f9f53e2a17a8598e4e5a616e78c6a6d3bc052b20657d112c8b8d04d61bc115ae9b
-  data.tar.gz: a6847f771d944cb5c2c0ac904b8bc889b4ed2cca762489fa126b9d3cb84ed6dd5b6250d4aa3c9e296e469cd5ce4ca6cb7891ded0bb4099933585b5ad2833220a
+  metadata.gz: 21558c01a3e3d3bbfa7e8c5d409d36d8575c844607a3904189e02554a24cc8c5c887d5663c3677399d2ddca44dae17b29f58ec3eac934b6dd22939db8fcdce56
+  data.tar.gz: 0eb1319c6eead463b8ada4b4cf45b29bb0fb6a3b5ac0121d3d7261b30a162887d1f8f96e32c0c7f6a8d69a81db7690628b8c60f48c6c6c7a0ea8b4345821e2eb

data/lib/drb_fileclient.rb

@@ -11,89 +11,113 @@ class DRbFileClient
   using ColouredText
 
   def initialize(location=nil, host: nil, port: '61010', debug: false)
-    
+
     @debug = debug
-    
+
     if location then
-      
+
       host = location[/(?<=^dfs:\/\/)[^\/:]+/]
       port = location[/(?<=^dfs:\/\/)[^:]+:(\d+)/,1]  || '61010'
       @directory = location[/(?<=^dfs:\/\/)[^\/]+\/(.*)/,1]
-      
+
     end
-    
+
     DRb.start_service
-    
+
   end
-  
+
   def chdir(raw_path)
-    
+
     return Dir.chdir raw_path unless @directory or raw_path =~ /^dfs:\/\//
-    
+
     if raw_path[0] == '/'  then
       directory = raw_path[1..-1]
     elsif raw_path =~ /^dfs:\/\//
       @file, directory = parse_path(raw_path)
-    else      
+    else
       directory = File.join(@directory, raw_path)
-    end    
-    
+    end
+
     if @file.exists? directory then
       @directory = directory
     else
       'No such file or directory'
     end
-    
+
+  end
+
+  def chmod(permissions, raw_path)
+
+    if raw_path =~ /^dfs:\/\// then
+
+      @file, path = parse_path(raw_path)
+      @file.chmod permissions, path
+
+    else
+      return FileUtils.chmod(permissions, raw_path)
+    end
   end
 
   def cp(raw_path, raw_path2)
-    
+
     puts 'inside cp'.info if @debug
-        
+
     if raw_path =~ /^dfs:\/\// then
-      
+
       if @debug then
         puts ('raw_path: ' + raw_path.inspect).debug
         puts ('raw_path2: ' + raw_path2.inspect).debug
       end
-      
+
       if raw_path[/^dfs:\/\/([^\/]+)/] == raw_path2[/^dfs:\/\/([^\/]+)/] then
-        
+
         _, path = parse_path(raw_path)
         @file, path2 = parse_path(raw_path2)
         @file.cp path, path2
-        
-      else
-        
+
+      elsif raw_path2[/^dfs:\/\//]
+
         @file, path = parse_path(raw_path)
         file2, path2 = parse_path(raw_path2)
+        puts ('path: ' + path.inspect).debug if @debug
+        puts ('path2: ' + path.inspect).debug if @debug
         content = @file.read path
-        
+
         file2.write path2, content
 
+      else
+
+        @file, path = parse_path(raw_path)
+        #file2, path2 = parse_path(raw_path2)
+        puts ('path: ' + path.inspect).debug if @debug
+        puts ('path2: ' + path2.inspect).debug if @debug
+        content = @file.read path
+
+        File.write raw_path2, content
+
       end
-    
+
     elsif raw_path2 =~ /dfs:\/\// then
-      
+
       puts 'option2'.info if @debug
-      
+
       file2, path2 = parse_path(raw_path2)
       puts ('path2: ' + path2.inspect).debug if @debug
       file2.write path2, File.read(raw_path)
-      
+
     else
-      
+
       puts 'option3'.info if @debug
       FileUtils.cp raw_path, raw_path2
-      
-    end 
-      
-  end   
-  
-  def directory?(filename=@filename)  
-    
+
+    end
+
+  end
+
+  def directory?(filename=@filename)
+
     return File.directory? filename unless @directory or filename =~ /^dfs:\/\//
-    
+
     if filename =~ /^dfs:\/\// then
       @file, filename2 = parse_path(filename)
     else
@@ -102,13 +126,13 @@ class DRbFileClient
     end
 
     @file.directory?(filename2)
-    
-  end  
-  
-  def exists?(filename=@filename)  
-    
+
+  end
+
+  def exists?(filename=@filename)
+
     return File.exists? filename unless @directory or filename =~ /^dfs:\/\//
-    
+
     if filename =~ /^dfs:\/\// then
       @file, filename2 = parse_path(filename)
     else
@@ -117,136 +141,180 @@ class DRbFileClient
     end
 
     @file.exists?(filename2)
-    
+
   end
-  
+
   alias exist? exists?
-  
+
+  def glob(s)
+
+    if s =~ /^dfs:\/\// then
+      @file, s2 = parse_path(s)
+    else
+      s2 = File.join(@directory, s)
+    end
+
+    @file.glob s2
+
+  end
+
   def ls(raw_path)
-    
+
     return Dir[raw_path] unless @directory or raw_path =~ /^dfs:\/\//
-    
+
     if raw_path[0] == '/'  then
       path = raw_path[1..-1]
     elsif raw_path =~ /^dfs:\/\//
       @file, path = parse_path(raw_path)
-    else      
+    else
       path = File.join(@directory, raw_path)
-    end    
-    
+    end
+
     @file.ls path
-    
-  end  
-  
+
+  end
+
   def mkdir(name)
-    
+
     return FileUtils.mkdir name unless @directory or name =~ /^dfs:\/\//
-    
+
     @file, path = parse_path(name)
     @file.mkdir path
   end
-  
+
   def mkdir_p(raw_path)
-    
+
     unless @directory or raw_path =~ /^dfs:\/\// then
-      return FileUtils.mkdir_p raw_path 
-    end    
-    
+      return FileUtils.mkdir_p raw_path
+    end
+
     if raw_path =~ /^dfs:\/\// then
       @file, filepath = parse_path(raw_path)
     else
       filepath = File.join(@directory, raw_path)
     end
-    
+
     @file.mkdir_p filepath
-  end  
-  
+  end
+
   def mv(raw_path, raw_path2)
-    
+
     unless @directory or raw_path =~ /^dfs:\/\// then
-      return FileUtils.mv raw_path, raw_path2  
+      return FileUtils.mv raw_path, raw_path2
     end
-    
+
     if raw_path =~ /^dfs:\/\// then
       _, path = parse_path(raw_path)
     else
       path = File.join(@directory, raw_path)
     end
-    
+
     if raw_path2 =~ /^dfs:\/\// then
       _, path2 = parse_path(raw_path2)
     else
       path2 = File.join(@directory, raw_path2)
     end
-      
+
     @file.mv path, path2
-  end  
-  
+  end
+
   def pwd()
-    
+
     return Dir.pwd unless @directory
-    
+
     '/' + @directory if @file
-    
-  end  
+
+  end
 
   def read(filename=@filename)
-    
+
     return File.read filename, s unless @directory or filename =~ /^dfs:\/\//
-    
+
     if filename =~ /^dfs:\/\// then
       @file, path = parse_path(filename)
     else
       path = File.join(@directory, filename)
     end
-    
+
     @file.read path
   end
-  
+
   def rm(path)
-    
+
     return FileUtils.rm path unless @directory or path =~ /^dfs:\/\//
-    
+
     if path =~ /^dfs:\/\// then
       @file, path2 = parse_path( path)
     else
       path2 = File.join(@directory, path)
     end
-      
+
     @file.rm  path2
-    
-  end    
-  
+
+  end
+
+  def rm_r(path, force: false)
+
+    unless @directory or path =~ /^dfs:\/\// then
+      return FileUtils.rm_r(path, force: force)
+    end
+
+    if path =~ /^dfs:\/\// then
+      @file, path2 = parse_path( path)
+    else
+      path2 = File.join(@directory, path)
+    end
+
+    @file.rm_r(path2, force: force)
+
+  end
+
+  def touch(s, mtime: Time.now)
+
+    unless @directory or s =~ /^dfs:\/\// then
+      return FileUtils.touch(s, mtime: mtime)
+    end
+
+    if s =~ /^dfs:\/\// then
+      @file, s2 = parse_path(s)
+    else
+      s2 = File.join(@directory, s)
+    end
+
+    @file.touch s2, mtime: mtime
+
+  end
+
   def write(filename=@filename, s)
-        
+
     return File.write filename, s unless @directory or filename =~ /^dfs:\/\//
-    
+
     if filename =~ /^dfs:\/\// then
       @file, path = parse_path(filename)
     else
       path = File.join(@directory, filename)
     end
-    
-    @file.write path, s     
-    
+
+    @file.write path, s
+
   end
-  
+
   def zip(filename_zip, a)
-    
+
     puts '@directory: ' + @directory.inspect if @debug
-    
+
     unless @directory or filename_zip =~ /^dfs:\/\// then
-      
+
       Zip::File.open(zipfile_zip, Zip::File::CREATE) do |x|
 
-        a.each do |filename, buffer| 
+        a.each do |filename, buffer|
           x.get_output_stream(filename) {|os| os.write buffer }
         end
 
       end
-      
+
     end
-    
+
     if filename_zip =~ /^dfs:\/\// then
       @file, filepath = parse_path(filename_zip)
     else
@@ -254,16 +322,16 @@ class DRbFileClient
     end
 
     @file.zip filepath, a
-    
+
   end
 
   private
-  
+
   def parse_path(filename)
 
     host = filename[/(?<=^dfs:\/\/)[^\/:]+/]
     @host = host if host
-    
+
     port = filename[/(?<=^dfs:\/\/)[^:]+:(\d+)/,1]  || '61010'
 
     file_server = DRbObject.new nil, "druby://#{host || @host}:#{port}"
@@ -271,24 +339,35 @@ class DRbFileClient
 
   end
 
-end 
+end
 
 class DfsFile
-  
+
   @client = DRbFileClient.new
-  
-  def self.directory?(filename) @client.directory?(filename) end 
-  def self.exists?(filename)    @client.exists?(filename)    end  
-  def self.chdir(path)          @client.chdir(path)          end  
-  def self.cp(path, path2)      @client.cp(path, path2)      end         
-  def self.ls(path)             @client.ls(path)             end  
-  def self.mkdir(name)          @client.mkdir(name)          end    
-  def self.mkdir_p(path)        @client.mkdir_p(path)        end       
-  def self.mv(path, path2)      @client.mv(path, path2)      end     
-  def self.pwd()                @client.pwd()                end       
+
+  def self.directory?(filename) @client.directory?(filename) end
+  def self.exists?(filename)    @client.exists?(filename)    end
+  def self.chdir(path)          @client.chdir(path)          end
+  def self.chmod(num, filename) @client.chmod(num, filename) end
+  def self.cp(path, path2)      @client.cp(path, path2)      end
+  def self.glob(s)              @client.glob(s)              end
+  def self.ls(path)             @client.ls(path)             end
+  def self.mkdir(name)          @client.mkdir(name)          end
+  def self.mkdir_p(path)        @client.mkdir_p(path)        end
+  def self.mv(path, path2)      @client.mv(path, path2)      end
+  def self.pwd()                @client.pwd()                end
   def self.read(filename)       @client.read(filename)       end
-  def self.rm(filename)         @client.rm(filename)         end  
+  def self.rm(filename)         @client.rm(filename)         end
+
+  def self.rm_r(filename, force: false)
+    @client.rm_r(filename, force: force)
+  end
+
+  def self.touch(filename, mtime: Time.now)
+    @client.touch(filename, mtime: mtime)
+  end
+
   def self.write(filename, s)   @client.write(filename, s)   end
   def self.zip(filename, a)     @client.zip(filename, a)     end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileclient
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.3
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMjE4MTMyMjE4WhcN
-  MjAwMjE4MTMyMjE4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDPLIWE
-  1LxL0Rs9thm/+dEKOLimLGMrg805TqNbDMVg3zSxx/hu5DDgZw+kZxHBrhdAOGgL
-  N9q1wHikBL3KRBlfpZn6DLL1J6RxsJmTEdhEY0IGT1sVlNYnW3IYK9nfaeJccSAA
-  Siqt1Wg2T7O6UOTq3jg4qWSp7jT8W/CYeN+drJNvTPXf5mlBcgWhzbCJLjAMdMoG
-  tEiBzlAGs5ys/6jk9JDVK/ll3QGq5ldzVmW+eV6z54MIXJTBRZKf43Eb5h28BNa5
-  MoWLdj2T0nKApQDnJjwbsKdb0qq5wOAbvz49NgGfEt+azogI2DFst3JC6tt62E1C
-  i1/6+xD70d5NpiQQlui027F8JdQbyk+3k8JMDKEI/mx+SWw41wvy1+wjiGm18X2y
-  PC2h2eGzDdS1Rf+RwYnmw4hwmsMysEnuJyy3odhmiuYL64Uj7GKGmFuigkff2pui
-  FSuSFUAZVcaFpqjozYvREn1iQiYCsbTs/zu1Hwyz5oZHsLlpI+J5iF6IsxkCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUZflEC5fi
-  H1TSltk+4vyAjijZuQ0wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMTE3MjExMTUxWhcN
+  MjMwMTE3MjExMTUxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC1sfsT
+  Jfjs0K5yhTPZsHAcniDvpZsgsTzASYu0IbH63AZ1o3dBV7IzF6KrziLoJ4LZ7UQK
+  yJ6PnHUSTKBZJccpxIErNb3YlU3wYhF4aFqVxZBjt/IWVyGk62GtgbkuFGcsC2DP
+  sxL4/WYtZvSrDCnY/XDEK8LUO6/MQ6cF2aT3OHmXSz3zuDW83yuIWrTXbKJnjuKn
+  V7zM0prSGfLGNM+DlIgAGrspj+D+aofhVZ1vcsy7tHHSazErTtp88ONCoJrBv8UZ
+  Zw+fZV14rwhqftK7jYH0XL7kBZYILVkpehNXRFOwojnkg/Z6IECYxz2alNYwDWUB
+  lPzxgCPJsHoQCtustc2UHE/Ik+8QVJIHimpwquzhwECGq9MSUlYau48XlB8nBHlN
+  3YckYd3CjdbB/4UkCjlQOBrb0UT7HQHm+f5uCa2hXKkpWFKJNO99FBR75FAJWbQt
+  JfYUJzGrp2z95pc6cDvaqzXPVA48JVVWF6uUqCeoVOCcz3rISfZT5X6Y+I8CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUWpxb19+x
+  FM42Y6G5h22m4V4WOQ8wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAehovpYSCjyALI2nsoZgOXuhu2FLJqUQBuoJ71qhb
-  Taqk2GGL7H3rw+230F7JFa6+mEDhvPRtPpvFouUWCVkWt/cFjCSi6wMtPtWI1npX
-  Z24Rq7o4qhnGnNOgF4GUIAB9wKkuGpHpGu3Pm6sSsoY53RSdOIrUbATq7d9R+nDC
-  IuHsUhqWu0JHuIcJAt2nFdNhpAM1xI8xmpBB/ZAPmuBgCIGACRUj9zDwCcvQTexg
-  VpPvUCkhqF2HslhSBvMt0uWior6rx2NF1XjLcaNZ3D/RYODI+c8bzGuG/kiy49T1
-  GiV9YurS5UW2Pbpy6GnkvDWNOGwV3SuIeVzo0kcGh/O4zRzC0UHWXzfMshQZq+vj
-  jYmP2hJqU6kqXV8nvKfwDTVov3W49/Nx2NgvhKFga4gMlwRryZCYpWSNJ/2PnKke
-  Q2NfvYKLI+E2SiA6gvWccHs5PVlVg/BMshm3jnuqHGeuzxtSivRoTcRKfedcs6CL
-  NlXQCltmwWchk+xRD5gmICCy
+  BgkqhkiG9w0BAQsFAAOCAYEAoKkYN6WZurnK5O9oEqj+ugBPm9Gh5I75oLQCUyIw
+  sHsBR0clXN+Lta4plvzonH3xKx9ddzX+KWZS0tHxcm072zV6sKEKFYcQiUzQyTwc
+  Hyfp6E3950UwJi3KO4o3RPZC1U5/fOvnuZgVAbGqcJQf/t/SfD5M3pBymbK2QszM
+  fG8W6bQ2kbkv7JbD3B0Sjb1eCDy3/s/eMmbjl1Wg48al1LWQDUMGAmadqLrnFEs0
+  3arfhEofWPCcGw0u45L6omLCU8VWJFupyvQKDwEmkVAD9MMbnUuIsMWMkW4qFwl4
+  0xIrbpFWN8ZHrlc29DrrNH9IKcgsI6Fmc4jOxrqnlushuHG3uthM1hGChljvOMaB
+  rs55jJl1U2ICzKSTmV28mLdtigYtJHOzuXrdZSLICM9FSvRkBWOnBz2YaDCA2NXP
+  FGcgjmmz5fOIqq2sBxk6JW1yo2G43yIUzymWOYKT2Jh6RR0Gg3z66wWwYpFpx8yR
+  00JTBNVAgW+s2sLpeBtyMDbb
   -----END CERTIFICATE-----
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -61,24 +61,24 @@ dependencies:
   name: c32
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -103,7 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Reads or writes files from a remote DRb server. Simple as DfsFile.read  or