kitchen-ansible 0.46.7 → 0.47.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8e3636006b7b01ceb1ddd0217009d47067174d6e
4
- data.tar.gz: 469e713e76640d0f12101528b69a56b778bfd12a
3
+ metadata.gz: 68789a1bc8b78cc0f7823a8fc37550b3380cce3e
4
+ data.tar.gz: a9c91817f79f0c2c2dd70eb7315b6b34e4dcc24a
5
5
  SHA512:
6
- metadata.gz: 9e029e313ee88469b8793830f2f963133311911193d437905385ab27d2cbb0ed3ef1de94e57132a9ba8827ebe1a86e7375a5ebfbf226339ffc446a83e4e9092d
7
- data.tar.gz: cc831046363a83a3930437c2be84c0ca4b7db170022f64cd0183941f35955a5063c3fa289568a526ef742eba6b1a8d7cf4c387f07158afd16da4b5b06441606d
6
+ metadata.gz: 1bc3691dd665a8d8bdc14ca4f95d8319972614bcb22a2ba91cef6379beffdca495fd020287671ee66451af0e5ec024618c872dcb2152b55ce78bdb76a115b7e7
7
+ data.tar.gz: 0513eac5a974766edb118bedfa2da1535960a2d2303ad79961cd8f5560d7509ff3468f58db6c23282705a35f504edc3de64661966641af087e40068071c62671
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  module Kitchen
3
3
  module Ansible
4
- VERSION = '0.46.7'.freeze
4
+ VERSION = '0.47.0'.freeze
5
5
  end
6
6
  end
@@ -880,8 +880,12 @@ module Kitchen
880
880
  roles_paths = []
881
881
  roles_paths << File.join(config[:root_path], 'roles') unless config[:roles_path].nil?
882
882
  if config[:additional_copy_role_path]
883
- config[:additional_copy_path].each do |path|
884
- roles_paths << File.join(config[:root_path], File.basename(path))
883
+ if config[:additional_copy_role_path].is_a? String
884
+ roles_paths << File.expand_path(config[:additional_copy_role_path])
885
+ else
886
+ config[:additional_copy_path].each do |path|
887
+ roles_paths << File.join(config[:root_path], File.expand_path(File.basename(path)))
888
+ end
885
889
  end
886
890
  end
887
891
  if roles_paths.empty?
@@ -902,7 +906,7 @@ module Kitchen
902
906
  if galaxy_requirements
903
907
  dest = File.join(sandbox_path, galaxy_requirements)
904
908
  FileUtils.mkdir_p(File.dirname(dest))
905
- FileUtils.cp(galaxy_requirements, dest)
909
+ FileUtils.cp(File.expand_path(galaxy_requirements), dest)
906
910
  end
907
911
 
908
912
  FileUtils.mkdir_p(File.join(tmp_roles_dir, role_name))
@@ -994,10 +998,10 @@ module Kitchen
994
998
  info('Preparing additional_copy_path')
995
999
  additional_files.each do |file|
996
1000
  info("Copy additional path: #{file}")
997
- destination = File.join(sandbox_path, File.basename(file))
998
- if File.directory?(file)
999
- debug("Copy dir: #{file} #{destination}")
1000
- FileUtils.cp_r(file, destination)
1001
+ destination = File.join(sandbox_path, File.basename(File.expand_path(file)))
1002
+ if File.directory?(File.expand_path(file)) && File.basename(File.expand_path(file))!= ?.
1003
+ debug("Copy dir: #{File.expand_path(file)} #{destination}")
1004
+ FileUtils.cp_r(File.expand_path(file), destination)
1001
1005
  else
1002
1006
  debug("Copy file: #{file} #{destination}")
1003
1007
  FileUtils.cp(file, destination)
@@ -1008,7 +1012,9 @@ module Kitchen
1008
1012
  Find.find(file) do |files|
1009
1013
  destination = File.join(sandbox_path, files)
1010
1014
  Find.prune if config[:ignore_paths_from_root].include? File.basename(files)
1015
+ Find.prune if "?.".include? File.basename(files)
1011
1016
  Find.prune if config[:ignore_extensions_from_root].include? File.extname(files)
1017
+ debug File.basename(files)
1012
1018
  if File.directory?(files)
1013
1019
  FileUtils.mkdir_p(destination)
1014
1020
  else
@@ -1127,7 +1133,7 @@ module Kitchen
1127
1133
  if config[:additional_ssh_private_keys]
1128
1134
  config[:additional_ssh_private_keys].each do |key|
1129
1135
  debug("Adding additional_ssh_private_key file #{key}")
1130
- FileUtils.cp_r(key, tmp_additional_ssh_private_keys_dir, remove_destination: true)
1136
+ FileUtils.cp_r(File.expand_path(key), tmp_additional_ssh_private_keys_dir, remove_destination: true)
1131
1137
  end
1132
1138
  else
1133
1139
  info 'nothing to do for additional_ssh_private_keys'
@@ -1149,7 +1155,7 @@ module Kitchen
1149
1155
  info('Preparing kerberos configuration file')
1150
1156
  debug("Copying kerberos configuration file from #{kerberos_conf_file} to #{tmp_kerberos_conf_file_path}")
1151
1157
 
1152
- FileUtils.cp(kerberos_conf_file, tmp_kerberos_conf_file_path)
1158
+ FileUtils.cp(File.expand_path(kerberos_conf_file), tmp_kerberos_conf_file_path)
1153
1159
  end
1154
1160
 
1155
1161
  def resolve_with_librarian
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-ansible
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.46.7
4
+ version: 0.47.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Neill Turner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-11 00:00:00.000000000 Z
11
+ date: 2017-06-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen