caravan 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04165e52055b23d22aefec5a138f1dd67fc1ee74
-  data.tar.gz: 4546e888f93eb980f88b3b1b43908c3069b0a0d1
+  metadata.gz: 053d66530512fb0724b0b46617ef7cfe44e447e9
+  data.tar.gz: 78b5c042ec355f3b57f109b34216ecac1ea6398c
 SHA512:
-  metadata.gz: e3307a23f979a82803154973525a0aa6b31483685902180f847d102ccb7b1d7cbdabbdcfddec86bb5ec49cfbac50702ffb417b3221ec9e285d3e0c78b9647baf
-  data.tar.gz: a31c7fa8e58967a756ffc33bc10a32f8132b7cc4832fc2d8f145e35d431b5aaa47b2c30fac49c52d5469736678b12b846b72f7082d705de642214ee55a363a84
+  metadata.gz: 39213b6bb545e83bac44ab192f4bd82db296c77d225a23a36cc666f560d99ba1f2abf1ee8a3c64fd37e82303aa1697f5a596bc5547137a4d60378f7031179ad6
+  data.tar.gz: 271db02321ef6377e7aadb1a62284c53791ca3315567000d3ca8749d2bc85672d03a3ad40daed387906c0d6c8cde22ea6e0e15c34e84cd96a8eefcbc0f0e582a

data/README.md

@@ -59,7 +59,7 @@ Generate default configuration:
 
 ```
 $ cd /path/to/src
-$ caravan init
+$ caravan --init
 ```
 
 A `caravan.yml` will be generated as `/path/to/src/caravan.yml`. You may specify any options in command arguments except source path.

data/exe/caravan

@@ -7,7 +7,7 @@ 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|
@@ -52,9 +52,13 @@ option_parser = OptionParser.new do |opts|
   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

data/lib/caravan/config.rb

@@ -8,14 +8,15 @@ module Caravan
       "incremental" => true,
       "exclude" => %w(
         .git .svn
-      )
+      ),
+      "once" => false
     }.freeze
 
     DEFAULT_CONFIG_NAME = "caravan.yml".freeze
 
     class << self
       def default_conf
-        DEFAULT_CONFIG
+        DEFAULT_CONFIG.dup
       end
 
       def default_conf_name
@@ -27,19 +28,26 @@ module Caravan
           YAML.load_file(user_config_path)
         else
           Caravan::Message.warn("User configuration [caravan.yml] not found.")
-          Caravan::Message.warn("Use `caravan init` to generate.")
-          default_conf.dup
+          Caravan::Message.warn("Use `caravan --init` to generate.")
+          nil
         end
       end
 
       def dump(user_config_path, user_config)
         File.open(user_config_path, "w") do |f|
+          f.write("# Generated Caravan's configuration file.\n")
+          f.write("# Use `caravan --help` to specify the values.\n")
           f.write(user_config.to_yaml)
         end
       end
 
       def merge(options, conf)
-        merged_conf = conf
+        if conf.nil?
+          merged_conf = Caravan::Config.default_conf
+        else
+          merged_conf = conf
+        end
+
         merged_conf["src"] = options[:src] if options.key?(:src)
         merged_conf["dst"] = options[:dst] if options.key?(:dst)
         merged_conf["debug"] = options[:debug] if options.key?(:debug)

data/lib/caravan/version.rb

@@ -1,3 +1,3 @@
 module Caravan
-  VERSION = "0.6.0".freeze
+  VERSION = "0.6.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caravan
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - David Zhang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen