rscript 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcb3dd422f080c1976bc0478fbdc1a433b7e8df117f1f6cb2f9fddbd1d71ea64
-  data.tar.gz: 6d02210b6339ebdf549bb4264e0d88ae57c44e681246d6d17d6014c9ec32ac1f
+  metadata.gz: 87de3007d89a229148c3dbb1c7c1f166dc9c1fc2bac1b7471587713d1550c11d
+  data.tar.gz: 67b9ad3063e3c4f90f210d7e738883ab1eaeafda7e5f8c2f2717c5cd3003e592
 SHA512:
-  metadata.gz: 7f023d1a1d6be510cf1f12f4f0708145e466883c0523343303952f1cef6dcb5d312ed3895163b3c5d505561e8f5d945ecb59d0d8540c29493e26d2016b95c79e
-  data.tar.gz: 2f7f93846337b081612fdfd35d60086d3e414a786263f612beb6a6343bdb5fc7f459b09cf76f8f6683dca7f86a3878870239b329000d4bb1708c81a55d1672e8
+  metadata.gz: 6b76c85bcf4bdf8420a35243852d6fee32873b3605f0e9b35fe321fb21b61513f0d67fb6b89e5d6f4f4d7759f973292303f347fa3b22c01ca23a7ba05315e51f
+  data.tar.gz: 4d976cda6b2aad249550384ba6b70b1dc0582c4db36f5fd97ad44efd91d6da53e62be62a38c55f718d9f2b9dce2734ed1f204087aaff0a19d23c4ee5bff9ac36

data/lib/rscript.rb

@@ -47,61 +47,6 @@ require 'hashcache'
 require 'rexle'
 
 
-class RScriptRW < RScript
-  
-  attr_accessor :type
-  
-  
-  def read(args=[])
-    
-    puts 'inside read' if @debug
-    @log.info 'RScript/read: args: '  + args.inspect if @log
-    @log.info 'RScript/read: type: '  + type.inspect if @log
-    
-    threads = []
-    
-    if args.to_s[/\/\/job:/] then 
-
-      ajob = ''
-      
-      args.each_index do |i| 
-        if args[i].to_s[/\/\/job:/] then          
-          ajob = $'; args[i] = nil
-        end
-      end
-
-      args.compact!
-      
-      if @debug then
-        puts 'type: ' + self.type.to_s.inspect
-        puts 'self.type: '  + self.type.to_s.inspect
-      end
-
-      a = read_rsfdoc(args)      
-      job = a.find do |xy| 
-        name, x = xy
-        name == ajob.to_sym and 
-            (x[:attributes][:type] || self.type.to_s) == self.type.to_s
-      end.last
-
-      out, attr = job[:code], job[: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]    
-    
-  end
-  
-end
-
-
 class RScript < RScriptBase
 
   def initialize(log: nil, pkg_src: '', cache: 5, debug: false, type: 'job')
@@ -237,6 +182,62 @@ class RScript < RScriptBase
   
 end
 
+
+class RScriptRW < RScript
+  
+  attr_accessor :type
+  
+  
+  def read(args=[])
+    
+    puts 'inside read' if @debug
+    @log.info 'RScript/read: args: '  + args.inspect if @log
+    @log.info 'RScript/read: type: '  + type.inspect if @log
+    
+    threads = []
+    
+    if args.to_s[/\/\/job:/] then 
+
+      ajob = ''
+      
+      args.each_index do |i| 
+        if args[i].to_s[/\/\/job:/] then          
+          ajob = $'; args[i] = nil
+        end
+      end
+
+      args.compact!
+      
+      if @debug then
+        puts 'type: ' + self.type.to_s.inspect
+        puts 'self.type: '  + self.type.to_s.inspect
+      end
+
+      a = read_rsfdoc(args)      
+      job = a.find do |xy| 
+        name, x = xy
+        name == ajob.to_sym and 
+            (x[:attributes][:type] || self.type.to_s) == self.type.to_s
+      end.last
+
+      out, attr = job[:code], job[: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]    
+    
+  end
+  
+end
+
+
 if __FILE__ == $0 then
   raw_args = ARGV
   rs = RScript.new()

metadata

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