[Fix #37] Ensure we got the key before destroying VM

lib/vagrant-butcher/action/cleanup.rb

@@ -11,6 +11,7 @@ def initialize(app, env)
 
         def call(env)
           if butcher_config(machine(env)).enabled
+            grab_key_from_guest(env) unless client_key_cached?(env)
             cleanup(env)
           else
             env[:ui].warn "Vagrant::Butcher disabled, not cleaning up Chef server!"

lib/vagrant-butcher/helpers/key_files.rb

@@ -18,6 +18,10 @@ def client_key_path(env)
           @client_key_path ||= butcher_config(env).client_key || "#{cache_dir(env)}/#{key_filename(env)}"
         end
 
+        def client_key_cached?(env)
+          File::exist?(client_key_path(env))
+        end
+
         def copy_guest_key(env)
           begin
             grab_key_from_guest(env)
@@ -57,7 +61,6 @@ def cleanup_cache_dir(env)
           def key_filename(env)
             @key_filename ||= "#{env[:machine].name}-client.pem"
           end
-
       end
     end
   end

lib/vagrant-butcher/plugin.rb

@@ -18,7 +18,7 @@ def provision(hook)
       action_hook(:vagrant_butcher_copy_guest_key, :machine_action_provision, &method(:provision))
 
       action_hook(:vagrant_butcher_cleanup, :machine_action_destroy) do |hook|
-        hook.before(::Vagrant::Action::Builtin::ProvisionerCleanup, Vagrant::Butcher::Action.cleanup)
+        hook.after(::Vagrant::Action::Builtin::DestroyConfirm, Vagrant::Butcher::Action.cleanup)
       end
 
       config("butcher") do