vagrant-butcher 2.1.0 → 2.1.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/vagrant-butcher/helpers/key_files.rb +7 -8
- data/lib/vagrant-butcher/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4b46329a612f8d0f161712048c32fba14802b03c
|
4
|
+
data.tar.gz: 0ab3292af71617e4ae15f0c55fb15a9f3a9888dc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 158685b6ce6ecd797885b083e49e910183f96dd174680124d21b31de63b0281ecb19c292b7d65e65df0c8d318c970c24cdade2902a2d9bfeec1f42f0415348d7
|
7
|
+
data.tar.gz: a3270d329466138996e5fa3c87761e7a0b2fd35d33e8cc6ddfd03d80148e325b31803a9644687b68aa634d46870a70872326fb182a088e469ccf3d6e8bea7c6a
|
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'fileutils'
|
2
|
+
|
1
3
|
module Vagrant
|
2
4
|
module Butcher
|
3
5
|
module Helpers
|
@@ -56,7 +58,7 @@ module Vagrant
|
|
56
58
|
def create_cache_dir(env)
|
57
59
|
unless File.exists?(cache_dir(env))
|
58
60
|
ui(env).info "Creating #{cache_dir(env)}"
|
59
|
-
|
61
|
+
FileUtils.mkdir_p(cache_dir(env))
|
60
62
|
end
|
61
63
|
end
|
62
64
|
|
@@ -64,7 +66,7 @@ module Vagrant
|
|
64
66
|
create_cache_dir(env)
|
65
67
|
|
66
68
|
begin
|
67
|
-
machine(env).communicate.execute "mkdir -p #{guest_cache_key_path(env)} ; cp #{guest_key_path(env)} #{guest_cache_key_path(env)}", :sudo => true
|
69
|
+
machine(env).communicate.execute "mkdir -p `dirname #{guest_cache_key_path(env)}` ; cp #{guest_key_path(env)} #{guest_cache_key_path(env)}", :sudo => true
|
68
70
|
ui(env).info "Copied #{guest_key_path(env)} to #{guest_cache_key_path(env)}"
|
69
71
|
rescue Exception => e
|
70
72
|
ui(env).error "Failed to copy #{guest_key_path(env)} to #{guest_cache_key_path(env)}"
|
@@ -75,12 +77,9 @@ module Vagrant
|
|
75
77
|
|
76
78
|
def cleanup_cache_dir(env)
|
77
79
|
unless @failed_deletions
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
rescue Errno::ENOTEMPTY
|
82
|
-
# The dir wasn't empty.
|
83
|
-
end
|
80
|
+
key_file = "#{cache_dir(env)}/#{guest_key_filename(env)}"
|
81
|
+
File.delete(key_file) if File.exists?(key_file)
|
82
|
+
Dir.delete(cache_dir(env)) if (Dir.entries(cache_dir(env)) - %w{ . .. }).empty?
|
84
83
|
else
|
85
84
|
ui(env).warn "#{@failed_deletions} not butchered from the Chef Server. Client key was left at #{client_key(env)}"
|
86
85
|
end
|