hiera 1.1.2 → 1.2.0.rc1

data/lib/hiera.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 class Hiera
-  VERSION = "1.1.2"
+  VERSION = "1.2.0-rc1"
 
   autoload :Config,         "hiera/config"
   autoload :Util,           "hiera/util"

data/lib/hiera/backend.rb

@@ -1,4 +1,8 @@
 require 'hiera/util'
+begin
+  require 'deep_merge'
+rescue LoadError
+end
 
 class Hiera
   module Backend
@@ -85,8 +89,9 @@ class Hiera
               # Puppet can return :undefined for unknown scope vars,
               # If it does then we still need to evaluate extra_data
               # before returning an empty string.
-              if scope[var] && scope[var] != :undefined
-                  val = scope[var]
+              scope_val = scope[var]
+              if !scope_val.nil? && scope_val != :undefined
+                  val = scope_val
               elsif extra_data[var]
                   val = extra_data[var]
               end
@@ -136,6 +141,26 @@ class Hiera
         end
       end
 
+      # Merges two hashes answers with the configured merge behavior.
+      #         :merge_behavior: {:native|:deep|:deeper}
+      #
+      # Deep merge options use the Hash utility function provided by [deep_merge](https://github.com/peritor/deep_merge)
+      #
+      #  :native => Native Hash.merge
+      #  :deep   => Use Hash.deep_merge  
+      #  :deeper => Use Hash.deep_merge!
+      #
+      def merge_answer(left,right)
+        case Config[:merge_behavior]
+        when :deeper,'deeper'
+          left.deep_merge!(right)
+        when :deep,'deep'
+          left.deep_merge(right)
+        else # Native and undefined
+          left.merge(right)
+        end
+      end
+
       # Calls out to all configured backends in the order they
       # were specified.  The first one to answer will win.
       #
@@ -167,7 +192,7 @@ class Hiera
               when :hash
                 raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
                 answer ||= {}
-                answer = new_answer.merge answer
+                answer = merge_answer(new_answer,answer)
               else
                 answer = new_answer
                 break

data/lib/hiera/backend/json_backend.rb

@@ -30,10 +30,15 @@ class Hiera
           new_answer = Backend.parse_answer(data[key], scope)
           case resolution_type
           when :array
+            raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
             answer ||= []
             answer << new_answer
+          when :hash
+            raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
+            answer ||= {}
+            answer = Backend.merge_answer(new_answer,answer)
           else
-            answer = Backend.parse_answer(data[key], scope)
+            answer = new_answer
             break
           end
         end

data/lib/hiera/backend/yaml_backend.rb

@@ -52,7 +52,7 @@ class Hiera
           when :hash
             raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.kind_of? Hash
             answer ||= {}
-            answer = new_answer.merge answer
+            answer = Backend.merge_answer(new_answer,answer)
           else
             answer = new_answer
             break

data/lib/hiera/config.rb

@@ -11,7 +11,8 @@ class Hiera::Config
     #   {:backends => "yaml", :hierarchy => "common"}
     def load(source)
       @config = {:backends => "yaml",
-                 :hierarchy => "common"}
+                 :hierarchy => "common",
+                 :merge_behavior => :native }
 
       if source.is_a?(String)
         if File.exist?(source)

data/spec/unit/backend/yaml_backend_spec.rb

@@ -5,6 +5,7 @@ class Hiera
   module Backend
     describe Yaml_backend do
       before do
+        Config.load({})
         Hiera.stubs(:debug)
         Hiera.stubs(:warn)
         @backend = Yaml_backend.new

data/spec/unit/backend_spec.rb

@@ -333,5 +333,30 @@ class Hiera
         Backend.lookup("key", {"test" => "value"}, {}, nil, :hash).should == {"test" => "value"}
       end
     end
+    describe '#merge_answer' do
+      before do
+        Hiera.stubs(:debug)
+        Hiera.stubs(:warn)
+      end
+
+      it "should use Hash.merge when configured with :merge_behavior => :native" do
+        Config.load({:merge_behavior => :native})
+        Hash.any_instance.expects(:merge).with({"b" => "bnswer"}).returns({"a" => "answer", "b" => "bnswer"})
+        Backend.merge_answer({"a" => "answer"},{"b" => "bnswer"}).should == {"a" => "answer", "b" => "bnswer"}
+      end
+      
+      it "should use deep_merge! when configured with :merge_behavior => :deeper" do
+        Config.load({:merge_behavior => :deeper})
+        Hash.any_instance.expects('deep_merge!').with({"b" => "bnswer"}).returns({"a" => "answer", "b" => "bnswer"})
+        Backend.merge_answer({"a" => "answer"},{"b" => "bnswer"}).should == {"a" => "answer", "b" => "bnswer"}
+      end
+
+      it "should use deep_merge when configured with :merge_behavior => :deep" do
+        Config.load({:merge_behavior => :deep})
+        Hash.any_instance.expects('deep_merge').with({"b" => "bnswer"}).returns({"a" => "answer", "b" => "bnswer"})
+        Backend.merge_answer({"a" => "answer"},{"b" => "bnswer"}).should == {"a" => "answer", "b" => "bnswer"}
+      end
+            
+    end
   end
 end

data/spec/unit/config_spec.rb

@@ -7,7 +7,8 @@ class Hiera
         {
           :backends  => ["yaml"],
           :hierarchy => "common",
-          :logger    => "console"
+          :logger    => "console",
+          :merge_behavior=>:native
         }
       end
 
@@ -43,11 +44,11 @@ class Hiera
 
       it "should merge defaults with the loaded or supplied config" do
         config = Config.load({})
-        config.should == {:backends => ["yaml"], :hierarchy => "common", :logger => "console"}
+        config.should == {:backends => ["yaml"], :hierarchy => "common", :logger => "console", :merge_behavior=>:native}
       end
 
       it "should force :backends to be a flattened array" do
-        Config.load({:backends => [["foo", ["bar"]]]}).should == {:backends => ["foo", "bar"], :hierarchy => "common", :logger => "console"}
+        Config.load({:backends => [["foo", ["bar"]]]}).should == {:backends => ["foo", "bar"], :hierarchy => "common", :logger => "console", :merge_behavior=>:native}
       end
 
       it "should load the supplied logger" do

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hiera
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 1822012835
+  prerelease: 6
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-27 00:00:00 Z
+date: 2013-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -41,26 +43,26 @@ extra_rdoc_files: []
 
 files: 
 - bin/hiera
-- lib/hiera/backend/json_backend.rb
-- lib/hiera/backend/yaml_backend.rb
-- lib/hiera/backend.rb
-- lib/hiera/config.rb
-- lib/hiera/console_logger.rb
-- lib/hiera/noop_logger.rb
 - lib/hiera/puppet_logger.rb
+- lib/hiera/console_logger.rb
 - lib/hiera/util.rb
+- lib/hiera/backend.rb
+- lib/hiera/noop_logger.rb
+- lib/hiera/config.rb
+- lib/hiera/backend/yaml_backend.rb
+- lib/hiera/backend/json_backend.rb
 - lib/hiera.rb
 - COPYING
 - README.md
 - LICENSE
-- spec/spec_helper.rb
-- spec/unit/backend/json_backend_spec.rb
-- spec/unit/backend/yaml_backend_spec.rb
-- spec/unit/backend_spec.rb
+- spec/unit/util_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/console_logger_spec.rb
+- spec/unit/backend_spec.rb
 - spec/unit/hiera_spec.rb
-- spec/unit/util_spec.rb
+- spec/unit/console_logger_spec.rb
+- spec/unit/backend/yaml_backend_spec.rb
+- spec/unit/backend/json_backend_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/hiera
 licenses: []
 
@@ -81,12 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -95,11 +99,11 @@ signing_key:
 specification_version: 3
 summary: Light weight hierarchical data store
 test_files: 
-- spec/spec_helper.rb
-- spec/unit/backend/json_backend_spec.rb
-- spec/unit/backend/yaml_backend_spec.rb
-- spec/unit/backend_spec.rb
+- spec/unit/util_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/console_logger_spec.rb
+- spec/unit/backend_spec.rb
 - spec/unit/hiera_spec.rb
-- spec/unit/util_spec.rb
+- spec/unit/console_logger_spec.rb
+- spec/unit/backend/yaml_backend_spec.rb
+- spec/unit/backend/json_backend_spec.rb
+- spec/spec_helper.rb