hiera 3.1.2 → 3.2.0

data/README.md

@@ -316,3 +316,8 @@ Long-term support, including security patches and bug fixes, is available for
 commercial customers. Please see the following page for more details:
 
 [Puppet Enterprise Support Lifecycle](http://puppetlabs.com/misc/puppet-enterprise-lifecycle)
+
+## MAINTAINERS
+
+* Thomas Hallgren
+* Henrik Lindberg

data/bin/hiera

@@ -28,7 +28,7 @@ require 'pp'
 
 options = {
   :default => nil,
-  :config  => File.join(Hiera::Util.config_dir, 'hiera.yaml'),
+  :config  => nil,
   :scope   => {},
   :key     => nil,
   :verbose => false,

data/lib/hiera.rb

@@ -40,9 +40,13 @@ class Hiera
   # If the config option is a string its assumed to be a filename,
   # else a hash of what would have been in the YAML config file
   def initialize(options={})
-    options[:config] ||= File.join(Util.config_dir, 'hiera.yaml')
-
-    @config = Config.load(options[:config])
+    config = options[:config]
+    if config.nil?
+      # Look in codedir first, then confdir
+      config = File.join(Util.code_dir, 'hiera.yaml')
+      config = File.join(Util.config_dir, 'hiera.yaml') unless File.exist?(config)
+    end
+    @config = Config.load(config)
 
     Config.load_backends
   end

data/lib/hiera/util.rb

@@ -26,20 +26,24 @@ class Hiera
 
     def config_dir
       if microsoft_windows?
-         File.join(common_appdata, 'PuppetLabs', 'code')
+         File.join(common_appdata, 'PuppetLabs', 'puppet', 'etc')
       else
-        '/etc/puppetlabs/code'
+        '/etc/puppetlabs/puppet'
       end
     end
 
-    def var_dir
+    def code_dir
       if microsoft_windows?
-        File.join(common_appdata, 'PuppetLabs', 'code', 'environments' , '%{environment}' , 'hieradata')
+        File.join(common_appdata, 'PuppetLabs', 'code')
       else
-        '/etc/puppetlabs/code/environments/%{environment}/hieradata'
+        '/etc/puppetlabs/code'
       end
     end
 
+    def var_dir
+      File.join(code_dir, 'environments' , '%{environment}' , 'hieradata')
+    end
+
     def file_alt_separator
       File::ALT_SEPARATOR
     end

data/lib/hiera/version.rb

@@ -7,7 +7,7 @@
 
 
 class Hiera
-  VERSION = "3.1.2"
+  VERSION = "3.2.0"
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/unit/hiera_spec.rb

@@ -50,22 +50,39 @@ describe "Hiera" do
   end
 
   describe "#initialize" do
-    it "uses a default config file when none is provided" do
-      config_file = File.join(Hiera::Util.config_dir, 'hiera.yaml')
-      Hiera::Config.expects(:load).with(config_file)
-      Hiera::Config.stubs(:load_backends)
-      Hiera.new
+    before(:each) { Hiera::Config.expects(:load_backends) }
+
+    context 'when loading the config' do
+      let!(:code_config) { File.join(Hiera::Util.code_dir, 'hiera.yaml') }
+      let!(:conf_config) { File.join(Hiera::Util.config_dir, 'hiera.yaml') }
+      let!(:cli_config) { File.join('/home/bob', 'hiera.yaml') }
+
+      it 'attempts to load from code_dir first and config_dir second' do
+        File.expects(:exist?).with(code_config).returns(false)
+        Hiera::Config.expects(:load).with(conf_config)
+        Hiera.new
+      end
+
+      it 'does not load from config_dir when file is found in code_dir' do
+        File.expects(:exist?).with(code_config).returns(true)
+        Hiera::Config.expects(:load).with(code_config)
+        Hiera.new
+      end
+
+      it 'makes no attempt to load from code_dir or config_dir when :config is given as an option' do
+        File.expects(:exist?).with(code_config).never
+        Hiera::Config.expects(:load).with(cli_config)
+        Hiera.new(:config => cli_config)
+      end
     end
 
     it "passes the supplied config to the config class" do
       Hiera::Config.expects(:load).with({"test" => "rspec"})
-      Hiera::Config.stubs(:load_backends)
       Hiera.new(:config => {"test" => "rspec"})
     end
 
     it "loads all backends on start" do
       Hiera::Config.stubs(:load)
-      Hiera::Config.expects(:load_backends)
       Hiera.new
     end
   end

data/spec/unit/util_spec.rb

@@ -23,13 +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)
-      expect(Hiera::Util.config_dir).to eq('/etc/puppetlabs/code')
+      expect(Hiera::Util.config_dir).to eq('/etc/puppetlabs/puppet')
     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')
-      expect(Hiera::Util.config_dir).to eq('C:\\ProgramData/PuppetLabs/code')
+      expect(Hiera::Util.config_dir).to eq('C:\\ProgramData/PuppetLabs/puppet/etc')
+    end
+  end
+
+  describe 'Hiera::Util.code_dir' do
+    it 'should return the correct path for posix systems' do
+      Hiera::Util.expects(:file_alt_separator).returns(nil)
+      expect(Hiera::Util.code_dir).to eq('/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')
+      expect(Hiera::Util.code_dir).to eq('C:\\ProgramData/PuppetLabs/code')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure