configure-s3-website 2.0.0.pre.RC1 → 2.0.0.pre.RC2
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 +4 -4
- data/changelog.md +9 -0
- data/lib/configure-s3-website/cloudfront_client.rb +8 -2
- data/lib/configure-s3-website/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2313aed03d85c1deee7be724073bed423e967af5
|
|
4
|
+
data.tar.gz: 5977ed491a0422fdec20a2409e03f015b410fbdf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1680c01cfcce66125781ac283521ef07efdb67e37257cfb20c5288de284841a740ff2179725e3b4518fe4f098f4515c77c611d4102da47536579add78dda92fc
|
|
7
|
+
data.tar.gz: 3e32bb6f000e5f9e173d1e0f079dd7b5a89f3d3ff3835afd63aeb9707bc398e7b47fafabbc7bd835fa98c64529380bb460f05352aa0d64d6da8e7fbee8b35291
|
data/changelog.md
CHANGED
|
@@ -36,6 +36,15 @@ contents of your `cloudfront_distribution_config` setting.
|
|
|
36
36
|
safely exit. If this happens, just fix the problems that client reports and
|
|
37
37
|
try again.
|
|
38
38
|
|
|
39
|
+
Also, the arrays in hashes are now merged:
|
|
40
|
+
|
|
41
|
+
```
|
|
42
|
+
source = {:x => [{:y => 1}]}
|
|
43
|
+
dest = {:x => [{:z => 2}]}
|
|
44
|
+
# merge...
|
|
45
|
+
Results: {:x => [{:y => 1, :z => 2}]}
|
|
46
|
+
```
|
|
47
|
+
|
|
39
48
|
## 1.7.5
|
|
40
49
|
|
|
41
50
|
* Fix CreateBucket broken in 1.7.4
|
|
@@ -20,7 +20,8 @@ module ConfigureS3Website
|
|
|
20
20
|
deep_symbolize(custom_distribution_config.merge({
|
|
21
21
|
caller_reference: live_config.distribution.distribution_config.caller_reference,
|
|
22
22
|
comment: 'Updated by the configure-s3-website gem'
|
|
23
|
-
}))
|
|
23
|
+
})),
|
|
24
|
+
ConfigureS3Website::deep_merge_options
|
|
24
25
|
)
|
|
25
26
|
cloudfront(config_source).update_distribution({
|
|
26
27
|
distribution_config: custom_distribution_config_with_caller_ref,
|
|
@@ -139,7 +140,7 @@ module ConfigureS3Website
|
|
|
139
140
|
'quantity' => '0'
|
|
140
141
|
},
|
|
141
142
|
'price_class' => 'PriceClass_All'
|
|
142
|
-
}.deep_merge!(custom_cf_settings)
|
|
143
|
+
}.deep_merge!(custom_cf_settings, ConfigureS3Website::deep_merge_options)
|
|
143
144
|
}
|
|
144
145
|
end
|
|
145
146
|
|
|
@@ -163,4 +164,9 @@ module ConfigureS3Website
|
|
|
163
164
|
end
|
|
164
165
|
end
|
|
165
166
|
end
|
|
167
|
+
def self.deep_merge_options
|
|
168
|
+
{
|
|
169
|
+
:merge_hash_arrays => true
|
|
170
|
+
}
|
|
171
|
+
end
|
|
166
172
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: configure-s3-website
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.0.pre.
|
|
4
|
+
version: 2.0.0.pre.RC2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Lauri Lehmijoki
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-12-
|
|
11
|
+
date: 2016-12-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: deep_merge
|