rbbt-util 5.17.3 → 5.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41386b64d3172f2e311677030c785d23a7c95e94
-  data.tar.gz: 6b2b16bf4cdba436b26e7642284ace59e6ee1be5
+  metadata.gz: a7fe012a90bd3fda632307cdd2bc21e3020b1814
+  data.tar.gz: c5d10734f03329aa7894c55287e8b2fb796cfa7f
 SHA512:
-  metadata.gz: 9733e02ad94fe5a33800f0b3a08401bab49ee1424c3c2227c4ff95761e495aad5f4962a70eda8fe0b02b5300c4a24ea87495fd35b37345ab507fd2d621fca02c
-  data.tar.gz: 6b1f42fe6470073932eb269989ac434fe75efbe0ffbea8ad04a6fcd015b99190e164564e90d759158cf07743f197234581e71cf66526bbc7aefa8332993fdd82
+  metadata.gz: 3dcd0d695669e781a8f6fa009e9db1b603becdbf50c787f46a3cc21813bf4a57e0be11ada30023994e40de48e1b6367227d19081e2343950008e28ab117077ac
+  data.tar.gz: 1a42db795b2f52a78b2bf1fde307f3d5a85bdbb363430eb28b87aabf0becaf45302331d0e5bf05e0698119b8258c37c7f349ef978cf241151255fcce0b154cdf

data/lib/rbbt/util/log.rb

@@ -268,7 +268,11 @@ def ppp(message)
   stack = caller
   puts "#{Log.color :cyan, "PRINT:"} " << stack.first
   puts ""
-  puts Log.color(:cyan, "=> ") << message.to_s
+  if message.length > 200 or message.include? "\n"
+    puts Log.color(:cyan, "=>|") << "\n" << message.to_s
+  else
+    puts Log.color(:cyan, "=> ") << message.to_s
+  end
   puts ""
 end
 

data/lib/rbbt/util/tar.rb

@@ -76,31 +76,39 @@ module Misc
 
   # un-gzips the given IO, returning the
   # decompressed version as a StringIO
-  def ungzip(tarfile)
+  def self.ungzip(tarfile)
     z = Zlib::GzipReader.new(tarfile)
     unzipped = StringIO.new(z.read)
     z.close
     unzipped
   end
 
+  def self._untar_cmd(io, destination)
+    FileUtils.mkdir_p destination unless File.exists? destination
+    CMD.cmd("tar xvf - -C '#{destination}'", :in => io)
+    nil
+  end
+
   # untars the given IO into the specified
   # directory
-  def untar(io, destination)
-    Gem::Package::TarReader.new io do |tar|
-      tar.each do |tarfile|
-        destination_file = File.join destination, tarfile.full_name
-
-        if tarfile.directory?
-          FileUtils.mkdir_p destination_file
-        else
-          destination_directory = File.dirname(destination_file)
-          FileUtils.mkdir_p destination_directory unless File.directory?(destination_directory)
-          File.open destination_file, "wb" do |f|
-            f.print tarfile.read
-          end
-        end
-      end
-    end
+  def self.untar(io, destination)
+    return _untar_cmd(io, destination)
+
+    #Gem::Package::TarReader.new io do |tar|
+    #  tar.each do |tarfile|
+    #    destination_file = File.join destination, tarfile.full_name
+
+    #    if tarfile.directory?
+    #      FileUtils.mkdir_p destination_file
+    #    else
+    #      destination_directory = File.dirname(destination_file)
+    #      FileUtils.mkdir_p destination_directory unless File.directory?(destination_directory)
+    #      File.open destination_file, "wb" do |f|
+    #        f.print tarfile.read
+    #      end
+    #    end
+    #  end
+    #end
   end
 end
 

data/lib/rbbt/workflow/accessor.rb

@@ -518,10 +518,11 @@ module Workflow
           case v
           when Symbol
             rec_dependency = real_dependencies.collect{|d| [d, d.rec_dependencies].compact.flatten}.flatten.select{|d| d.task.name == v }.first
-            if (dependency.first.tasks[dependency[1]].input_options[i] || {})[:stream]
+            input_options = dependency.first.task_info(dependency[1])[:input_options][i] || {}
+            if input_options[:stream]
               inputs[i] = rec_dependency.run(true).grace.join.path 
             else
-              inputs[i] = rec_dependency.run(true).join.load
+              inputs[i] = rec_dependency.run
             end
           else
             inputs[i] = v

metadata

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