rscript 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87de3007d89a229148c3dbb1c7c1f166dc9c1fc2bac1b7471587713d1550c11d
-  data.tar.gz: 67b9ad3063e3c4f90f210d7e738883ab1eaeafda7e5f8c2f2717c5cd3003e592
+  metadata.gz: 845e770b89f51965807fd09565b493e371f7cde6cf731e0cb2b6735f3570ed83
+  data.tar.gz: e0a90d763a8ddc14d020f429d301a2c2ba476a5bd2600e7fcd4ee07ba6b4c715
 SHA512:
-  metadata.gz: 6b76c85bcf4bdf8420a35243852d6fee32873b3605f0e9b35fe321fb21b61513f0d67fb6b89e5d6f4f4d7759f973292303f347fa3b22c01ca23a7ba05315e51f
-  data.tar.gz: 4d976cda6b2aad249550384ba6b70b1dc0582c4db36f5fd97ad44efd91d6da53e62be62a38c55f718d9f2b9dce2734ed1f204087aaff0a19d23c4ee5bff9ac36
+  metadata.gz: deda38285fdc3d090a80fdc571e117508f4f81477d744e07e53157451c325974d984e1812b691bb160f1b6c487bdc12effdf7c3de247316c8b40b7765548e54e
+  data.tar.gz: c65076ba2fcad742663ce5ecad832f76dc9800d0c41b21b7b6116374da2dfb672a55a826ddd9a312dba77df5e0d8baecd5c94fdae47c4ee4cf88c89ced45b2f6

data/lib/rscript.rb

@@ -3,10 +3,12 @@
 # file: rscript.rb
 
 # created:  1-Jul-2009
-# updated: 05-Mar-2019
+# updated: 00-Mar-2019
 
 # modification:
 
+  # 00-Mar-2019: feature: An explicit path or implicit path now can be 
+  #                       specified in the src attribute
   # 05-Mar-2019: feature: Added the class RScriptRW for :get, :post typed jobs
   # 13-Oct-2018: bug fix: The log is now only written when the log exists
   # 30-Jul-2018: feature: A list of job ids can now be returned
@@ -169,13 +171,17 @@ class RScript < RScriptBase
     puts 'args: ' + args.inspect if @debug
     rsfile = args[0]; args.shift
     
+    url = File.dirname  rsfile
+    @url_dir = url[/(?:\w+:\/\/|.*)[^\/]*(\/.*)/,1]
+    @url_base = url[/(\w+:\/\/[^\/]+|.*)/]   
+    
     $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
     
     a = @cache ? @rsf_cache.read(rsfile) { build_a(rsfile) } : build_a(rsfile)
     puts 'read_rsfdoc a: ' + a.inspect if @debug
 
-    @url_base = rsfile[/\w+:\/\/[^\/]+/]
-    
+
+        
     return a
 
   end    

data/lib/rscript_base.rb

@@ -7,6 +7,7 @@ require 'open-uri'
 require 'rxfhelper'
 
 class RScriptBase
+  using ColouredText
   
   def initialize(debug: false)
     @debug = debug
@@ -19,7 +20,7 @@ class RScriptBase
   protected
   
   def read_script(script)
-    puts 'inside read_script' if @debug
+    puts 'inside read_script'.info if @debug
     out_buffer = ''
     
     src = script.attributes[:src]
@@ -34,8 +35,20 @@ class RScriptBase
   end
         
   def read_sourcecode(rsf)
-    puts 'inside read_sourcecode' if @debug
-    buffer, _ = RXFHelper.read rsf, auto: false
+    
+    puts 'inside read_sourcecode'.info if @debug
+    #@log.debug 'rsf: ' + rsf.inspect if @log
+    #@log.debug 'url_base: ' + @url_base.inspect if @log
+    
+    path = case rsf
+    when /^\// 
+      @url_base =~ /^\// ? rsf : File.join(@url_base, rsf) 
+    when /\w+:/ then rsf  
+    else
+      File.join(@url_base, @url_dir, rsf)
+    end
+    
+    buffer, _ = RXFHelper.read path, auto: false
     return buffer
   end          
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   H+WbcZlnDVw3xyetJLKgUOqsjkXnFyv2ansbZtghG1wEvnd/0sNdyfRnjXv3gAt2
   OUyieSgHfrd2srDrlcNHFJY8
   -----END CERTIFICATE-----
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache