kitchen-ansible 0.46.7 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e3636006b7b01ceb1ddd0217009d47067174d6e
-  data.tar.gz: 469e713e76640d0f12101528b69a56b778bfd12a
+  metadata.gz: 68789a1bc8b78cc0f7823a8fc37550b3380cce3e
+  data.tar.gz: a9c91817f79f0c2c2dd70eb7315b6b34e4dcc24a
 SHA512:
-  metadata.gz: 9e029e313ee88469b8793830f2f963133311911193d437905385ab27d2cbb0ed3ef1de94e57132a9ba8827ebe1a86e7375a5ebfbf226339ffc446a83e4e9092d
-  data.tar.gz: cc831046363a83a3930437c2be84c0ca4b7db170022f64cd0183941f35955a5063c3fa289568a526ef742eba6b1a8d7cf4c387f07158afd16da4b5b06441606d
+  metadata.gz: 1bc3691dd665a8d8bdc14ca4f95d8319972614bcb22a2ba91cef6379beffdca495fd020287671ee66451af0e5ec024618c872dcb2152b55ce78bdb76a115b7e7
+  data.tar.gz: 0513eac5a974766edb118bedfa2da1535960a2d2303ad79961cd8f5560d7509ff3468f58db6c23282705a35f504edc3de64661966641af087e40068071c62671

data/lib/kitchen-ansible/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 module Kitchen
   module Ansible
-    VERSION = '0.46.7'.freeze
+    VERSION = '0.47.0'.freeze
   end
 end

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -880,8 +880,12 @@ module Kitchen
         roles_paths = []
         roles_paths << File.join(config[:root_path], 'roles') unless config[:roles_path].nil?
         if config[:additional_copy_role_path]
-          config[:additional_copy_path].each do |path|
-            roles_paths << File.join(config[:root_path], File.basename(path))
+          if config[:additional_copy_role_path].is_a? String
+            roles_paths << File.expand_path(config[:additional_copy_role_path])
+          else
+            config[:additional_copy_path].each do |path|
+              roles_paths << File.join(config[:root_path], File.expand_path(File.basename(path)))
+            end
           end
         end
         if roles_paths.empty?
@@ -902,7 +906,7 @@ module Kitchen
         if galaxy_requirements
           dest = File.join(sandbox_path, galaxy_requirements)
           FileUtils.mkdir_p(File.dirname(dest))
-          FileUtils.cp(galaxy_requirements, dest)
+          FileUtils.cp(File.expand_path(galaxy_requirements), dest)
         end
 
         FileUtils.mkdir_p(File.join(tmp_roles_dir, role_name))
@@ -994,10 +998,10 @@ module Kitchen
         info('Preparing additional_copy_path')
         additional_files.each do |file|
            info("Copy additional path: #{file}")
-           destination = File.join(sandbox_path, File.basename(file))
-           if File.directory?(file)
-             debug("Copy dir: #{file} #{destination}")
-             FileUtils.cp_r(file, destination)
+           destination = File.join(sandbox_path, File.basename(File.expand_path(file)))
+           if File.directory?(File.expand_path(file)) && File.basename(File.expand_path(file))!= ?.
+             debug("Copy dir: #{File.expand_path(file)} #{destination}")
+             FileUtils.cp_r(File.expand_path(file), destination)
            else
              debug("Copy file: #{file} #{destination}")
              FileUtils.cp(file, destination)
@@ -1008,7 +1012,9 @@ module Kitchen
           Find.find(file) do |files|
             destination = File.join(sandbox_path, files)
             Find.prune if config[:ignore_paths_from_root].include? File.basename(files)
+            Find.prune if "?.".include? File.basename(files)
             Find.prune if config[:ignore_extensions_from_root].include? File.extname(files)
+            debug File.basename(files)
             if File.directory?(files)
               FileUtils.mkdir_p(destination)
             else
@@ -1127,7 +1133,7 @@ module Kitchen
         if config[:additional_ssh_private_keys]
           config[:additional_ssh_private_keys].each do |key|
             debug("Adding additional_ssh_private_key file #{key}")
-            FileUtils.cp_r(key, tmp_additional_ssh_private_keys_dir, remove_destination: true)
+            FileUtils.cp_r(File.expand_path(key), tmp_additional_ssh_private_keys_dir, remove_destination: true)
           end
         else
           info 'nothing to do for additional_ssh_private_keys'
@@ -1149,7 +1155,7 @@ module Kitchen
         info('Preparing kerberos configuration file')
         debug("Copying kerberos configuration file from #{kerberos_conf_file} to #{tmp_kerberos_conf_file_path}")
 
-        FileUtils.cp(kerberos_conf_file, tmp_kerberos_conf_file_path)
+        FileUtils.cp(File.expand_path(kerberos_conf_file), tmp_kerberos_conf_file_path)
       end
 
       def resolve_with_librarian

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansible
 version: !ruby/object:Gem::Version
-  version: 0.46.7
+  version: 0.47.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen