rscript 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cd9913db1e9daf774da2dc91a1fee0427da24c2
-  data.tar.gz: 8085e7359ef897a5fed6744243aa812d41183109
+  metadata.gz: 9c705ac08971d5107f144f4d25125e0ffd0d8eb8
+  data.tar.gz: b9e18e18e81827b96a77af285eb52fddca178ccf
 SHA512:
-  metadata.gz: a1f6728c5d886c807f4de9bcd4d7805e01bd2d52a6e2f732f481e26a21c9547b704020d6f306ea5b88475f130235909d93df8f0e10392c8959806cfeffd618bf
-  data.tar.gz: c1c78c772b71c09b577d35219daec7b197b94c005755533875f87b70e868ae8a63832b79b4e606f4d28ad483ddfa8d6b5d00c862c951303b3b1a80f2f0239764
+  metadata.gz: 0cff8c7c26434bc826115d66e90d3a1a9a35200b05bba34cb4c45bae61f091982c03c52e5f00ad59494cfdf933f1a39f6f1feb12e7a6a35a3c739d193cd11502
+  data.tar.gz: 7002a8234ed9ac5767796f17d69b4c70ff4c3498f12d67c254a5bd57b2603691df1265f415b004d359f2044632f6fe26423af253be8f727b218966f0e3829f01

data/lib/rscript.rb

@@ -1,6 +1,14 @@
 #!/usr/bin/env ruby
+
 #file: rscript.rb
 
+# created:  1-Jul-2009
+# updated: 08-Aug-2013
+
+# modification:
+
+  # 08-Aug-2013: re-enabled the hashcache;
+  # 24-Jun-2011: disabled the hashcache
 
 # description
 #  - This script executes Ruby script contained within an XML file.
@@ -18,14 +26,14 @@
 # MIT license - basically you can do anything you like with the script.
 #  http://www.opensource.org/licenses/mit-license.php
 
-
 require 'rscript_base'
 require 'hashcache'
 
+
 class RScript < RScriptBase
 
-  def initialize()
-    @rsf_cache = HashCache.new(cache: 5)
+  def initialize(opt={})
+    @rsf_cache = HashCache.new({cache: 5}.merge(opt))
   end
   
   def read(args=[])
@@ -58,6 +66,38 @@ class RScript < RScriptBase
   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 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
+    
+    begin
+
+      r = eval code2
+      params = {}
+      return r          
+
+    rescue Exception => e  
+      params = {}
+      err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")      
+      return err_label
+    end        
+  end  
   
   private
 
@@ -68,6 +108,7 @@ class RScript < RScriptBase
 
     @url_base = rsfile[/\w+:\/\/[^\/]+/]
     buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
+    #jr080813 buffer = read_sourcecode(rsfile) 
 
     doc =  Document.new(buffer)
     yield(doc)
@@ -80,6 +121,7 @@ class RScript < RScriptBase
 
     $rsfile = rsfile[/[^\/]+(?=\.rsf)/]
     buffer = @rsf_cache.read(rsfile) {read_sourcecode(rsfile) }
+    #jr080813 buffer = read_sourcecode(rsfile) 
     @url_base = rsfile[/\w+:\/\/[^\/]+/]
     doc =  Document.new(buffer)
     yield(doc)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   2tHFESql9unw2f1cmqvD6DMfA2vVH7UJJoxEbkE1ECWj9QoYqYpgDvaSp0Z0WYD1
   Xj5QxdIHOcsEDKdkQpPw4y7x8lNM2Bww
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache