Switch from vendor copy of deep_merge to using gem

Gets rid of warning about constant redefinition when gem is also installed
ThrowTheSwitch · Nov 30, 2020 · b063510 · b063510
1 parent 482d39c
commit b063510
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 910 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,6 +8,7 @@ gem "constructor"
 gem "diy"
 gem "rr"
 gem "thor"
+gem "deep_merge"
 
 #these will be used if present, but ignored otherwise
 #gem "curses"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     constructor (2.0.0)
+    deep_merge (1.2.1)
     diff-lcs (1.3)
     diy (1.1.2)
       constructor (>= 1.0.0)
@@ -30,6 +31,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.3.5)
   constructor
+  deep_merge
   diy
   rake (>= 12.2.1)
   require_all

diff --git a/bin/ceedling b/bin/ceedling
@@ -137,7 +137,6 @@ unless (project_found)
             {:src => 'vendor/cmock/config/',        :dst => 'vendor/cmock/config'},
             {:src => 'vendor/cmock/lib/',           :dst => 'vendor/cmock/lib'},
             {:src => 'vendor/cmock/src/',           :dst => 'vendor/cmock/src'},
-            {:src => 'vendor/deep_merge/lib/',      :dst => 'vendor/deep_merge/lib'},
             {:src => 'vendor/diy/lib',              :dst => 'vendor/diy/lib'},
             {:src => 'vendor/unity/auto/',          :dst => 'vendor/unity/auto'},
             {:src => 'vendor/unity/src/',           :dst => 'vendor/unity/src'},

diff --git a/ceedling.gemspec b/ceedling.gemspec
@@ -32,6 +32,7 @@ Ceedling projects are created with a YAML configuration file. A variety of conve
 
   s.add_dependency "thor", ">= 0.14.5"
   s.add_dependency "rake", ">= 12.2.1"
+  s.add_dependency "deep_merge", ">= 1.2.1"
   s.add_runtime_dependency "constructor", ">= 1.0.4"
 
   # Files needed from submodules

diff --git a/config/test_environment.rb b/config/test_environment.rb
@@ -5,7 +5,6 @@
   'test',
   'vendor/behaviors/lib',
   'vendor/hardmock/lib',
-  'vendor/deep_merge/lib',
 ].each do |dir|
   $LOAD_PATH.unshift( File.join( File.expand_path(File.dirname(__FILE__) + "/../"), dir) )
 end
diff --git a/lib/ceedling/rakefile.rb b/lib/ceedling/rakefile.rb
@@ -10,7 +10,6 @@
 $LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'unity/auto') )
 $LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'diy/lib') )
 $LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'cmock/lib') )
-$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'deep_merge/lib') )
 
 require 'rake'
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -8,7 +8,6 @@
 here = File.dirname(__FILE__)
 
 $: << File.join(here, '../lib')
-$: << File.join(here, '../vendor/deep_merge/lib')
 $: << File.join(here, '../vendor/cmock/lib')
 
 support_files = File.join(File.dirname(__FILE__), "support/**/*.rb")

diff --git a/vendor/deep_merge/MIT-LICENSE b/vendor/deep_merge/MIT-LICENSE
diff --git a/vendor/deep_merge/README b/vendor/deep_merge/README
diff --git a/vendor/deep_merge/Rakefile b/vendor/deep_merge/Rakefile