rbbt-util 5.20.10 → 5.20.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c424ed8cfdf95b53803cbc976261f9542eda87d
-  data.tar.gz: 1ed15794721f06807a43e2158ec5186cdfaa6462
+  metadata.gz: fb04010c741dc27743572f0226f9c04cb4a89fde
+  data.tar.gz: bba967e38524c0e9b98207e30035ee1335a58ee2
 SHA512:
-  metadata.gz: 3006d04121e96c3a1a290520a7749615a602718843c09bca87533f2f07cf412918eee6a48eedee4c12c88f751cb203ca9a996b8c6b08f0ad821ac2f56b64b35f
-  data.tar.gz: 7ca5624085d95696df0d2693e384031d7c82fc38372721fb5978c96e9e4d132abb71f9dde3f942d0f2abcf10d2b4f3f82f4fa5feab97396d23474f2ba42f9b17
+  metadata.gz: 5773870946611774dd7bf227933619e8db98b88913aaa27a28ab8c20bf2e25ffd178426c5bd9b0f1e32a0185f5974c0749429128ae1327d4fc6d7f11615dfec7
+  data.tar.gz: 71e87075d9e5df5fd09262266758141a6c2b4abf139cf4ee224f17a70480710217a6ca05e21ec7d4b9ff149a94f7a77a7cf6b978b3cc70c5f318b145ba9e8028

data/lib/rbbt/rest/client/get.rb

@@ -124,7 +124,7 @@ class WorkflowRESTClient
       Log.debug{ "RestClient stream #{Process.pid}: #{ task_url } #{stream_input} #{cache_type} - #{Misc.fingerprint task_params}" }
       res = RbbtMutiplartPayload.issue task_url, task_params, stream_input, nil, nil, true
       type = res.gets
-      case type.strip
+      out = case type.strip
       when "LOCATION"
         @url = res.gets
         @url.sub!(/\?.*/,'')
@@ -145,6 +145,8 @@ class WorkflowRESTClient
       else
         raise "What? " + type
       end
+      ConcurrentStream.setup(out, :filename => @url)
+      out
     end
   end
 

data/lib/rbbt/rest/client/step.rb

@@ -238,11 +238,22 @@ class WorkflowRESTClient
           @done = true
           @streaming = false
         end
+
+        @url = io.filename if io.filename
         return io
       end
 
       WorkflowRESTClient.capture_exception do
         @url = URI.encode(File.join(base_url, task.to_s))
+        inputs.each do |k,v|
+          if v.respond_to? :path
+            class << v
+              def original_filename
+                File.expand_path(path)
+              end
+            end
+          end
+        end
         task_params = inputs.merge(:_cache_type => cache_type, :jobname => base_name, :_format => [:string, :boolean, :tsv, :annotations].include?(result_type) ? :raw : :json)
 
         sout, sin = Misc.pipe
@@ -253,6 +264,8 @@ class WorkflowRESTClient
         post_thread = Thread.new(Thread.current) do |parent|
           bl = lambda do |rok|
             if Net::HTTPOK === rok
+              _url = rok["RBBT-STREAMING-JOB-URL"]
+              @url = File.join(@url, File.basename(_url)) if _url
               rok.read_body do |c,_a, _b|
                 sin.write c
               end

data/lib/rbbt/util/misc/inspect.rb

@@ -225,7 +225,11 @@ module Misc
           when TSV::Parser
             remove_long_items(obj)
           when File 
-            "<File:" << obj.path << ">"
+            if obj.respond_to? :filename and obj.filename
+              "<IO:" << obj.filename << ">"
+            else
+              "<IO:" << obj.path << ">"
+            end
           when (defined? Step and Step)
             "<IO:" << obj.path << ">"
           else

data/lib/rbbt/util/misc/multipart_payload.rb

@@ -1,22 +1,6 @@
 require 'net/http'
 require 'rbbt-util'
 
-#class Net::HTTPGenericRequest
-#  alias old_send_request_with_body_stream send_request_with_body_stream
-#
-#  def __send_request_with_body_stream(*args)
-#    begin
-#      pid = Process.fork do
-#        iii [:pre_chunk, Thread.current]
-#        return old_send_request_with_body_stream(*args)
-#      end
-#      Process.wait pid
-#    ensure
-#      iii [:pre_chunk_done, Thread.current]
-#    end
-#  end
-#end
-
 module RbbtMutiplartPayload
   BOUNDARY = "Rbbt_Param_Stream"
   EOL = "\r\n"
@@ -133,7 +117,7 @@ module RbbtMutiplartPayload
               sin.write res["location"]
             elsif stream_input and url_path
               Log.medium "Response recieved STREAM: #{ url_path }"
-              url = URI::HTTP.build(:host => uri.hostname, :post => uri.port, :path => url_path)
+              url = URI::HTTP.build(:host => uri.hostname, :port => uri.port, :path => url_path)
               sin.puts "STREAM: #{url.to_s}" if report_type
               Log.medium "Read body: #{ url_path }"
               res.read_body(sin)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.20.10
+  version: 5.20.11
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake