configure-s3-website 2.0.0.pre.RC1 → 2.0.0.pre.RC2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eb8cd23cd38b0f3330c3917994b6d2ebfff0b0d
-  data.tar.gz: d94e2faca53f693abc671f839b8ac4b8525119fc
+  metadata.gz: 2313aed03d85c1deee7be724073bed423e967af5
+  data.tar.gz: 5977ed491a0422fdec20a2409e03f015b410fbdf
 SHA512:
-  metadata.gz: 2432f7a98b9c751a920037c54e015a48a096fffc36aaff2713b1b63e1a1f8232a58a0ed918e35327619d23bbe77a668eb92b60f9187838b5d1e782078ae5f3a7
-  data.tar.gz: b66e343138433203ec72d781d286c10d374ab560860c39419c556ba75b9ccdb84527ddcfcd8e92d565dea326d6b6da66d4b0754959a2b1c08e179d65b64a04fd
+  metadata.gz: 1680c01cfcce66125781ac283521ef07efdb67e37257cfb20c5288de284841a740ff2179725e3b4518fe4f098f4515c77c611d4102da47536579add78dda92fc
+  data.tar.gz: 3e32bb6f000e5f9e173d1e0f079dd7b5a89f3d3ff3835afd63aeb9707bc398e7b47fafabbc7bd835fa98c64529380bb460f05352aa0d64d6da8e7fbee8b35291

data/changelog.md

@@ -36,6 +36,15 @@ contents of your `cloudfront_distribution_config` setting.
   safely exit. If this happens, just fix the problems that client reports and
   try again.
 
+Also, the arrays in hashes are now merged:
+
+```
+source = {:x => [{:y => 1}]}
+dest   = {:x => [{:z => 2}]}
+# merge...
+Results: {:x => [{:y => 1, :z => 2}]}
+```
+
 ## 1.7.5
 
 * Fix CreateBucket broken in 1.7.4

data/lib/configure-s3-website/cloudfront_client.rb

@@ -20,7 +20,8 @@ module ConfigureS3Website
         deep_symbolize(custom_distribution_config.merge({
           caller_reference: live_config.distribution.distribution_config.caller_reference,
           comment: 'Updated by the configure-s3-website gem'
-        }))
+        })),
+        ConfigureS3Website::deep_merge_options
       )
       cloudfront(config_source).update_distribution({
         distribution_config: custom_distribution_config_with_caller_ref,
@@ -139,7 +140,7 @@ module ConfigureS3Website
             'quantity' => '0'
           },
           'price_class' => 'PriceClass_All'
-        }.deep_merge!(custom_cf_settings)
+        }.deep_merge!(custom_cf_settings, ConfigureS3Website::deep_merge_options)
       }
     end
 
@@ -163,4 +164,9 @@ module ConfigureS3Website
       end
     end
   end
+  def self.deep_merge_options
+    {
+      :merge_hash_arrays => true
+    }
+  end
 end

data/lib/configure-s3-website/version.rb

@@ -1,3 +1,3 @@
 module ConfigureS3Website
-  VERSION = '2.0.0-RC1'
+  VERSION = '2.0.0-RC2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configure-s3-website
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.RC1
+  version: 2.0.0.pre.RC2
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge