rspec-puppet-utils 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: 9c4d6d2970af159ab900e47f39b656d0fef11739
-  metadata.gz: 946d6dec16dcfa5ee307065eea16b1b84dc6aaa8
 SHA512: 
-  data.tar.gz: 8e7d528ea6255a1c00b5a7ba4d2eccf4fbe88fc2781f49847a7eb9f9bed4056561319783dfb1badb3c2a2c30f6b8443a4baaf6c7a87fe28ba806332b676551b9
-  metadata.gz: 4438ee69a987e4ebcbf9201a3d094b5cc18f399b424ee4274c5646191e06ac33aa176022351a9621b26b90ede7ecc2b32bd3fddc121f8d20fce5086e56c9f99e
+  metadata.gz: 106fa2607e4f29ce28dee277ad33e57af9172a0950ff6d7e1603aced6853511a71dc826e56e9224865d8671437a1e531b6d64fc89f5551b5e7224a062988d88c
+  data.tar.gz: faa7027e9499454bf5ae605921f64356485385025b5da3b290bf2bb37cd48435237d42cbf8d185f99d56d5a17e2c9ad6d754c7e242b829e31dc52a2b9e9a9b61
+SHA1: 
+  metadata.gz: f268650abcc12899be821391c1c8442983cbecb8
+  data.tar.gz: 962eb0d4da79073e942b5e8000a34abf2b5eb491

data/README.md

@@ -2,7 +2,7 @@
 
 This is a more refined version of a previous project about [rspec-puppet unit testing](https://github.com/TomPoulton/rspec-puppet-unit-testing), it provides a class for mocking functions, a harness for testing templates, and a simple tool for testing hiera data files. The motivation for mocking functions etc is provided in that project so I won't go over it here.
 
-See [release notes for v2.0.1](../../wiki/Release-Notes#v201)
+See [release notes](../../wiki/Release-Notes) about latest version
 
 ## Usage
 

data/lib/hieradata/yaml_validator.rb

@@ -29,13 +29,17 @@ module RSpecPuppetUtils
 
       private
 
+      # For presentation, return just the subpath within hieradata.
+      # e.g., /path/hieradata/subdir/foo.yaml becomes subdir/foo.yaml
+      def subpath(file)
+        file.sub(/#{@directory}/, '').sub(/#{File::SEPARATOR}/, '')
+      end
+
       def load_data_for_file(file, ignore_empty)
-        # Assume all file names are unique i.e. thing.yaml and thing.yml don't both exist
-        # Allow dots in filename i.e. thing.something.yaml
-        file_name = File.basename(file, File.extname(file))
+        file_name = subpath(file)
         begin
           yaml = File.open(file) { |yf| YAML::load( yf ) }
-        rescue ArgumentError => e
+        rescue => e
           @load_errors.push "Error in file #{file}: #{e.message}"
           return
         end

data/rspec-puppet-utils.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = 'rspec-puppet-utils'
-  gem.version       = '2.0.5'
+  gem.version       = '2.0.6'
   gem.description   = 'Helper classes for mock/stub functions, templates and hierdata'
   gem.summary       = ''
   gem.author        = 'Tom Poulton'

data/spec/classes/hieradata/yaml_validator_spec.rb

@@ -22,15 +22,23 @@ describe HieraData::YamlValidator do
       end
 
       it 'should load yaml files recursively' do
-        expect(validator.data.keys).to include :nested
+        expect(validator.data.keys).to include :'sub/nested.yaml'
       end
 
       it 'should load yaml data from files' do
-        expect(validator.data[:valid]['string-value']).to eq 'a string'
+        expect(validator.data[:'valid.yaml']['string-value']).to eq 'a string'
       end
 
       it 'should load yaml data from files with dot in filename' do
-        expect(validator.data.keys).to include :'nested.dot'
+        expect(validator.data.keys).to include :'sub/nested.dot.yaml'
+      end
+
+      it 'should load yaml data from files with same name but different dir' do
+        expect(validator.data.keys).to include :'sub2/nested.dot.yaml'
+      end
+
+      it 'should load yaml data from files with same name but different ext' do
+        expect(validator.data.keys).to include :'sub2/nested.dot.yml'
       end
 
       it 'should not add any load errors' do
@@ -46,7 +54,7 @@ describe HieraData::YamlValidator do
       validator.load_data
 
       it 'should load yml files into data' do
-        expect(validator.data).to have_key :other
+        expect(validator.data).to have_key :'other.foo'
       end
 
     end
@@ -105,7 +113,7 @@ describe HieraData::YamlValidator do
 
       it 'should add non empty files to data' do
         validator.load_data :ignore_empty
-        expect(validator.data.keys).to include :not_empty
+        expect(validator.data.keys).to include :'not_empty.yaml'
       end
 
     end
@@ -126,7 +134,7 @@ describe HieraData::YamlValidator do
 
     it 'should support old #load method' do
       expect { validator.load true }.to_not raise_error
-      expect(validator.data.keys).to include :not_empty
+      expect(validator.data.keys).to include :'not_empty.yaml'
     end
 
     it 'should still throw errors if necessary' do

data/spec/fixtures/hieradata/invalid/invalid.yaml

@@ -1,3 +1,3 @@
 ---
-# missing : between key and value
-'hello' 'world'
+# really gross yaml
+{'hello') 'world'

data/spec/fixtures/hieradata/valid/sub2/nested.dot.yaml

@@ -0,0 +1,2 @@
+---
+bar: 'baz'

data/spec/fixtures/hieradata/valid/sub2/nested.dot.yml

@@ -0,0 +1,2 @@
+---
+bar: 'baz'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-puppet-utils
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - Tom Poulton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-06 00:00:00 Z
+date: 2015-01-16 00:00:00 Z
 dependencies: []
 
 description: Helper classes for mock/stub functions, templates and hierdata
@@ -42,6 +42,8 @@ files:
 - spec/fixtures/hieradata/valid/other.foo
 - spec/fixtures/hieradata/valid/sub/nested.dot.yaml
 - spec/fixtures/hieradata/valid/sub/nested.yaml
+- spec/fixtures/hieradata/valid/sub2/nested.dot.yaml
+- spec/fixtures/hieradata/valid/sub2/nested.dot.yml
 - spec/fixtures/hieradata/valid/valid.yaml
 - spec/fixtures/templates/returns_elephant.erb
 - spec/spec_helper.rb
@@ -83,6 +85,8 @@ test_files:
 - spec/fixtures/hieradata/valid/other.foo
 - spec/fixtures/hieradata/valid/sub/nested.dot.yaml
 - spec/fixtures/hieradata/valid/sub/nested.yaml
+- spec/fixtures/hieradata/valid/sub2/nested.dot.yaml
+- spec/fixtures/hieradata/valid/sub2/nested.dot.yml
 - spec/fixtures/hieradata/valid/valid.yaml
 - spec/fixtures/templates/returns_elephant.erb
 - spec/spec_helper.rb