pdqtest 1.9.9beta9 → 1.9.9beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 438426faf365d5ee59ac7b075dec4bef83048a08e4d231bf9e069f8b70374194
-  data.tar.gz: b8d07f4d78e6e4f4721fcbe6a9e34e7e5ca51bd59e11c4f55fd1765b548b571f
+  metadata.gz: f787c7d95a40dd0243e1a79bf35c50c6f35156114fa400d969e1482847918934
+  data.tar.gz: 45a75d89287e99c6c4ba900ba535e14898cb3c1ba28575dbc5d19199e86bda95
 SHA512:
-  metadata.gz: 66d94c1d45b76ab56e30dc7ab1aa26b0f32727f12232b04b83b308d65cc25328bae044ca1e4941c927b08d9680b6d91a335bed6e8213306aff073ff7ba66e811
-  data.tar.gz: cd0acb639f47015da1c6d23e1431ac512a07585c429fbf8ad5a9336d23f90f72a45808921337c584b938f924f917b46523f6438f4129624b1822f08c906afc98
+  metadata.gz: 46f4d91ffbed0f0e856bee1960a1f54044b956102b91136445941c36d51231e815794233e6d267ba3637a0ae32279c6155e5ac5991148b09e7ac71af8456dca8
+  data.tar.gz: 534779666962526e7dbc29bf28eb39e22a4d8490bba9001da36a5aa156c36f6711db2c2db26603cf3239a5f982532cd09a024df0836421fb9470b5fcc56f0af4

data/README.md

@@ -52,4 +52,5 @@ PDQTest 2.0 new features:
 1. [Troubleshooting](doc/troubleshooting.md)
 1. [Examples](doc/examples.md)
 1. [Development](doc/development.md)
+1  [Inplace execution](doc/inplace.md)
 1. [PDQTest 1.x -> 2.x Upgrade guide](doc/upgrade_1_2.md)

data/doc/inplace.md

@@ -0,0 +1,28 @@
+# Inplace execution
+Sometimes you _must_ run PDQTest inplace, on the computer your running from. 
+
+This is mostly useful for CI systems where running Docker-In-Docker is too
+slow/heavy.
+
+## Warning
+**Do not run PDQTest inplace on a system you care about**
+
+It will run puppet against it and likely destroy the system depending what your
+tests look like
+
+## Requirements
+The current system must have available in `PATH`:
+* Puppet
+* BATS (Linux) or PATS (Windows)
+* PDK
+
+## Activation
+You have to run PDQTest with the options `--inplace --inplace-enable` to 
+activate inplace alteration. This is normally done from CI integration files.
+
+## Problems in-place execution solves
+* Acceptance testing on Bitbucket Pipelines.
+* Acceptance testing Windows on Appveyor
+
+## Example project
+https://bitbucket.org/geoffwilliams_pp/test

data/doc/pdk.md

@@ -138,6 +138,7 @@ or supported.
 * ⚡ - File updated/replaced when you run `pdqtest upgrade`:
 
 ```
+├── appveyor.yml ⚡
 ├── bitbucket-pipelines.yml ⚡
 ├── Gemfile 🛠
 ├── Gemfile.local
@@ -163,6 +164,7 @@ or supported.
 ```
 
 Notes:
+* `appveyor.yml` - Complete test suite for Windows modules
 * `.travis.yml` - Complete test suite for Linux modules
 * `bitbucket-pipelines.yaml` - logical testing only (unit/RSpec) 
 * `.puppet-lint.rc` - Make lint errors test failures, ignore double quotes, etc

data/lib/pdqtest/inplace.rb

@@ -27,12 +27,16 @@ module PDQTest
       $logger.debug("exec_real: running inplace command: #{real_c}")
       if @@enable
         # must splat to avoid "wrong first argument"
-        Open3.popen3(*real_c) do |stdin, stdout, stderr, wait_thr|
-          res[:OUT] = stdout.read.split("\n")
-          res[:ERR] = stderr.read.split("\n")
-          # Process::Status object returned from `.value`
-          res[:STATUS] = wait_thr.value.exitstatus
-        end
+        # Open3.popen3(*real_c) do |stdin, stdout, stderr, wait_thr|
+        #   res[:OUT] = stdout.read.split("\n")
+        #   res[:ERR] = stderr.read.split("\n")
+        #   # Process::Status object returned from `.value`
+        #   res[:STATUS] = wait_thr.value.exitstatus
+        # end
+        stdout, stderr, status = Open3.capture3(*real_c)
+        res[:OUT] = stdout.split("\n")
+        res[:ERR] = stderr.split("\n")
+        res[:STATUS] = status.exitstatus
       else
         $logger.info "didn't run command, reason: DISABLED"
       end
@@ -46,13 +50,13 @@ module PDQTest
     end
 
     def self.new_container(image_name, privileged)
-      FileUtils.rm_f Docker.test_dir if Dir.exist? Docker.test_dir
+      FileUtils.rm_rf Docker.test_dir if Dir.exist? Docker.test_dir
 
       FileUtils.cp_r(File.join(Dir.pwd, "."), Docker.test_dir)
     end
 
     def self.cleanup_container(container)
-      FileUtils.rm_f Docker.test_dir
+      FileUtils.rm_rf Docker.test_dir
     end
   end
 end

data/lib/pdqtest/skeleton.rb

@@ -42,6 +42,9 @@ module PDQTest
         "bitbucket-pipelines.yml" => {
             "unmanaged" => true,
         },
+        "appveyor.yml" => {
+            "unmanaged" => true,
+        },
         ".gitignore" => {
             "paths" => [
                 ".Puppetfile.pdqtest",
@@ -135,6 +138,7 @@ module PDQTest
       install_skeleton('make.ps1', 'make.ps1')
       install_skeleton('bitbucket-pipelines.yml', 'bitbucket-pipelines.yml')
       install_skeleton('.travis.yml', '.travis.yml')
+      install_skeleton('appveyor.yml', 'appveyor.yml')
       Pdk.amend_sync_yml(SYNC_YML_CONTENT)
     end
 

data/lib/pdqtest/version.rb

@@ -1,3 +1,3 @@
 module PDQTest
-  VERSION = "1.9.9beta9"
+  VERSION = "1.9.9beta10"
 end

data/res/skeleton/appveyor.yml

@@ -0,0 +1,19 @@
+# appveyor.yml
+---
+image: "Visual Studio 2017"
+
+install:
+  - "cinst ruby --version 2.4.3.1"
+  - "cinst pdk"
+  - set PATH=C:\tools\ruby24\bin;c:\pats\;%PATH%
+  - "gem install bundler"
+  - "ruby --version"
+  - "gem --version"
+  - git clone https://github.com/GeoffWilliams/pats c:\pats
+
+build_script:
+  - "gem install bundler"
+
+test_script:
+  - ps: ./make.ps1 pdqtestbundle
+  - cd .pdqtest && bundle exec pdqtest --inplace --inplace-enable all

data/res/skeleton/bitbucket-pipelines.yml

@@ -18,7 +18,7 @@ pipelines:
           - apt install -y pdk
           - sh .ci_custom.sh
           - make pdqtestbundle
-          - cd .pdqtest && bundle exec pdqtest --inplace --inplace enable all
+          - cd .pdqtest && bundle exec pdqtest --inplace --inplace-enable all
 
 definitions:
   caches:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 1.9.9beta9
+  version: 1.9.9beta10
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,6 +189,7 @@ files:
 - doc/enabling_testing.md
 - doc/examples.md
 - doc/hiera.md
+- doc/inplace.md
 - doc/installation.md
 - doc/pdk.md
 - doc/puppet_facts.md
@@ -231,6 +232,7 @@ files:
 - res/skeleton/.puppet-lint.rc
 - res/skeleton/.travis.yml
 - res/skeleton/Makefile
+- res/skeleton/appveyor.yml
 - res/skeleton/bitbucket-pipelines.yml
 - res/skeleton/make.ps1
 - res/skeleton/spec/fixtures/hiera.yaml