rscript 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8faefa337d623421e570cb61a2ac888a90bd5664
-  data.tar.gz: 6436e9b81657b714c67102715cbfe2d9e7c27b21
+  metadata.gz: b5b1f2dc9cd687680432ff6a4e8d0e572f4cabf5
+  data.tar.gz: 246310e6d4dc4bc5708e72fa7591450e6ff069bc
 SHA512:
-  metadata.gz: 0f28100568f554d9e421fa691884fdd081bf789437c1a33000ddfc4051ed91ced83dd050c776fe424dce13578e9ec3b0e034ca64b14cab0328782198d611ec8c
-  data.tar.gz: 9a02566bcad1e99f4f23aa22ad8ccc43351065682dced270d5502e0567d095aa416bcf9701298a4e1a6c3db0006fb413bbc80fd4d003988bebee22f8a7e489c1
+  metadata.gz: a50186cb43434b2c6e5dcb2375f68519f045ae90bb3ffeac5be51b09e2277a70f9839507690034abaaaf3ea8da5c6090b3065a2fbe2043527b7726250b883047
+  data.tar.gz: 05a0eaf524599a672c9b14eee823dddd6c5a7fb2900891f37b8ff651a6e8febbca1ab7bb29ec39cc18ebce5adc972c37faf809776f299ed2ffeaac6e2b16659b

data/lib/rscript.rb

@@ -2,13 +2,12 @@
 
 # file: rscript.rb
 
-
 # created:  1-Jul-2009
-# updated: 14-Jan-2016
+# updated: 21-Jun-2016
 
 # modification:
 
-  # 14-Jan-2016: Replaced the simple thread with just the eval
+  # 21-Jun-2016: Replaced the initialize hash options with inline named params
   # 29-Jan-2015: Replaced REXML with Rexle
   # 06-Nov-2013: An error is now raised if the job doesn't exist
   # 02-Nov-2013: Replaced XThreads with a simle thread
@@ -33,6 +32,7 @@
 #  http://www.opensource.org/licenses/mit-license.php
 
 
+
 require 'rscript_base'
 require 'hashcache'
 require 'rexle'
@@ -40,10 +40,11 @@ require 'rexle'
 
 class RScript < RScriptBase
 
-  def initialize(opt={}, log: nil)
+  def initialize(logfile: '', logrotate: 'daily', pkg_src: '', cache: true)
     
-    @logger = Logger.new log, 'daily' if log
-    @rsf_cache = HashCache.new({cache: 5}.merge(opt))
+    @logger = Logger.new logfile, logrotate unless logfile.empty?
+    @cache = cache
+    @rsf_cache = HashCache.new({cache: 5}) if cache
     
   end
   
@@ -83,7 +84,7 @@ class RScript < RScriptBase
       out = read_rsf(args) {|doc| doc.root.xpath('//script').map {|s| read_script(s)}}.join("\n")   
     end
     
-    @logger.debug 'RScript -> out: ' + out.inspect if @logger
+    @logger.debug 'RScript -> out: ' + out.inspect[0..250] if @logger
 
     [out, args]
   end
@@ -115,7 +116,7 @@ class RScript < RScriptBase
     end            
     
     code2, args = self.read raw_args
-    @logger.debug 'RScript -> code2: ' + code2.inspect if @logger
+    @logger.debug 'RScript -> code2: ' + code2.inspect[0..250] if @logger
     
     begin
       
@@ -131,41 +132,35 @@ class RScript < RScriptBase
       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_doc_rsf(args=[])
-    rsfile = args[0]; args.shift
-
-    $rsfile = rsfile[/[a-zA-z0-9]+(?=\.rsf)/]
-
-    @url_base = rsfile[/\w+:\/\/[^\/]+/]
-    buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
-
-    doc =  Rexle.new(buffer)
-    yield(doc)
+    end
 
-  end
+  end  
   
+  private    
       
   def read_rsf(args=[])
+    
     rsfile = args[0]; args.shift
     
     $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
-    buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
+    
+    buffer = if @cache then
+      @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
+    else
+      read_sourcecode(rsfile)
+    end
 
     @url_base = rsfile[/\w+:\/\/[^\/]+/]
 
@@ -181,4 +176,4 @@ if __FILE__ == $0 then
   rs = RScript.new()
   code, args = rs.read(raw_args)
   puts eval(code).join("\n")
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   iYiOpzs0Jmv4jizUQGqzjOvyRUQTlYG2IDutjigLuyZllxXvxAcdRXKarC+qvESI
   fb096Gf6Ao7H/w==
   -----END CERTIFICATE-----
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -59,40 +59,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.3.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.3.34
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -100,7 +100,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rscript.rb
-- lib/rscript_base.rb
 homepage: https://github.com/jrobertson/rscript
 licenses:
 - MIT
@@ -121,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: rscript previously known as rcscript, reads Ruby code which is embedded within

data/lib/rscript_base.rb

@@ -1,46 +0,0 @@
-#!/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