pdqtest 1.9.9beta11 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d0d90f3af8c39a0195c66bc63db29c12a2a17fc6a84d3d82151b24a570ad1e8
-  data.tar.gz: 6aaa15557cf39b16773ded05b3b4165eed0e5ec2cefa0cc9150abf95bb4931f6
+  metadata.gz: c613051273e1726c3eba61ccf83240240071febd92f389a3fc5deb9e450d731c
+  data.tar.gz: 653aed1411b01865e5dd0f4c496d83c9bb9154433685d2f8e4bf2d2de172f670
 SHA512:
-  metadata.gz: 5b085a8730dab2447f943f78697b277e97173bc5c668e2e54897be454a614d3f011cca0346e579794319c82cd9dd39452db29b1f665da530419941594bfad86e
-  data.tar.gz: '024703510449d147758d6df284baf29d82c6796e58f8432fbe1596c2e787f4cc399d1983ea9a2f4db5d84fd3feff46b7bfcc9b01dce08e0379bcdc3db20b792a'
+  metadata.gz: 3a7b3eacf0af556ffc739986183373131d2f5a152a3bcec8de23c83f8014f3149d65c2bd15970e95a8d5e319aafd20361f2bd8d41be479325d5664500c8111a5
+  data.tar.gz: 236a5130aed1412b3fd87e04dadf9e4787ad3069d6e30ff36f0244066a5e6b831c714ecfbcd018adcd6725fd7a9adf2a684b25433a22530f86f3e2628442943d

data/doc/installation.md

@@ -26,10 +26,12 @@ PDQTest and Docker.
 4. Install PDQTest - `gem install pdqtest`
 5. Install bundler (the only sane way to manage Ruby dependencies) 
    `gem install bundler`
-6. Install [Docker CE](www.docker.com)
-7. Start the `docker` daemon and make sure the user your running as is in the
+7  Add PDK to your path (add to `.profile` for permanent): 
+   `export PATH=/opt/puppetlabs/pdk/bin/:$PATH`
+8. Install [Docker CE](www.docker.com)
+9. Start the `docker` daemon and make sure the user your running as is in the
    `docker` group.  You will need to log out and back in again after doing this
-8. Install the PDQTest docker images by typing `pdqtest setup`
+10. Install the PDQTest docker images by typing `pdqtest setup`
 
 ## Mac instructions
 **UNTESTED! Do you own a mac? Please let me know what works**

data/doc/pdk.md

@@ -337,3 +337,9 @@ With PDK!:
 ```shell
 pdk validate -a
 ```
+
+## What's going on with Puppet Strings?
+We use our own gem version of `puppet` and `puppet-strings` because
+`puppet-strings` is not shipped by PDK.
+
+We execute `puppet strings` outside of ruby for simplicity.

data/doc/running_tests.md

@@ -43,6 +43,8 @@ an argument from this table:
 * no: we run an alternative command
 * -: There is no corresponding `pdk` command
 
+Fast mode requires `puppet` in your path (not installed via gem).
+
 **Examples**
 
 Test the module as quickly as possible:

data/docker_images/ubuntu/Dockerfile

@@ -36,7 +36,7 @@ RUN apt-get update && apt-get install -y cron \
 RUN echo 'LANG=en_US.UTF-8' > /etc/locale.conf
 ENV LANG en_US.UTF-8
 ENV LC_ALL en_US.UTF-8
-ENV PATH /usr/local/bats/bin:/opt/puppetlabs/puppet/bin/:/usr/sbin:/sbin:/usr/bin:/bin
+ENV PATH /usr/local/bats/bin:/usr/sbin:/sbin:/usr/bin:/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/pdk/bin
 ENV TERM xterm
 
 # puppet (and dont run the daemons)
@@ -60,5 +60,18 @@ VOLUME /testcase
 # hiera
 RUN mkdir -p /spec/fixtures/
 
+# PDK
+RUN curl -O https://apt.puppetlabs.com/puppet5-release-trusty.deb && \
+    dpkg -i puppet5-release-trusty.deb && \
+    apt-get update && \
+    apt install -y pdk
+
+# ruby
+RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN curl -sSL https://get.rvm.io | bash -s stable
+RUN echo "source /etc/profile.d/rvm.sh" >> ~/.bashrc
+RUN /bin/bash -c "source /etc/profile.d/rvm.sh ; rvm install 2.4.1"
+RUN /bin/bash -c "source /etc/profile.d/rvm.sh ; gem install bundler ; bundle --version"
+
 # alternate shudown for systemd
 STOPSIGNAL SIGRTMIN+3

data/lib/pdqtest/docker.rb

@@ -10,7 +10,7 @@ module PDQTest
 
     IMAGES = {
      :DEFAULT => 'declarativesystems/pdqtest-centos:2018-09-15-0',
-     :UBUNTU  => 'declarativesystems/pdqtest-ubuntu:2018-09-15-0',
+     :UBUNTU  => 'declarativesystems/pdqtest-ubuntu:2018-10-06-0',
      :WINDOWS => 'declarativesystems/pdqtest-windows:2018-09-30-0',
     }
 

data/lib/pdqtest/inplace.rb

@@ -20,23 +20,19 @@ module PDQTest
 
     def self._exec_real(container, real_c)
       res = {}
-
       res[:OUT]    = []
       res[:ERR]    = []
       res[:STATUS] = 0
       $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
-        stdout, stderr, status = Open3.capture3(*real_c)
+        # OMG ruby... https://dmerej.info/blog/post/why-i-dont-like-ruby/
+        stdout, stderr, status = Open3.capture3(
+          Util.clean_env, *real_c, unsetenv_others: true
+        )
+
+        res[:STATUS] = status.exitstatus
         res[:OUT] = stdout.split("\n")
         res[:ERR] = stderr.split("\n")
-        res[:STATUS] = status.exitstatus
       else
         $logger.info "didn't run command, reason: DISABLED"
       end

data/lib/pdqtest/instance.rb

@@ -89,7 +89,7 @@ module PDQTest
           test_platforms = [PDQTest::Inplace::INPLACE_IMAGE]
           cc = PDQTest::Inplace
         else
-          test_platforms = get_acceptance_test_images
+          test_platforms = get_acceptance_test_images.uniq
           cc = PDQTest::Docker
         end
 

data/lib/pdqtest/pdk.rb

@@ -33,35 +33,8 @@ module PDQTest
         PDQTest::Puppet.fixtures_yml
       end
 
-      # on windows our environment is heavly contaminated by bundler - we have
-      # to remove it's environment or pdk command will flatout refuse to run
-      # probably doens't hurt to do this on linux too.
-      env = ENV.reject { |e|
-        [
-            "BUNDLER_ORIG_BUNDLER_ORIG_MANPATH",
-            "BUNDLER_ORIG_BUNDLER_VERSION",
-            "BUNDLER_ORIG_BUNDLE_BIN_PATH",
-            "BUNDLER_ORIG_BUNDLE_GEMFILE",
-            "BUNDLER_ORIG_GEM_HOME",
-            "BUNDLER_ORIG_GEM_PATH",
-            "BUNDLER_ORIG_MANPATH",
-            "BUNDLER_ORIG_PATH",
-            "BUNDLER_ORIG_RB_USER_INSTALL",
-            "BUNDLER_ORIG_RUBYLIB",
-            "BUNDLER_ORIG_RUBYOPT",
-            "BUNDLER_VERSION",
-            "BUNDLE_BIN_PATH",
-            "BUNDLE_GEMFILE",
-            "GEM_HOME",
-            "GEM_PATH",
-            "MANPATH",
-            "PROMPT",
-            "RUBYLIB",
-            "RUBYOPT",
-        ].include? e
-      }
-
-      status = system(env, pdk, :unsetenv_others=>true)
+      # our environment is heavly contaminated by bundler and maybe RVM too
+      status = system(Util.clean_env, pdk, unsetenv_others: true)
 
       PDQTest::Emoji.partial_status(status, subcommand)
       status

data/lib/pdqtest/skeleton.rb

@@ -139,6 +139,7 @@ module PDQTest
       install_skeleton('bitbucket-pipelines.yml', 'bitbucket-pipelines.yml')
       install_skeleton('.travis.yml', '.travis.yml')
       install_skeleton('appveyor.yml', 'appveyor.yml')
+      install_skeleton('.ci_custom.sh', '.ci_custom.sh', false)
       Pdk.amend_sync_yml(SYNC_YML_CONTENT)
     end
 

data/lib/pdqtest/upgrade.rb

@@ -16,11 +16,7 @@ module PDQTest
           'added' => false,
       },
       'puppet-strings' => {
-          'line' => "gem 'puppet-strings'",
-          'added' => false,
-      },
-      'puppet' => {
-          'line' => "gem 'puppet', '5.5.6'",
+          'line' => "gem 'puppet-strings', '2.1.0'",
           'added' => false,
       },
       'puppet-lint' => {
@@ -39,6 +35,10 @@ module PDQTest
           'line' => "gem 'rake', '12.3.1'",
           'added' => false,
       },
+      'puppet' => {
+          'line' => "gem 'puppet', '6.0.2'",
+          'added' => false,
+      },
     }.freeze
 
 

data/lib/pdqtest/util.rb

@@ -1,6 +1,6 @@
 module PDQTest
   module Util
-    ENV='export TERM=xterm LC_ALL=C PATH=/usr/local/bats/bin:/opt/puppetlabs/puppet/bin:$PATH;'
+    PDQENV = 'export TERM=xterm LC_ALL=C PATH=/usr/local/bats/bin:/opt/puppetlabs/puppet/bin:$PATH;'
 
     def self.resource_path(resource)
       joinp(File.dirname(File.expand_path(__FILE__)), "../../res/#{resource}")
@@ -37,7 +37,7 @@ module PDQTest
       if is_windows
         wrapped = [shell, "-command", "#{cmd} ; exit $LastExitCode"]
       else
-        wrapped = [shell, "-c", "#{ENV} #{cmd}"]
+        wrapped = [shell, "-c", "#{PDQENV} #{cmd}"]
       end
 
       wrapped
@@ -92,5 +92,43 @@ module PDQTest
         }.first
       }
     end
+
+    # environment - rvm and bundler 🤮
+    def self.clean_env
+      env = ENV.reject { |e|
+        [
+          "BUNDLER_ORIG_BUNDLER_ORIG_MANPATH",
+          "BUNDLER_ORIG_BUNDLER_VERSION",
+          "BUNDLER_ORIG_BUNDLE_BIN_PATH",
+          "BUNDLER_ORIG_BUNDLE_GEMFILE",
+          "BUNDLER_ORIG_GEM_HOME",
+          "BUNDLER_ORIG_GEM_PATH",
+          "BUNDLER_ORIG_MANPATH",
+          "BUNDLER_ORIG_PATH",
+          "BUNDLER_ORIG_RB_USER_INSTALL",
+          "BUNDLER_ORIG_RUBYLIB",
+          "BUNDLER_ORIG_RUBYOPT",
+          "BUNDLER_VERSION",
+          "BUNDLE_BIN_PATH",
+          "BUNDLE_GEMFILE",
+          "GEM_HOME",
+          "GEM_PATH",
+          "MANPATH",
+          "PROMPT",
+          "RUBYLIB",
+          "RUBYOPT",
+
+          # more random crap
+          "rvm_bin_path",
+          "IRBRC",
+          "MY_RUBY_HOME",
+          "rvm_path",
+          "rvm_prefix",
+          "RUBY_VERSION"
+        ].include? e
+      }
+
+      env
+    end
   end
 end

data/lib/pdqtest/version.rb

@@ -1,3 +1,3 @@
 module PDQTest
-  VERSION = "1.9.9beta11"
+  VERSION = "2.0.1"
 end

data/res/skeleton/bitbucket-pipelines.yml

@@ -2,24 +2,23 @@
 # To run locally:
 # https://confluence.atlassian.com/bitbucket/debug-your-pipelines-locally-with-docker-838273569.html
 ---
-image: ruby:2.4.1
+image: declarativesystems/pdqtest-ubuntu:2018-10-06-0
 
 pipelines:
   default:
-    - step:
-        caches:
-          - bundler
-        script:
-          - ruby --version
-          - bundler --version
-          - wget https://apt.puppetlabs.com/puppet5-release-trusty.deb
-          - dpkg -i puppet5-release-trusty.deb
-          - apt-get update
-          - apt install -y pdk
-          - sh .ci_custom.sh
-          - make pdqtestbundle
-          - cd .pdqtest && bundle exec pdqtest --inplace --inplace-enable all
+  - step:
+      caches:
+      - bundler
+      script:
+      - source /etc/profile.d/rvm.sh
+      - ruby --version
+      - which ruby
+      - bundler --version
+      - sh .ci_custom.sh
+      - make pdqtestbundle
+      - cd .pdqtest && bundle exec pdqtest --inplace --inplace-enable all
 
 definitions:
   caches:
     bundler: vendor/bundle
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 1.9.9beta11
+  version: 2.0.1
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -253,9 +253,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6