rscript 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85499beaf8d024ecdb086bb4dd070f81f91b485a
-  data.tar.gz: 5e9fcdcd242c20dca80c9277be5136ec0ea743f5
+  metadata.gz: 8faefa337d623421e570cb61a2ac888a90bd5664
+  data.tar.gz: 6436e9b81657b714c67102715cbfe2d9e7c27b21
 SHA512:
-  metadata.gz: 20e45654ab3efda5e766914fafbb9e069d21bb0ca13df2d4de705cf1dbf0e58d2d68e9deb601834f2c4cd8408cce16bc691a3bc3ee659c297caf02641d1d690e
-  data.tar.gz: 9d735160d60cbfe35ff812ad6b75ec10feed8aac59bfb0bcc71e9e6bc51269e6570bd24076be33c7f4fbd90e6353b9050386386cd09c3590f0bd432f4777681c
+  metadata.gz: 0f28100568f554d9e421fa691884fdd081bf789437c1a33000ddfc4051ed91ced83dd050c776fe424dce13578e9ec3b0e034ca64b14cab0328782198d611ec8c
+  data.tar.gz: 9a02566bcad1e99f4f23aa22ad8ccc43351065682dced270d5502e0567d095aa416bcf9701298a4e1a6c3db0006fb413bbc80fd4d003988bebee22f8a7e489c1

data/lib/rscript.rb

@@ -4,10 +4,11 @@
 
 
 # created:  1-Jul-2009
-# updated: 29-Jan-2015
+# updated: 14-Jan-2016
 
 # modification:
 
+  # 14-Jan-2016: Replaced the simple thread with just the eval
   # 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
@@ -39,12 +40,24 @@ require 'rexle'
 
 class RScript < RScriptBase
 
-  def initialize(opt={})
+  def initialize(opt={}, log: nil)
+    
+    @logger = Logger.new log, 'daily' if log
     @rsf_cache = HashCache.new({cache: 5}.merge(opt))
+    
   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 = []
@@ -67,8 +80,10 @@ class RScript < RScriptBase
       out
       
     else    
-      out = read_rsf(args) {|doc| doc.root.xpath('//script').map {|s| read_script(s)}}    
-    end 
+      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
 
     [out, args]
   end
@@ -80,6 +95,11 @@ class RScript < RScriptBase
   # 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
@@ -93,16 +113,26 @@ class RScript < RScriptBase
       end
       params.merge! h
     end            
-
+    
     code2, args = self.read raw_args
+    @logger.debug 'RScript -> code2: ' + code2.inspect if @logger
     
     begin
       
-      
-      thread = Thread.new(code2) {|x| Thread.current['result'] = eval x}
+=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
-      #r = eval code2
-      r = thread['result']
+=end      
+      r = eval code2
+      #r = thread['result']
 
       params = {}
       return r          
@@ -115,6 +145,7 @@ class RScript < RScriptBase
   end  
   
   private
+  
 
   def read_doc_rsf(args=[])
     rsfile = args[0]; args.shift
@@ -123,7 +154,6 @@ class RScript < RScriptBase
 
     @url_base = rsfile[/\w+:\/\/[^\/]+/]
     buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
-    #jr080813 buffer = read_sourcecode(rsfile) 
 
     doc =  Rexle.new(buffer)
     yield(doc)
@@ -133,7 +163,7 @@ class RScript < RScriptBase
       
   def read_rsf(args=[])
     rsfile = args[0]; args.shift
-
+    
     $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
     buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDcxMzAyMjk1MloXDTE1MDcxMzAyMjk1MlowSDESMBAG
+  8ixkARkWAmV1MB4XDTE2MDExNDIxMzM1N1oXDTE3MDExMzIxMzM1N1owSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAN3iMwxNvkjBQey6OxOEsDsMoOeUYqK57oisduaN97l2zu55N2GFs1lnCD+v
-  sZdwnbWeX1A/z49SQu6SyUdQgTH3Anq1sTKodzzkNPDiJHj4akdNM0Z6CjVu5Yby
-  Z/tjuFNu954m5OgqE5Ziqel3hHI65N/RgAIWPcGOCUqwz3YUOLNrds74OX8oVR4O
-  EJCqAzDFWhUFJz+gJ+Kyyq9Y7MEzt1PEE93LqOkEMPTMeQZohIL5QdEiHuUYsrWi
-  O5i8CDERhA9CfX/v1mI+x3E4Xd9AEv5KV9PVRLBJVOfdQsMN74L8AkWhrGfWafGi
-  QuTvEFeBlSzuNTHRCyASXHGDDqkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUMau3eO/7SrVV5wDnH2cUFXVrkBAwJgYDVR0RBB8w
+  ggEBAM4rXRN2dI2T811f1lUPK/1+4SNjbO37Jfw9z+mPsT0Ffsl40pbT4DL73Ks9
+  ooU92wYkMDCGQ9Ql7j6LkNM4Et7TKhdhuGdMclvYiSWuLegHEF0fjpTkdrgWXwmZ
+  Crdj/vblfq120A0qGOFT5PtG/17W690lFgwA0kFwnTiSPIMfMddCpXT7+Y6n48EB
+  j6lxjVZilY88cba+YUky7wSKp7cfRnf5cEzE7ScNQWlbFBg6D7VIcyeXH3Ob3BVu
+  K1uaOf7J8GCi/AYGmmhUoHZxPKFta5WoLv/dMCPc9M+X4oOiISd/uqmDJ4LhBd2i
+  AjnPtQyXXKb+Lk6IV+bBsurJQ8UCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUzCJ1cguRxKnAD9Icwox5i/VgFmAwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEA220n1IXw
-  i3erJ2iIDJ61vT2DCq6jaOZojqLfGtHB3LaxnkigU5CYi2ChXyj7JOc14tlbBjyW
-  4pP6iBrTSscaFDvsfAlfUpQeOHEY9P0+K0z7l2rqZYOX0JiZ5kLzkI7505bWzVGK
-  qPuANvQy2ySAImuXX5NZCbykQRyTqL4QjnW58yGmt6Wd4S235Bx7qqYTk91IgOdk
-  1JLY8tOB6wkf024VN5odwy8jLcHAUFaUg8YMJeK/jmPw/Ewb4QdAelAl+2lAoGh2
-  pTl90ccAo96Myith2+5jI2p1BAoSjDRNTv+Uz21Zp7x1b0lFfXtaZ4FK5hu/B+DM
-  B4M/dUmu40qQLg==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAVdfe0gI1
+  uKeSkQHKe0vwnvce9vHVPXAJgDsDTtvh0qPKFK6yjbbyVxKumM5K6h9geeQ43hBX
+  uoGDJ7oHNsBX0LaS9Tb7234YNbKuSty2fLNIoiAuvegboOlQT+BREUmY4HKHmpqQ
+  a9NTgF8PnZYcuD+sl2tTLihBgFLzQ9GMIEck+lHJGF7ml4ZAY8u4683at1t3U32Y
+  LyOfovuK6uJvyL7lh1NOOcMSjGSyEYgA47VfYXNVkgIBCwGpyekoH+51vUiSIEDd
+  iYiOpzs0Jmv4jizUQGqzjOvyRUQTlYG2IDutjigLuyZllxXvxAcdRXKarC+qvESI
+  fb096Gf6Ao7H/w==
   -----END CERTIFICATE-----
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: rscript previously known as rcscript, reads Ruby code which is embedded within