cps-property-generator 0.2.7 → 0.2.8

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.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/generator/service.rb +6 -2
  3. metadata +15 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8c538411f403418186287f058c9e9ceb4d054513
4
- data.tar.gz: 76f347bfd52b07b8333ea929345e4b650d8221b8
3
+ metadata.gz: 33e9da4826b7c811df4e0bdf35383788e850bb26
4
+ data.tar.gz: 47dec9e45bb96c348427ecbaab2a9bc045fada2e
5
5
  SHA512:
6
- metadata.gz: cdd7d8f5a4cad809bf09d655f026c6c9f12c75e3e28e044a3361bce2eb83748c36512c55668f9b48514b0d085e610d7bf78f3358c81336df93143ecdb7bba5e6
7
- data.tar.gz: 5f7b3911296e18c5715de3f43a09a0104c046dacdc32eee97f191281363cc73aeae817ab467590189bfd2584f7f78716b98176ea06bd0e70e72438c214d2586b
6
+ metadata.gz: 2a4a98b7de3530d277542c38b1bff58d1b8a1b821eeec9bfe1e5c31222c05d7372fa38882f88f0896dff22da878f76c0427e6dbe21fd346a5b60f667835350fa
7
+ data.tar.gz: f135b5a38316ca0db25d998a85867749638ff897d863458b0d0168a9accb4f0b3debd82ff846f04bf29c21dbd74788eabc6fab241c4680cd86bae5253b7c8522
@@ -1,6 +1,10 @@
1
1
  module PropertyGenerator
2
+
2
3
  class Service
4
+ require 'active_support/core_ext/hash'
5
+
3
6
  attr_accessor :service
7
+
4
8
  def initialize(service_data, config, globals)
5
9
  @service_data = service_data
6
10
  @environments = config.environments
@@ -57,7 +61,7 @@ module PropertyGenerator
57
61
  environment_data = data['environments'][env].dup
58
62
  if data['encrypted']
59
63
  encrypted = data['encrypted'][env].dup unless data['encrypted'][env].nil?
60
- environment_data = data['environments'][env].merge(encrypted) unless encrypted.nil?
64
+ environment_data = data['environments'][env].deep_merge(encrypted) unless encrypted.nil?
61
65
  end
62
66
  if default_clone.nil?
63
67
  merged = environment_data
@@ -85,6 +89,6 @@ module PropertyGenerator
85
89
  output
86
90
  end
87
91
 
88
-
89
92
  end
93
+
90
94
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cps-property-generator
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.7
4
+ version: 0.2.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bryan Call
@@ -38,6 +38,20 @@ dependencies:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: activesupport
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: 4.2.11.1
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: 4.2.11.1
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: terminal-table
43
57
  requirement: !ruby/object:Gem::Requirement