rbbt-util 5.17.55 → 5.17.56

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c7dc0ccac314db71b52743fed88ff75b47211075
4
- data.tar.gz: 91db3a2a2869f4c223651d09982b2c9ad244be5c
3
+ metadata.gz: 9f19b263699fee9f9c4a3457fc5a5ce52cc31f3e
4
+ data.tar.gz: 07d8a21299dcdba62b42417ac8441053ad798b34
5
5
  SHA512:
6
- metadata.gz: 887b843bdd42533c81f3310289c6f7455b9074667d1305124d6c32566fe84ab7bcef90d63b54eaf0dbc4169f369ba0a1f6fbda0140719ef02893b7098293bdb1
7
- data.tar.gz: 8b04905bedadd987e785fc680be47a0e8daf8ce6612b8d079dbd75e38d5fc97f122bad426e0a21a8a706eaf99837441684be9bf5faba6b4d50a31d2c09be40d5
6
+ metadata.gz: 2833843af1acc35f46c6f94cd33320fbab757e05dbc3782f4d6f21d64314d0d6cf54146d07e82539168ec4942628c6974bba5778b60fdd05e8585a737e93e38e
7
+ data.tar.gz: 8efa91cd581a0919814166e4f384a121f5541308c416b118ab05ade8ffd0710c31a6e1b8c4eef7851a4e89a5e61c581ff6780089118597aee81d15d1f8d25553
@@ -465,6 +465,15 @@ module Workflow
465
465
  all_deps.concat rec_dependencies(dep.to_sym)
466
466
  when DependencyBlock
467
467
  all_deps << dep.dependency
468
+ case dep.dependency
469
+ when Array
470
+ dep_wf, dep_task = dep.dependency
471
+ dep_rec_dependencies = dep_wf.rec_dependencies(dep_task.to_sym)
472
+ dep_rec_dependencies.collect!{|d| Array === d ? d : [dep_wf, d]}
473
+ all_deps.concat dep_rec_dependencies
474
+ when Symbol, String
475
+ all_deps.concat rec_dependencies(dep.dependency.to_sym)
476
+ end
468
477
  end
469
478
  end
470
479
  all_deps.uniq
@@ -34,19 +34,19 @@ module Workflow
34
34
  @result_description = description
35
35
  end
36
36
 
37
- def dep(*dependency_list, &block)
38
- @dependencies ||= []
39
- if Module === dependency_list.first or Hash === dependency_list.last
40
- @dependencies << dependency_list
41
- else
42
- @dependency_list ||= []
43
- if block_given?
44
- dependency_list.unshift self if dependency_list.length == 1
45
- dependency_list << block
46
- end
47
- dependencies.concat dependency_list
48
- end
49
- end
37
+ #def dep(*dependency_list, &block)
38
+ # @dependencies ||= []
39
+ # if Module === dependency_list.first or Hash === dependency_list.last
40
+ # @dependencies << dependency_list
41
+ # else
42
+ # @dependency_list ||= []
43
+ # if block_given?
44
+ # dependency_list.unshift self if dependency_list.length == 1
45
+ # dependency_list << block
46
+ # end
47
+ # dependencies.concat dependency_list
48
+ # end
49
+ #end
50
50
 
51
51
  def dep(*dependency, &block)
52
52
  @dependencies ||= []
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-util
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.17.55
4
+ version: 5.17.56
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez