hiera 1.3.4 → 2.0.0

data/spec/unit/config_spec.rb

@@ -72,6 +72,21 @@ class Hiera
           Config.load('/dev/null')
         end
       end
+
+      describe "if deep_merge can't be loaded" do
+        let(:error_message) { "Must have 'deep_merge' gem installed for the configured merge_behavior." }
+        before(:each) do
+          Config.expects(:require).with("deep_merge").raises(LoadError, "unable to load")
+        end
+
+        it "should error if merge_behavior is 'deep'" do
+          expect { Config.load(:merge_behavior => :deep) }.to raise_error(Hiera::Error, error_message)
+        end
+
+        it "should error if merge_behavior is 'deeper'" do
+          expect { Config.load(:merge_behavior => :deeper) }.to raise_error(Hiera::Error, error_message)
+        end
+      end
     end
 
     describe "#load_backends" do

data/spec/unit/fixtures/interpolate/config/hiera.yaml

@@ -0,0 +1,6 @@
+:backends:
+  - yaml
+
+:hierarchy:
+  - recursive
+  - niltest

data/spec/unit/fixtures/interpolate/data/niltest.yaml

@@ -0,0 +1,2 @@
+niltest: 'Missing key #%{hiera("knotfound")}#. Key with nil #%{hiera("knil")}#'
+knil: null

data/spec/unit/fixtures/interpolate/data/recursive.yaml

@@ -0,0 +1,3 @@
+foo: '%{hiera("bar")}'
+
+bar: '%{hiera("foo")}'

data/spec/unit/fixtures/override/config/hiera.yaml

@@ -0,0 +1,5 @@
+:backends:
+  - yaml
+
+:hierarchy:
+  - common

data/spec/unit/fixtures/override/data/alternate.yaml

@@ -0,0 +1 @@
+bar: 'alternate'

data/spec/unit/fixtures/override/data/common.yaml

@@ -0,0 +1,2 @@
+foo: '%{hiera("bar")}'
+bar: 'common'

data/spec/unit/interpolate_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'hiera/util'
+
+describe "Hiera" do
+  context "when doing interpolation" do
+    let(:fixtures) { File.join(HieraSpec::FIXTURE_DIR, 'interpolate') }
+
+    it 'should prevent endless recursion' do
+      Hiera::Util.expects(:var_dir).at_least_once.returns(File.join(fixtures, 'data'))
+      hiera = Hiera.new(:config => File.join(fixtures, 'config', 'hiera.yaml'))
+      expect do
+        hiera.lookup('foo', nil, {})
+      end.to raise_error Hiera::InterpolationLoop, 'Detected in [hiera("bar"), hiera("foo")]'
+    end
+  end
+
+  context "when not finding value for interpolated key" do
+    let(:fixtures) { File.join(HieraSpec::FIXTURE_DIR, 'interpolate') }
+
+    it 'should resolve the interpolation to an empty string' do
+      Hiera::Util.expects(:var_dir).at_least_once.returns(File.join(fixtures, 'data'))
+      hiera = Hiera.new(:config => File.join(fixtures, 'config', 'hiera.yaml'))
+      expect(hiera.lookup('niltest', nil, {})).to eq('Missing key ##. Key with nil ##')
+    end
+  end
+
+  context "when doing interpolation with override" do
+    let(:fixtures) { File.join(HieraSpec::FIXTURE_DIR, 'override') }
+
+    it 'should resolve interpolation using the override' do
+      Hiera::Util.expects(:var_dir).at_least_once.returns(File.join(fixtures, 'data'))
+      hiera = Hiera.new(:config => File.join(fixtures, 'config', 'hiera.yaml'))
+      expect(hiera.lookup('foo', nil, {}, 'alternate')).to eq('alternate')
+    end
+  end
+end

data/spec/unit/util_spec.rb

@@ -23,26 +23,26 @@ describe Hiera::Util do
   describe 'Hiera::Util.config_dir' do
     it 'should return the correct path for posix systems' do
       Hiera::Util.expects(:file_alt_separator).returns(nil)
-      Hiera::Util.config_dir.should == '/etc'
+      Hiera::Util.config_dir.should == '/etc/puppetlabs/code'
     end
 
     it 'should return the correct path for microsoft windows systems' do
       Hiera::Util.expects(:microsoft_windows?).returns(true)
       Hiera::Util.expects(:common_appdata).returns('C:\\ProgramData')
-      Hiera::Util.config_dir.should == 'C:\\ProgramData/PuppetLabs/hiera/etc'
+      Hiera::Util.config_dir.should == 'C:\\ProgramData/PuppetLabs/code'
     end
   end
 
   describe 'Hiera::Util.var_dir' do
     it 'should return the correct path for posix systems' do
       Hiera::Util.expects(:file_alt_separator).returns(nil)
-      Hiera::Util.var_dir.should == '/var/lib/hiera'
+      Hiera::Util.var_dir.should == '/etc/puppetlabs/code/hieradata'
     end
 
     it 'should return the correct path for microsoft windows systems' do
       Hiera::Util.expects(:microsoft_windows?).returns(true)
       Hiera::Util.expects(:common_appdata).returns('C:\\ProgramData')
-      Hiera::Util.var_dir.should == 'C:\\ProgramData/PuppetLabs/hiera/var'
+      Hiera::Util.var_dir.should == 'C:\\ProgramData/PuppetLabs/code/hieradata'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -58,7 +58,14 @@ files:
 - spec/unit/console_logger_spec.rb
 - spec/unit/fallback_logger_spec.rb
 - spec/unit/filecache_spec.rb
+- spec/unit/fixtures/interpolate/config/hiera.yaml
+- spec/unit/fixtures/interpolate/data/niltest.yaml
+- spec/unit/fixtures/interpolate/data/recursive.yaml
+- spec/unit/fixtures/override/config/hiera.yaml
+- spec/unit/fixtures/override/data/alternate.yaml
+- spec/unit/fixtures/override/data/common.yaml
 - spec/unit/hiera_spec.rb
+- spec/unit/interpolate_spec.rb
 - spec/unit/puppet_logger_spec.rb
 - spec/unit/util_spec.rb
 - spec/unit/version_spec.rb
@@ -81,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Light weight hierarchical data store
@@ -94,7 +101,14 @@ test_files:
 - spec/unit/console_logger_spec.rb
 - spec/unit/fallback_logger_spec.rb
 - spec/unit/filecache_spec.rb
+- spec/unit/fixtures/interpolate/config/hiera.yaml
+- spec/unit/fixtures/interpolate/data/niltest.yaml
+- spec/unit/fixtures/interpolate/data/recursive.yaml
+- spec/unit/fixtures/override/config/hiera.yaml
+- spec/unit/fixtures/override/data/alternate.yaml
+- spec/unit/fixtures/override/data/common.yaml
 - spec/unit/hiera_spec.rb
+- spec/unit/interpolate_spec.rb
 - spec/unit/puppet_logger_spec.rb
 - spec/unit/util_spec.rb
 - spec/unit/version_spec.rb