Merge pull request puppetlabs#101 from dylanratcliffe/issue_100

(puppetlabs#100) Changed hiera.yaml hierarchy

README.md

@@ -285,7 +285,7 @@ If you have hiera data inside your controlrepo (or somewhere else) the Controlre
 
 **WARNING:** This assumes that the path to your hiera data (datadir) is relative to the root of the controlrepo, if not it will fall over.
 
-**Alternatively:**, if you are using cool new per-environment hiera config made available in puppet 4.x, the tool will automatically detect this and everything should work.
+**Alternatively:**, if you are using cool new per-environment hiera config made available in puppet 4.x (Now called Hiera 5), the tool will automatically detect this and everything should work. If you want to use a different v5 `hiera.yaml` for testing, pleace it under the spec directory. Note that the datadir must be relative to the location of the hiera.yaml file in this instance. i.e. `../data`
 
 ## Spec testing
 
@@ -616,4 +616,3 @@ Cheers to all of those who helped out:
   - jairojunior
   - natemccurdy
   - aardvark
-

lib/onceover/controlrepo.rb

@@ -335,8 +335,8 @@ def fixtures
 
     def hiera_config_file
       # try to find the hiera.iyaml file
-      hiera_config_file = File.expand_path('./hiera.yaml',@spec_dir) if File.exist?(File.expand_path('./hiera.yaml',@spec_dir))
       hiera_config_file = File.expand_path('./hiera.yaml',@root) if File.exist?(File.expand_path('./hiera.yaml',@root))
+      hiera_config_file = File.expand_path('./hiera.yaml',@spec_dir) if File.exist?(File.expand_path('./hiera.yaml',@spec_dir))
       hiera_config_file
     end