yaml_servers 0.4.0 → 0.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/yaml_servers/read_yaml.rb +2 -2
- data/lib/yaml_servers/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f9bb1a5081a188cc071565fd48efdbb028556df0
|
|
4
|
+
data.tar.gz: fdcebd242a065d6ebe9bc9465c3d201e87e12258
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3a8ede12315553f8051062b174185827ede2a36294007f8e4085fe9e0bf588daef7ac1a830d9910738427221847c42e4fc299ba447edfd847f34c40acfcee593
|
|
7
|
+
data.tar.gz: b534b4044c18448e46eae7eab39079b56c596033393e0f61aa6d295410ff67f10c924647bcb330a09b436f396724f52c7b253dda4e190bc393a206fd983c1ecc
|
|
@@ -53,7 +53,7 @@ module YamlServers
|
|
|
53
53
|
return {}
|
|
54
54
|
end
|
|
55
55
|
elsif yaml.is_a?(Hash) and !yaml.key?("servers")
|
|
56
|
-
|
|
56
|
+
filebase = File.basename(file, '.*')
|
|
57
57
|
if filebase != 'local' then
|
|
58
58
|
yaml = { "servers" => { filebase => yaml } }
|
|
59
59
|
else
|
|
@@ -80,7 +80,7 @@ module YamlServers
|
|
|
80
80
|
missing_ok = true
|
|
81
81
|
|
|
82
82
|
# merge localconf defaults over top of lower precedence defaults
|
|
83
|
-
config.deep_merge!(local_config.reject { |key| key == "servers"} )
|
|
83
|
+
config.deep_merge!(local_config.reject { |key,value| key == "servers" } )
|
|
84
84
|
|
|
85
85
|
# get servers from config
|
|
86
86
|
servers.deep_merge!(apply_defaults(config, defaults))
|
data/lib/yaml_servers/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: yaml_servers
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Robert Brooks
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-04-
|
|
11
|
+
date: 2018-04-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: deep_merge
|