pdqtest 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e25661660c62d88a32a857323cbf32a089addfda
-  data.tar.gz: fdf28862849ba4908d760ad7b287bd7cc928d445
+  metadata.gz: 75a6265aa171ae4d88a6e97d754c6018edfe7d3a
+  data.tar.gz: b1ae71344008ff1fdaabf2df6b332c0dc8766c27
 SHA512:
-  metadata.gz: b6ef89914b36b871fe83c949170caaf6b852407b5f4854902656f5199350136965941a93cac5bd1fb41197e61c8ffb6d1eefd26b176373b7e8eaf5370f6365ec
-  data.tar.gz: 578dbaf2fb74bcc7183e0b61d501671eefae2b08ce4721a7a659183429e6e1eccf8ccb5442750f6c8f05c75544e6af2421ad0bedfa86ce3261dabe13d6a2c2c9
+  metadata.gz: '019cde9a45ac72c3f48e1d06779fcdf9d56971215cb434fe2a9cc78dd02a4bb2a699bad97fcb82cdc45e117bd6076975abf222ffa51edc04e5238a600eb3d3df'
+  data.tar.gz: 382c6283d6c0c2801d21634fe3a2709978cd35f7a715fd0d9834bf289b2dfffed77138673162e32f1ae0042335168e5409e25aad79365c937adba584d5b1e3f2

data/README.md

@@ -223,6 +223,12 @@ pdqtest generate_acceptance examples/mynewthing.pp
 ```
 * Note:  will also create examples/mynewthing.pp if you haven't created it yet
 
+## Caching
+PDQTest will attempt to cache:
+* Puppet modules (via librarian-puppet) in `~/.pdqtest/cache/modules`
+* 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.
 
 ## Development
 

data/lib/pdqtest/docker.rb

@@ -1,3 +1,5 @@
+require 'pdqtest/util'
+
 module PDQTest
   module Docker
     OUT = 0
@@ -8,6 +10,8 @@ module PDQTest
     HIERA_YAML_CONTAINER = '/etc/puppetlabs/puppet/hiera.yaml'
     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"
 
     def self.wrap_cmd(cmd)
       ['bash',  '-c', "#{ENV} #{cmd}"]
@@ -33,6 +37,10 @@ module PDQTest
           []
         end
 
+      if ! Dir.exists?(YUM_CACHE_HOST)
+        FileUtils.mkdir_p(YUM_CACHE_HOST)
+      end
+
       # hiera.yaml *must* exist on the host or we will get errors from Docker
       if ! File.exists?(hiera_yaml_host)
         File.write(hiera_yaml_host, '# hiera configuration for testing')
@@ -41,10 +49,11 @@ module PDQTest
         'Image'   => IMAGE_NAME,
         'Volumes' => {
           test_dir              => {pwd               => 'rw'},
-          HIERA_YAML_CONTAINER  => {hiera_yaml_host   => 'ro'},
-          HIERA_DIR             => {hiera_dir         => 'ro'},
+          HIERA_YAML_CONTAINER  => {hiera_yaml_host   => 'rw'},
+          HIERA_DIR             => {hiera_dir         => 'rw'},
           '/cut'                => {pwd               => 'rw'}, # DEPRECATED -FOR REMOVAL
           '/sys/fs/cgroup'      => {'/sys/fs/cgroup'  => 'ro'},
+          YUM_CACHE_CONTAINER   => {YUM_CACHE_HOST    => 'rw'},
         },
         'HostConfig' => {
           "SecurityOpt" => security_opt,
@@ -54,6 +63,7 @@ module PDQTest
             "#{pwd}:#{test_dir}:rw",
             "#{hiera_yaml_host}:#{HIERA_YAML_CONTAINER}:rw",
             "#{hiera_dir}:#{HIERA_DIR}:rw",
+            "#{YUM_CACHE_HOST}:#{YUM_CACHE_CONTAINER}:rw",
           ],
         },
       )

data/lib/pdqtest/rspec.rb

@@ -4,15 +4,23 @@ require 'pdqtest/util'
 require 'pdqtest/emoji'
 require 'erb'
 require 'fileutils'
+require 'pdqtest/util'
+
+
 module PDQTest
   module Rspec
     SPEC_DIR          = './spec'
     SPEC_CLASSES_DIR  = "#{SPEC_DIR}/classes"
+    MODULE_CACHE_DIR  = "#{Util::app_dir}/cache/modules"
+
 
     def self.run
-      Escort::Logger.output.puts
+      if ! Dir.exists?(MODULE_CACHE_DIR)
+        FileUtils.mkdir_p(MODULE_CACHE_DIR)
+      end
+
       PDQTest::Emoji.emoji_message("🐌", "I'm downloading The Internet, please hold...")
-      cmd = "bundle exec librarian-puppet install --path ./spec/fixtures/modules --destructive"
+      cmd = "LIBRARIAN_PUPPET_TMP=#{MODULE_CACHE_DIR} bundle exec librarian-puppet install --path ./spec/fixtures/modules --destructive"
       status = system(cmd)
       if status
         PDQTest::Puppet.git_fixtures.each { |extra_mod_install_cmd|

data/lib/pdqtest/util.rb

@@ -3,5 +3,9 @@ module PDQTest
     def self.resource_path(resource)
       File.join(File.dirname(File.expand_path(__FILE__)), "../../res/#{resource}")
     end
+
+    def self.app_dir
+      "#{Dir.home}/.pdqtest"
+    end
   end
 end

data/lib/pdqtest/version.rb

@@ -1,3 +1,3 @@
 module PDQTest
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

metadata

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