rbbt-util 5.17.16 → 5.17.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46bdb284581bf999c5c1587e40b205957bab4b02
-  data.tar.gz: 4ce2d4c7a36b3da5a3f1dc0eba1c4b83a490b60e
+  metadata.gz: 93a138cf7e724b74445c53a3afb9e728df0ea293
+  data.tar.gz: ea7ad0564a6777c5eb64c57e42d8c8aded6c735e
 SHA512:
-  metadata.gz: 7027762318277299622de3bea20673fda68b0775b954623e82e4c5b8aea198e29fc4ce7759876464609dd9d5259af6d170e96b8ce5d214b3c4446e9826fa05b0
-  data.tar.gz: 64665e7a8758d492725a8e87d202a89ef87c495d7b3f115a1ef2dfb51c7a9e3969a4ea5779d3ce9a0e2da26f2b95290bc2520c06c39955cf52e3770c7430ddb1
+  metadata.gz: 9e5684971fae54cb83485755097b298c56b74dd2d6244b73e6f1212276fdb9060cd3512e09038053adcd7f08707092c4441c78298aa2d48c249cf06d745805fb
+  data.tar.gz: 6a7bffb98760080be7550e299c209bbad81b6ea43007400b097141e2b12f428336fbb5f703dc4de345f615584171ccfdb9a82ce4c6a9cf0cf80f76573c9442ff

data/lib/rbbt/workflow.rb

@@ -284,7 +284,8 @@ module Workflow
     Workflow.resolve_locals(inputs)
 
     task_inputs = task_info(taskname)[:inputs]
-    defaults = IndiferentHash.setup(task_info(taskname)[:input_defaults])
+    #defaults = IndiferentHash.setup(task_info(taskname)[:input_defaults])
+    defaults = task.input_defaults
 
     dependencies = real_dependencies(task, jobname, defaults.merge(inputs), task_dependencies[taskname] || [])
 

data/lib/rbbt/workflow/accessor.rb

@@ -517,7 +517,7 @@ module Workflow
       when Array
         workflow, task, options = dependency
 
-        options = dependency.last if Hash === dependency.last
+        #options = dependency.last if Hash === dependency.last
         _inputs = inputs.dup
         options.each{|i,v|
           case v
@@ -536,7 +536,7 @@ module Workflow
           end
         } if options
 
-        res = dependency.first.job(dependency[1], jobname, _inputs)
+        res = workflow.job(task, jobname, _inputs)
         res
       when Step
         dependency

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.16
+  version: 5.17.17
 platform: ruby
 authors:
 - Miguel Vazquez
@@ -432,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Utilities for the Ruby Bioinformatics Toolkit (rbbt)