pdqtest 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c5355775775a0badae1b521e35cae0a72ee7fd1b88f4f30d8c3490255f5ed1b
-  data.tar.gz: 05c379330825b777cbce9428acdc178380786dc4e919166d55be46ea05fcb7a9
+  metadata.gz: 41b30099aa248eb077c002ae3ec69672302aff7c5f3839fdc5b768f7da6fd508
+  data.tar.gz: 9f6cba5c988c6404942826277ad2a985cadc3d5dc77c8309aab0a80f1cca5f88
 SHA512:
-  metadata.gz: 468175c2a3cfc156b3772f9e6601c981f155a2780c74dadee047878b0b0182f961e3e028fa8a5aae83a7d39ab31ff523a43c814dd2948d3cb48250b410187e1f
-  data.tar.gz: be15594560c112c1cc816d2c25bd2ddcca0b8441d7e6ea3c4981bf34e69db9fcaf1789218f1eeb224d7a4ed453855907f2fb94c9d28bf57dd33fb14463bc2229
+  metadata.gz: 075d97a8ebd8a60fed4567e75781e460cedf8b1d2d5d90f4cf9249a2c9298bc5d6f83d8591e36efdcdd4a8681f4ef147d1687958033b250055eec83ed8da1fbc
+  data.tar.gz: eec8e5d7690e5d9c649f924f4184feb0ab4aa98e713a19691f5ac2a82b1d006df84d4f4497cb37b29c355d4640d0145d639520a044c986aa4eee2786a1e6de77

data/doc/caching.md

@@ -1,6 +1,6 @@
 # Caching
 PDQTest will attempt to cache:
-* Puppet modules (via librarian-puppet) in `~/.pdqtest/cache/modules`
+* Puppet modules (via r10k) in `~/.r10k/cache`
 * The yum cache in `~/.pdqtest/cache/yum`
 
 Note that since the yum cache is writen to via a docker volume from the container your running tests in, the files in this directory will be root owned.  If you need to clear your cache for whatever reason, delete the `~/.pdqtest/cache` directory (you will likely need `sudo`) and PDQtest will recreate it next time it runs.

data/doc/puppet_module_dependencies.md

@@ -24,4 +24,6 @@ There is no need to maintain a `.fixtures.yml` file and the presence of this fil
 * The filename is for private modules 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.
-* We convert the dependencies from `metadata.json` to a temporary puppetfile store at `.Puppetfile.pdqtes` which is then installed using r10k
+* We convert the dependencies from `metadata.json` to a temporary puppetfile store at `.Puppetfile.pdqtest` which is then installed using r10k
+* Previous versions of pdqtest configured the r10k cache via `.r10k.yaml` which caused #44. To fix this, we now use the default r10k cache dir at ~/.r10k/cache and don't write
+  `.r10k.yaml` any more. You should remove any `.r10k.yaml` files from your project unless you need it for something specific.

data/lib/pdqtest/docker.rb

@@ -15,7 +15,7 @@ module PDQTest
     HIERA_YAML_HOST = '/spec/fixtures/hiera.yaml'
     HIERA_DIR  = '/spec/fixtures/hieradata'
     YUM_CACHE_CONTAINER = "/var/cache/yum"
-    YUM_CACHE_HOST    = "#{Util::app_dir}/cache/yum"
+    YUM_CACHE_HOST    = "#{Util::app_dir_expanded}/cache/yum"
 
     def self.wrap_cmd(cmd)
       ['bash',  '-c', "#{ENV} #{cmd}"]
@@ -149,7 +149,7 @@ module PDQTest
       exec_out(res).each { |l|
         # Output comes back as an array and needs to be iterated or we lose our
         # ansi formatting
-        Escort::Logger.output.puts l
+        Escort::Logger.output << l
       }
     end
 
@@ -162,7 +162,7 @@ module PDQTest
       exec_err(res).each { |l|
         # Output comes back as an array and needs to be iterated or we lose our
         # ansi formatting
-        Escort::Logger.error.error l
+        Escort::Logger.error << l
       }
     end
 

data/lib/pdqtest/puppet.rb

@@ -342,9 +342,13 @@ module PDQTest
 
       PDQTest::Emoji.emoji_message("🐌", "I'm downloading The Internet, please hold...")
 
-      cmd = "bundle exec r10k puppetfile install --verbose --moduledir ./spec/fixtures/modules --config .r10k.yaml --puppetfile #{TMP_PUPPETFILE}"
+      cmd = "bundle exec r10k puppetfile install --verbose --moduledir ./spec/fixtures/modules --puppetfile #{TMP_PUPPETFILE}"
       status = system(cmd)
 
+      if ! status
+        Escort::Logger.error.error "Failed to run the R10K command: #{cmd}"
+      end
+
       status
     end
   end

data/lib/pdqtest/rspec.rb

@@ -12,7 +12,7 @@ module PDQTest
   module Rspec
     SPEC_DIR          = './spec'
     SPEC_CLASSES_DIR  = "#{SPEC_DIR}/classes"
-    MODULE_CACHE_DIR  = "#{Util::app_dir}/cache/modules"
+    MODULE_CACHE_DIR  = "#{Util::app_dir_expanded}/cache/modules"
 
 
     def self.run
@@ -35,8 +35,6 @@ module PDQTest
         if status
           status &= system("bundle exec rake spec")
         end
-      else
-        Escort::Logger.error.error "Librarian command failed: #{cmd}"
       end
       PDQTest::Emoji.partial_status(status, 'RSpec-Puppet')
       status

data/lib/pdqtest/skeleton.rb

@@ -91,7 +91,6 @@ module PDQTest
       install_skeleton('Makefile', 'Makefile')
       install_skeleton('bitbucket-pipelines.yml', 'bitbucket-pipelines.yml')
       install_skeleton('.travis.yml', 'dot_travis.yml')
-      install_template('.r10k.yaml', 'r10k.yaml.erb', {})
     end
 
     def self.install_acceptance(example_file ="init.pp")

data/lib/pdqtest/util.rb

@@ -1,11 +1,16 @@
 module PDQTest
   module Util
+
     def self.resource_path(resource)
       File.join(File.dirname(File.expand_path(__FILE__)), "../../res/#{resource}")
     end
 
     def self.app_dir
-      "#{Dir.home}/.pdqtest"
+      ".pdqtest"
+    end
+
+    def self.app_dir_expanded
+      File.join(Dir.home, app_dir)
     end
   end
 end

data/lib/pdqtest/version.rb

@@ -1,4 +1,4 @@
 module PDQTest
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
   PUPPET_VERSION = "5.3.5"
 end

data/res/skeleton/Makefile

@@ -1,6 +1,6 @@
 all:
 	bundle exec pdqtest all
-	bundle exec puppet strings
+	bundle exec puppet strings generate --format=markdown
 
 shell:
 	bundle exec pdqtest --keep-container acceptance

data/res/skeleton/dot_gitignore

@@ -5,4 +5,5 @@ Puppetfile.lock
 .tmp
 .yardoc
 /pkg
-.Puppetfile.pdqtest
+.Puppetfile.pdqtest
+.idea

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -314,7 +314,6 @@ files:
 - res/skeleton/spec_helper.rb
 - res/skeleton/test.yaml
 - res/templates/examples_init.pp.erb
-- res/templates/r10k.yaml.erb
 - res/templates/rspec.rb.erb
 homepage: https://github.com/GeoffWilliams/pdqtest
 licenses:

data/res/templates/r10k.yaml.erb

@@ -1,3 +0,0 @@
----
-:cachedir: <%= PDQTest::Util::app_dir %>/cache/modules
-