pdqtest 1.9.9beta4 → 1.9.9beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1825d421c28096e7d5ccf9d0e235905a59e5ae7dba50e424a62959c7738b3101
-  data.tar.gz: 608f8fcef51637ea0bc51eb7b2cc9017fc3445b380fbc53ab42cd04de8f6212e
+  metadata.gz: 2a9b6fed071d96aaf5e9be2d817ef816dc0a4ba8e56e93413a1c40889225fd03
+  data.tar.gz: 31d2c4d2eaf7a731dcb72d62a0cf84d5257e7de755c87a7531b7fc1414329f7f
 SHA512:
-  metadata.gz: fffc15198639ff6a435d9c801544f986024578a28c52a700d5f754b253ef191c180b37fa84f6d0eba955e5546782a043366a42460035120fdd979aba166e5543
-  data.tar.gz: 47770f9efc8f717b08222bfeb3f26d57897be2a0f81d58041927dc5860de0b2b8cf83feb1b894554f38fd3fd527e2d2071542e3eb96cf6b2eaa6b29d31c1f1fa
+  metadata.gz: 8565026a8c28a794fe58c26065de33bd17c62daab57fc917af5d5742cecea6c9f7508a51fab8de0fbd763ff6c7ea89be1c7bc1b43049479a71073eaa05306509
+  data.tar.gz: e6aa081aa4de254977b034327c85090b0c9e0dd3c1e75131af26eab434fec8a80730699ec03b4852f936d8d07cb83d630ff3411675c8a420c38c9e6b7fdca4a9

data/exe/pdqtest

@@ -23,8 +23,6 @@ require 'pdqtest/fastcheck'
 # display help if nothing specified
 ARGV.push('-h') if ARGV.empty?
 
-# Setup our own hacky logger
-
 
 Escort::App.create do |app|
   app.version PDQTest::VERSION
@@ -88,15 +86,15 @@ Escort::App.create do |app|
       PDQTest::Instance.set_privileged(options[:global][:options][:privileged])
       PDQTest::Instance.set_keep_container(options[:global][:options][:keep_container])
       PDQTest::Instance.set_docker_image(options[:global][:options][:image_name])
-
-      PDQTest::Core.run([
-        lambda {PDQTest::Pdk.run("validate 'metadata,puppet'")},
-        lambda {PDQTest::Puppet.install_modules},
-        lambda {PDQTest::Pdk.run("test unit")},
-        lambda {PDQTest::Instance.run},
-        lambda {system("bundle exec puppet strings generate --format=markdown")},
-        lambda {PDQTest::Pdk.run("build --force")},
-      ])
+      Dir.chdir ".." do
+        PDQTest::Core.run([
+          lambda {PDQTest::Pdk.run("validate 'metadata,puppet'")},
+          lambda {PDQTest::Puppet.install_modules},
+          lambda {PDQTest::Pdk.run("test unit")},
+          lambda {PDQTest::Instance.run},
+          lambda {PDQTest::Pdk.run("build --force")},
+        ])
+      end
     end
   end
 
@@ -114,12 +112,13 @@ 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])
 
-      PDQTest::Core.run([
-        lambda {PDQTest::Fastcheck.run},
-        lambda {PDQTest::Puppet.install_modules},
-        lambda {PDQTest::Instance.run},
-        lambda {system("bundle exec puppet strings generate --format=markdown")},
-      ])
+      Dir.chdir ".." do
+        PDQTest::Core.run([
+          lambda {PDQTest::Fastcheck.run},
+          lambda {PDQTest::Puppet.install_modules},
+          lambda {PDQTest::Instance.run},
+        ])
+      end
     end
   end
 
@@ -131,7 +130,9 @@ Escort::App.create do |app|
       $logger.level = :debug if options[:global][:options][:debug]
 
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
-      PDQTest::Core.run(lambda {PDQTest::Pdk.run("test unit")})
+      Dir.chdir ".." do
+        PDQTest::Core.run(lambda {PDQTest::Pdk.run("test unit")})
+      end
     end
   end
 
@@ -157,7 +158,9 @@ Escort::App.create do |app|
       PDQTest::Instance.set_docker_image(options[:global][:options][:image_name])
       PDQTest::Instance.set_keep_container(options[:global][:options][:keep_container])
       example = options[:global][:commands][:acceptance][:options][:example]
-      PDQTest::Core.run(lambda {PDQTest::Instance.run(example)})
+      Dir.chdir ".." do
+        PDQTest::Core.run(lambda {PDQTest::Instance.run(example)})
+      end
     end
   end
 
@@ -191,7 +194,9 @@ Escort::App.create do |app|
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
       example = options[:global][:commands][:generate_acceptance][:options][:example]
 
-      PDQTest::Skeleton.generate_acceptance(example)
+      Dir.chdir ".." do
+        PDQTest::Skeleton.generate_acceptance(example)
+      end
     end
   end
 
@@ -216,7 +221,9 @@ Escort::App.create do |app|
       $logger.level = :debug if options[:global][:options][:debug]
 
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
-      PDQTest::Core.run(lambda {PDQTest::Pdk.run("validate 'metadata,puppet'")})
+      Dir.chdir ".." do
+        PDQTest::Core.run(lambda {PDQTest::Pdk.run("validate 'metadata,puppet'")})
+      end
     end
   end
 
@@ -228,11 +235,13 @@ Escort::App.create do |app|
       PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
-      PDQTest::Core.run(lambda {
-        PDQTest::Docker::IMAGES.each { |key, image|
-          system("docker pull #{image}")
-        }
-      })
+      Dir.chdir ".." do
+        PDQTest::Core.run(lambda {
+          PDQTest::Docker::IMAGES.each { |key, image|
+            system("docker pull #{image}")
+          }
+        })
+      end
     end
   end
 
@@ -243,7 +252,9 @@ Escort::App.create do |app|
       PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
-      PDQTest::Puppet.info
+      Dir.chdir ".." do
+        PDQTest::Puppet.info
+      end
     end
   end
 
@@ -255,7 +266,9 @@ Escort::App.create do |app|
       PDQTest::Logger.logger
       $logger.level = :debug if options[:global][:options][:debug]
 
-      PDQTest::Upgrade.upgrade
+      Dir.chdir ".." do
+        PDQTest::Upgrade.upgrade
+      end
     end
   end
 end

data/lib/pdqtest/pdk.rb

@@ -61,11 +61,6 @@ module PDQTest
         ].include? e
       }
 
-      # we must run build target nastyhack before running PDK on linux
-      if ! Util.is_windows
-        $logger.warn("Running nasty hack: https://tickets.puppetlabs.com/browse/PDK-1192")
-        system("make nastyhack")
-      end
       status = system(env, pdk, :unsetenv_others=>true)
 
       PDQTest::Emoji.partial_status(status, subcommand)

data/lib/pdqtest/puppet.rb

@@ -280,8 +280,8 @@ module PDQTest
       setup_script = Util.joinp(XATS_TESTS, test_basename(example)) + setting(:setup_suffix)
       if File.exists?(setup_script)
         script = File.read(setup_script)
-
-        if script =~ /^\s*$/
+        $logger.debug "setup script: \n #{script}"
+        if script.strip.empty?
           $logger.info "skipping empty setup script at #{setup_script}"
         else
           $logger.info "Setting up test for #{example}"

data/lib/pdqtest/skeleton.rb

@@ -44,8 +44,16 @@ module PDQTest
     def self.should_replace_file(target, skeleton)
       target_hash   = Digest::SHA256.file target
       skeleton_hash = Digest::SHA256.file skeleton
-
-      target_hash != skeleton_hash
+      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}"
+
+      should
     end
 
     def self.install_skeletons
@@ -59,11 +67,14 @@ module PDQTest
       if File.exists?(target_file)
         if replace && should_replace_file(target_file, skeleton_file)
           install = true
+        else
+          $logger.debug "#{target_file} exists and will not be replaced"
         end
       else
         install = true
       end
       if install
+        $logger.debug "Installing skeleton file at #{target_file}"
         FileUtils.cp(skeleton_file, target_file)
       end
     end

data/lib/pdqtest/upgrade.rb

@@ -2,7 +2,8 @@ require 'pdqtest/skeleton'
 
 module PDQTest
   module Upgrade
-    GEMFILE             = 'Gemfile.project'
+    GEMDIR              = '.pdqtest'
+    GEMFILE             = File.join(GEMDIR,'Gemfile')
     GEM_REGEXP          = /gem ('|")([-\w]+)('|").*$/
     GEM_ATTRIB_REGEXP   = /^\s*:\w+/
 
@@ -11,15 +12,22 @@ module PDQTest
         'line'  => "gem 'pdqtest', '#{PDQTest::VERSION}'",
         'added' => false,
       },
-      'puppet-strings'  => {
-        'line'  => "gem 'puppet-strings', :git => 'https://github.com/puppetlabs/puppet-strings'",
-        'added' => false,
+      'puppet-strings'         => {
+          'line'  => "gem 'puppet-strings'",
+          'added' => false,
+      },
+      'puppet'         => {
+          'line'  => "gem 'puppet'",
+          'added' => false,
       },
     }
 
 
     # upgrade a module to the latest version of PDQTest
     def self.upgrade()
+      if ! Dir.exist?(GEMDIR)
+        Dir.mkdir GEMDIR
+      end
       t_file = File.open("#{GEMFILE}.tmp","w")
       updating_gem = false
 

data/lib/pdqtest/util.rb

@@ -30,7 +30,7 @@ module PDQTest
     # need to wrap commands with shell to gain access to
     # shell functions like `cd` etc
     def self.wrap_cmd(cmd)
-      if cmd =~ /^\s*$/ || cmd == "bash" || cmd == "powershell"
+      if cmd.strip.empty? || cmd == "bash" || cmd == "powershell"
         raise "Missing command to wrap!"
       end
 

data/lib/pdqtest/version.rb

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

data/res/skeleton/Makefile

@@ -1,33 +1,38 @@
-all: Gemfile.local
-	bundle exec pdqtest all
+all:
+	cd .pdqtest && bundle exec pdqtest all
+	$(MAKE) docs
 
-fast: Gemfile.local
-	bundle exec pdqtest fast
+fast:
+	cd .pdqtest && bundle exec pdqtest fast
 
-shell: Gemfile.local
-	bundle exec pdqtest --keep-container acceptance
+shell:
+	cd .pdqtest && bundle exec pdqtest --keep-container acceptance
 
-shellnopuppet: Gemfile.local
-	bundle exec pdqtest shell
+setup:
+	cd .pdqtest && bundle exec pdqtest setup
 
-logical: Gemfile.local
-	bundle exec pdqtest syntax
-	bundle exec pdqtest rspec
+shellnopuppet:
+	cd .pdqtest && bundle exec pdqtest shell
+
+logical:
+	cd .pdqtest && bundle exec pdqtest syntax
+	cd .pdqtest && bundle exec pdqtest rspec
+	$(MAKE) docs
 
 nastyhack:
 	# fix for - https://tickets.puppetlabs.com/browse/PDK-1192
 	find vendor -iname '*.pp' -exec rm {} \;
 
 bundle:
-	# Obtain puppet 5x and lock
-	pdk bundle install
 	# Install all gems into _normal world_ bundle so we can use all of em
-	bundle install
+	cd .pdqtest && bundle install
 
 Gemfile.local:
 	echo "[🐌] Creating symlink and running pdk bundle..."
 	ln -s Gemfile.project Gemfile.local
-	make bundle
+
+docs:
+	cd .pdqtest && bundle exec "cd ..&& puppet strings"
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 1.9.9beta4
+  version: 1.9.9beta5
 platform: ruby
 authors:
 - Geoff Williams