pdqtest 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638a3b448f2f304f4a58b2f33818dc46a7ac60a7
-  data.tar.gz: d2f055964d056dae276f1e199388fa8758eadd3a
+  metadata.gz: 1c69b57c8fc39f020f891c0723296a260f1edbb0
+  data.tar.gz: 2d0db562865e6b6a64b53c021a52f9c59aa9e3c7
 SHA512:
-  metadata.gz: 629ecab2db96008de2fc3ae38a628b0170e9fe57383d3623e6a45eac97fa2a58f4b3df0cb0241cd7ecc82e129cfdc0724ca3a1f464e68873b92d5bd06bbf6afd
-  data.tar.gz: 186f823452f0f8aecbbb049aff0e1218c30e0b04b1a437adf92cee2b20422279659a5f5d5f2d45a7265477d64a058621c0a893359b266243fbbdb02935c637d3
+  metadata.gz: c381af3af819891d19fea87d3564a18852983210a79e240771dd8097909b2d10be0e51f9f1aa8e7d41b5a22947d452165ef9c4eabca6860502dee702ac8ebfa2
+  data.tar.gz: 135bf38bc95d618c069179f7aaf80ce53fae001e6859bc8f5c02464b95ba6e2c8635fcc737554d9b7e7eede1a3a74ce42d22fc89ebe110cb80f19f15f740e71f

data/lib/pdqtest/docker.rb

@@ -5,7 +5,9 @@ module PDQTest
     STATUS = 2
     ENV='export TERM=xterm LC_ALL=C PATH=/usr/local/bats/bin:/opt/puppetlabs/puppet/bin:$PATH;'
     IMAGE_NAME='geoffwilliams/pdqtest-centos:2017-05-04-0'
-
+    HIERA_YAML_CONTAINER = '/etc/puppetlabs/puppet/hiera.yaml'
+    HIERA_YAML_HOST = '/spec/fixtures/hiera.yaml'
+    HIERA_DIR  = '/spec/fixtures/hieradata'
 
     def self.wrap_cmd(cmd)
       ['bash',  '-c', "#{ENV} #{cmd}"]
@@ -17,18 +19,29 @@ module PDQTest
 
     def self.new_container(test_dir)
       pwd = Dir.pwd
+      hiera_yaml_host = File.join(pwd, HIERA_YAML_HOST)
+      hiera_dir = File.join(pwd, HIERA_DIR)
+
+      # hiera.yaml *must* exist on the host or we will get errors from Docker
+      if ! File.exists?(hiera_yaml_host)
+        File.write(hiera_yaml_host, '# hiera configuration for testing')
+      end
       container = ::Docker::Container.create(
         'Image'   => IMAGE_NAME,
         'Volumes' => {
-          test_dir         => {pwd               => 'rw'},
-          '/cut'           => {pwd               => 'rw'}, # DEPRECATED -FOR REMOVAL
-          '/sys/fs/cgroup' => {'/sys/fs/cgroup'  => 'ro'},
+          test_dir              => {pwd               => 'rw'},
+          HIERA_YAML_CONTAINER  => {hiera_yaml_host   => 'ro'},
+          HIERA_DIR             => {hiera_dir         => 'ro'},
+          '/cut'                => {pwd               => 'rw'}, # DEPRECATED -FOR REMOVAL
+          '/sys/fs/cgroup'      => {'/sys/fs/cgroup'  => 'ro'},
         },
         'HostConfig' => {
           "Binds": [
             "/sys/fs/cgroup:/sys/fs/cgroup:ro",
             "#{pwd}:/cut:rw",                               # DEPRECATED -FOR REMOVAL
             "#{pwd}:#{test_dir}:rw",
+            "#{hiera_yaml_host}:#{HIERA_YAML_CONTAINER}:rw",
+            "#{hiera_dir}:#{HIERA_DIR}:rw",
           ],
         },
       )

data/lib/pdqtest/skeleton.rb

@@ -15,7 +15,9 @@ module PDQTest
     EXAMPLES_DIR    = 'examples'
     GEMFILE         = 'Gemfile'
     GEMFILE_LINE    = "gem 'pdqtest', '#{PDQTest::VERSION}'"
-
+    HIERA_DIR       =  File.join(SPEC_DIR, 'fixtures', 'hieradata')
+    HIERA_YAML      = 'hiera.yaml'
+    HIERA_TEST      = 'test.yaml'
 
 
     def self.should_replace_file(target, skeleton)
@@ -88,6 +90,8 @@ module PDQTest
       install_skeleton('.gitignore', 'dot_gitignore')
       install_skeleton('.rspec', 'dot_rspec')
       install_skeleton('Makefile', 'Makefile')
+      install_skeleton(File.join(SPEC_DIR, 'fixtures', HIERA_YAML), HIERA_YAML)
+      install_skeleton(File.join(HIERA_DIR, HIERA_TEST), HIERA_TEST)
 
       install_acceptance()
       install_gemfile()

data/lib/pdqtest/version.rb

@@ -1,3 +1,3 @@
 module PDQTest
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/res/skeleton/Gemfile

@@ -8,7 +8,6 @@ gem 'facter', '2.4.6'
 gem 'rubocop', '0.47.1'
 gem 'rspec-puppet-facts', '1.7.0'
 
-# Workaround for PDOC-160
+# Workaround for PDOC-160 (until gem published)
 gem 'puppet-strings',
-  :git => 'https://github.com/declarativesystems/puppet-strings',
-  :ref => 'no_dates'
+  :git => 'https://github.com/puppetlabs/puppet-strings',

data/res/skeleton/hiera.yaml

@@ -0,0 +1,7 @@
+---
+:backends:
+  - yaml
+:yaml:
+  :datadir: 'spec/fixtures/hieradata'
+:hierarchy:
+  - 'default'

data/res/skeleton/spec_helper.rb

@@ -1 +1,4 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
+RSpec.configure do |c|
+  c.hiera_config = File.expand_path(File.join(__FILE__, '../fixtures/hiera.yaml'))
+end

data/res/skeleton/test.yaml

@@ -0,0 +1,3 @@
+# test.yaml (for testing)
+---
+message: "this is a test message from pdqtest/hiera"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -245,10 +245,12 @@ files:
 - res/skeleton/dot_gitignore
 - res/skeleton/dot_rspec
 - res/skeleton/dot_travis.yml
+- res/skeleton/hiera.yaml
 - res/skeleton/init.bats
 - res/skeleton/init__before.bats
 - res/skeleton/init__setup.sh
 - res/skeleton/spec_helper.rb
+- res/skeleton/test.yaml
 - res/templates/examples_init.pp.erb
 - res/templates/rspec.rb.erb
 homepage: https://github.com/GeoffWilliams/pdqtest