coral_core 0.2.13 → 0.2.14

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.
Files changed (5) hide show
  1. data/.gitmodules +3 -0
  2. data/VERSION +1 -1
  3. data/coral_core.gemspec +1 -1
  4. data/lib/coral_core.rb +12 -0
  5. metadata +3 -3
data/.gitmodules CHANGED
@@ -7,3 +7,6 @@
7
7
  [submodule "lib/dependency/log4r"]
8
8
  path = lib/dependency/log4r
9
9
  url = git://github.com/colbygk/log4r.git
10
+ [submodule "lib/dependency/deep_merge"]
11
+ path = lib/dependency/deep_merge
12
+ url = git://github.com/danielsdeleo/deep_merge.git
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.13
1
+ 0.2.14
data/coral_core.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "coral_core"
8
- s.version = "0.2.13"
8
+ s.version = "0.2.14"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Adrian Webb"]
data/lib/coral_core.rb CHANGED
@@ -69,6 +69,18 @@ end
69
69
 
70
70
  #---
71
71
 
72
+ begin
73
+ require 'deep_merge'
74
+
75
+ rescue LoadError
76
+ deep_merge_lib = File.join(dependencies, 'deep_merge', 'lib')
77
+
78
+ $:.push(deep_merge_lib)
79
+ require File.join(deep_merge_lib, 'deep_merge.rb')
80
+ end
81
+
82
+ #---
83
+
72
84
  begin
73
85
  require 'json'
74
86
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: coral_core
3
3
  version: !ruby/object:Gem::Version
4
- hash: 13
4
+ hash: 11
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 2
9
- - 13
10
- version: 0.2.13
9
+ - 14
10
+ version: 0.2.14
11
11
  platform: ruby
12
12
  authors:
13
13
  - Adrian Webb