pdqtest 1.9.9beta5 → 1.9.9beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a9b6fed071d96aaf5e9be2d817ef816dc0a4ba8e56e93413a1c40889225fd03
-  data.tar.gz: 31d2c4d2eaf7a731dcb72d62a0cf84d5257e7de755c87a7531b7fc1414329f7f
+  metadata.gz: e9833010ae1e09cfb08af4e3ce5471a07df1fcc7fd8f674b44399f6f5dc021fc
+  data.tar.gz: c5310840d59b593d0bae1d63a2cc61b84f47ccc8cfa6f72afedb5e9f10335e91
 SHA512:
-  metadata.gz: 8565026a8c28a794fe58c26065de33bd17c62daab57fc917af5d5742cecea6c9f7508a51fab8de0fbd763ff6c7ea89be1c7bc1b43049479a71073eaa05306509
-  data.tar.gz: e6aa081aa4de254977b034327c85090b0c9e0dd3c1e75131af26eab434fec8a80730699ec03b4852f936d8d07cb83d630ff3411675c8a420c38c9e6b7fdca4a9
+  metadata.gz: d2472553063f8d3b17612b7b692a6af350bb7f83090296042778cce7e0e40e0b87a680af4abb98cda3916276643e8bc409e42dc9b46edcd8397a69de538ef07c
+  data.tar.gz: bacbb3ffde09c8df33c5d5861a3b51735d830bef228b7d42ff9d00533bbd08bf30b7590b2e0092429c785e881355296a8bd648b9296db715aa3efe359712e646

data/doc/tips_and_tricks.md

@@ -20,3 +20,4 @@
   * Create/copy files, directories, etc.
   * Install OS packages
   * Install python scripts to mock database servers using SQLite... 😉
+* Files added by PDQTest >= 2.0 have the magic marker: `*File originally created by PDQTest*`

data/doc/upgrade_1_2.md

@@ -0,0 +1,157 @@
+geoff@computer:~/tmp/ssh$ git checkout -b pdk
+Switched to a new branch 'pdk'
+geoff@computer:~/tmp/ssh$ pdqtest init
+Puppet metadata not found at metadata.json - not a valid puppet module
+geoff@computer:~/tmp/ssh$ ls
+total 72K
+4.0K bitbucket-pipelines.yml  4.0K Gemfile       4.0K Makefile         4.0K Rakefile
+4.0K CHANGELOG                4.0K Gemfile.lock  4.0K manifests        4.0K README.md
+4.0K data                     4.0K hiera.yaml    4.0K metadata.json    4.0K REFERENCE.md
+4.0K examples                  12K LICENSE       4.0K Puppetfile.lock  4.0K spec
+geoff@computer:~/tmp/ssh$ pdqtest init
+Doing one-time upgrade to PDK - Generating fresh set of files...
+pdk (INFO): Creating new module: x
+pdk (INFO): Module 'x' generated at path '/tmp/d20180929-15397-q82464/x', from template 'file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git'.
+pdk (INFO): In your module directory, add classes with the 'pdk new class' command.
+new module x --skip-interview: 😬
+Detected PDQTest 1.x file at spec/spec_helper.rb (will upgrade to PDK)
+Detected PDQTest 1.x file at spec/default_facts.yml (will upgrade to PDK)
+Detected PDQTest 1.x file at .pdkignore (will upgrade to PDK)
+Detected PDQTest 1.x file at Gemfile (will upgrade to PDK)
+Detected PDQTest 1.x file at Rakefile (will upgrade to PDK)
+Detected PDQTest 1.x file at .gitignore (will upgrade to PDK)
+Updated .sync.yml with {".travis.yml"=>{:unmanaged=>true}}
+enabling PDK in metadata.json
+geoff@computer:~/tmp/ssh$ git status
+On branch pdk
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+	modified:   .gitignore
+	modified:   .travis.yml
+	modified:   Gemfile
+	modified:   Makefile
+	modified:   Rakefile
+	modified:   metadata.json
+	modified:   spec/spec_helper.rb
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	.Puppetfile.pdqtest
+	.librarian/
+	.pdkignore
+	.pdqtest/
+	.puppet-lint.rc
+	.sync.yaml
+	Puppetfile.lock
+	make.ps1
+	spec/acceptance/init__before.bats
+	spec/acceptance/init__setup.sh
+	spec/default_facts.yml
+	spec/fixtures/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+geoff@computer:~/tmp/ssh$ cat Makefile 
+all:
+	cd .pdqtest && pwd && bundle exec pdqtest all
+	$(MAKE) docs
+
+fast:
+	cd .pdqtest && pwd && bundle exec pdqtest fast
+
+shell:
+	cd .pdqtest && pwd && bundle exec pdqtest --keep-container acceptance
+
+setup:
+	cd .pdqtest && pwd && bundle exec pdqtest setup
+
+shellnopuppet:
+	cd .pdqtest && pwd && bundle exec pdqtest shell
+
+logical:
+	cd .pdqtest && pwd && bundle exec pdqtest syntax
+	cd .pdqtest && pwd && bundle exec pdqtest rspec
+	$(MAKE) docs
+
+#nastyhack:
+#	# fix for - https://tickets.puppetlabs.com/browse/PDK-1192
+#	find vendor -iname '*.pp' -exec rm {} \;
+
+pdqtestbundle:
+	# Install all gems into _normal world_ bundle so we can use all of em
+	cd .pdqtest && pwd && bundle install
+
+docs:
+	cd .pdqtest && pwd && bundle exec "cd ..&& puppet strings"
+
+
+Gemfile.local:
+	echo "[🐌] Creating symlink and running pdk bundle..."
+	ln -s Gemfile.project Gemfile.local
+	$(MAKE) pdkbundle
+
+pdkbundle:
+	pdk bundle install
+geoff@computer:~/tmp/ssh$ make pdqtestbundle
+# Install all gems into _normal world_ bundle so we can use all of em
+cd .pdqtest && pwd && bundle install
+/home/geoff/tmp/ssh/.pdqtest
+Resolving dependencies...
+Using rake 12.3.1
+Using bundler 1.16.1
+Using colored 1.2
+Using cri 2.6.1
+Using deep_merge 1.2.1
+Using excon 0.62.0
+Using multi_json 1.13.1
+Using docker-api 1.34.2
+Using nesty 1.0.2
+Using escort 0.4.0
+Using facter 2.5.1
+Using multipart-post 2.0.0
+Using faraday 0.13.1
+Using faraday_middleware 0.12.2
+Using fast_gettext 1.1.2
+Using locale 2.1.2
+Using text 1.3.1
+Using gettext 3.2.9
+Using gettext-setup 0.30
+Using hiera 3.4.5
+Using hocon 1.2.5
+Using httpclient 2.8.3
+Using little-plugger 1.1.4
+Using log4r 1.1.10
+Using logging 2.2.2
+Using minitar 0.6.1
+Using semantic_puppet 1.0.2
+Using puppet_forge 2.2.9
+Using r10k 2.6.4
+Using thor 0.20.0
+Using pdqtest 1.9.9beta6
+Using puppet-resource_api 1.6.0
+Using puppet 6.0.0
+Using puppet-lint 2.3.6
+Using rgen 0.8.2
+Using yard 0.9.16
+Using puppet-strings 2.1.0
+Using puppet-syntax 2.4.1
+Bundle complete! 5 Gemfile dependencies, 38 gems now installed.
+Use `bundle info [gemname]` to see where a bundled gem is installed.
+geoff@computer:~/tmp/ssh$ make
+cd .pdqtest && pwd && bundle exec pdqtest all
+/home/geoff/tmp/ssh/.pdqtest
+pdk (INFO): Using Ruby 2.4.4
+pdk (INFO): Using Puppet 5.5.6
+[✔] Checking metadata syntax (metadata.json tasks/*.json).
+[✖] Checking module metadata style (metadata.json).
+[✔] Checking Puppet manifest syntax (**/**.pp).
+[✔] Checking Puppet manifest style (**/*.pp).
+warning: metadata-json-lint: metadata.json: Dependency puppetlabs-stdlib has an open ended dependency version requirement >= 4.15.0
+validate 'metadata,puppet': 💣
+Error encountered running #<Proc:0x000055595e990ce8@/home/geoff/.rbenv/versions/2.5.1/lib/ruby/gems/2.5.0/gems/pdqtest-1.9.9beta6/exe/pdqtest:91 (lambda)>
+Overall: 💩
+ABORTED - there are test failures! :(
+Makefile:2: recipe for target 'all' failed
+make: *** [all] Error 1

data/exe/pdqtest

@@ -23,6 +23,11 @@ require 'pdqtest/fastcheck'
 # display help if nothing specified
 ARGV.push('-h') if ARGV.empty?
 
+# Setup logging and print out where we were started from because we have to use
+# a separate Gemfile to PDK
+PDQTest::Logger.logger
+$logger.info("Entered PDQTest from #{Dir.pwd}")
+
 
 Escort::App.create do |app|
   app.version PDQTest::VERSION
@@ -77,7 +82,7 @@ Escort::App.create do |app|
     command.summary "All"
     command.description "Run all tests"
     command.action do |options, arguments|
-      PDQTest::Logger.logger
+
       $logger.level = :debug if options[:global][:options][:debug]
 
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
@@ -102,7 +107,6 @@ Escort::App.create do |app|
     command.summary "Fast"
     command.description "Run basic lint/syntax and acceptance tests (skips rspec)"
     command.action do |options, arguments|
-      PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
@@ -112,6 +116,7 @@ Escort::App.create do |app|
       PDQTest::Instance.set_keep_container(options[:global][:options][:keep_container])
       PDQTest::Instance.set_docker_image(options[:global][:options][:image_name])
 
+      $logger.debug "before chdir #{Dir.pwd}"
       Dir.chdir ".." do
         PDQTest::Core.run([
           lambda {PDQTest::Fastcheck.run},
@@ -122,21 +127,6 @@ Escort::App.create do |app|
     end
   end
 
-  app.command :rspec do |command|
-    command.summary "RSpec"
-    command.description "Run the RSpec tests (`pdk test unit` with emojis)"
-    command.action do |options, arguments|
-      PDQTest::Logger.logger
-      $logger.level = :debug if options[:global][:options][:debug]
-
-      PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
-      Dir.chdir ".." do
-        PDQTest::Core.run(lambda {PDQTest::Pdk.run("test unit")})
-      end
-    end
-  end
-
-
   app.command :acceptance do |command|
     command.summary "Acceptance"
     command.description "Run the acceptance (Docker) tests"
@@ -149,7 +139,6 @@ Escort::App.create do |app|
       )
     end
     command.action do |options, arguments|
-      PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
@@ -168,10 +157,11 @@ Escort::App.create do |app|
     command.summary "Initialise testing"
     command.description "Install skeleton testing configuration into this module"
     command.action do |options, arguments|
-      PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
+      # Init isn't run with bundler because we're not in the bundle. because its
+      # a system command, we don't need to jump back out of 'our' Gemfile dir
       PDQTest::Skeleton.init
     end
   end
@@ -188,7 +178,6 @@ Escort::App.create do |app|
       )
     end
     command.action do |options, arguments|
-      PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
@@ -205,24 +194,28 @@ Escort::App.create do |app|
     command.summary "Shell"
     command.description "Open a shell inside a docker container identical to the test environment before anything has run"
     command.action do |options, arguments|
-      PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
       PDQTest::Instance.set_docker_image(options[:global][:options][:image_name])
-      PDQTest::Instance.shell
+      Dir.chdir ".." do
+        PDQTest::Instance.shell
+      end
     end
   end
 
-  app.command :syntax do |command|
+  app.command :logical do |command|
     command.summary "Syntax"
     command.description "Check for syntax errors (`pdk validate metadata,puppet` with emojis)"
     command.action do |options, arguments|
-      PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
       Dir.chdir ".." do
-        PDQTest::Core.run(lambda {PDQTest::Pdk.run("validate 'metadata,puppet'")})
+        PDQTest::Core.run([
+          lambda {PDQTest::Pdk.run("validate 'metadata,puppet'")},
+          lambda {PDQTest::Puppet.install_modules},
+          lambda {PDQTest::Pdk.run("test unit")},
+        ])
       end
     end
   end
@@ -232,7 +225,6 @@ Escort::App.create do |app|
     command.description "Install the docker container required for testing"
 
     command.action do |options, arguments|
-      PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
       Dir.chdir ".." do
@@ -249,7 +241,6 @@ Escort::App.create do |app|
     command.summary "Info"
     command.description "Print info about this module"
     command.action do |options, arguments|
-      PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
       Dir.chdir ".." do
@@ -263,12 +254,11 @@ Escort::App.create do |app|
     command.summary "Upgrade"
     command.description "Upgrade the current module to use this version of PDQTest"
     command.action do |options, arguments|
-      PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
-      Dir.chdir ".." do
-        PDQTest::Upgrade.upgrade
-      end
+      # also runs without bundler since we're not in the bundle yet - see notes
+      # for `init`
+      PDQTest::Upgrade.upgrade
     end
   end
 end

data/lib/pdqtest/fastcheck.rb

@@ -5,10 +5,16 @@ module PDQTest
   module Fastcheck
 
     def self.run
-      status = system("bundle exec puppet-lint manifests")
+      $logger.debug "inside Fastcheck::run - current dir: #{Dir.pwd}"
+
+      $logger.debug "Running syntax..."
+      status = system("bundle exec 'rake syntax'")
+      $logger.debug "...done; result: #{status}"
 
       if status
-        status = system("bundle exec rake syntax")
+        $logger.debug "Running lint..."
+        status = system("bundle exec 'puppet-lint manifests'")
+        $logger.debug "...done; result: #{status}"
       end
 
       PDQTest::Emoji.partial_status(status, "fastcheck (syntax+lint)")

data/lib/pdqtest/instance.rb

@@ -54,7 +54,22 @@ module PDQTest
         # process each supported OS
         test_platforms = @@image_name || Docker::acceptance_test_images
         $logger.info "Acceptance test on #{test_platforms}..."
-        test_platforms.each { |image_name|
+        test_platforms.reject { |image_name|
+          reject = false
+          if Util.is_windows
+            if image_name !~ /windows/
+              $logger.info "Skipping test image #{image_name} (requires Linux)"
+              reject = true
+            end
+          else
+            if image_name =~ /windows/
+              $logger.info "Skipping test image #{image_name} (requires Windows)"
+              reject = true
+            end
+          end
+
+          reject
+        }.each { |image_name|
           $logger.info "--- start test with #{image_name} ---"
           @@active_container = PDQTest::Docker::new_container(image_name, @@privileged)
           $logger.info "alive, running tests"

data/lib/pdqtest/pdk.rb

@@ -9,7 +9,7 @@ module PDQTest
   # inside `pdk bundle` to work, nor could I figure out how to load the PDK
   # libraries from the "inside"
   module Pdk
-    SYNC_YML    = '.sync.yaml'
+    SYNC_YML    = '.sync.yml'
 
     # Copy these values from PDK generated metadata to module metadata
     PDK_TAGS    = [

data/lib/pdqtest/skeleton.rb

@@ -17,7 +17,7 @@ module PDQTest
     ACCEPTANCE_DIR   = File.join(SPEC_DIR, 'acceptance')
     SKELETON_DIR     = 'skeleton'
     EXAMPLES_DIR     = 'examples'
-    HIERA_DIR        =  File.join(SPEC_DIR, 'fixtures', 'hieradata')
+    HIERA_DIR        = File.join(SPEC_DIR, 'fixtures', 'hieradata')
     HIERA_YAML       = 'hiera.yaml'
     HIERA_TEST       = 'test.yaml'
     PDK_FILES        = [
@@ -36,20 +36,20 @@ module PDQTest
     # Every time we `pdqtest upgrade`, update .sync.yml (merges)
     SYNC_YML_CONTENT = {
         ".travis.yml" => {
-            "unmanaged": true
+            "unmanaged" => true,
+        },
+        ".gitignore" => {
+            "paths" => [
+                ".Puppetfile.pdqtest",
+            ],
         }
-    }
+    }.freeze
 
 
     def self.should_replace_file(target, skeleton)
       target_hash   = Digest::SHA256.file target
       skeleton_hash = Digest::SHA256.file skeleton
-      puts Dir.pwd
-puts target
-      puts skeleton
-      puts target_hash
-      puts skeleton_hash
-      puts Digest::SHA256.file "/nothere"
+
       should = (target_hash != skeleton_hash)
       $logger.debug "should replace: #{should}"
 
@@ -81,7 +81,6 @@ puts target
 
     # vars is a hash of variables that can be accessed in template
     def self.install_template(target, template_file, vars)
-      example_file = File.join(EXAMPLES_DIR, template_file)
       if ! File.exists?(target)
         template = File.read(Util::resource_path(File.join('templates', template_file)))
         content  = ERB.new(template, nil, '-').result(binding)

data/lib/pdqtest/upgrade.rb

@@ -8,19 +8,32 @@ module PDQTest
     GEM_ATTRIB_REGEXP   = /^\s*:\w+/
 
     GEMS = {
-      'pdqtest'         => {
-        'line'  => "gem 'pdqtest', '#{PDQTest::VERSION}'",
-        'added' => false,
+      # 'gemsource' => {
+      #     'line' => "source ENV['GEM_SOURCE'] || 'https://rubygems.org'",
+      #     'added' => false,
+      # },
+      'pdqtest' => {
+          'line' => "gem 'pdqtest', '#{PDQTest::VERSION}'",
+          'added' => false,
+      },
+      'puppet-strings' => {
+          'line' => "gem 'puppet-strings'",
+          'added' => false,
       },
-      'puppet-strings'         => {
-          'line'  => "gem 'puppet-strings'",
+      'puppet' => {
+          'line' => "gem 'puppet'",
           'added' => false,
       },
-      'puppet'         => {
-          'line'  => "gem 'puppet'",
+      'puppet-lint' => {
+          'line' => "gem 'puppet-lint'",
           'added' => false,
       },
-    }
+      'puppet-syntax' => {
+          'line' => "gem 'puppet-syntax'",
+          'added' => false,
+      },
+
+    }.freeze
 
 
     # upgrade a module to the latest version of PDQTest
@@ -37,11 +50,11 @@ module PDQTest
         FileUtils.touch(GEMFILE)
       end
       File.open(GEMFILE, 'r') do |f|
-        f.each_line{ |line|
+        f.each_line { |line|
           if line =~ GEM_REGEXP
             # a gem stanza
-            processing_gem = $2
-            if GEMS.keys.include?(processing_gem)
+            processing_gem = Regexp.last_match(2)
+            if GEMS.key?(processing_gem)
               # fixup one of our monitored gems as needed, mark
               # this as being a gem that is being updated so
               # that we can kill any multi-line attributes
@@ -53,7 +66,7 @@ module PDQTest
               t_file.puts line
               updating_gem = false
             end
-          elsif updating_gem and line =~ GEM_ATTRIB_REGEXP
+          elsif updating_gem && line =~ GEM_ATTRIB_REGEXP
             # do nothing - remove the multi-line attributes
           else
             # anything else... (esp comments)

data/lib/pdqtest/version.rb

@@ -1,3 +1,3 @@
 module PDQTest
-  VERSION = "1.9.9beta5"
+  VERSION = "1.9.9beta6"
 end

data/res/acceptance/init.bats

@@ -1,6 +1,7 @@
+# *File originally created by PDQTest*
 # BATS test file to run after executing 'examples/init.pp' with puppet.
 #
-# For more info on BATS see https://github.com/sstephenson/bats
+# For more info on BATS see https://github.com/bats-core/bats-core
 
 # Tests are really easy! just the exit status of running a command...
 @test "addition using bc" {

data/res/acceptance/init__before.bats

@@ -1,6 +1,7 @@
+# *File originally created by PDQTest*
 # BATS test file to run before executing 'examples/init.pp' with puppet.
 #
-# For more info on BATS see https://github.com/sstephenson/bats
+# For more info on BATS see https://github.com/bats-core/bats-core
 
 # Tests are really easy! just the exit status of running a command...
 @test "addition using bc" {

data/res/acceptance/init__setup.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
+# *File originally created by PDQTest*
 # If this file exists it will be run on the system under test before puppet runs
 # to setup any prequisite test conditions, etc

data/res/skeleton/.ci_custom.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+# *File originally created by PDQTest*
+# This is your place to add custom CI actions without modifying travis.yml
+# PDQTest will create this initial file for you but only so you know where
+# add your stuff. We won't change this file unless you run `pdqtest init`
+# again

data/res/skeleton/.puppet-lint.rc

@@ -1,3 +1,4 @@
+# *File originally created by PDQTest*
 --fail-on-warnings
 --no-double_quoted_strings-check
 --no-80chars-check

data/res/skeleton/.travis.yml

@@ -1,9 +1,16 @@
 # .travis.yml
 #
+# *File originally created by PDQTest*
+#
 # To debug travis locally:
 # https://docs.travis-ci.com/user/common-build-problems/#Running-a-Container-Based-Docker-Image-Locally
 ---
 sudo: false
+
+# Don't process the PDK Gemfile - causes big problems!
+gemfile: .pdqtest/Gemfile
+
+bundler_args: --path .pdqtest
 language: ruby
 services:
   - docker
@@ -13,9 +20,11 @@ before_install:
   - sudo dpkg -i puppet5-release-trusty.deb
   - sudo apt-get update
   - sudo apt install -y pdk
-  - make Gemfile.local
-  - bundle exec pdqtest setup
+
+# travis itself does the bundle install for us, so we are ready to run now
 script:
+  - sh .ci_custom.sh
+  - make setup
   - make
 rvm:
   - 2.4.1

data/res/skeleton/Makefile

@@ -1,3 +1,4 @@
+# *File originally created by PDQTest*
 all:
 	cd .pdqtest && bundle exec pdqtest all
 	$(MAKE) docs
@@ -5,6 +6,9 @@ all:
 fast:
 	cd .pdqtest && bundle exec pdqtest fast
 
+acceptance:
+	cd .pdqtest && bundle exec pdqtest acceptance
+
 shell:
 	cd .pdqtest && bundle exec pdqtest --keep-container acceptance
 
@@ -15,24 +19,21 @@ shellnopuppet:
 	cd .pdqtest && bundle exec pdqtest shell
 
 logical:
-	cd .pdqtest && bundle exec pdqtest syntax
-	cd .pdqtest && bundle exec pdqtest rspec
+	cd .pdqtest && bundle exec pdqtest logical
 	$(MAKE) docs
 
-nastyhack:
-	# fix for - https://tickets.puppetlabs.com/browse/PDK-1192
-	find vendor -iname '*.pp' -exec rm {} \;
-
-bundle:
+pdqtestbundle:
 	# Install all gems into _normal world_ bundle so we can use all of em
-	cd .pdqtest && bundle install
-
-Gemfile.local:
-	echo "[🐌] Creating symlink and running pdk bundle..."
-	ln -s Gemfile.project Gemfile.local
+	cd .pdqtest && pwd && bundle install
 
 docs:
-	cd .pdqtest && bundle exec "cd ..&& puppet strings"
+	cd .pdqtest && pwd && bundle exec "cd ..&& puppet strings"
 
 
+Gemfile.local:
+	echo "[🐌] Creating symlink and running pdk bundle..."
+	ln -s Gemfile.project Gemfile.local
+	$(MAKE) pdkbundle
 
+pdkbundle:
+	pdk bundle install

data/res/skeleton/bitbucket-pipelines.yml

@@ -1,3 +1,4 @@
+# *File originally created by PDQTest*
 image: ruby:2.3.5
 
 pipelines:

data/res/skeleton/make.ps1

@@ -10,6 +10,7 @@
 .PARAMETER target
   Test suite to run
 #>
+# *File originally created by PDQTest*
 param(
     $target = "all"
 )

data/res/skeleton/spec/fixtures/hiera.yaml

@@ -1,4 +1,5 @@
 # Hiera 5 Global configuration file *****test configuration*****
+# *File originally created by PDQTest*
 #
 # Hiera data expected from spec/fixtures/hieradata to give consistent path for
 # testing both rspec and acceptance

data/res/skeleton/spec/fixtures/hieradata/test.yaml

@@ -1,4 +1,5 @@
 # test.yaml *****for testing*****
+# *File originally created by PDQTest*
 #
 # This allows you to acceptance test the _global_ hierarchy. Usually this is not
 # what you want- for in-module data, just look at `/hiera.yaml` and `/data`

data/res/templates/examples_init.pp.erb

@@ -1,2 +1,3 @@
 #<%= PDQTest::Puppet::setting(:magic_marker) %>
+# *File originally created by PDQTest*
 include <%= PDQTest::Puppet.module_name %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 1.9.9beta5
+  version: 1.9.9beta6
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,6 +197,7 @@ files:
 - doc/test_generation.md
 - doc/tips_and_tricks.md
 - doc/troubleshooting.md
+- doc/upgrade_1_2.md
 - doc/upgrading.md
 - doc/windows.md
 - docker_images/centos/Dockerfile
@@ -224,6 +225,7 @@ files:
 - res/acceptance/init.bats
 - res/acceptance/init__before.bats
 - res/acceptance/init__setup.sh
+- res/skeleton/.ci_custom.sh
 - res/skeleton/.puppet-lint.rc
 - res/skeleton/.travis.yml
 - res/skeleton/Makefile
@@ -232,7 +234,6 @@ files:
 - res/skeleton/spec/fixtures/hiera.yaml
 - res/skeleton/spec/fixtures/hieradata/test.yaml
 - res/templates/examples_init.pp.erb
-- res/templates/rspec.rb.erb
 homepage: https://github.com/DeclarativeSystems/pdqtest
 licenses:
 - Apache-2.0

data/res/templates/rspec.rb.erb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-require 'puppet_factset'
-describe '<%= vars[:classname] %>' do
-  # Uncomment only the factset you would like to use for these tests
-<%
-require 'puppet_factset'
-default_factset = 'CentOS-7.0-64'
-PuppetFactset.factsets.each { |factset|
--%>
-  <% if factset != default_factset -%># <% end -%>system_name = '<%= factset %>'
-<% } -%>
-  let :facts do
-    PuppetFactset::factset_hash(system_name)
-  end
-
-  context 'compiles ok' do
-    it { should compile }
-  end
-
-  context 'with default values for all parameters' do
-    it { should contain_class('<%= vars[:classname] %>') }
-  end
-end