update

.gitignore

@@ -0,0 +1 @@
+SOURCES/deep_merge-1.2.1.gem

.rubygem-deep_merge.metadata

@@ -0,0 +1 @@
+4a1985fcb9fd15668f9571a2cd5dc3cf12b7c3cf  SOURCES/deep_merge-1.2.1.gem

SOURCES/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2008-2104 Steve Midgley, Daniel DeLeo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

SOURCES/deep_merge-minitest5.patch

@@ -0,0 +1,48 @@
+diff -uNr deep_merge-1.0.1.ORIG/deep_merge.gemspec deep_merge-1.0.1/deep_merge.gemspec
+--- deep_merge-1.0.1.ORIG/deep_merge.gemspec	2014-05-30 13:15:45.024000000 +0000
++++ deep_merge-1.0.1/deep_merge.gemspec	2014-05-30 13:18:42.221000000 +0000
+@@ -30,5 +30,6 @@
+   else
+     s.add_dependency(%q<rake>, ["~> 10.1"])
+   end
++  s.add_development_dependency "minitest"
+ end
+ 
+diff -uNr deep_merge-1.0.1.ORIG/test/test_deep_merge.rb deep_merge-1.0.1/test/test_deep_merge.rb
+--- deep_merge-1.0.1.ORIG/test/test_deep_merge.rb	2014-05-30 13:15:45.024000000 +0000
++++ deep_merge-1.0.1/test/test_deep_merge.rb	2014-05-30 13:21:27.440000000 +0000
+@@ -1,4 +1,4 @@
+-require 'test/unit'
++require 'minitest/autorun'
+ 
+ $:.unshift(File.dirname(__FILE__) + '/../lib/')
+ require 'deep_merge'
+@@ -11,7 +11,7 @@
+   end
+ end
+ 
+-class TestDeepMerge < Test::Unit::TestCase
++class TestDeepMerge < Minitest::Test
+ 
+   def setup
+   end
+@@ -214,12 +214,13 @@
+     assert_equal({"property" => {"bedroom_count" => {"king_bed" => [nil, 3], "queen_bed" => [4, nil, 1]}, "bathroom_count" => [nil, "2", "1"]}}, hash_dst)
+ 
+     # test parameter management for knockout_prefix and overwrite unmergable
+-    assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => ""})}
+-    assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => ""})}
+-    assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => "--"})}
+-    assert_nothing_raised(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => "--"})}
+-    assert_nothing_raised(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst)}
+-    assert_nothing_raised(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})}
++    assert_raises(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => ""})}
++    assert_raises(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => ""})}
++    assert_raises(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => "--"})}
++    # test valid parameters
++    DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => "--"})
++    DeepMerge::deep_merge!(hash_src, hash_dst)
++    DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
+ 
+     # hash holding arrays of arrays
+     hash_src = {["1", "2", "3"] => ["1", "2"]}