rxfileio 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272d1fa65e584c7e367b29d17992898b57d3662f279f40d15bd18c758d846f2c
-  data.tar.gz: c9d602379efcb03790db530d928d8e17fe6fa8e58598b5c397d93cd7e201a065
+  metadata.gz: '08d1e85a91de04e491f6ddc55f9b7a761c56528f8a05aa2629713067c8bb6dcf'
+  data.tar.gz: c06843254fd4e53b5d948e0f5f7c36d30c2b37f099790a775485bee5a0d8286c
 SHA512:
-  metadata.gz: 19730610a5b4193b90caa8fedc5197a2dd40a38f37ae3c129f8013e5b153a0893e60392a3e05d527d95936064e8e7c86b516669595e894f64150b48068aa86ba
-  data.tar.gz: 731c67073761c9617355ded197590211201f298f2c3bdefc26f6b9ccc623d4647a64f32677ee4944921d411d16ad45131d32b59d4bab1b173491627620a1bcc8
+  metadata.gz: bc554443fed2e90df5b85617eb7680bf8896d7e4600e800ad4730ac1a2e1aa737452c143f93d384ada94dc4be94a363eeb5c697c8f68bf23ed23469f149e0eed
+  data.tar.gz: 1790ea0632b76cf409f8159d8c0ed8a0f2232959dc8579a34c41584c00dd878bd3747e9500549f306a5b7ca3bca886639ae4a21c1b221d306eca3cda35819338

data/lib/rxfileio.rb

@@ -11,42 +11,13 @@ require 'mymedia_ftp'
 module RXFileIOModule
   include RXFReadWriteModule
 
-  def DirX.chdir(s)  RXFileIO.chdir(s)   end
-  def DirX.mkdir(s)  RXFileIO.mkdir(s)   end
-  def DirX.pwd()     RXFileIO.pwd()      end
-
-  def FileX.chdir(s)  RXFileIO.chdir(s)  end
-
-  def FileX.directory?(filename)
-
-    type = FileX.filetype(filename)
-
-    filex = case type
-    when :file
-      File
-    when :dfs
-      DfsFile
-    else
-      nil
-    end
-
-    return nil unless filex
-
-    filex.directory? filename
-
-  end
-
-  def FileX.exist?(filename)
-    exists? filename
-  end
-
+  def FileX.exist?(filename) exist?(filename)     end
   def FileX.chmod(num, s) RXFileIO.chmod(num, s)  end
   def FileX.cp(s, s2)     RXFileIO.cp(s, s2)      end
   def FileX.ls(s)         RXFileIO.ls(s)          end
   def FileX.mkdir(s)      RXFileIO.mkdir(s)       end
   def FileX.mkdir_p(s)    RXFileIO.mkdir_p(s)     end
   def FileX.mv(s, s2)     RXFileIO.mv(s, s2)      end
-  def FileX.pwd()         RXFileIO.pwd()          end
   def FileX.read(x)       RXFileIO.read(x).first  end
   def FileX.rm(s)         RXFileIO.rm(s)          end
 
@@ -73,14 +44,13 @@ end
 class RXFileIO < RXFReadWrite
   using ColouredText
 
-  @fs = :local
 
   def self.chmod(permissions, s)
 
     return unless permissions.is_a? Integer
     return unless s.is_a? String
 
-    if s[/^dfs:\/\//] or @fs[0..2] == 'dfs' then
+    if s[/^dfs:\/\//] or @@fs[0..2] == 'dfs' then
       DfsFile.chmod permissions, s
     else
       FileUtils.chmod permissions, s
@@ -112,31 +82,11 @@ class RXFileIO < RXFReadWrite
     end
   end
 
-  def self.chdir(x)
-
-    # We can use @fs within chdir() to flag the current file system.
-    # Allowing us to use relative paths with FileX operations instead
-    # of explicitly stating the path each time. e.g. touch 'foo.txt'
-    #
-
-    if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
-
-      @fs = :local
-      FileUtils.chdir x
 
-    elsif x[/^dfs:\/\//]
-
-      host = x[/(?<=dfs:\/\/)[^\/]+/]
-      @fs = 'dfs://' + host
-      DfsFile.chdir x
-
-    end
-
-  end
 
   def self.ls(x='*')
 
-    return Dir[x] if File.exists?(File.dirname(x))
+    return Dir[x] if File.exist?(File.dirname(x))
 
     case x[/^\w+(?=:\/\/)/]
     when 'file'
@@ -151,19 +101,9 @@ class RXFileIO < RXFReadWrite
 
   end
 
-  def self.mkdir(x)
-
-    if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
-      FileUtils.mkdir x
-    elsif x[/^dfs:\/\//]
-      DfsFile.mkdir x
-    end
-
-  end
-
   def self.mkdir_p(x)
 
-    if x[/^dfs:\/\//] or @fs[0..2] == 'dfs' then
+    if x[/^dfs:\/\//] or @@fs[0..2] == 'dfs' then
       DfsFile.mkdir_p x
     else
       FileUtils.mkdir_p x
@@ -175,13 +115,6 @@ class RXFileIO < RXFReadWrite
     DfsFile.mv(s1, s2)
   end
 
-
-  def self.pwd()
-
-    DfsFile.pwd
-
-  end
-
   def self.read(x, h={})
 
     opt = {debug: false}.merge(h)
@@ -231,7 +164,7 @@ class RXFileIO < RXFReadWrite
 
         [MyMediaFTP.read(x), :ftp]
 
-      elsif x[/^file:\/\//] or File.exists?(x) then
+      elsif x[/^file:\/\//] or File.exist?(x) then
 
         contents = File.read(File.expand_path(x.sub(%r{^file://}, '')))
 
@@ -347,8 +280,8 @@ class RXFileIO < RXFReadWrite
 
   def self.touch(filename, mtime: Time.now)
 
-    if @fs[0..2] == 'dfs' then
-      return DfsFile.touch(@fs + pwd + '/' + filename, mtime: mtime)
+    if @@fs[0..2] == 'dfs' then
+      return DfsFile.touch(@@fs + pwd + '/' + filename, mtime: mtime)
     end
 
     case filename[/^\w+(?=:\/\/)/]
@@ -391,7 +324,7 @@ class RXFileIO < RXFReadWrite
 
     if not source =~ /:\/\// then
 
-      return true if File.exists? source
+      return true if File.exist? source
 
     else
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfileio
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   yLO5YIYbN1F1F4bnaaoKLedXnnC+5VCarLA4HblYDwqrZ78CQIBelACSnxeY9gD3
   oyr0nnshzqXtH7vQD0nI5kqL
   -----END CERTIFICATE-----
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfreadwrite
@@ -46,7 +46,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: drb_fileclient
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Features remote file operations using the DFS protocol and more.