kitchen-puppet 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5642be7475bf0630875b90636a565d6900b77ae7
-  data.tar.gz: 5243d5d8468c4ca6ec654b2f58b0ca395dfe986a
+  metadata.gz: 3f972d0a87b1def1a969330b08fee33887823ba7
+  data.tar.gz: 536cd0b900f3e927578114c1fd62b1901ffe8df7
 SHA512:
-  metadata.gz: bb5906e46ad8d73d14e3ebf14f08afe42b4ceebb912636cbe8eb7db8a1eb07533bdfa528790e0990a7fa784ef1499592d092257906f6dfd85ffd80ed78ed3a1b
-  data.tar.gz: 1e2730f250b0d5dcd5746aeb18adff0fe627ac4d27c58434fa4ff4a0505a89e842d1aa40c444f33b3ccb3c44a8efd4f50bfb90b75cb1ec268944a4289c2c7150
+  metadata.gz: 791e698c2111a21c9afe7c3cd9a2c84c0e97beea6defd4379cdaa241f33db77c0ac1ebe1ad7346907e1abe31e3f051c555a04381dc001cf92ad19cf435dccfa4
+  data.tar.gz: 8620ff75720a0a8264b520b09fbdf71f1d2820719af142667a6744c09040252cda881998c15dc5a5f7bcb1e898a18a6b757168f04fd09f7d230d2d40e9c3abff

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '0.0.30'
+    VERSION = '0.0.31'
   end
 end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -116,6 +116,12 @@ module Kitchen
         provisioner.calculate_path('manifests', :directory)
       end
 
+      default_config :spec_files_path do |provisioner|
+        provisioner.calculate_path('spec', :directory)
+      end
+
+      default_config :spec_files_remote_path, '/etc/puppet/spec'
+
       default_config :puppet_debug, false
       default_config :puppet_verbose, false
       default_config :puppet_noop, false
@@ -359,7 +365,10 @@ module Kitchen
       def init_command
         dirs = %w(modules manifests files hiera hiera.yaml)
         .map { |dir| File.join(config[:root_path], dir) }.join(' ')
-        cmd = "#{sudo('rm')} -rf #{dirs} #{hiera_data_remote_path} /etc/hiera.yaml #{puppet_dir}/hiera.yaml #{puppet_dir}/fileserver.conf;"
+        cmd = "#{sudo('rm')} -rf #{dirs} #{hiera_data_remote_path} \
+              /etc/hiera.yaml #{puppet_dir}/hiera.yaml \
+              #{spec_files_remote_path} \
+              #{puppet_dir}/fileserver.conf;"
         cmd += config[:puppet_environment] ? "#{sudo('rm')} -f #{File.join(puppet_dir, config[:puppet_environment])};" : ''
         cmd += " mkdir -p #{config[:root_path]}; #{sudo('mkdir')} -p #{puppet_dir}"
         debug(cmd)
@@ -378,6 +387,7 @@ module Kitchen
         prepare_hiera_config
         prepare_fileserver_config
         prepare_hiera_data
+        prepare_spec_files
         info('Finished Preparing files for transfer')
       end
 
@@ -471,6 +481,15 @@ module Kitchen
           ].join(' ')
         end
 
+        if spec_files_path && spec_files_remote_path
+          commands << [
+            sudo('mkdir -p'), spec_files_remote_path
+          ].join(' ')
+          commands << [
+            sudo('cp -r'), File.join(config[:root_path], 'spec/*'), spec_files_remote_path
+          ].join(' ')
+        end
+
         command = commands.join(' && ')
         debug(command)
         command
@@ -694,6 +713,14 @@ module Kitchen
         config[:remove_puppet_repo]
       end
 
+      def spec_files_path
+        config[:spec_files_path]
+      end
+
+      def spec_files_remote_path
+        config[:spec_files_remote_path]
+      end
+
       def facterlib
         return nil if config[:facterlib].nil?
         bash_vars = "export FACTERLIB='#{config[:facterlib]}';"
@@ -828,7 +855,7 @@ module Kitchen
         module_target_path = File.join(sandbox_path, 'modules', module_name)
         FileUtils.mkdir_p(module_target_path)
         FileUtils.cp_r(
-          Dir.glob(File.join(config[:kitchen_root], '*')).reject { |entry| entry =~ /modules$/ },
+          Dir.glob(File.join(config[:kitchen_root], '*')).reject { |entry| entry =~ /modules$|spec$|pkg$/ },
           module_target_path,
           remove_destination: true
         )
@@ -875,6 +902,15 @@ module Kitchen
         FileUtils.cp_r(Dir.glob("#{hiera_eyaml_key_path}/*"), tmp_hiera_key_dir)
       end
 
+      def prepare_spec_files
+        return unless spec_files_path
+        info('Preparing spec files')
+        tmp_spec_dir = File.join(sandbox_path, 'spec')
+        debug("Copying specs from #{spec_files_path} to #{tmp_spec_dir}")
+        FileUtils.mkdir_p(tmp_spec_dir)
+        FileUtils.cp_r(Dir.glob("#{spec_files_path}/*"), tmp_spec_dir)
+      end
+
       def resolve_with_librarian
         Kitchen.mutex.synchronize do
           ENV['SSL_CERT_FILE'] = librarian_puppet_ssl_file if librarian_puppet_ssl_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen