hiera 2.0.0 → 3.0.1

data/lib/hiera/config.rb

@@ -4,14 +4,14 @@ class Hiera::Config
     # load takes a string or hash as input, strings are treated as filenames
     # hashes are stored as data that would have been in the config file
     #
-    # Unless specified it will only use YAML as backend with a single
-    # 'common' hierarchy and console logger
+    # Unless specified it will only use YAML as backend with a
+    # hierarchy of 'nodes/%{::trusted.certname}' and 'common', and with a
+    # console logger.
     #
-    # @return [Hash] representing the configuration.  e.g.
-    #   {:backends => "yaml", :hierarchy => "common"}
+    # @return [Hash] representing the configuration.
     def load(source)
-      @config = {:backends => "yaml",
-                 :hierarchy => "common",
+      @config = {:backends => ["yaml"],
+                 :hierarchy => ["nodes/%{::trusted.certname}", "common"],
                  :merge_behavior => :native }
 
       if source.is_a?(String)

data/lib/hiera/util.rb

@@ -29,9 +29,9 @@ class Hiera
 
     def var_dir
       if microsoft_windows?
-        File.join(common_appdata, 'PuppetLabs', 'code', 'hieradata')
+        File.join(common_appdata, 'PuppetLabs', 'code', 'environments' , '%{environment}' , 'hieradata')
       else
-        '/etc/puppetlabs/code/hieradata'
+        '/etc/puppetlabs/code/environments/%{environment}/hieradata'
       end
     end
 

data/lib/hiera/version.rb

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

data/spec/unit/backend_spec.rb

@@ -22,13 +22,13 @@ class Hiera
 
       it "defaults to a directory in var" do
         Config.load({})
-        Backend.datadir(:rspec, {}).should == Hiera::Util.var_dir
+        Backend.datadir(:rspec, { "environment" => "foo" }).should == Hiera::Util.var_dir % { :environment => "foo"}
 
         Config.load({:rspec => nil})
-        Backend.datadir(:rspec, {}).should == Hiera::Util.var_dir
+        Backend.datadir(:rspec, { "environment" => "foo" }).should == Hiera::Util.var_dir % { :environment => "foo"}
 
         Config.load({:rspec => {}})
-        Backend.datadir(:rspec, {}).should == Hiera::Util.var_dir
+        Backend.datadir(:rspec, { "environment" => "foo" }).should == Hiera::Util.var_dir % { :environment => "foo"}
       end
 
       it "fails when the datadir is an array" do
@@ -92,7 +92,8 @@ class Hiera
       end
 
       it "parses the names of the hierarchy levels using the given scope" do
-        Backend.expects(:parse_string).with("common", {:rspec => :tests}, {}, {:order_override => nil})
+        Backend.expects(:parse_string).with('nodes/%{::trusted.certname}', {:rspec => :tests}, {}, {:order_override => nil})
+        Backend.expects(:parse_string).with('common', {:rspec => :tests}, {}, {:order_override => nil})
         Backend.datasources({:rspec => :tests}) { }
       end
 

data/spec/unit/config_spec.rb

@@ -6,7 +6,7 @@ class Hiera
       let(:default_config) do
         {
           :backends  => ["yaml"],
-          :hierarchy => "common",
+          :hierarchy => ['nodes/%{::trusted.certname}', 'common'],
           :logger    => "console",
           :merge_behavior=>:native
         }
@@ -44,11 +44,13 @@ class Hiera
 
       it "should merge defaults with the loaded or supplied config" do
         config = Config.load({})
-        config.should == {:backends => ["yaml"], :hierarchy => "common", :logger => "console", :merge_behavior=>:native}
+        config.should == {:backends => ["yaml"], :hierarchy => ['nodes/%{::trusted.certname}', '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", :merge_behavior=>:native}
+        Config.load({:backends => [["foo", ["bar"]]]}).should == {:backends => ["foo", "bar"],
+          :hierarchy => ['nodes/%{::trusted.certname}', 'common'], :logger => "console", :merge_behavior=>:native}
       end
 
       it "should load the supplied logger" do

data/spec/unit/util_spec.rb

@@ -36,13 +36,13 @@ describe Hiera::Util do
   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 == '/etc/puppetlabs/code/hieradata'
+      Hiera::Util.var_dir.should == '/etc/puppetlabs/code/environments/%{environment}/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/code/hieradata'
+      Hiera::Util.var_dir.should == 'C:\\ProgramData/PuppetLabs/code/environments/%{environment}/hieradata'
     end
   end
 end

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: hiera
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A pluggable data store for hierarcical data
@@ -32,83 +35,84 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/hiera
-- lib/hiera/backend.rb
-- lib/hiera/backend/json_backend.rb
-- lib/hiera/backend/yaml_backend.rb
-- lib/hiera/config.rb
-- lib/hiera/console_logger.rb
+- lib/hiera/version.rb
+- lib/hiera/noop_logger.rb
 - lib/hiera/error.rb
 - lib/hiera/fallback_logger.rb
+- lib/hiera/recursive_guard.rb
+- lib/hiera/backend/yaml_backend.rb
+- lib/hiera/backend/json_backend.rb
+- lib/hiera/config.rb
 - lib/hiera/filecache.rb
 - lib/hiera/interpolate.rb
-- lib/hiera/noop_logger.rb
+- lib/hiera/console_logger.rb
 - lib/hiera/puppet_logger.rb
-- lib/hiera/recursive_guard.rb
 - lib/hiera/util.rb
-- lib/hiera/version.rb
+- lib/hiera/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/config_spec.rb
-- 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/interpolate_spec.rb
 - 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/fixtures/interpolate/config/hiera.yaml
+- spec/unit/fixtures/interpolate/data/niltest.yaml
+- spec/unit/fixtures/interpolate/data/recursive.yaml
+- spec/unit/backend_spec.rb
+- spec/unit/filecache_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/backend/yaml_backend_spec.rb
+- spec/unit/backend/json_backend_spec.rb
 - spec/unit/puppet_logger_spec.rb
-- spec/unit/util_spec.rb
+- spec/unit/console_logger_spec.rb
 - spec/unit/version_spec.rb
+- spec/unit/fallback_logger_spec.rb
+- spec/unit/util_spec.rb
+- spec/unit/hiera_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/hiera
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+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/config_spec.rb
-- 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/interpolate_spec.rb
 - 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/fixtures/interpolate/config/hiera.yaml
+- spec/unit/fixtures/interpolate/data/niltest.yaml
+- spec/unit/fixtures/interpolate/data/recursive.yaml
+- spec/unit/backend_spec.rb
+- spec/unit/filecache_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/backend/yaml_backend_spec.rb
+- spec/unit/backend/json_backend_spec.rb
 - spec/unit/puppet_logger_spec.rb
-- spec/unit/util_spec.rb
+- spec/unit/console_logger_spec.rb
 - spec/unit/version_spec.rb
+- spec/unit/fallback_logger_spec.rb
+- spec/unit/util_spec.rb
+- spec/unit/hiera_spec.rb
+- spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: dd4a69f9d2131165eba3e8767b8731dcc11f3a6d
-  data.tar.gz: fd038d50edc2f8c3dd6d21d21d30cc9463b11c4c
-SHA512:
-  metadata.gz: 6d669f8a2ea3cea56f2c0d66959e2aa2df7a84f74940ae51e8c192929f45e102d99b85c7530084c87294594557229060de56b093e87c5a96076c7849343efb15
-  data.tar.gz: 10d478df00b859bddf583631ae9fe9f2f1028b3394fda6dfd38d3e0a2a57ce32a1b41a681b814552594421d9b9b373b94c6300eccdd2291827abacf8f9c3a566