rscript 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b1f2dc9cd687680432ff6a4e8d0e572f4cabf5
-  data.tar.gz: 246310e6d4dc4bc5708e72fa7591450e6ff069bc
+  metadata.gz: dafd9ec99e12b666918cb7b8006d5cd3527c8faf
+  data.tar.gz: b6ff8fe6150016b7fd1f8a0906c312cc3fdf7bb6
 SHA512:
-  metadata.gz: a50186cb43434b2c6e5dcb2375f68519f045ae90bb3ffeac5be51b09e2277a70f9839507690034abaaaf3ea8da5c6090b3065a2fbe2043527b7726250b883047
-  data.tar.gz: 05a0eaf524599a672c9b14eee823dddd6c5a7fb2900891f37b8ff651a6e8febbca1ab7bb29ec39cc18ebce5adc972c37faf809776f299ed2ffeaac6e2b16659b
+  metadata.gz: af4850b00ee83ae347424652cf5e3b9361c52193a07b3b094840e64cec66a7abaafe72ae0f633a1bf0a3d67b29b2b6b77b33e31f3d477dedb87372d3337f2b11
+  data.tar.gz: d6a31d2d3803c42896ed93b86ba9d9c383b6da4c66864fcb9e567b1da8786faf16b595cbe61710885dd535af83a3308b1431e1d756a4eae758a29316e0f37790

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-���U
-_JR�%�C�v�>����W$['vP�Ӽ��VW�E��������2����I�G> Mh�so��1�
�_~�x�ړ���^�k#�ENq����^j���*)��$�%�2�`J���.ڕ���f	߆���2�-m��Pf�%us�#<K
+O�}�!�\�-4��2P��`��;����Y��2�t�6b�'Aѧ[[���i��'�?k�kaY���}i��:�����6��`F���9���̀�>�
 ��z����aɹ{
+��b�� �4^�}$9P��h�qvt%J7>r@C��"�i�q_�190_�F)���I���sẵ��1Ȉ�hUj"�֐mr�5f7�Ŋ���֖���⵾�Tz�R��2���9� �=*�Q��=r�-#6�

data/lib/rscript.rb

@@ -3,10 +3,11 @@
 # file: rscript.rb
 
 # created:  1-Jul-2009
-# updated: 21-Jun-2016
+# updated: 26-Jun-2016
 
 # modification:
 
+  # 26-Jun-2016: The .rb files are now located within the rscript file directory
   # 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
@@ -31,149 +32,5 @@
 # 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'
-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
+require 'rscript/rscript'
+require 'rscript/rscript_base'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   iYiOpzs0Jmv4jizUQGqzjOvyRUQTlYG2IDutjigLuyZllxXvxAcdRXKarC+qvESI
   fb096Gf6Ao7H/w==
   -----END CERTIFICATE-----
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: rscript previously known as rcscript, reads Ruby code which is embedded within