bin/dyn-yml in dyndoc-ruby-1.2.1 vs bin/dyn-yml in dyndoc-ruby-1.2.2
- old
+ new
@@ -99,13 +99,35 @@
doc += "_dyn.yml" unless doc =~ /_dyn.yml$/
require 'yaml'
require 'fileutils'
-cfg_yml=YAML::load_file(doc)
-
doc =~ /^(.*)_dyn\.yml$/
docname=$1
+
+cfg_lines=File.readlines(doc)
+i=0
+i += 1 if cfg_lines[i][0,3] == "---"
+
+if cfg_lines[i][0,9] == "dyntask: "
+ ## regular _dyn.yml file
+ cfg_yml=YAML::load(cfg_lines.join("\n"))
+else
+ cfg_txt = cfg_lines[0..i].join("\n")
+ cfg_lines[(i+1)..-1].each do |line|
+ if line[0,2] == " "
+ cfg_txt << line
+ else
+ tn,td=line.split(":")
+ cfg_txt << tn.strip << ": |\n"
+ cfg_txt << " " << td.strip << "\n"
+ end
+ end
+ puts "ici\n"
+ puts cfg_txt
+ cfg_yml=YAML::load(cfg_txt.strip)
+end
+
unless cfg_yml["dyntask"]
#attempt to know if format is the simplified one for workflow
ks=cfg_yml.keys
cfg2={"dyntask" => "workflow", "params" => {"id" => ks[0], "workdir" => cfg_yml[ks[0]]}}
\ No newline at end of file