vagrant-butcher 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca1d827124b21623cd41daacdb1a72e4dcd7cda6
-  data.tar.gz: d9799e2328a5f3d723fe906570d2fbc474dfa9a6
+  metadata.gz: 4b46329a612f8d0f161712048c32fba14802b03c
+  data.tar.gz: 0ab3292af71617e4ae15f0c55fb15a9f3a9888dc
 SHA512:
-  metadata.gz: 956282406a98f53cbf15022e0eec08419abaa0079f1fb5f379af90ce8d206c7a94d37f65f679cc61bc94719e4e56260d7f39dcfcfa7233eccdf4de9f68291a63
-  data.tar.gz: f02c1defd5d1763ff3c8703e3947bec9d6618739df4ee27a1df601940677e9ca48dd2ebb78475454bf963e5c59105efb3149609ea6d7d8f952e1309e75794b74
+  metadata.gz: 158685b6ce6ecd797885b083e49e910183f96dd174680124d21b31de63b0281ecb19c292b7d65e65df0c8d318c970c24cdade2902a2d9bfeec1f42f0415348d7
+  data.tar.gz: a3270d329466138996e5fa3c87761e7a0b2fd35d33e8cc6ddfd03d80148e325b31803a9644687b68aa634d46870a70872326fb182a088e469ccf3d6e8bea7c6a

data/lib/vagrant-butcher/helpers/key_files.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Vagrant
   module Butcher
     module Helpers
@@ -56,7 +58,7 @@ module Vagrant
         def create_cache_dir(env)
           unless File.exists?(cache_dir(env))
             ui(env).info "Creating #{cache_dir(env)}"
-            Dir.mkdir(cache_dir(env))
+            FileUtils.mkdir_p(cache_dir(env))
           end
         end
 
@@ -64,7 +66,7 @@ module Vagrant
           create_cache_dir(env)
 
           begin
-            machine(env).communicate.execute "mkdir -p #{guest_cache_key_path(env)} ; cp #{guest_key_path(env)} #{guest_cache_key_path(env)}", :sudo => true
+            machine(env).communicate.execute "mkdir -p `dirname #{guest_cache_key_path(env)}` ; cp #{guest_key_path(env)} #{guest_cache_key_path(env)}", :sudo => true
             ui(env).info "Copied #{guest_key_path(env)} to #{guest_cache_key_path(env)}"
           rescue Exception => e
             ui(env).error "Failed to copy #{guest_key_path(env)} to #{guest_cache_key_path(env)}"
@@ -75,12 +77,9 @@ module Vagrant
 
         def cleanup_cache_dir(env)
           unless @failed_deletions
-            File.delete(client_key(env))
-            begin
-              Dir.delete(cache_dir(env))
-            rescue Errno::ENOTEMPTY
-              # The dir wasn't empty.
-            end
+            key_file = "#{cache_dir(env)}/#{guest_key_filename(env)}"
+            File.delete(key_file) if File.exists?(key_file)
+            Dir.delete(cache_dir(env)) if (Dir.entries(cache_dir(env)) - %w{ . .. }).empty?
           else
             ui(env).warn "#{@failed_deletions} not butchered from the Chef Server. Client key was left at #{client_key(env)}"
           end

data/lib/vagrant-butcher/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Butcher
-    VERSION = "2.1.0"
+    VERSION = "2.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-butcher
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Cassiano Leal