coral_core 0.2.13 → 0.2.14

data/.gitmodules

@@ -7,3 +7,6 @@
 [submodule "lib/dependency/log4r"]
 	path = lib/dependency/log4r
 	url = git://github.com/colbygk/log4r.git
+[submodule "lib/dependency/deep_merge"]
+	path = lib/dependency/deep_merge
+	url = git://github.com/danielsdeleo/deep_merge.git

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/coral_core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "coral_core"
-  s.version = "0.2.13"
+  s.version = "0.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]

data/lib/coral_core.rb

@@ -69,6 +69,18 @@ end
 
 #---
 
+begin
+  require 'deep_merge'
+    
+rescue LoadError
+  deep_merge_lib = File.join(dependencies, 'deep_merge', 'lib')
+  
+  $:.push(deep_merge_lib)
+  require File.join(deep_merge_lib, 'deep_merge.rb')  
+end
+
+#---
+
 begin
   require 'json'
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coral_core
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - Adrian Webb