drb_fileclient 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ee3feb5166347679ba7107067598c719cf15663fa6a872c07fe6a53742bb727
-  data.tar.gz: 9ccfc67edaa513985ce97b6f81e94733bb4f7b637403b1c713cc273255c973f5
+  metadata.gz: 07a2cbcbbc70f014fa750685abf3a553e1d904873aba2c58b979b9178c1ab8e8
+  data.tar.gz: 0c6ea77a2ce0c463a4ecc39a1c735f5b91645e917b1208d7e43258c9db096fd0
 SHA512:
-  metadata.gz: 3584d15b675099e548d8c1943523db7705afcd0aaf4261dd6af957c98fe0bff876eaa26ed99a41bb62749c05200da07e34d7a5ecd3db1e5f0950b81f9d263894
-  data.tar.gz: 902a9ac523608de39170beab7004f1335e5100dabac8e7cb9f46bac0bee5682647a78988ea4ed2719e273bf908c85f92adb563cb5ed6993cd89254f6102f4dd0
+  metadata.gz: 33d3c8869c4228aa4bfd05e2b488d1606110bd3db7634f995d978cc132b3189124b13c5d301064a1f8844e9243c12685183456d12e87bd335eec5da8ee1a7105
+  data.tar.gz: b75e6e463ed540df983fd10d655fa8bfeea7ad2072701c688b4278e224aa87fb74a1e242f2e87ff698a68f9a2393094ac7722620858862e434a4ae6ebb1d03dd

data/lib/drb_fileclient.rb

@@ -2,58 +2,21 @@
 
 # file: drb_fileclient.rb
 
-require 'drb'
 require 'zip'
-require 'c32'
-# Commented out to avoid bug with RXFHelper constants
-#require 'dir-to-xml'
+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:\/\//
-
-    if raw_path[0] == '/'  then
-      directory = raw_path[1..-1]
-    elsif raw_path =~ /^dfs:\/\//
-      @file, directory = parse_path(raw_path)
-    else
-      directory = File.join(@directory, raw_path)
-    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
+      @@file, path = parse_path(raw_path)
+      @@file.chmod permissions, path
 
     else
       return FileUtils.chmod(permissions, raw_path)
@@ -74,26 +37,26 @@ class DRbFileClient
       if raw_path[/^dfs:\/\/([^\/]+)/] == raw_path2[/^dfs:\/\/([^\/]+)/] then
 
         _, path = parse_path(raw_path)
-        @file, path2 = parse_path(raw_path2)
-        @file.cp path, path2
+        @@file, path2 = parse_path(raw_path2)
+        @@file.cp path, path2
 
       elsif raw_path2[/^dfs:\/\//]
 
-        @file, path = parse_path(raw_path)
+        @@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
+        content = @@file.read path
 
         file2.write path2, content
 
       else
 
-        @file, path = parse_path(raw_path)
+        @@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
+        content = @@file.read path
 
         File.write raw_path2, content
 
@@ -116,227 +79,83 @@ class DRbFileClient
 
   end
 
-  def directory?(filename=@filename)
-
-    return File.directory? filename unless @directory or filename =~ /^dfs:\/\//
-
-    if filename =~ /^dfs:\/\// then
-      @file, filename2 = parse_path(filename)
-    else
-
-      filename2 = File.join(@directory, filename)
-    end
-
-    @file.directory?(filename2)
-
-  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:\/\//
+    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)
+      @@file, path = parse_path(raw_path)
     else
-      path = File.join(@directory, raw_path)
-    end
-
-    @file.ls path
-
-  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
+      path = File.join(@@directory, raw_path)
     end
 
-    if raw_path =~ /^dfs:\/\// then
-      @file, filepath = parse_path(raw_path)
-    else
-      filepath = File.join(@directory, raw_path)
-    end
+    @@file.ls path
 
-    @file.mkdir_p filepath
   end
 
   def mv(raw_path, raw_path2)
 
-    unless @directory or raw_path =~ /^dfs:\/\// then
+    unless @@directory or raw_path =~ /^dfs:\/\// then
       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)
+      path = File.join(@@directory, raw_path)
     end
 
     if raw_path2 =~ /^dfs:\/\// then
       _, path2 = parse_path(raw_path2)
     else
-      path2 = File.join(@directory, raw_path2)
+      path2 = File.join(@@directory, raw_path2)
     end
 
-    @file.mv path, path2
+    @@file.mv path, path2
   end
 
-  def pwd()
 
-    return Dir.pwd unless @directory
-
-    '/' + @directory if @file
-
-  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 \
+    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)
+      path2 = File.join(@@directory, path)
     end
 
-    @file.ru  path2
+    found = @@file.ru  path2
+    return (addr + found) if found and addr
 
   end
 
   def ru_r(path)
 
-    unless @directory or path =~ /^dfs:\/\// then
+    unless @@directory or path =~ /^dfs:\/\// then
       return DirToXML.new(path, recursive: true, verbose: false).latest
     end
 
     if path =~ /^dfs:\/\// then
-      @file, path2 = parse_path( path)
+      @@file, path2, addr = parse_path(path)
     else
-      path2 = File.join(@directory, path)
+      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
 
   def zip(filename_zip, a)
 
-    puts '@directory: ' + @directory.inspect if @debug
+    puts '@@directory: ' + @@directory.inspect if @debug
 
-    unless @directory or filename_zip =~ /^dfs:\/\// then
+    unless @@directory or filename_zip =~ /^dfs:\/\// then
 
       Zip::File.open(zipfile_zip, Zip::File::CREATE) do |x|
 
@@ -349,61 +168,42 @@ class DRbFileClient
     end
 
     if filename_zip =~ /^dfs:\/\// then
-      @file, filepath = parse_path(filename_zip)
+      @@file, filepath = parse_path(filename_zip)
     else
-      filepath = File.join(@directory, filename_zip)
+      filepath = File.join(@@directory, filename_zip)
     end
 
-    @file.zip filepath, a
+    @@file.zip filepath, a
 
   end
 
-  private
-
-  def parse_path(filename)
-
-    host = filename[/(?<=^dfs:\/\/)[^\/:]+/]
-    @host = host if host
-
-    port = filename[/(?<=^dfs:\/\/)[^:]+:(\d+)/,1]  || '61010'
+end
 
-    file_server = DRbObject.new nil, "druby://#{host || @host}:#{port}"
-    [file_server, filename[/(?<=^dfs:\/\/)[^\/]+\/(.*)/,1]]
 
-  end
+def DfsFile.chmod(num, filename)
+  DRbFileClient.new.chmod(num, filename)
+end
 
+def DfsFile.cp(path, path2)
+  DRbFileClient.new.cp(path, path2)
 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 DfsFile.ls(path)
+  DRbFileClient.new.ls(path)
+end
 
-  def self.ru(path)             @client.ru(path)             end
-  def self.ru_r(path)           @client.ru_r(path)           end
+def DfsFile.mv(path, path2)
+  DRbFileClient.new.mv(path, path2)
+end
 
-  def self.touch(filename, mtime: Time.now)
-    @client.touch(filename, mtime: mtime)
-  end
+def DfsFile.ru(path)
+  DRbFileClient.new.ru(path)
+end
 
-  def self.write(filename, s)   @client.write(filename, s)   end
-  def self.zip(filename, a)     @client.zip(filename, a)     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.2
+  version: 0.8.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   FGcgjmmz5fOIqq2sBxk6JW1yo2G43yIUzymWOYKT2Jh6RR0Gg3z66wWwYpFpx8yR
   00JTBNVAgW+s2sLpeBtyMDbb
   -----END CERTIFICATE-----
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
@@ -58,25 +58,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: c32
+  name: dir-to-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: drb_fileclient-readwrite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  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.5
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -103,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