rbbt-util 5.14.5 → 5.14.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rbbt/workflow/usage.rb +10 -9
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f1fa2f550e7cac4d0ccdfe338c6a5012288bbdff
4
- data.tar.gz: af4d638b5f65f37eac8279b3f6be21f87fd71b65
3
+ metadata.gz: 861750b318943153ffe352fab01ea7cabcd9c3db
4
+ data.tar.gz: 9ca19a6bae45a91b9fd47df1bacf4316a4bc511f
5
5
  SHA512:
6
- metadata.gz: b4695a330e812a45fc5f1bdcf0bf36752b49161b408022da3f37f64133e2c9ba5b7ed4754861ef189f588601e81f5a5f2d32008d464ed3bc98846a066dd3171e
7
- data.tar.gz: 4475cf87c50919517a7a56e32e9d4fbb653b65adf9fe7e3935f8db24562d72ae2d4e5ea991bba6c1db441aa643abf11e0e6e4cacc3974d54422745b742d034e2
6
+ metadata.gz: e952c743e3fc39056eb52152073e387f5b60ddbe363eb85be3266d590f0db89891c86d9b0671f85a11d019e78f69ed7b475da5e83dcc716b677e975bf18d1ccf
7
+ data.tar.gz: f66789350e2f1f936675b4363971b4c189f6a128b6e5fd90ccf82a09910283969a2cc8307aeeeb6008de120b2c015fc5abd1eb97bc07ba2a0687fc751b946a86
@@ -1,7 +1,7 @@
1
1
  require 'rbbt/util/simpleopt'
2
2
 
3
3
  module Task
4
- def doc(deps = nil)
4
+ def doc(workflow = nil, deps = nil)
5
5
  puts Log.color(:yellow, "## #{ name }") << ":"
6
6
  puts "\n" << description << "\n" if description and not description.empty?
7
7
  puts
@@ -29,13 +29,15 @@ module Task
29
29
  puts
30
30
  seen = []
31
31
  deps.each do |dep|
32
- next if seen.include? dep.name
33
- seen << dep.name
34
- new_inputs = (dep.inputs - self.inputs)
32
+ task = Array === dep ? dep.first.tasks[dep[1].to_sym] : workflow.tasks[dep.to_sym]
33
+ maps = (Array === dep and Hash === dep.last) ? dep.last.keys : []
34
+ next if seen.include? task.name
35
+ seen << task.name
36
+ new_inputs = (task.inputs - self.inputs - maps)
35
37
  next unless new_inputs.any?
36
- puts " #{Log.color :yellow, dep.name.to_s}:"
38
+ puts " #{Log.color :yellow, task.name.to_s}:"
37
39
  puts
38
- puts SOPT.input_doc(new_inputs, dep.input_types, dep.input_descriptions, dep.input_defaults, true)
40
+ puts SOPT.input_doc(new_inputs, task.input_types, task.input_descriptions, task.input_defaults, true)
39
41
  puts
40
42
  end
41
43
  end
@@ -79,9 +81,8 @@ module Workflow
79
81
  task = self.tasks[task_name]
80
82
  end
81
83
 
82
- dependencies = self.rec_dependencies(task_name).collect{|dep_name| Array === dep_name ? dep_name.first.tasks[dep_name[1].to_sym] : self.tasks[dep_name.to_sym]}
83
-
84
- task.doc(dependencies)
84
+ #dependencies = self.rec_dependencies(task_name).collect{|dep_name| Array === dep_name ? dep_name.first.tasks[dep_name[1].to_sym] : self.tasks[dep_name.to_sym]}
85
+ task.doc(self, self.rec_dependencies(task_name))
85
86
 
86
87
  if self.examples.include? task_name
87
88
  self.examples[task_name].each do |example|
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-util
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.14.5
4
+ version: 5.14.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-11 00:00:00.000000000 Z
11
+ date: 2014-07-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake