rbbt-util 5.8.3 → 5.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f878977d61954ff0e75db2c46a479f60cdb9ac0
-  data.tar.gz: 0d525ca80ffcc1bb9ab128968406e399552fa4d5
+  metadata.gz: 4c797873ae505de56e3946d6effdb0cabd417c6a
+  data.tar.gz: f191e7f6bd071f97dd3147d0b7c5b672a708c69d
 SHA512:
-  metadata.gz: a35853cd5698117c360befd9dc876a36b2c590c3eaa171424700bdd1d28ba75106d28badfb0d76534dd975fe0fe50a43cc92794c3be5b44b66077e649296ab0c
-  data.tar.gz: d4522e6efe04efaa658e19bfee22cf15b41dce5a771e2e5be3137a518691b80dbd6aebf0a638696f6f1d632db6bffc97b4ad8e9266d5236d22bb62ed42a1d435
+  metadata.gz: da7d7f21f11c5564514be72b81734958f0a46b742f40a50252f62442dd4089a96c41da2b0d714c8d135d3851699d519c1f4b95fd3a2830dd89d452453cc4ca2e
+  data.tar.gz: e38d5a7d439fda5310a8db460337414e808762a5996fbc7f6413da71c7506b57d91f5b4d6fab28d2f774652614848a20d4016a8476f58f72d5e91e648d66d90b

data/lib/rbbt/util/open.rb

@@ -342,7 +342,7 @@ module Open
 
     if block_given?
       res = yield(io)
-      io.close
+      io.close unless io.closed?
       return res
     else
       io

data/share/rbbt_commands/workflow/example

@@ -10,24 +10,35 @@ def run_task(workflow, task, name)
   example_dir = workflow.libdir.examples[task][name].find
   Log.debug "Using #{example_dir}"
 
-  ARGV.replace([workflow.to_s, task, '--load_inputs', example_dir, '--jobname', name,'--pf'] + $saved_args)
-
-  @pid = Process.fork{
-    load Rbbt.share.rbbt_commands.workflow.task.find
-  }
-  Signal.trap(:INT) do
-    begin
-      Process.kill "INT", @pid
-    ensure
-      exit -1
+  ARGV.replace([workflow.to_s, task, '--load_inputs', example_dir, '--jobname', name,'-pf'] + $saved_args)
+
+  path = nil
+  TmpFile.with_file do |res|
+    Open.open(res, :mode => 'w') do |file|
+      @pid = Process.fork{
+        STDOUT.reopen res
+        load Rbbt.share.rbbt_commands.workflow.task.find
+      }
+      file.close
+      Signal.trap(:INT) do
+        begin
+          Process.kill "INT", @pid
+        ensure
+          exit -1
+        end
+      end
+      Process.wait @pid
     end
+    path = Open.read(res) if File.exists? res
   end
-  Process.wait @pid
+  path = "NO RESULT" if path.nil? or path.empty?
 
   if $?.success?
     Log.info "#{Log.color :green, "SUCCESS"} #{Log.color :magenta, workflow.to_s}##{Log.color :yellow, task} -- #{Log.color :cyan, name}"
+    return [path, true]
   else
     Log.info "#{Log.color :red, "ERROR"} #{Log.color :magenta, workflow.to_s}##{Log.color :yellow, task} -- #{Log.color :cyan, name}"
+    return [path, false]
   end
 end
 
@@ -42,14 +53,27 @@ name = nil if name == '--'
 
 $saved_args = ARGV.dup
 
-
 workflow = Workflow.require_workflow workflow
 
 tasks = task ? [task] : workflow.libdir.examples.glob('*').collect{|file| File.basename file }
 
+task_result = {}
 tasks.each do |task|
   names = name ? [name] : workflow.libdir.examples[task].glob('*').collect{|file| File.basename file }
   names.each do |name|
-    run_task workflow, task, name
+    success = run_task workflow, task, name
+    task_result[[task, name]] = success
+  end
+end
+
+task_result.each do |code,res|
+  task, name = code
+  path, success = res
+  if success
+    puts "#{Log.color :green, "SUCCESS"} #{Log.color :magenta, workflow.to_s}##{Log.color :yellow, task} -- #{Log.color :cyan, name}"
+    puts path
+  else
+    puts "#{Log.color :red, "ERROR"} #{Log.color :magenta, workflow.to_s}##{Log.color :yellow, task} -- #{Log.color :cyan, name}"
+    puts path
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.8.3
+  version: 5.8.4
 platform: ruby
 authors:
 - Miguel Vazquez