yaml_servers 0.2.6 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f7afeb89a89c422f7810c4f13adf32234dd17448
4
- data.tar.gz: ff132211bdf5349f8896e0c0e8a390ecc511b820
3
+ metadata.gz: d334b1f1ac9dd2258d71fce645a042dc07339e3c
4
+ data.tar.gz: f504abf65f06ee5346cd559a21203ff4dd3b9f42
5
5
  SHA512:
6
- metadata.gz: 6a2769ff11dfd4108fa4e9c50d8c6da0772b37790e32108b3b92beed9b2b6131c12507148d3e579a0ef3b97c61942eb2fffa40701be4f0dc0777e65dd9b97b67
7
- data.tar.gz: 48af372fe54ca67381c6f698ea051d0b41467d16c4a0360fafe1b71319b1b143da1537209dd9c93ab7ef9103f023e0805faabe46bb4bcc8a9fa1f55e385276d2
6
+ metadata.gz: a3f2911e8c633e7fe567ece25bc3594916635e38914abea1e386b2c8f2fe7478cd39c17035fdff84bf75adb1222d495d80de0cfb02bcd1cc5fa4a1224f899f7b
7
+ data.tar.gz: 61a99e963258c5950834749a22f84355bd7925d6291fe92cd23ea85851359197872855c772cedf1eebc5082aeb883b866e087897c1cd1cf087e6d0720cee136a
@@ -34,7 +34,11 @@ module YamlServers
34
34
  end
35
35
 
36
36
  begin
37
- yaml = YAML::load(File.read(file))
37
+ if /\.json$/.match(file) then
38
+ yaml = JSON::load(File.read(file))
39
+ else
40
+ yaml = YAML::load(File.read(file))
41
+ end
38
42
  rescue => err
39
43
  STDERR.puts "Warning: #{file} not available"
40
44
  STDERR.puts err
@@ -49,7 +53,7 @@ module YamlServers
49
53
  return {}
50
54
  end
51
55
  elsif yaml.is_a?(Hash) and !yaml.key?("servers")
52
- /^(?<filebase>.*)\.yaml$/ =~ File.basename(file)
56
+ /^(?<filebase>.*)\.(yaml|json)$/ =~ File.basename(file)
53
57
  if filebase != 'local' then
54
58
  yaml = { "servers" => { filebase => yaml } }
55
59
  else
@@ -1,3 +1,3 @@
1
1
  module YamlServers
2
- VERSION = "0.2.6"
2
+ VERSION = "0.2.7"
3
3
  end
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.2.6
4
+ version: 0.2.7
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-02-15 00:00:00.000000000 Z
11
+ date: 2018-02-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport