rscript 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dafd9ec99e12b666918cb7b8006d5cd3527c8faf
-  data.tar.gz: b6ff8fe6150016b7fd1f8a0906c312cc3fdf7bb6
+  metadata.gz: dfa743d27a2badb05e6df2a86cd897edde0225b5
+  data.tar.gz: 14414cceedeaffab943afe3f6b5ecb847b477856
 SHA512:
-  metadata.gz: af4850b00ee83ae347424652cf5e3b9361c52193a07b3b094840e64cec66a7abaafe72ae0f633a1bf0a3d67b29b2b6b77b33e31f3d477dedb87372d3337f2b11
-  data.tar.gz: d6a31d2d3803c42896ed93b86ba9d9c383b6da4c66864fcb9e567b1da8786faf16b595cbe61710885dd535af83a3308b1431e1d756a4eae758a29316e0f37790
+  metadata.gz: cf60bcd9047d5eaa5bc803fb8cf66339a91f7d1c5f5b1db41663f7e32c7cda4ec2976b3517f8381ef42b0dc38546ef96af4754db2842abdb5834ac15111029fc
+  data.tar.gz: 573e5164bdf8896978ba8b3730f0a2b66771761b569338696086c3107c8a9a2fec9b44da16f9bb066cfd531196f8829099f71c5b5e09315017da3421320b254d

data.tar.gz.sig

@@ -1 +1 @@
-!%n;���X9�"R?Y�ײ
+��>�l���Aa6}�L�r��c��ʿd2��pV	�3��oK�RVLbDjί���hz.�-.8���pj]�<��tW&�ޯ����=��C�"�95�;�=�C�@SΗ�MB��P�]̒w������F1��V�E݇�Ŝ~,/n`��d�2�+jR�J���s���n�&�H�~�|��:n���u�n�E�÷M�O�N���Ü!�8���d���@���Ϙr�[	�����nyfԅ�"6��1�V�����

data/lib/rscript.rb

@@ -32,5 +32,148 @@
 # MIT license - basically you can do anything you like with the script.
 #  http://www.opensource.org/licenses/mit-license.php
 
-require 'rscript/rscript'
-require 'rscript/rscript_base'
+
+require 'rscript_base'
+require 'hashcache'
+require 'rexle'
+
+
+class RScript < RScriptBase
+
+  def initialize(logfile: '', logrotate: 'daily', pkg_src: '', cache: true)
+    
+    @logger = Logger.new logfile, logrotate unless logfile.empty?
+    @cache = cache
+    @rsf_cache = HashCache.new({cache: 5}) if cache
+    
+  end
+  
+  def read(args=[])
+
+    if @logger then
+      
+      @logger.debug 'inside RScript#read' 
+      @logger.debug 'RScript -> args: ' + args.inspect
+      
+    end
+    
+    threads = []
+    
+    if args.to_s[/\/\/job:/] then 
+
+      ajob = []
+      
+      args.each_index do |i| 
+        if args[i][/\/\/job:/] then          
+          ajob << "@id='#{$'}'"; args[i] = nil
+        end
+      end
+
+      args.compact!
+
+      out = read_rsf(args) do |doc|
+        doc.root.xpath("//job[#{ajob.join(' or ')}]").map do |job|
+          job.xpath('script').map {|s| read_script(s)}.join("\n")
+        end.join("\n")        
+      end
+
+      raise "job not found" unless out.length > 0
+      out
+      
+    else    
+      out = read_rsf(args) {|doc| doc.root.xpath('//script').map {|s| read_script(s)}}.join("\n")   
+    end
+    
+    @logger.debug 'RScript -> out: ' + out.inspect[0..250] if @logger
+
+    [out, args]
+  end
+
+  def reset()
+    @rsf_cache.reset
+  end
+
+  # note: run() was copied from the development file rscript-wrapper.rb
+  def run(raw_args, params={}, rws=nil)
+
+    if @logger then
+      @logger.debug 'inside RScript#run' 
+      @logger.debug 'RScript -> raw_args: ' + raw_args.inspect
+    end
+    
+    if 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[: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 = self.read raw_args
+    @logger.debug 'RScript -> code2: ' + code2.inspect[0..250] if @logger
+    
+    begin
+      
+=begin      
+      thread = Thread.new(code2) do |x| 
+        
+        begin
+          Thread.current['result'] = eval x
+        rescue
+          @logger.debug('RScript -> eval: ' + ($!).inspect) if @logger
+        end
+        
+      end
+      thread.join
+=end      
+      #puts 'code2 :'  + code2.inspect
+      r = eval code2
+      #r = thread['result']
+
+      params = {}
+
+      return r          
+
+    rescue Exception => e  
+      params = {}
+      err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")      
+      return err_label
+    end
+
+  end  
+  
+  private    
+      
+  def read_rsf(args=[])
+    
+    rsfile = args[0]; args.shift
+    
+    $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
+    
+    buffer = if @cache then
+      @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
+    else
+      read_sourcecode(rsfile)
+    end
+
+    @url_base = rsfile[/\w+:\/\/[^\/]+/]
+
+    doc =  Rexle.new(buffer)
+    yield(doc)
+
+  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

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+# file: rscript_base.rb
+
+require 'cgi'
+require 'open-uri'
+require 'rxfhelper'
+
+class RScriptBase
+  
+  def initialize()
+  end
+  
+  def read(doc)
+    doc.root.xpath('//script').map {|s| run_script(s)}.join(';')
+  end
+  
+  protected
+  
+  def read_script(script)  
+    out_buffer = ''
+    
+    src = script.attributes[:src]
+
+    out_buffer = if src then
+      read_sourcecode(script.attributes[:src].to_s)
+    else
+      script.texts.join("\n")
+    end
+    
+    out_buffer
+  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
+  end          
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -100,6 +100,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rscript.rb
+- lib/rscript_base.rb
 homepage: https://github.com/jrobertson/rscript
 licenses:
 - MIT