caravan 0.5.0.alpha1 → 0.5.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/exe/caravan +5 -2
- data/lib/caravan/config.rb +9 -4
- data/lib/caravan/message.rb +1 -1
- data/lib/caravan/version.rb +1 -1
- data/lib/caravan.rb +6 -6
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a4b237145d830cb90dcb215844fe2a8f47bb424f
|
4
|
+
data.tar.gz: 0de0d122559370b7644d8c25abbaa16832d5d915
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fa4eb26ce60c3d9477fa6bb7d8d1740ee8d2c12da73a9724c80d97df4dedcea090ae20faa32918c50ca20eb2ba8edc4ea7a1c2cfe0b1724103130a4a0a8d28e0
|
7
|
+
data.tar.gz: 739b1a57cc965e786a95544bf6c9df863b8b37c425abacfbcdf9965ba59d49a6a1c97e0bf4dfe4e58dc1e2f503e64992bca175ddeb1bad18e371fa3c7ab9e17e
|
data/exe/caravan
CHANGED
@@ -46,6 +46,9 @@ if ARGV.size == 1 && ARGV[0] == "init"
|
|
46
46
|
end
|
47
47
|
|
48
48
|
option_parser.parse!(ARGV)
|
49
|
-
|
50
|
-
|
49
|
+
merged_conf = Caravan::Config.merge(options, Caravan.process_conf(options[:src]))
|
50
|
+
if merged_conf.key?('src') && merged_conf.key?('dst') && merged_conf.key?('deploy_mode')
|
51
|
+
Caravan.start(merged_conf)
|
52
|
+
else
|
53
|
+
Caravan::Message.error('No src, dst, deploy_mode specified. Cannot deploy.')
|
51
54
|
end
|
data/lib/caravan/config.rb
CHANGED
@@ -11,17 +11,23 @@ module Caravan
|
|
11
11
|
)
|
12
12
|
}.freeze
|
13
13
|
|
14
|
+
DEFAULT_CONFIG_NAME = "caravan.yml".freeze
|
15
|
+
|
14
16
|
class << self
|
15
17
|
def default_conf
|
16
18
|
DEFAULT_CONFIG
|
17
19
|
end
|
18
20
|
|
21
|
+
def default_conf_name
|
22
|
+
DEFAULT_CONFIG_NAME
|
23
|
+
end
|
24
|
+
|
19
25
|
def from(user_config_path)
|
20
26
|
if File.exist?(user_config_path)
|
21
27
|
YAML.load_file(user_config_path)
|
22
28
|
else
|
23
|
-
Caravan::Message.
|
24
|
-
Caravan::Message.
|
29
|
+
Caravan::Message.warn("User configuration [caravan.yml] not found.")
|
30
|
+
Caravan::Message.warn("Use `caravan init` to generate.")
|
25
31
|
default_conf.dup
|
26
32
|
end
|
27
33
|
end
|
@@ -34,8 +40,7 @@ module Caravan
|
|
34
40
|
|
35
41
|
def merge(options, conf)
|
36
42
|
merged_conf = conf
|
37
|
-
merged_conf["src"] = options[:src]
|
38
|
-
|
43
|
+
merged_conf["src"] = options[:src] if options.key?(:src)
|
39
44
|
merged_conf["dst"] = options[:dst] if options.key?(:dst)
|
40
45
|
merged_conf["debug"] = options[:debug] if options.key?(:debug)
|
41
46
|
merged_conf["deploy_mode"] = options[:mode] if options.key?(:mode)
|
data/lib/caravan/message.rb
CHANGED
data/lib/caravan/version.rb
CHANGED
data/lib/caravan.rb
CHANGED
@@ -10,12 +10,9 @@ require "caravan/version"
|
|
10
10
|
|
11
11
|
require "listen"
|
12
12
|
|
13
|
-
DEFAULT_CONFIG_NAME = "caravan.yml".freeze
|
14
|
-
|
15
13
|
module Caravan
|
16
14
|
class << self
|
17
|
-
def start(
|
18
|
-
merged_conf = Caravan::Config.merge(options, process_conf(options[:src]))
|
15
|
+
def start(merged_conf)
|
19
16
|
src_path = merged_conf["src"]
|
20
17
|
target_path = merged_conf["dst"]
|
21
18
|
deploy_mode = merged_conf["deploy_mode"]
|
@@ -59,7 +56,10 @@ module Caravan
|
|
59
56
|
|
60
57
|
def process_conf(src_path)
|
61
58
|
Caravan::Message.success("Reading configuration...")
|
62
|
-
|
59
|
+
if src_path.nil?
|
60
|
+
src_path = '.'
|
61
|
+
end
|
62
|
+
user_config_path = File.join(File.expand_path(src_path), Caravan::Config.default_conf_name)
|
63
63
|
conf = Caravan::Config.from(user_config_path)
|
64
64
|
conf
|
65
65
|
end
|
@@ -69,7 +69,7 @@ module Caravan
|
|
69
69
|
end
|
70
70
|
|
71
71
|
def dump_default_conf
|
72
|
-
user_config_path = File.join(File.expand_path("."),
|
72
|
+
user_config_path = File.join(File.expand_path("."), Caravan::Config.default_conf_name)
|
73
73
|
default_conf = Caravan::Config.default_conf
|
74
74
|
|
75
75
|
Caravan::Config.dump(user_config_path, default_conf)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: caravan
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- David Zhang
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-12-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: listen
|
@@ -153,9 +153,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
153
153
|
version: '0'
|
154
154
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
155
155
|
requirements:
|
156
|
-
- - "
|
156
|
+
- - ">="
|
157
157
|
- !ruby/object:Gem::Version
|
158
|
-
version:
|
158
|
+
version: '0'
|
159
159
|
requirements: []
|
160
160
|
rubyforge_project:
|
161
161
|
rubygems_version: 2.6.11
|