hiera 1.2.0.rc2 → 1.2.0.rc3

data/lib/hiera.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 class Hiera
-  VERSION = "1.2.0-rc2"
+  VERSION = "1.2.0-rc3"
 
   require "hiera/config"
   require "hiera/util"

data/lib/hiera/config.rb

@@ -42,10 +42,25 @@ class Hiera::Config
         @config[:logger] = "console"
         Hiera.logger = "console"
       end
+    
+      self.validate!
 
       @config
     end
 
+    def validate!
+      case @config[:merge_behavior]
+      when :deep,'deep',:deeper,'deeper'
+        begin
+          require "deep_merge"
+        rescue LoadError
+          Hiera.warn "Ignoring configured merge_behavior"
+          Hiera.warn "Must have 'deep_merge' gem installed."
+          @config[:merge_behavior] = :native
+        end
+      end
+    end
+
     ##
     # yaml_load_file directly delegates to YAML.load_file and is intended to be
     # a private, internal method suitable for stubbing and mocking.

data/spec/unit/backend_spec.rb

@@ -390,6 +390,7 @@ class Hiera
       before do
         Hiera.stubs(:debug)
         Hiera.stubs(:warn)
+        Config.stubs(:validate!)
       end
 
       it "uses Hash.merge when configured with :merge_behavior => :native" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hiera
 version: !ruby/object:Gem::Version 
-  hash: -723940848
+  hash: -3093716430
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
   - rc
-  - 2
-  version: 1.2.0.rc2
+  - 3
+  version: 1.2.0.rc3
 platform: ruby
 authors: 
 - Puppet Labs
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-12 00:00:00 Z
+date: 2013-03-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure