Merge pull request #110 from firedev/master

added gem deep_merge to gemspec
rubyconfig · Jun 27, 2015 · 6717826 · 6717826
2 parents 97554e7 + a2560bc
commit 6717826
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 183 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.1.6
+2.1.6
diff --git a/lib/rails_config.rb b/lib/rails_config.rb
@@ -4,7 +4,7 @@
 require 'rails_config/version'
 require 'rails_config/engine' if defined?(::Rails)
 require 'rails_config/sources/yaml_source'
-require 'rails_config/vendor/deep_merge' unless defined?(DeepMerge)
+require 'deep_merge'
 
 module RailsConfig
   # ensures the setup only gets run once

diff --git a/lib/rails_config/vendor/deep_merge.rb b/lib/rails_config/vendor/deep_merge.rb
diff --git a/rails_config.gemspec b/rails_config.gemspec
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.require_paths    = ["lib"]
 
   s.add_dependency "activesupport", ">= 3.0"
+  s.add_dependency "deep_merge", "~> 1.0"
 
   s.add_development_dependency "bundler",     "~> 1.10.3"
   s.add_development_dependency "rake"
@@ -37,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rubocop",     "~> 0.32.0"
 
-  if ENV['RUBY_VERSION'] >= 'ruby-2.2'
+  if ENV['RUBY_VERSION'].to_s >= 'ruby-2.2'
     s.add_development_dependency "test-unit",   "~> 3.1.2"
   end