pdqtest 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0d353b261cba8bb08ccbb67f871cc2a813c9b37
-  data.tar.gz: 6d4ed2b02bea498009f70d4b5dc4bb4f75257af5
+  metadata.gz: 0a9a4b43ee5eaabaed3d6d613494db8bdd70af0d
+  data.tar.gz: fc93f6516cbdffab0fcb48aaf9fc52301d124a91
 SHA512:
-  metadata.gz: fd93da962bce72087e77321fa7871be381cc984bd3d1de09512c36b23a5ba42a348f29df5f8e1daeed9b18a130b0e905c756fe321e8ebb1223a488a64f83e7f2
-  data.tar.gz: ead0de74af3969b5e968137bc678cbedd309b92cab154bbe838776e2e81608c2a9dcee2a4189c2e8939438ea18c21fca077d478e8f1aeed8c8ecbb9e4192ef49
+  metadata.gz: f29cc8546375a72f0ca277541543e58ab840ec0d9f42581b645e55672c5bb24bfc072891318fc5a98bbd48ab0009c805d5740070777838b56ae47a91161b8eae
+  data.tar.gz: 96e10024b23b44f3f4ffe651b152a0eb71f3bd5f3d77d5074affa124ed2fa6e9ee26f952a2a1f8c331f086d5d22180f793dd0af69b7ec5855661006c3f614d15

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/declarativesystems/pdqtest.svg?branch=master)](https://travis-ci.org/GeoffWilliams/pdqtest)
+[![Build Status](https://travis-ci.org/declarativesystems/pdqtest.svg?branch=master)](https://travis-ci.org/declarativesystems/pdqtest)
 
 # PDQTest
 
@@ -45,9 +45,13 @@ bundle exec pdqtest setup
 This image is updated periodically, the above command will download the appropriate image for the version of `pdqtest` being used.
 
 ### Module dependencies/.fixtures.yml
-Ordinarily, there is no need to maintain a `.fixtures.yml` file.  Dependencies on public forge modules should be specified in your module's `metadata.json` file.
+There is no need to maintain a `.fixtures.yml` file and the presence of this file when using `pdqtest` is an error.
 
-If you need to download modules from git (eg those not available on forge.puppetlabs.com), then you must populate the `fixtures` section of `.fixtures.yml`, eg:
+#### Public modules (PuppetForge)
+Dependencies on public forge modules must be specified in your module's `metadata.json` file.
+
+#### Private modules (from git)
+If you need to download modules from git, then you must populate the `fixtures` section of `fixtures.yml`, eg:
 
 ```
 repositories:
@@ -56,7 +60,10 @@ repositories:
     ref: 'mybranch'
 ```
 
-Note that only the repositories section of the file will be processed as we do not use `puppetlabs_spec_helper` to do this for us.
+##### Notes:
+* The filename is `fixtures.yml` NOT `.fixtures.yml`.  The leading dot had to be removed to avoid `puppetlabs_spec_helper` also detecting the file and trying to use it.
+* The file format of `.fixtures.yml` and `fixtures.yml` for specifing git repositories is identical
+* Only the repositories section of the file will be processed as we do not use `puppetlabs_spec_helper` to do this for us.
 
 ### All tests
 If you just want to run all tests:
@@ -101,6 +108,8 @@ You should use pdqtest if you find it increases your productivity and enriches y
 ## Troubleshooting
 * If you can't find the `pdqtest` command and your using `rbenv` be sure to run `rbenv rehash` after installing the gem to create the necessary symlinks
 * Don't forget to run `pdqtest setup` before your first `pdqtest` run to download/update the Docker image
+* If you need to access private git repositories, make sure to use `fixtures.yml` not `.fixtures.yml`
+* If you need a private key to access private repositories, set this up for your regular git command/ssh and `pdqtest` will reuse the settings
 
 ## Support
 This software is not supported by Puppet, Inc.  Use at your own risk.

data/lib/pdqtest/puppet.rb

@@ -19,7 +19,7 @@ module PDQTest
     CLASS_RE          = /^class /
     @@bats_executed   = []
     @@setup_executed  = []
-    FIXTURES          = '.fixtures.yml'
+    FIXTURES          = 'fixtures.yml'
 
     def self.reset_bats_executed
       @@bats_executed = []
@@ -93,7 +93,7 @@ module PDQTest
       examples
     end
 
-    # process fixtures->repositories->* from .fixtures.yml if present to
+    # process fixtures->repositories->* from fixtures.yml if present to
     # generate an array of commands to run ON THE DOCKER VM to checkout the
     # required modules from git
     def self.git_fixtures()
@@ -102,14 +102,17 @@ module PDQTest
         fixtures = YAML.load_file(FIXTURES)
         if fixtures.has_key?('repositories')
           fixtures['repositories'].each { |fixture, opts|
+            target = "spec/fixtures/modules/#{fixture}"
             if opts.instance_of?(String)
               source = opts
-              target = "spec/fixtures/modules/#{fixture}"
               ref    = 'master'
             elsif opts.instance_of?(Hash)
-              target = "spec/fixtures/modules/#{fixture}"
               source = opts['repo']
-              ref    = opts['ref']
+              if opts.has_key? 'ref'
+                ref = opts['ref']
+              else
+                ref = 'master'
+              end
             end
 
             refresh_cmd << "git_refresh refresh --target-dir #{target} --source-url #{source} --ref #{ref}"

data/lib/pdqtest/rspec.rb

@@ -9,18 +9,24 @@ module PDQTest
     SPEC_CLASSES_DIR  = "#{SPEC_DIR}/classes"
 
     def self.run
-      status = system("bundle exec librarian-puppet install --path ./spec/fixtures/modules --destructive")
-      PDQTest::Puppet.git_fixtures.each { |extra_mod_install_cmd|
+      cmd = "bundle exec librarian-puppet install --path ./spec/fixtures/modules --destructive"
+      status = system(cmd)
+      if status
+        PDQTest::Puppet.git_fixtures.each { |extra_mod_install_cmd|
+          if status
+            cmd = "bundle exec #{extra_mod_install_cmd}"
+            status &= system(cmd)
+          end
+          if ! status
+            Escort::Logger.error.error "Install git fixtures failed: #{cmd}"
+          end
+        }
         if status
-          # fast-fail
-          status &= system("bundle exec #{extra_mod_install_cmd}")
+          status &= system("bundle exec rake spec")
         end
-      }
-      if status
-        # fail fast on test execution
-        status &= system("bundle exec rake spec")
+      else
+        Escort::Logger.error.error "Librarian command failed: #{cmd}"
       end
-
       PDQTest::Emoji.partial_status(status, 'RSpec-Puppet')
       status
     end

data/lib/pdqtest/version.rb

@@ -1,3 +1,3 @@
 module PDQTest
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

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