merlin 0.1.12 → 0.1.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/merlin/configuration.rb +1 -3
- data/lib/merlin/version.rb +1 -1
- metadata +2 -16
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: aefbc7d04351342e81bf2f3d2b2dbe0dc8601a5a
|
|
4
|
+
data.tar.gz: c53d8cf915038aa627650fadde02517b96898e14
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 03c2a13f5380f2f7255c1532e9bd8f12674a63f5e0f5faa8d7eaa8c962c0e1c28574f215887a0d67c576e5f52d16843ea5c2783e5a878824384529caa8e5a107
|
|
7
|
+
data.tar.gz: 3c28ec40bb6c01fe68d6f5fdf2bd0ae2bd0d10e5cd070d67408ac830a84f7f676df11b60923a858b44b63904c6587c9e6a7a721dee150b3d75319c9fa0348a70
|
data/lib/merlin/configuration.rb
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
require 'yaml'
|
|
2
2
|
require 'faraday'
|
|
3
|
-
require 'faraday_middleware'
|
|
4
3
|
require 'deep_merge' unless {}.respond_to?(:deep_merge)
|
|
5
4
|
require 'ostruct'
|
|
6
5
|
require 'json'
|
|
@@ -52,7 +51,6 @@ module Merlin
|
|
|
52
51
|
|
|
53
52
|
def from_server(connection = nil)
|
|
54
53
|
connection ||= Faraday.new(merlin_server) do |conn|
|
|
55
|
-
conn.response :json, :content_type => /\bjson$/
|
|
56
54
|
conn.adapter Faraday.default_adapter
|
|
57
55
|
end
|
|
58
56
|
|
|
@@ -61,7 +59,7 @@ module Merlin
|
|
|
61
59
|
}
|
|
62
60
|
|
|
63
61
|
if response.status == 200
|
|
64
|
-
result = response.body
|
|
62
|
+
result = JSON.parse(response.body)
|
|
65
63
|
dump_config(result) unless production_or_staging
|
|
66
64
|
result
|
|
67
65
|
else
|
data/lib/merlin/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: merlin
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.13
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Artur Roszczyk
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2014-01-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: faraday
|
|
@@ -24,20 +24,6 @@ dependencies:
|
|
|
24
24
|
- - '>='
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
26
|
version: '0'
|
|
27
|
-
- !ruby/object:Gem::Dependency
|
|
28
|
-
name: faraday_middleware
|
|
29
|
-
requirement: !ruby/object:Gem::Requirement
|
|
30
|
-
requirements:
|
|
31
|
-
- - '>='
|
|
32
|
-
- !ruby/object:Gem::Version
|
|
33
|
-
version: '0'
|
|
34
|
-
type: :runtime
|
|
35
|
-
prerelease: false
|
|
36
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
37
|
-
requirements:
|
|
38
|
-
- - '>='
|
|
39
|
-
- !ruby/object:Gem::Version
|
|
40
|
-
version: '0'
|
|
41
27
|
- !ruby/object:Gem::Dependency
|
|
42
28
|
name: deep_merge
|
|
43
29
|
requirement: !ruby/object:Gem::Requirement
|