exe/caravan in caravan-1.0.0.beta1 vs exe/caravan in caravan-1.0.0.beta2
- old
+ new
@@ -58,15 +58,16 @@
exit
end
end
# rubocop:enable Metrics/BlockLength
-spec_name = options[:spec] || Caravan::Config.default_spec_name
+default_spec_name = Caravan::Config.default_spec_name
if ARGV.length.zero?
- merged_conf = Caravan::Config.merge({}, Caravan.process_conf("."), spec_name)
+ merged_conf = Caravan::Config.merge({}, Caravan.process_conf("."), default_spec_name)
else
option_parser.parse!(ARGV)
+ spec_name = options[:spec] || default_spec_name
merged_conf = if options.key?(:yaml)
Caravan::Config.merge(
options,
Caravan.process_conf(options[:src], options[:yaml]),
spec_name