rxfhelper 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1ba5f3ebfdf98137009f629d1c29f5953beed326
-  data.tar.gz: 5d2a9b3d7ee477e47f2541b194eaf27892a260de
+SHA256:
+  metadata.gz: 6709086d384ceee3f914d93abda5464dda82dd93d51e51131a7463c6cd53aca4
+  data.tar.gz: 69c1750f264aa4a9e813b4273736036ff3044da9bf4ac7141e1f336ad97d722d
 SHA512:
-  metadata.gz: ff58ae4ef0b5658f111e123a4a6456c9bea9cd0301fa622813807f5453962611107dfc17a5ce7e10a6030a3a62b7380e01fc3399128ffcfa3813e54b0bba1cb9
-  data.tar.gz: 19fdd878529c872c7c3299b8a130be0931019b2db965e36b3e869e4668a8d2d8f483e858ea092f0c3fd0d81a0758519ecf13b9d7e2792da006b048f506452a20
+  metadata.gz: f135fc6115bc9de4f24368ed6d0dfe7ccf682e366943217f7477b52baae40bd99b6777f928797e19d49755f6e48a8e30003eea8af5e58f8cdcceda2e10fe4d94
+  data.tar.gz: 9ff55da403701f1311a1bd393923f355b97da47b15ac07f055e1155d766a4a687831a25fc86f61db5fc9c3a5936a4c92cb5eece60c71f6e68c3a03549ba72467

data/lib/rxfhelper.rb

@@ -10,7 +10,9 @@ require 'drb_fileclient'
 module RXFHelperModule
   
   class FileX
-    
+
+    def self.chdir(s)  RXFHelper.chdir(s)   end
+
     def self.exists?(filename)
       
       type = self.filetype(filename)
@@ -29,7 +31,7 @@ module RXFHelperModule
       filex.exists? filename
       
     end
-    
+
     def self.filetype(x)
       
       return :string if x.lines.length > 1
@@ -53,10 +55,13 @@ module RXFHelperModule
         
       end
     end
-    
+
+    def self.mkdir(s)     RXFHelper.mkdir(s)       end
+    def self.mkdir_p(s)   RXFHelper.mkdir_p(s)     end            
+    def self.pwd()        RXFHelper.pwd()          end    
     def self.read(x)      RXFHelper.read(x).first  end
     def self.write(x, s)  RXFHelper.write(x, s)    end      
-    
+
   end
 end
 
@@ -76,6 +81,16 @@ end
 class RXFHelper
   
   
+  def self.chdir(x)
+    
+    if x[/^file:\/\//] or File.exists?(File.dirname(x)) then
+      FileUtils.chdir x
+    elsif x[/^dfs:\/\//]
+      DfsFile.chdir x
+    end
+    
+  end
+  
   def self.get(x)   
 
     raise RXFHelperException, 'nil found, expected a string' if x.nil?    
@@ -87,8 +102,36 @@ class RXFHelper
     end
 
   end    
-
-  def self.read(x, opt={})   
+  
+  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[/^file:\/\//] or File.exists?(File.dirname(x)) then
+      FileUtils.mkdir_p x
+    elsif x[/^dfs:\/\//]
+      DfsFile.mkdir_p x
+    end
+    
+  end
+  
+  def self.pwd()
+    
+    DfsFile.pwd
+    
+  end  
+  
+  def self.read(x, h={})   
+    
+    opt = {debug: false, auto: false}.merge(h)
 
     raise RXFHelperException, 'nil found, expected a string' if x.nil?
     
@@ -125,9 +168,10 @@ class RXFHelper
          
       elsif x[/^file:\/\//] or File.exists?(x) then
         
+        puts 'RXFHelper.read before File.read' if opt[:debug]
         contents = File.read(File.expand_path(x.sub(%r{^file://}, '')))
         
-        obj = if contents.lines.first =~ /<?dynarex / then
+        obj = if (contents.lines.first =~ /<?dynarex /) and opt[:auto] then
         
           dx = Dynarex.new(debug: opt[:debug])
           dx.import contents
@@ -142,6 +186,8 @@ class RXFHelper
         
       elsif x =~ /\s/
         [x, :text]
+      elsif DfsFile.exists?(x)
+        [DfsFile.read(x), :dfs]
       else
         [x, :unknown]
       end
@@ -152,18 +198,27 @@ class RXFHelper
     end
   end
   
-  def self.write(uri, s=nil)
+  def self.write(location, s=nil)
     
-    case uri
+    case location
     when /^dfs:\/\//
       
       DfsFile.write filename, s
       
     when /^rse:\/\//
-      RSC.new.post(uri, s)
+      
+      RSC.new.post(location, s)
+      
     else
-      File.write(uri, s)
+      
+      if DfsFile.exists?(File.dirname(location)) then
+        DfsFile.write location, s
+      else
+        File.write(location, s)
+      end
+      
     end
+    
   end
   
   def self.writeable?(source)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxfhelper
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   8rLqizynNftXvmwVftEH2yQKlc6bsltIk+l2sNVht38tWANd/Zs0H6abD5zkVp2e
   h6ZEatzAI88gwQ==
   -----END CERTIFICATE-----
-date: 2018-08-05 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: gpd-request
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Helpful library for primarily reading the contents of a file either from