rbbt-util 5.19.15 → 5.19.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d73aae34ca0964a65ba2e91e3f7e4652686445e
-  data.tar.gz: 787a93830f080f70f5399f3c4d74a1c0a02720b5
+  metadata.gz: 30d1f9a2c70b373c0146ba34c922b2577af62b62
+  data.tar.gz: 80a304d5cd33966a92e79f249ec08502e83cd306
 SHA512:
-  metadata.gz: d6f0179b882486a6c861d37bba0e35871b02fbc67b391b662a612b49d15a9aa8c4a1e5d8b7a58d538a556eb86536135ac0e6479dbe6ccb8fedf8fd3f4446ee07
-  data.tar.gz: 1f652ff82f4823a5c10afc8ad7e6480d84196d5749f82fd874d6355928290a2440ed19095c90a79e763e4b4404ea46862f8d4dccad672c5a675f624822754730
+  metadata.gz: fbda93383628d898f22a69ba89beedda4fb527287a3beef8428f915fe6441b76cb94d41e19ee507d44a4cf89243bd1379ccdb698589e88e20692f2443c5817fe
+  data.tar.gz: 4888a0652f9f80275ea0aa0773839fb8ba6f58582ba1344c8ae1e5486c8f6839e4af16559272fdd796877a600ba0eec83d947b51d82821e0db6ff5e023f8ee36

data/lib/rbbt/workflow/step/run.rb

@@ -151,9 +151,25 @@ class Step
 
     @seen.each do |dependency| 
       next unless dependencies.include? dependency
-      Log.info "#{Log.color :cyan, "dependency"} #{Log.color :yellow, task.name.to_s || ""} => #{Log.color :yellow, dependency.task_name.to_s || ""} -- #{Log.color :blue, dependency.path}"
+
       begin
-        dependency.run(true) unless dependency.done? or dependency.started? 
+
+        if not dependency.done?
+          if dependency.started?
+            if dependency.streaming?
+              Log.info "#{Log.color :cyan, "dependency"} #{Log.color :yellow, task.name.to_s || ""} => #{Log.color :yellow, dependency.task_name.to_s || ""} streaming -- #{Log.color :blue, dependency.path}"
+            else
+              Log.info "#{Log.color :cyan, "dependency"} #{Log.color :yellow, task.name.to_s || ""} => #{Log.color :yellow, dependency.task_name.to_s || ""} joining -- #{Log.color :blue, dependency.path}"
+              dependency.join unless dependency.streaming?
+            end
+          else
+            Log.info "#{Log.color :cyan, "dependency"} #{Log.color :yellow, task.name.to_s || ""} => #{Log.color :yellow, dependency.task_name.to_s || ""} starting -- #{Log.color :blue, dependency.path}"
+            dependency.run(true) 
+          end
+        else
+          Log.info "#{Log.color :cyan, "dependency"} #{Log.color :yellow, task.name.to_s || ""} => #{Log.color :yellow, dependency.task_name.to_s || ""} done -- #{Log.color :blue, dependency.path}"
+        end
+
       rescue Aborted
         Log.error "Aborted dep. #{Log.color :red, dependency.task.name.to_s}"
         raise $!

data/share/rbbt_commands/app/start

@@ -3,20 +3,17 @@
 require 'rbbt-util'
 require 'rbbt/util/simpleopt'
 
-#options = SOPT.get "-e--environment*:-p--port*:-s--server*:-f--finder:-R--Rserve_session*:-ho--host*:--views*"
-
 $0 = "rbbt #{$previous_commands*""} #{ File.basename(__FILE__) }" if $previous_commands
 
 options = SOPT.setup <<EOF
-Description
-
-$ rbbt command command [options] <filename.tsv|->
+Start an rbbt app
 
-Use - to read from STDIN
+$ rbbt app start [options] <app_name>
 
 -h--help Print this help
 -e--environment* Execution environment: production or development
--ho--host* Host name
+-Ho--Host* Host name
+-B--Bind* Bind IP
 -p--port* TCP port
 -s--server* Server type:  thin, webrick, unicorn, etc
 -f--finder Start server with finder functionality

data/share/rbbt_commands/workflow/server

@@ -14,7 +14,32 @@ require 'rbbt/rest/knowledge_base'
 require 'rbbt/rest/helpers'
 require 'rbbt/rest/web_tool'
 
-options = SOPT.get "-e--environment*:-p--port*:-s--server*:-b--bind*:-e--environment*:-R--RServe_session*:--finder:--views*:-w--workflows*"
+#options = SOPT.get "-e--environment*:-p--port*:-s--server*:-b--bind*:-e--environment*:-R--RServe_session*:--finder:--views*:-w--workflows*"
+
+options = SOPT.setup <<EOF
+Start an rbbt app
+
+$ rbbt app start [options] <app_name>
+
+-h--help Print this help
+-e--environment* Execution environment: production or development
+-b--bind* Bind to a particular IP (net interface)
+-p--port* TCP port
+-s--server* Server type:  thin, webrick, unicorn, etc
+-f--finder Start server with finder functionality
+-R--Rserve_session* Rserve session to use, otherwise start new one
+-w--workflows* List of additional workflows to load
+--views* Directory with view templates
+EOF
+
+if options[:help]
+  if defined? rbbt_usage
+    rbbt_usage 
+  else
+    puts SOPT.usage
+  end
+  exit 0
+end
 
 workflow = ARGV.first
 

metadata

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