rbbt-util 5.32.23 → 5.32.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 900a7061d40ec2cbffd38886ef9629aa0c0ed6d6ee1aef6e0c95c51656230ef0
-  data.tar.gz: 13b965a0ec134a932c6ae0ae6a109fbc2bc83b7ffd855a1ef05ed4e1e51b9d88
+  metadata.gz: 7a7eebab331a8908a290e4a3ad8db2ee3dc3c3dec07b93ec1c74f504f9f7ea29
+  data.tar.gz: 0f9a2ce6019676118ab439dea57f16605555d9ef850c35998704b9215c477ffb
 SHA512:
-  metadata.gz: 3b890e2b6fb3675df4319d0541d9057a54b0cb37286a814822915f5b5b061d4f7e02deab0afdd7cd0833cb741aeded7454a9585f93ff3486e595b99db4da00f6
-  data.tar.gz: 105072ca6c7b5c43c6a60455eaa9c7167feeb93f505c61c6aeffe6305de3166a6cb440c262abf025407306ba82c2fe3167f5f9e743e086d99fa936e44ea8e448
+  metadata.gz: 2d81532c2babaae631ca98784e7b7e36039fed68544b6bce9fc8fc2d74a155ffd98fe0752477c7ad245aaa0c65e82c47f330f65c5d70a7f5f20a77de4bc4dbd6
+  data.tar.gz: 2914786ec23349cabccbb6e8a1c561336b60dd5d862e89c3a95802f040c66f8107d5a2135455f00d8bc7b9e06e390fd6462a861419b78ae25bf3a58c14a33350

data/bin/rbbt

@@ -262,9 +262,8 @@ rescue ParameterException
   puts
   exit_status = -1
   exit exit_status
-rescue SystemExit
-rescue CmdStop
-  exit_status = $!.exit_status
+rescue SystemExit,CmdStop
+  exit_status = $!.status
   exit exit_status
 rescue Exception
   Log.exception $!

data/lib/rbbt/tsv/manipulate.rb

@@ -356,6 +356,16 @@ module TSV
     elems.sort_by{|k,v| v}.collect{|k,v| k}
   end
 
+  def subset(keys)
+    new = TSV.setup({}, :key_field => key_field, :fields => fields, :type => type, :filename => filename, :identifiers => identifiers)
+    self.with_unnamed do
+      keys.each do |k|
+        new[k] = self[k]
+      end
+    end
+    new
+  end
+
   def select(method = nil, invert = false, &block)
     new = TSV.setup({}, :key_field => key_field, :fields => fields, :type => type, :filename => filename, :identifiers => identifiers)
 

data/lib/rbbt/workflow/examples.rb

@@ -48,7 +48,7 @@ module Workflow
 
 
         case input_types[input]
-        when :file
+        when :file, :binary
           Log.debug "Pointing #{ input } to #{file}"
           if file =~ /\.yaml/
             inputs[input.to_sym]  = YAML.load(Open.read(file))

data/lib/rbbt/workflow.rb

@@ -45,14 +45,10 @@ module Workflow
     load_remote_tasks(Rbbt.root.etc.remote_tasks.find) if Rbbt.root.etc.remote_tasks.exists?
   end
 
-  def self.require_remote_workflow(wf_name, url)
-    require 'rbbt/workflow/remote_workflow'
-    eval "Object::#{wf_name} = RemoteWorkflow.new '#{ url }', '#{wf_name}'"
-  end
 
   def self.require_remote_workflow(wf_name, url)
     require 'rbbt/workflow/remote_workflow'
-    eval "Object::#{wf_name} = RemoteWorkflow.new '#{ url }', '#{wf_name}'"
+    eval "Object::#{wf_name.split("+").first} = RemoteWorkflow.new '#{ url }', '#{wf_name}'"
   end
 
   def self.load_workflow_libdir(filename)
@@ -134,9 +130,10 @@ module Workflow
   end
 
   def self.require_local_workflow(wf_name)
+
     filename = local_workflow_filename(wf_name)
 
-    if filename and File.exist? filename
+    if filename and File.exist?(filename)
       load_workflow_file filename
     else
       return false
@@ -194,14 +191,23 @@ module Workflow
     end
 
     Log.high{"Loading workflow #{wf_name}"}
-    require_local_workflow(wf_name) or 
-    (Workflow.autoinstall and `rbbt workflow install #{Misc.snake_case(wf_name)} || rbbt workflow install #{wf_name}` and require_local_workflow(wf_name)) or raise("Workflow not found or could not be loaded: #{ wf_name }")
-    workflow = begin
-                 Misc.string2const Misc.camel_case(wf_name)
-               rescue
-                 Workflow.workflows.last || true
-               end
-    workflow.load_documentation
+
+    first = nil
+    wf_name.split("+").each do |wf_name|
+      require_local_workflow(wf_name) or 
+        (Workflow.autoinstall and `rbbt workflow install #{Misc.snake_case(wf_name)} || rbbt workflow install #{wf_name}` and require_local_workflow(wf_name)) or raise("Workflow not found or could not be loaded: #{ wf_name }")
+
+      workflow = begin
+                   Misc.string2const Misc.camel_case(wf_name.split("+").first)
+                 rescue
+                   Workflow.workflows.last || true
+                 end
+      workflow.load_documentation
+
+      first ||= workflow
+    end
+    return first
+
     workflow
   end
 

data/share/rbbt_commands/workflow/task

@@ -287,8 +287,8 @@ else
     puts
     puts $!.message
     puts
-    
-    exit 0
+
+    exit -1
   end
 end
 
@@ -572,7 +572,9 @@ when Step
     exit! 0
   else
     res.join
-    out.puts Open.read(res.path) if Open.exist?(res.path) || Open.remote?(res.path) || Open.ssh?(res.path)
+    Open.open(res.path, :mode => 'rb') do |io|
+      Misc.consume_stream(io, false, out)
+    end if Open.exist?(res.path) || Open.remote?(res.path) || Open.ssh?(res.path)
   end
 else
   if Array === res

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.32.23
+  version: 5.32.24
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake