rbbt-util 5.34.21 → 5.34.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d6cd028bf0803b71e0abdbd53b5f1dc1f1495f3b3fce7f3d3d9550b824816dc
-  data.tar.gz: 8479aabccee8d49ba733c297e6e5ffb5751b6544eaea3f09a5cb5655090a9082
+  metadata.gz: 40183cfe120bb6545a1bb59f150bb3cac9426ce018d18485afdbf0c8f1de92b2
+  data.tar.gz: fd625b45572be4a158bc9f08007225e284659ec9ef26fbe66a2e9ae7fb84ce9f
 SHA512:
-  metadata.gz: ca686195461a9cdc3b13337aaffa8bf816ce6935692db0610e588d6ebe00f7ed2f8c48c6ee7ed1b7574242d4f4dabe789ed6ec350eb6b29114c68cc4eab51267
-  data.tar.gz: 9fa7c8a4de4b514f66c92f5dac30e8e9473452c9f4b2fd0ceeef2b022f10eb740c762b62f343ca2562374b0d13e0c29acb561fc101fcf7af1b67733d9c95f149
+  metadata.gz: f9f2a5ee2e22b84c8bce0f0da023a39cb917a8210ab1c9a4daca7d67902134221fd671da62ca19a2ce02fb06049ea00f4a8a282a1906235f91380d936240b987
+  data.tar.gz: 5124409cb58db3eea7029042ec8671e13075bd814b40a25a905a56ccc52ae660e9981f3146f8a2ecaad2c122ea6edea1ea8b4c7d1a1191a58621c797f317577c

data/lib/rbbt/workflow/dependencies.rb

@@ -72,9 +72,7 @@ module Workflow
   def setup_override_dependency(dep, workflow, task_name)
     return [] if dep == :skip || dep == 'skip'
 
-    if Step === dep
-      dep = dep.load
-    else
+    if ! Step === dep
       located = Open.exists?(dep)
       dep = Workflow.load_step(dep)
     end

data/share/rbbt_commands/study/task

@@ -106,7 +106,7 @@ options = SOPT.get <<EOF
 -as--array_separator* Change the character that separates elements of Arrays, ',', '|', or '\\n' by default:
 -cl--clean Clean the last step of the job so that it gets recomputed:
 -rcl--recursive_clean Clean the last step and its dependencies to recompute the job completely:
--n--name* Job name to use. The name 'Default' is used by default:
+-n--name* Job name to use. The name '#{Workflow::DEFAULT_NAME}' is used by default:
 -pn--printname Print the name of the job and exit without starting it:
 -rw--require_workflow* Workflows to require, separated by commas
 EOF
@@ -155,7 +155,7 @@ end
 
 usage workflow, task if help
 
-name = options.delete(:name) || "Default"
+name = options.delete(:name) || Workflow::DEFAULT_NAME
 
 # get job args
 sopt_option_string = SOPT_options(workflow, task)

data/share/rbbt_commands/workflow/task

@@ -178,7 +178,7 @@ available. Examples can be enacted using `rbbt workflow example <workflow>
 [<task>] [<example>]`.
 
 When a task is enacted a job is instantiated. This job is identified by the
-`jobname` (which is *Default* unless specified otherwise) and the values of the
+`jobname` (which is *#{Workflow::DEFAULT_NAME}* unless specified otherwise) and the values of the
 parameters; these two things determine the filename under which the job result
 will be saved. If the taks is enacted using the same `jobname` and parameters
 it will result in the same job, pointing to the same result file.
@@ -194,7 +194,7 @@ The `recursive_clean` cleans all the job dependency steps recursively.
 -wda--workdir_all* Change the working directory of ALL workflow
 -as--array_separator* Change the character that separates elements of Arrays, ',', '|', or '\\n' by default
 -fs--field_separator* Change the character that separates fields of TSV files '\\t' by default
--jn--jobname* Job name to use. The name 'Default' is used by default
+-jn--jobname* Job name to use. The name '#{Workflow::DEFAULT_NAME}' is used by default
 -pn--printname Print the name of the job and exit without starting it
 -pf--printpath Print the path of the job result
 -cl--clean Clean the last step of the job so that it gets recomputed

metadata

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