rbbt-util 5.21.54 → 5.21.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2694c3dd908e3b5711942aa887313585c82eb817
-  data.tar.gz: 3f2383f88770be0bb1dabab5dd365f46ce46752f
+  metadata.gz: d5af3a00bb7cefa94e0d6e2ee3fade766193c5c1
+  data.tar.gz: 5f9e807ae6ec9edad6891b07bc8f54d0ecea87e2
 SHA512:
-  metadata.gz: dd8982733ba669ea67403459e8fbe0742c5909cffedfe1725629bd704c716669ec64a3f177d00ed2daf6d85af83b8ed6a25fd1cda23f92b88e40c1c343d53d68
-  data.tar.gz: a2f22166721bd4a0d752afaf1062df290524fabe899e4fb383b85a2edfd5d4b27e3611781b5076bd26d73f16f9e123cdc12fb1f84df12887b7f50c646ae5e7b8
+  metadata.gz: 8d14056a7f5ed61f56dab6d36803e78c5ef077656523fed4daf23bf574d4c6e93ed5e98570bd51c52f059563d93c1440dcaf9761fc871dc79bcda5f56eec2ea9
+  data.tar.gz: 76d58d3d25f4ba8f8793d2852dfc2b3c1c00c6369f2314b4ec193d3874669a17514662ec79ef883a7961528a7ee710fe5d70fa966c7db2244892a895e481a7a5

data/lib/rbbt/util/log.rb

@@ -33,10 +33,9 @@ module Log
     line ||= caller.first
   end
 
-  def self.ignore_stderr
-    LOG_MUTEX.synchronize do
-      backup_stderr = STDERR.dup
-      File.open('/dev/null', 'w') do |f|
+  def self._ignore_stderr
+    backup_stderr = STDERR.dup
+    File.open('/dev/null', 'w') do |f|
         STDERR.reopen(f)
         begin
           yield
@@ -44,7 +43,12 @@ module Log
           STDERR.reopen backup_stderr
           backup_stderr.close
         end
-      end
+    end
+  end
+
+  def self.ignore_stderr(&block)
+    LOG_MUTEX.synchronize do
+      _ignore_stderr &block
     end
   end
 

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

@@ -174,4 +174,8 @@ module Misc
     end
   end
 
+  def self.humanize_list(list)
+    list[0..-2].collect{|e| e.to_s} * ", " << " and " << list[-1].to_s
+  end
+
 end

data/lib/rbbt/workflow.rb

@@ -310,6 +310,19 @@ module Workflow
     task_inputs = task_info(taskname)[:inputs]
     defaults = IndiferentHash.setup(task.input_defaults)
 
+    missing_inputs = []
+    task.required_inputs.each do |input|
+      missing_inputs << input if inputs[input].nil?
+    end
+
+    if missing_inputs.length == 1
+      raise ParameterException, "Input #{missing_inputs.first} is required but was not provided or is nil"
+    end
+
+    if missing_inputs.length > 1
+      raise ParameterException, "Inputs #{Misc.humanize_list(missing_inputs)} are required but where not provided or are nil"
+    end
+
     dependencies = real_dependencies(task, jobname, defaults.merge(inputs), task_dependencies[taskname] || [])
 
     real_inputs = {}

data/lib/rbbt/workflow/annotate.rb

@@ -24,6 +24,7 @@ module AnnotatedModule
   add_consummable_annotation(self,
     :description        => "",
     :inputs             => [],
+    :required_inputs    => [],
     :input_types        => {},
     :input_descriptions => {},
     :input_defaults     => {},
@@ -38,11 +39,17 @@ module AnnotatedModule
     @input_descriptions = {} if @input_descriptions.nil?
     @input_defaults     = {} if @input_defaults.nil?
     @input_options      = {} if @input_options.nil?
+    @required_inputs    = [] if @required_inputs.nil?
+
+    required = Misc.process_options options, :required if options
+    required, default = true, nil if default == :required
+    @required_inputs << name  if required
 
     @inputs                   << name
     @input_types[name]        = type unless type.nil?
     @input_descriptions[name] = desc unless desc.nil?
     @input_defaults[name]     = default unless default.nil?
     @input_options[name]      = options unless options.nil?
+
   end
 end

data/lib/rbbt/workflow/definition.rb

@@ -81,6 +81,7 @@ module Workflow
       :result_description => consume_result_description,
       :input_defaults     => consume_input_defaults,
       :input_descriptions => consume_input_descriptions,
+      :required_inputs    => consume_required_inputs,
       :extension          => consume_extension,
       :input_options      => consume_input_options
     }

data/lib/rbbt/workflow/task.rb

@@ -2,7 +2,7 @@ require 'rbbt/util/misc'
 require 'rbbt/persist'
 
 module Task
-  attr_accessor :inputs, :input_types, :result_type, :input_defaults, :input_descriptions, :input_options, :description, :name, :result_description, :extension
+  attr_accessor :inputs, :input_types, :result_type, :input_defaults, :input_descriptions, :input_options, :required_inputs, :description, :name, :result_description, :extension
 
   def self.setup(options = {}, &block)
     block.extend Task

data/lib/rbbt/workflow/usage.rb

@@ -60,6 +60,12 @@ module Workflow
     if task.nil?
       puts Log.color :magenta, self.to_s 
       puts Log.color :magenta, "=" * self.to_s.length
+
+      if self.documentation[:title] and not self.documentation[:title].empty?
+        puts
+        puts Misc.format_paragraph self.documentation[:title] 
+      end
+
       if self.documentation[:description] and not self.documentation[:description].empty?
         puts
         puts Misc.format_paragraph self.documentation[:description] 

data/share/rbbt_commands/workflow/task

@@ -31,9 +31,13 @@ def usage(workflow = nil, task = nil, exception=nil)
   else
     puts Log.color :magenta, workflow.to_s
     puts Log.color :magenta, "=" * workflow.to_s.length
+    if workflow.documentation[:title] and not workflow.documentation[:title].empty?
+      puts
+      puts Misc.format_paragraph workflow.documentation[:title] 
+    end
     if workflow.documentation[:description] and not workflow.documentation[:description].empty?
       puts
-      puts workflow.documentation[:description]
+      puts Misc.format_paragraph workflow.documentation[:description] 
     end
     puts
     workflow.doc(task)

metadata

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