rbbt-util 5.17.55 → 5.17.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7dc0ccac314db71b52743fed88ff75b47211075
-  data.tar.gz: 91db3a2a2869f4c223651d09982b2c9ad244be5c
+  metadata.gz: 9f19b263699fee9f9c4a3457fc5a5ce52cc31f3e
+  data.tar.gz: 07d8a21299dcdba62b42417ac8441053ad798b34
 SHA512:
-  metadata.gz: 887b843bdd42533c81f3310289c6f7455b9074667d1305124d6c32566fe84ab7bcef90d63b54eaf0dbc4169f369ba0a1f6fbda0140719ef02893b7098293bdb1
-  data.tar.gz: 8b04905bedadd987e785fc680be47a0e8daf8ce6612b8d079dbd75e38d5fc97f122bad426e0a21a8a706eaf99837441684be9bf5faba6b4d50a31d2c09be40d5
+  metadata.gz: 2833843af1acc35f46c6f94cd33320fbab757e05dbc3782f4d6f21d64314d0d6cf54146d07e82539168ec4942628c6974bba5778b60fdd05e8585a737e93e38e
+  data.tar.gz: 8efa91cd581a0919814166e4f384a121f5541308c416b118ab05ade8ffd0710c31a6e1b8c4eef7851a4e89a5e61c581ff6780089118597aee81d15d1f8d25553

data/lib/rbbt/workflow/accessor.rb

@@ -465,6 +465,15 @@ module Workflow
                                   all_deps.concat rec_dependencies(dep.to_sym)
                                 when DependencyBlock
                                   all_deps << dep.dependency
+                                  case dep.dependency
+                                  when Array
+                                    dep_wf, dep_task = dep.dependency
+                                    dep_rec_dependencies = dep_wf.rec_dependencies(dep_task.to_sym)
+                                    dep_rec_dependencies.collect!{|d| Array === d ? d : [dep_wf, d]}
+                                    all_deps.concat dep_rec_dependencies
+                                  when Symbol, String
+                                    all_deps.concat rec_dependencies(dep.dependency.to_sym)
+                                  end
                                 end
                               end
                               all_deps.uniq

data/lib/rbbt/workflow/definition.rb

@@ -34,19 +34,19 @@ module Workflow
     @result_description = description
   end
 
-  def dep(*dependency_list, &block)
-    @dependencies ||= []
-    if Module === dependency_list.first or Hash === dependency_list.last
-      @dependencies << dependency_list
-    else
-      @dependency_list ||= []
-      if block_given?
-        dependency_list.unshift self if dependency_list.length == 1
-        dependency_list << block 
-      end
-      dependencies.concat dependency_list
-    end
-  end
+  #def dep(*dependency_list, &block)
+  #  @dependencies ||= []
+  #  if Module === dependency_list.first or Hash === dependency_list.last
+  #    @dependencies << dependency_list
+  #  else
+  #    @dependency_list ||= []
+  #    if block_given?
+  #      dependency_list.unshift self if dependency_list.length == 1
+  #      dependency_list << block 
+  #    end
+  #    dependencies.concat dependency_list
+  #  end
+  #end
 
   def dep(*dependency, &block)
     @dependencies ||= []

metadata

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