drb_fileclient 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebfe11659555afdd1a5b938d65dbf555710785308077f46040275f6416fa407a
-  data.tar.gz: 749c9c2c1dc888fe6cf7faa5ff7163454887edf2f2fdf26ba9b8a7ec47a65275
+  metadata.gz: 3ed719651fa7f16cafe56ad1b31e5dc38e2b5f4911efc02ea3debbf000fe979f
+  data.tar.gz: e7f3cedea649ef656a2a3bbac1bbea1c5b08d4361a8dbba6e8e6c053daba6cea
 SHA512:
-  metadata.gz: 2ad6ed6c1a5b71271904c308df9ba30a9165b13777066afbf03d4dbba222f4b7b8c82a96d639156996a09d103efa7cf6401d8c51083e36e2a9d31c6b9e019c65
-  data.tar.gz: 03b607d56913a234a7e51ee91ecf6592aa3e366b545367bda920fa77ebe0413da9e5adf320789c0dd1f5687b6fe337c8422643d70c8beca6dd9d4e04ed69a5f4
+  metadata.gz: 8e58ed59bb066e970725a2c78e7f53541eba9dd78502583fe460353a60e2ea1ceead178426fb5f062a763fb96663395274f9318551576cd6d01d09692268a1a6
+  data.tar.gz: 7f9dea8306afeb58826bf9c0ca791d41770dc566a1409ff8df7d7c2d564aee3904ddb2404c75580bf99d29ed28226ad2bd996f63c1793b3d7770ee7d772332f8

data/lib/drb_fileclient.rb

@@ -2,31 +2,14 @@
 
 # file: drb_fileclient.rb
 
-require 'drb'
 require 'zip'
-require 'c32'
 require 'dir-to-xml'
+require 'drb_fileclient-readwrite'
 
 
-class DRbFileClient
+class DRbFileClient < DRbFileClientReadWrite
   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:\/\//
@@ -130,35 +113,6 @@ class DRbFileClient
 
   end
 
-  def exists?(filename=@filename)
-
-    return File.exists? filename unless @directory or filename =~ /^dfs:\/\//
-
-    if filename =~ /^dfs:\/\// then
-      @file, filename2 = parse_path(filename)
-    else
-
-      filename2 = File.join(@directory, filename)
-    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:\/\//
@@ -175,29 +129,6 @@ class DRbFileClient
 
   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
-
-    if raw_path =~ /^dfs:\/\// then
-      @file, filepath = parse_path(raw_path)
-    else
-      filepath = File.join(@directory, raw_path)
-    end
-
-    @file.mkdir_p filepath
-  end
-
   def mv(raw_path, raw_path2)
 
     unless @directory or raw_path =~ /^dfs:\/\// then
@@ -227,61 +158,19 @@ class DRbFileClient
 
   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
-
-  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 ru(path)
 
     return DirToXML.new(path, verbose: false).latest unless @directory \
         or path =~ /^dfs:\/\//
 
     if path =~ /^dfs:\/\// then
-      @file, path2 = parse_path( path)
+      @file, path2, addr = parse_path(path)
     else
       path2 = File.join(@directory, path)
     end
 
-    @file.ru  path2
+    found = @file.ru  path2
+    return (addr + found) if found and addr
 
   end
 
@@ -292,42 +181,13 @@ class DRbFileClient
     end
 
     if path =~ /^dfs:\/\// then
-      @file, path2 = parse_path( path)
+      @file, path2, addr = parse_path(path)
     else
       path2 = File.join(@directory, path)
     end
 
-    @file.ru_r  path2
-
-  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
+    found = @file.ru_r  path2
+    return (addr + found) if found and addr
 
   end
 
@@ -357,52 +217,36 @@ class DRbFileClient
 
   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}"
-    [file_server, filename[/(?<=^dfs:\/\/)[^\/]+\/(.*)/,1]]
-
-  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.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_r(filename, force: false)
-    @client.rm_r(filename, force: force)
-  end
-
-  def self.ru(path)             @client.ru(path)             end
-  def self.ru_r(path)           @client.ru_r(path)           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
 
+def DfsFile.directory?(filename)
+  DRbFileClient.new.directory?(filename)
+end
+def DfsFile.chdir(path)
+  DRbFileClient.new.chdir(path)
+end
+def DfsFile.chmod(num, filename)
+  DRbFileClient.new.chmod(num, filename)
+end
+def DfsFile.cp(path, path2)
+  DRbFileClient.new.cp(path, path2)
+end
+def DfsFile.ls(path)
+  DRbFileClient.new.ls(path)
+end
+def DfsFile.mv(path, path2)
+  DRbFileClient.new.mv(path, path2)
+end
+def DfsFile.pwd()
+  DRbFileClient.new.pwd()
+end
+def DfsFile.ru(path)
+  DRbFileClient.new.ru(path)
+end
+def DfsFile.ru_r(path)
+  DRbFileClient.new.ru_r(path)
+end
+def DfsFile.zip(filename, a)
+  DRbFileClient.new.zip(filename, a)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drb_fileclient
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,68 +35,68 @@ cert_chain:
   FGcgjmmz5fOIqq2sBxk6JW1yo2G43yIUzymWOYKT2Jh6RR0Gg3z66wWwYpFpx8yR
   00JTBNVAgW+s2sLpeBtyMDbb
   -----END CERTIFICATE-----
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dir-to-xml
+  name: zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: zip
+  name: dir-to-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: c32
+  name: drb_fileclient-readwrite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -123,8 +123,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.2.22
 signing_key: 
 specification_version: 4
 summary: Reads or writes files from a remote DRb server. Simple as DfsFile.read  or