caravan 0.5.0.alpha1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba029c54b538361378d648eb8e1bd8cc78079a1b
-  data.tar.gz: cc59b3a03e11ae33e636aa4feac5261c5a239de8
+  metadata.gz: a4b237145d830cb90dcb215844fe2a8f47bb424f
+  data.tar.gz: 0de0d122559370b7644d8c25abbaa16832d5d915
 SHA512:
-  metadata.gz: 6425491bd500a8ce5d21362b8d01667a317d15a9f61772c8f70b09341605049dae897d13058545b9f1600ad8ad93c059438adef9ec131b9ebd05abe6f3ac197d
-  data.tar.gz: 4350a3578c5c0bfdfe99763f5a0c6d34ba04cc255c3b8619bf68bb5db721477f536df68c7b4a5a939915ee0d686f687592b31a2a997e655484b13d05884024cf
+  metadata.gz: fa4eb26ce60c3d9477fa6bb7d8d1740ee8d2c12da73a9724c80d97df4dedcea090ae20faa32918c50ca20eb2ba8edc4ea7a1c2cfe0b1724103130a4a0a8d28e0
+  data.tar.gz: 739b1a57cc965e786a95544bf6c9df863b8b37c425abacfbcdf9965ba59d49a6a1c97e0bf4dfe4e58dc1e2f503e64992bca175ddeb1bad18e371fa3c7ab9e17e

data/exe/caravan

@@ -46,6 +46,9 @@ if ARGV.size == 1 && ARGV[0] == "init"
 end
 
 option_parser.parse!(ARGV)
-if options.key?(:src) && options.key?(:dst)
-  Caravan.start(options)
+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

data/lib/caravan/config.rb

@@ -11,17 +11,23 @@ module Caravan
       )
     }.freeze
 
+    DEFAULT_CONFIG_NAME = "caravan.yml".freeze
+
     class << self
       def default_conf
         DEFAULT_CONFIG
       end
 
+      def default_conf_name
+        DEFAULT_CONFIG_NAME
+      end
+
       def from(user_config_path)
         if File.exist?(user_config_path)
           YAML.load_file(user_config_path)
         else
-          Caravan::Message.warning("User configuration [caravan.yml] not found.")
-          Caravan::Message.warning("Use `caravan init` to generate.")
+          Caravan::Message.warn("User configuration [caravan.yml] not found.")
+          Caravan::Message.warn("Use `caravan init` to generate.")
           default_conf.dup
         end
       end
@@ -34,8 +40,7 @@ module Caravan
 
       def merge(options, conf)
         merged_conf = conf
-        merged_conf["src"] = options[:src]
-
+        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)
         merged_conf["deploy_mode"] = options[:mode] if options.key?(:mode)

data/lib/caravan/message.rb

@@ -15,7 +15,7 @@ module Caravan
         puts "[ERROR] #{msg}".red
       end
 
-      def warning(msg)
+      def warn(msg)
         puts "[WARN] #{msg}".yellow
       end
 

data/lib/caravan/version.rb

@@ -1,3 +1,3 @@
 module Caravan
-  VERSION = "0.5.0.alpha1".freeze
+  VERSION = "0.5.1".freeze
 end

data/lib/caravan.rb

@@ -10,12 +10,9 @@ 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"]
@@ -59,7 +56,10 @@ module Caravan
 
     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
@@ -69,7 +69,7 @@ module Caravan
     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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caravan
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha1
+  version: 0.5.1
 platform: ruby
 authors:
 - David Zhang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -153,9 +153,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11