rbbt-util 5.14.24 → 5.14.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd34ace1726633f7431a3929e2c035a192ee874
-  data.tar.gz: b2d9f37f496e89c256ce74b5e4b2d543f473dd1d
+  metadata.gz: 88885c1c0256441286016e2dcce5064c4bd62c75
+  data.tar.gz: 73044f407bdd1fb7c936841074211291cc13a327
 SHA512:
-  metadata.gz: b59fcb177f41b692077052ce358c40bedcbb47fd205ab4d6aea4abe498f4eea895e823159aefbc73e28ab652099b73bf15d11a91e0169b8122887ce93caba070
-  data.tar.gz: cdad69d36ef4306145ff97f8785dd5716ff2fd19a17d48c0dd18f30f7ce7d9b456fe71bff37741d17ce0289d452adab61986e802c51e797c6de520899404312e
+  metadata.gz: c61172f11902cc5eb070d82a764a469741f9899efbf7fda38c011a18cde6306bbfcfc6e6251372af29f8a5565dd7ffaccf7d091b98cc5ce3715bc6508ef41131
+  data.tar.gz: f34f9a02776870e4dcc253877f953ea48d278a5a60bec8481b04eb084c97d53aa65034133c336ea53e8edfa2c65b20e3cb8de9cb0af3a42d4861ae09771839f5

data/lib/rbbt/tsv/util.rb

@@ -90,7 +90,13 @@ module TSV
       file.stream
     when Path
       file.open(open_options)
-    when IO, StringIO, File, Tempfile
+    when (defined? Tempfile and Tempfile)
+      begin
+        file.rewind if file.respond_to?(:rewind) and file.eof?
+      rescue
+      end
+      file
+    when IO, StringIO, File
       begin
         file.rewind if file.respond_to?(:rewind) and file.eof?
       rescue

data/lib/rbbt/util/R.rb

@@ -26,7 +26,7 @@ source('#{UTIL}');
     Log.debug{"R Script:\n#{ cmd }"}
 
     if options.delete :monitor
-      io = CMD.cmd('R --vanilla --slave --quiet', options.merge(:in => cmd, :pipe => true))
+      io = CMD.cmd('R --vanilla --slave --quiet', options.merge(:in => cmd, :pipe => true, :log => true))
       while line = io.gets
         puts line
       end
@@ -85,8 +85,8 @@ module TSV
   def R(script, open_options = {})
     TmpFile.with_file do |f|
       Open.write(f, self.to_s)
-      io = R.run(
-      <<-EOF
+
+      script = <<-EOF
 ## Loading tsv into data
 data = rbbt.tsv('#{f}');
 
@@ -95,9 +95,10 @@ data = rbbt.tsv('#{f}');
 ## Resaving data
 if (! is.null(data)){ rbbt.tsv.write('#{f}', data); }
       EOF
-      )
 
-      Log.debug(io.read)
+      r_options = Misc.pull_keys open_options, :R
+      io = R.run script, r_options
+
 
       open_options = Misc.add_defaults open_options, :type => :list
       if open_options[:raw]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.14.24
+  version: 5.14.25
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake