exe/caravan in caravan-0.6.0 vs exe/caravan in caravan-0.6.1
- old
+ new
@@ -5,11 +5,11 @@
require "optparse"
require "caravan"
options = {}
option_parser = OptionParser.new do |opts|
- opts.banner = "Caravan #{Caravan::VERSION}\nCopyright (c) David Zhang 2017\n"
+ opts.banner = "Caravan #{Caravan::VERSION}\nCopyright (c) David Zhang 2018\n"
opts.separator ""
opts.on("-s SOURCE_PATH", "--source SOURCE_PATH", "Source path") do |value|
options[:src] = value
end
@@ -50,12 +50,16 @@
puts Caravan::VERSION
exit
end
end
-option_parser.parse!(ARGV)
+if ARGV.length == 0
+ merged_conf = Caravan::Config.merge({}, Caravan.process_conf("."))
+else
+ option_parser.parse!(ARGV)
+ merged_conf = Caravan::Config.merge(options, Caravan.process_conf(options[:src]))
+end
-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.")
end