rscript 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcf43718d97e71fe37bee3a62f1770d1a55254e59d892462f879864faf653688
-  data.tar.gz: ff8a1cf984cc885b90d119a47b9354185df2b16081f7547feb8b5e2ab1bb1fc2
+  metadata.gz: 8aec962ed289a675c59189eb2bd7d5c8c28cbdb0e6c35e2fa127f9c7336f181d
+  data.tar.gz: acda35d707dc3d0162b889f4920354de05f3d4621c2f5c8fc04a613bab57b5f2
 SHA512:
-  metadata.gz: fc56fc7b376efeeabf272a0f85d4512daf274b2203d1ede851abc05e37685e895e9bacf8b0a5b66741b6646f2b5ea45e4e880887af785aeaa585781ab964597b
-  data.tar.gz: 2d70b5ede964d1516e90c0a22887ccf714cf6bb7cccdd678b93ff2d07a9df767879397eaf4c2d172dbabeb2c81dc78c73de27064cfcbc80950d6e163160b2fc8
+  metadata.gz: 3432b133427da64d0e5efc87df4907751fe0e906e2bf711e2037fb6fc2d0d5e35a2400ee0e25421b2bc56d06275706b9bbf0ef9070049c823d16a7af1a6c68ea
+  data.tar.gz: 74b615fe0c30f3828fde0f1fb5625f468fa6405ed510ccdc8571893dc9b63d1444d8cbe349cfc555023c26915c1c33081d1e8105f104368fb88a4d4fbce3f8e8

data/lib/rscript.rb

@@ -48,37 +48,144 @@ require 'hashcache'
 require 'rexle'
 
 
-class RScriptBase
+class RScript < RScriptBase
+
+  def initialize(log: nil, pkg_src: '', cache: 5, debug: false, type: 'job')
+    
+    puts 'inside RScript' if @debug
+    @log = log
+    @cache = cache
+    @rsf_cache = HashCache.new({cache: cache}) if cache and cache > 0
+    @jobname = type
+    super(debug: debug)
+    
+  end
   
-  def initialize(debug: false)
-    @debug = debug
+  def jobs(package)
+    a = read_rsfdoc([package])  
+    a.map(&:first).uniq
   end
   
-  def read(doc)
-    doc.root.xpath('//script').map {|s| run_script(s)}.join(';')
+  def read(raw_args=[])
+      
+    puts 'inside read' if @debug
+    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!
+      puts 'before read_rsfdoc' if @debug
+      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]
   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  
   
-  protected
+  private    
   
-  def read_script(script)
-    puts 'inside read_script' if @debug
-    out_buffer = ''
+  def build_a(rsfile)
     
-    src = script.attributes[:src]
+    buffer = read_sourcecode(rsfile) 
+    puts 'buffer: ' + buffer.inspect if @debug
+    
+    doc =  Rexle.new(buffer)
+    puts 'after Rexle' if @debug
+    
+    doc.root.xpath("//#{@jobname}").inject([]) do |r,x|
+      puts 'x: ' + x.inspect if @debug
+      codeblock = x.xpath('//script')\
+          .map {|s| read_script(s)}.join("\n")
+      r << [x.attributes[:id].to_sym, {attributes: x.attributes, 
+                                            code: codeblock}]
+    end        
+    
+  end      
+  
+  def read_rsfdoc(args=[])
+    
+    puts 'args: ' + args.inspect if @debug
+    rsfile = args[0]; args.shift
+    
+    $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
+    
+    a = @cache ? @rsf_cache.read(rsfile) { build_a(rsfile) } : build_a(rsfile)
+    puts 'read_rsfdoc a: ' + a.inspect if @debug
 
-    out_buffer = if src then
-      read_sourcecode(script.attributes[:src].to_s)
-    else
-      script.texts.join("\n")
-    end
+    @url_base = rsfile[/\w+:\/\/[^\/]+/]
     
-    out_buffer
-  end
-        
-  def read_sourcecode(rsf)
-    puts 'inside read_sourcecode' if @debug
-    buffer, _ = RXFHelper.read rsf, auto: false
-    return buffer
-  end          
+    return a
+
+  end    
   
 end
+
+if __FILE__ == $0 then
+  raw_args = ARGV
+  rs = RScript.new()
+  code, args = rs.read(raw_args)
+  puts eval(code).join("\n")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - James Robertson