rscript 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e8024251f399b0c527884244f22a6a2f3f2e25a
-  data.tar.gz: 2d0d3c0ba7a6fd47075bd0fe66925abd90427ac4
+SHA256:
+  metadata.gz: bcf43718d97e71fe37bee3a62f1770d1a55254e59d892462f879864faf653688
+  data.tar.gz: ff8a1cf984cc885b90d119a47b9354185df2b16081f7547feb8b5e2ab1bb1fc2
 SHA512:
-  metadata.gz: 735e7b6f0146103bd125cb4ff7146d3eb8bf1f979edc0251f41d758074cebe9bff0a4ff270c3cb2c29665cc00bb999a145a1aa90fc9ce554dbf1626be8de86ab
-  data.tar.gz: 1ea34739b2f614f471540f84c79be1fd5c718ee1eb84021559b9e62f3057b14aaa808b90e041239e37be3b49ceb0e5b011f958099b386bdabd71d1424b27a371
+  metadata.gz: fc56fc7b376efeeabf272a0f85d4512daf274b2203d1ede851abc05e37685e895e9bacf8b0a5b66741b6646f2b5ea45e4e880887af785aeaa585781ab964597b
+  data.tar.gz: 2d70b5ede964d1516e90c0a22887ccf714cf6bb7cccdd678b93ff2d07a9df767879397eaf4c2d172dbabeb2c81dc78c73de27064cfcbc80950d6e163160b2fc8

data/lib/rscript.rb

@@ -3,10 +3,11 @@
 # file: rscript.rb
 
 # created:  1-Jul-2009
-# updated: 30-Jul-2018
+# updated: 11-Aug-2018
 
 # modification:
 
+  # 11-Aug-2018: Added the keyword auto: false to RxfHelper for clarity
   # 30-Jul-2018: feature: A list of job ids can now be returned
   # 28-Jul-2018: feature: Jobs are now looked up from a Hash object
   # 13-Jul-2018: bug fix: The use of a cache is now optional
@@ -47,137 +48,37 @@ require 'hashcache'
 require 'rexle'
 
 
-class RScript < RScriptBase
-
-  def initialize(log: nil, pkg_src: '', cache: 5, debug: false, type: 'job')
-    
-    @log = log
-    @cache = cache
-    @rsf_cache = HashCache.new({cache: cache}) if cache and cache > 0
-    @debug = debug
-    @jobname = type
-    
-  end
+class RScriptBase
   
-  def jobs(package)
-    a = read_rsfdoc([package])  
-    a.map(&:first).uniq
+  def initialize(debug: false)
+    @debug = debug
   end
   
-  def read(raw_args=[])
-      
-    args = raw_args.clone
-    @log.info 'RScript/read: args: '  + args.inspect if @log
-    
-    threads = []
-    
-    if args.to_s[/\/\/#{@jobname}:/] then 
-     ajob = '' 
-      args.each_index do |i| 
-        if args[i].to_s[/\/\/#{@jobname}:/] then          
-          ajob = $'; args[i] = nil
-        end
-      end
-
-      args.compact!
-      
-      a = read_rsfdoc(args)      
-      job = a.assoc(ajob.to_sym)
-      out, attr = job.last[:code], job.last[:attributes]
-
-      raise "job not found" unless out.length > 0
-      out
-      
-    else    
-      out = read_rsfdoc(args).map {|x| x.last[:code]}.join("\n")
-    end    
-          
-    @log.info 'RScript/read: code: '  + out.inspect if @log
-
-    [out, args, attr]
+  def read(doc)
+    doc.root.xpath('//script').map {|s| run_script(s)}.join(';')
   end
-
-  def reset()
-    @rsf_cache.reset
-  end
-
-  # note: run() was copied from the development file rscript-wrapper.rb
-  def run(raw_args, params={}, rws=self)
-
-    @log.info 'RScript/run: raw_args: ' + raw_args.inspect if @log
-    puts 'raw_args: ' + raw_args.inspect if @debug
-    
-    if params and params[:splat] then
-      params.each do  |k,v|
-        params.delete k unless k == :splat or k == :package or k == :job or k == :captures
-      end
-    end
-
-    if params and params[:splat] and params[:splat].length > 0 then
-      h = params[:splat].first[1..-1].split('&').inject({}) do |r,x| 
-        k, v = x.split('=')
-        v ? r.merge(k[/\w+$/].to_sym => v) : r
-      end
-      params.merge! h
-    end            
-    
-    code2, args, attr = self.read raw_args.clone
-    puts 'code2 : ' + code2.inspect if @debug
-    @log.info 'RScript/run: code2: ' + code2 if @log
-    
-    begin
-      
-      r = eval code2
-
-      params = {}
-
-      return r          
-
-    rescue Exception => e  
-      params = {}
-      err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")      
-      @log.debug 'rscrcript/error: ' + err_label
-      return err_label
-    end
-
-  end  
   
-  private    
-  
-  def build_a(rsfile)
-    
-    buffer = read_sourcecode(rsfile) 
-    doc =  Rexle.new(buffer)
-
-    doc.root.xpath("//#{@jobname}").inject([]) do |r,x|
-      codeblock = x.xpath('//script')\
-          .map {|s| read_script(s)}.join("\n")
-      r << [x.attributes[:id].to_sym, {attributes: x.attributes, 
-                                            code: codeblock}]
-    end        
-    
-  end      
+  protected
   
-  def read_rsfdoc(args=[])
-    
-    puts 'args: ' + args.inspect if @debug
-    rsfile = args[0]; args.shift
+  def read_script(script)
+    puts 'inside read_script' if @debug
+    out_buffer = ''
     
-    $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
-    
-    a = @cache ? @rsf_cache.read(rsfile) { build_a(rsfile) } : build_a(rsfile)
+    src = script.attributes[:src]
 
-    @url_base = rsfile[/\w+:\/\/[^\/]+/]
+    out_buffer = if src then
+      read_sourcecode(script.attributes[:src].to_s)
+    else
+      script.texts.join("\n")
+    end
     
-    return a
-
-  end    
+    out_buffer
+  end
+        
+  def read_sourcecode(rsf)
+    puts 'inside read_sourcecode' if @debug
+    buffer, _ = RXFHelper.read rsf, auto: false
+    return buffer
+  end          
   
 end
-
-if __FILE__ == $0 then
-  raw_args = ARGV
-  rs = RScript.new()
-  code, args = rs.read(raw_args)
-  puts eval(code).join("\n")
-end

data/lib/rscript_base.rb

@@ -8,7 +8,8 @@ require 'rxfhelper'
 
 class RScriptBase
   
-  def initialize()
+  def initialize(debug: false)
+    @debug = debug
   end
   
   def read(doc)
@@ -17,7 +18,8 @@ class RScriptBase
   
   protected
   
-  def read_script(script)  
+  def read_script(script)
+    puts 'inside read_script' if @debug
     out_buffer = ''
     
     src = script.attributes[:src]
@@ -32,15 +34,9 @@ class RScriptBase
   end
         
   def read_sourcecode(rsf)
-    
-    buffer, type = RXFHelper.read rsf
-    
-    case type
-      when :url, :file
-        buffer
-      when :relative_url
-        open(@url_base + rsf, "UserAgent" => "rscript"){|x| x.read}
-    end
+    puts 'inside read_sourcecode' if @debug
+    buffer, _ = RXFHelper.read rsf, auto: false
+    return buffer
   end          
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   TqGxWMRGelsOt2zNIFH+8d4Yz1dYsNbhK66Q8KRR2vHoT/9T3IJGBPHdsR6Kl6yB
   e5SlxbsP/R/Leg==
   -----END CERTIFICATE-----
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -59,20 +59,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,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: Reads or executes a job contained within a package (XML document), whereby