bora 1.7.0 → 1.7.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/bora.gemspec +2 -1
  3. data/lib/bora/template.rb +2 -4
  4. data/lib/bora/version.rb +1 -1
  5. metadata +23 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: af9562b301a731f8fee40274923e356d3541ca98
4
- data.tar.gz: 3a2cc26919d1502e0e272e16a47331426b38e2d3
3
+ metadata.gz: d145303611497605607c623bdda4ef8d51396155
4
+ data.tar.gz: 23d4d5b11a9f373219ddcf583c4faf1c96c21113
5
5
  SHA512:
6
- metadata.gz: 64fb26a2e2d65fe271346fdfbdb2f0f81f100135d149314d469b7d9b6b8f006cf25d13bfeefaaaa350110e2a9cb1a5d540919080b841c36532ccd41747c9f61f
7
- data.tar.gz: c9de80ce38c97800dd0e03e84aa5f51be532350219915a61634fa6a4cdfbbda535a798afc6eee20997add492766e50c40c47e28377c38340300c0eb1c8c556ba
6
+ metadata.gz: ad934b35b1569718613640b8c84c7fd274d1c38e93411292c399c7ae9af51ef1a85a8a447f3a63b3586396743823c79be1770609a54f3bef1d0e95cf9793c446
7
+ data.tar.gz: ef010ea3118919bd1646d6d2d50923349f81b74e45d558a0196cb96bc491b3d2d199372a47fd5f18b72c421efec3d6821ee0442c9d1ac9c2d571cfddece23d6c
data/bora.gemspec CHANGED
@@ -21,12 +21,13 @@ Gem::Specification.new do |spec|
21
21
  spec.add_dependency 'aws-sdk', '~> 2.0'
22
22
  spec.add_dependency 'cfndsl', '~> 0.4'
23
23
  spec.add_dependency 'colorize', '~> 0.7'
24
+ spec.add_dependency 'deep_merge', '~> 1.1'
24
25
  spec.add_dependency 'diffy', '~> 3.0'
25
26
  spec.add_dependency 'rake', '~> 10.0'
26
27
  spec.add_dependency 'thor', '~> 0.19'
27
- spec.add_dependency 'hashie', '~> 3.4.6'
28
28
 
29
29
  spec.add_development_dependency 'bundler', '~> 1.11'
30
+ spec.add_development_dependency 'hashie', '~> 3.4.6'
30
31
  spec.add_development_dependency 'rspec', '~> 3.0'
31
32
  spec.add_development_dependency 'simplecov', '~> 0.12'
32
33
  spec.add_development_dependency 'rubocop'
data/lib/bora/template.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'bora/stack'
2
- require 'hashie'
2
+ require 'deep_merge'
3
3
 
4
4
  class Bora
5
5
  class Template
@@ -36,9 +36,7 @@ class Bora
36
36
  private
37
37
 
38
38
  def resolve_stack_config(template_config, stack_config, override_config)
39
- Hashie::Mash.new(
40
- inheritable_properties(template_config)
41
- ).deep_merge(stack_config).merge(overridable_properties(override_config))
39
+ inheritable_properties(template_config).deep_merge!(stack_config).merge(overridable_properties(override_config))
42
40
  end
43
41
 
44
42
  def inheritable_properties(config)
data/lib/bora/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class Bora
2
- VERSION = '1.7.0'.freeze
2
+ VERSION = '1.7.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bora
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.0
4
+ version: 1.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Charles Blaxland
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-05-23 00:00:00.000000000 Z
11
+ date: 2017-05-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk
@@ -52,6 +52,20 @@ dependencies:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0.7'
55
+ - !ruby/object:Gem::Dependency
56
+ name: deep_merge
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: '1.1'
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
68
+ version: '1.1'
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: diffy
57
71
  requirement: !ruby/object:Gem::Requirement
@@ -95,33 +109,33 @@ dependencies:
95
109
  - !ruby/object:Gem::Version
96
110
  version: '0.19'
97
111
  - !ruby/object:Gem::Dependency
98
- name: hashie
112
+ name: bundler
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - "~>"
102
116
  - !ruby/object:Gem::Version
103
- version: 3.4.6
104
- type: :runtime
117
+ version: '1.11'
118
+ type: :development
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
122
  - - "~>"
109
123
  - !ruby/object:Gem::Version
110
- version: 3.4.6
124
+ version: '1.11'
111
125
  - !ruby/object:Gem::Dependency
112
- name: bundler
126
+ name: hashie
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - "~>"
116
130
  - !ruby/object:Gem::Version
117
- version: '1.11'
131
+ version: 3.4.6
118
132
  type: :development
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
136
  - - "~>"
123
137
  - !ruby/object:Gem::Version
124
- version: '1.11'
138
+ version: 3.4.6
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: rspec
127
141
  requirement: !ruby/object:Gem::Requirement