lib/caravan.rb in caravan-0.5.0.alpha1 vs lib/caravan.rb in caravan-0.5.1

@@ -8,16 +8,13 @@
 require "caravan/message"
 require "caravan/version"
 
 require "listen"
 
-DEFAULT_CONFIG_NAME = "caravan.yml".freeze
-
 module Caravan
   class << self
-    def start(options)
-      merged_conf = Caravan::Config.merge(options, process_conf(options[:src]))
+    def start(merged_conf)
       src_path = merged_conf["src"]
       target_path = merged_conf["dst"]
       deploy_mode = merged_conf["deploy_mode"]
       ignores = merged_conf["exclude"]
       debug = merged_conf["debug"]
@@ -57,20 +54,23 @@
       end
     end
 
     def process_conf(src_path)
       Caravan::Message.success("Reading configuration...")
-      user_config_path = File.join(File.expand_path(src_path), DEFAULT_CONFIG_NAME)
+      if src_path.nil?
+        src_path = '.'
+      end
+      user_config_path = File.join(File.expand_path(src_path), Caravan::Config.default_conf_name)
       conf = Caravan::Config.from(user_config_path)
       conf
     end
 
     def sleep_forever
       loop { sleep 1000 }
     end
 
     def dump_default_conf
-      user_config_path = File.join(File.expand_path("."), DEFAULT_CONFIG_NAME)
+      user_config_path = File.join(File.expand_path("."), Caravan::Config.default_conf_name)
       default_conf = Caravan::Config.default_conf
 
       Caravan::Config.dump(user_config_path, default_conf)
     end
   end