kitchen-ansible 0.47.0 → 0.47.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68789a1bc8b78cc0f7823a8fc37550b3380cce3e
-  data.tar.gz: a9c91817f79f0c2c2dd70eb7315b6b34e4dcc24a
+  metadata.gz: 834b027ab5fac64b2bbe85384e903dc3c264c471
+  data.tar.gz: b04fda5b3e316ec67459e1949a77fddc36988ad2
 SHA512:
-  metadata.gz: 1bc3691dd665a8d8bdc14ca4f95d8319972614bcb22a2ba91cef6379beffdca495fd020287671ee66451af0e5ec024618c872dcb2152b55ce78bdb76a115b7e7
-  data.tar.gz: 0513eac5a974766edb118bedfa2da1535960a2d2303ad79961cd8f5560d7509ff3468f58db6c23282705a35f504edc3de64661966641af087e40068071c62671
+  metadata.gz: f25c60dda7958c8bf075fbc1a903b9ce35ee64d0fdd66a7b0010bbbf9acb8eb2e7d43b6b6c4b8f74b7c5261e6e40e25d72cd1a67091abc7610e31f6f2c13a538
+  data.tar.gz: 907c70037a0b0f5b54dcc47e0f3cb5a473af3c90aabd441de540df3b8365dbe4a4fbaea1bf6e09908246bf4fe5d17d06f680ced382427f1a0998773b583ee4e2

data/lib/kitchen-ansible/version.rb

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

data/lib/kitchen/provisioner/ansible_playbook.rb

@@ -881,10 +881,10 @@ module Kitchen
         roles_paths << File.join(config[:root_path], 'roles') unless config[:roles_path].nil?
         if config[:additional_copy_role_path]
           if config[:additional_copy_role_path].is_a? String
-            roles_paths << File.expand_path(config[:additional_copy_role_path])
+            roles_paths << File.join(config[:root_path], File.basename(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)))
+            config[:additional_copy_role_path].each do |path|
+              roles_paths << File.join(config[:root_path], File.basename(File.expand_path(path)))
             end
           end
         end
@@ -899,7 +899,7 @@ module Kitchen
 
       def prepare_roles
         info('Preparing roles')
-        debug("Using roles from #{roles}")
+        debug("Using roles from #{File.expand_path(roles)}")
 
         resolve_with_librarian if File.exist?(ansiblefile)
 
@@ -909,6 +909,21 @@ module Kitchen
           FileUtils.cp(File.expand_path(galaxy_requirements), dest)
         end
 
+        if config[:additional_copy_role_path]
+          if config[:additional_copy_role_path].is_a? String
+            debug("Using additional roles copy from #{File.expand_path(config[:additional_copy_role_path])}")
+            dest = File.join(sandbox_path, File.basename(File.expand_path(config[:additional_copy_role_path])))
+            FileUtils.mkdir_p(File.dirname(dest))
+            FileUtils.cp_r(File.expand_path(config[:additional_copy_role_path]), dest)
+          else
+            config[:additional_copy_role_path].each do |path|
+              dest = File.join(sandbox_path, File.basename(File.expand_path(path)))
+              FileUtils.mkdir_p(File.dirname(dest))
+              FileUtils.cp_r(File.expand_path(path), dest)
+            end
+          end
+        end
+
         FileUtils.mkdir_p(File.join(tmp_roles_dir, role_name))
         Find.find(roles) do |source|
           # Detect whether we are running tests on a role
@@ -917,7 +932,6 @@ module Kitchen
           unless roles =~ /\/roles$/
             role_path = "#{role_name}/#{role_path}"
           end
-
           target = File.join(tmp_roles_dir, role_path)
 
           Find.prune if config[:ignore_paths_from_root].include? File.basename(source)

metadata

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