exe/caravan in caravan-0.5.2 vs exe/caravan in caravan-0.6.0
- old
+ new
@@ -38,20 +38,23 @@
options[:debug] = false
opts.on("-b", "--debug", "Debug mode") do
options[:debug] = true
end
+ opts.on_head("--init", "Init caravan.yml") do
+ Caravan.dump_default_conf
+ Caravan::Message.success("Generated #{Caravan::Config.default_conf_name}")
+ exit
+ end
+
opts.on_tail("--version", "Show version") do
puts Caravan::VERSION
exit
end
end
-if ARGV.size == 1 && ARGV[0] == "init"
- Caravan.dump_default_conf
-end
-
option_parser.parse!(ARGV)
+
merged_conf = Caravan::Config.merge(options, Caravan.process_conf(options[:src]))
if merged_conf.key?("src") && merged_conf.key?("dst") && merged_conf.key?("deploy_mode")
Caravan.start(merged_conf)
else
Caravan::Message.error("No src, dst, deploy_mode specified. Cannot deploy.")