kitchen-puppet 1.37.1 → 1.38.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f163d8d8f9248b899ed3991dcf8c0cbfa7ae3b7
-  data.tar.gz: e9e2a9ecc77628dfc8edcd4fe4da92e9cb73497c
+  metadata.gz: b86557b055a6bec703e3cb5dec37119246367b14
+  data.tar.gz: e54294a521319c29da7c0217812cbaa1b46737a0
 SHA512:
-  metadata.gz: e581c8f25b15a659dd7d3bd2560279020f2410a6ff64779660bc07f3cda724d5bc6094d42bf7856d1c2f4247ee9a63a287b69c20204832f8b95e83aaa48ec400
-  data.tar.gz: 36eca3d2f51e82df641fbf4b898ceec97d6da8d46f685b389dd1700d0573572d6191a86c159a68a158df1f8d5b7860d1d274100c36ac91698542faf0e70e3976
+  metadata.gz: 8842936f233daa01810837a9a80a2f713c4dc9080e1f6495cf62d8fe269b557d0255643fbb0c8438812e31d697acce5938ac9e7f2e2295a708ce4fa5a4545fa1
+  data.tar.gz: 59f909ccd17e1dd32ec58517040f98d4e577df0d21499c3bf270dddbbc2c8f20f5e6215c366853bf8ca97d24653c95d9941e716d8fa992e4c57b3efc615ff7fb

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '1.37.1'.freeze
+    VERSION = '1.38.1'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -931,7 +931,16 @@ module Kitchen
         FileUtils.mkdir_p(tmpmodules_dir)
         resolve_with_librarian if File.exist?(puppetfile) && config[:resolve_with_librarian_puppet]
 
-        if modules && File.directory?(modules)
+        if modules.include?(':')
+          debug('Found multiple directories in module path merging.....')
+          modules_array = modules.split(':')
+          modules_array.each do |m|
+            if File.directory?(m)
+              debug("Copying modules from #{m} to #{tmpmodules_dir}")
+              FileUtils.cp_r(Dir.glob("#{m}/*"), tmpmodules_dir, remove_destination: true)
+            end
+          end
+        elsif modules && File.directory?(modules)
           debug("Copying modules from #{modules} to #{tmpmodules_dir}")
           FileUtils.cp_r(Dir.glob("#{modules}/*"), tmpmodules_dir, remove_destination: true)
         else

data/provisioner_options.md

@@ -23,7 +23,7 @@ puppet_coll_remote_path | "/opt/puppetlabs" | Server Installation location of a
 puppet_detailed_exitcodes | nil | Provide transaction information via exit codes. See `--detailed-exitcodes` section of `puppet help apply`
 manifests_path | | puppet repo manifests directory
 manifest | 'site.pp' | manifest for puppet apply to run
-modules_path | | puppet repo manifests directory
+modules_path | | puppet repo manifests directory. Can be multiple directories separated by colons and then they will be merged
 files_path | | directory to place at /tmp/kitchen/files
 fileserver_config_path | | file to place fileserver.conf
 hiera_config_path | | path to hiera.yaml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 1.37.1
+  version: 1.38.1
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen