yaml_servers 0.2.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dcf7c38f328d587436aca275b803a341980c82c
-  data.tar.gz: 639a45e5aca520c10ae4bcce0ff217c1a134f04a
+  metadata.gz: 8b52e3f69cbe0d8037f8b8af2167b112aa9c8311
+  data.tar.gz: 42fd2a712e5bded522a4876500074db465e296c9
 SHA512:
-  metadata.gz: 38affedf0bd2e0b222f97869e0d712d605cb060d1a3e92dff1119df02d0bbce23d987d5d6448c26c0ecace2c17b9e37b32a4da7075d0cf6be07d52941321dd8c
-  data.tar.gz: 2f214e0e5cafa16bf35b9c973d0699334cb9e1d8ffc7315a2955204823d2c84a99dc970f72e97ebc887ee37998d71a62db96cf98a871a20db1bdff5e219da5b6
+  metadata.gz: 839fb34748406b3182f49f3ff74a90252c6104225125b0cfd9dd83f097347c0ae595374f7ae456d8c9bdba13dbb0539f8c149a1fc5e3f2efb1f72bee6fdafc7c
+  data.tar.gz: b5631a18ae13a57c16af543cc7bb394a4dd2e918bce60efbc20d1608571e66dd03ac5c217735c8ae406fdb2030c8b6f87e1de1bf6b3c9ad6a82783532c609da0

data/lib/yaml_servers.rb

@@ -1,8 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-require 'active_support'
-require 'active_support/core_ext'
+require 'deep_merge'
 require 'getoptlong'
 require 'json'
 require 'resolv'

data/lib/yaml_servers/read_yaml.rb

@@ -6,12 +6,12 @@ module YamlServers
 
     def self.apply_defaults(config, defaults)
       # merge defaults
-      config = defaults.deep_merge(config)
+      config = defaults.deep_merge!(config)
 
       # apply defaults to each server
       servers = {}
       config["servers"].each { |hostname, server|
-        servers[hostname] = config["default"].deep_merge(server.is_a?(Hash) ? server : { })
+        servers[hostname] = config["default"].dup.deep_merge!(server.is_a?(Hash) ? server : { })
         servers[hostname]["is_primary"] = (hostname == config["primary"])
         if servers[hostname].key?("ip") then
           begin
@@ -75,20 +75,21 @@ module YamlServers
       config = {}
       missing_ok = false
       yaml_configs.each do |yaml|
-        config = get_yaml(File.join(path, yaml), missing_ok)
+        file = Pathname.new(yaml).relative? ? File.join(path, yaml) : yaml
+        config = get_yaml(file, missing_ok)
         missing_ok = true
 
         # merge localconf defaults over top of lower precedence defaults
-        config = config.deep_merge(local_config.reject { |key| key == "servers"} )
+        config.deep_merge!(local_config.reject { |key| key == "servers"} )
 
         # get servers from config
-        servers = servers.deep_merge!(apply_defaults(config, defaults))
+        servers.deep_merge!(apply_defaults(config, defaults))
       end
 
       # build new config hash with servers collected above and local config applied
       config = { "servers" => servers, "primary" => config["primary"] }
-      config = defaults.deep_merge(config)
-      config = config.deep_merge(local_config)
+      config = defaults.dup.deep_merge!(config)
+      config.deep_merge!(local_config)
 
       # we need at least one server
       config["servers"] = { "default" => nil }  unless config.key?("servers")

data/lib/yaml_servers/version.rb

@@ -1,3 +1,3 @@
 module YamlServers
-  VERSION = "0.2.9"
+  VERSION = "0.4.0"
 end

data/yaml_servers.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.6'
+  spec.add_runtime_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: yaml_servers
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Brooks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement