vagrant-butcher 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b46329a612f8d0f161712048c32fba14802b03c
-  data.tar.gz: 0ab3292af71617e4ae15f0c55fb15a9f3a9888dc
+  metadata.gz: 179d7410197d7530eec83448494a0b51944d3b16
+  data.tar.gz: 9807b4d078972eacf729e064651e3056e4b9b940
 SHA512:
-  metadata.gz: 158685b6ce6ecd797885b083e49e910183f96dd174680124d21b31de63b0281ecb19c292b7d65e65df0c8d318c970c24cdade2902a2d9bfeec1f42f0415348d7
-  data.tar.gz: a3270d329466138996e5fa3c87761e7a0b2fd35d33e8cc6ddfd03d80148e325b31803a9644687b68aa634d46870a70872326fb182a088e469ccf3d6e8bea7c6a
+  metadata.gz: a2319cc363933b06ef5bb69529b4c0fcfca61a8523a1256357a49f0d0467ff6082c84708bc813260425c1a59f88d245491f59b7cd31ded7a29b8ea7471224d39
+  data.tar.gz: 76f86e961f9e835d0572e837494f75067b46c84d720a06b1b129de09cd601a025887fbf7a7e44ca3a89c31f5fff3900aedc25527ef0f0569a1fb42de0f27dce9

data/lib/vagrant-butcher/config.rb

@@ -3,7 +3,7 @@ module Vagrant
     class Config < ::Vagrant.plugin('2', :config)
       attr_accessor :enabled
       attr_accessor :guest_key_path
-      attr_accessor :cache_dir
+      attr_reader   :cache_dir
       attr_accessor :verify_ssl
       attr_accessor :retries
       attr_accessor :retry_interval
@@ -15,7 +15,7 @@ module Vagrant
         super
         @enabled = UNSET_VALUE
         @guest_key_path = UNSET_VALUE
-        @cache_dir = UNSET_VALUE
+        @cache_dir = ".vagrant/butcher"
         @verify_ssl = UNSET_VALUE
         @retries = UNSET_VALUE
         @retry_interval = UNSET_VALUE
@@ -24,14 +24,9 @@ module Vagrant
         @client_key = UNSET_VALUE
       end
 
-      def cache_dir=(value)
-        @cache_dir = File.expand_path(value)
-      end
-
       def finalize!
         @enabled = true if @enabled == UNSET_VALUE
         @guest_key_path = '/etc/chef/client.pem' if @guest_key_path == UNSET_VALUE
-        @cache_dir = File.expand_path ".vagrant/butcher" if @cache_dir == UNSET_VALUE
         @verify_ssl = true if @verify_ssl == UNSET_VALUE
         @retries = 0 if @retries == UNSET_VALUE
         @retry_interval = 0 if @retry_interval == UNSET_VALUE

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

@@ -12,6 +12,10 @@ module Vagrant
           @machine ||= env[:machine]
         end
 
+        def root_path(env)
+          @root_path ||= env[:root_path]
+        end
+
       end
     end
   end

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

@@ -10,26 +10,23 @@ module Vagrant
         include ::Vagrant::Butcher::Helpers::KeyFiles
 
         def setup_connection(env)
-          unless @conn
-            begin
-              @conn = ::Ridley.new(
-                server_url: chef_provisioner(env).chef_server_url,
-                client_name: client_name(env),
-                client_key: client_key(env),
-                ssl: {
-                  verify: butcher_config(env).verify_ssl
-                },
-                retries: butcher_config(env).retries,
-                retry_interval: butcher_config(env).retry_interval,
-                proxy: butcher_config(env).proxy
-              )
-            rescue Ridley::Errors::ClientKeyFileNotFoundOrInvalid
-              ui(env).error "Chef client key not found at #{client_key(env)}"
-            rescue Exception => e
-              ui(env).error "Could not connect to Chef Server: #{e}"
-            end
+          begin
+            @conn = ::Ridley.new(
+              server_url: chef_provisioner(env).chef_server_url,
+              client_name: client_name(env),
+              client_key: client_key_path(env),
+              ssl: {
+                verify: butcher_config(env).verify_ssl
+              },
+              retries: butcher_config(env).retries,
+              retry_interval: butcher_config(env).retry_interval,
+              proxy: butcher_config(env).proxy
+            )
+          rescue Ridley::Errors::ClientKeyFileNotFoundOrInvalid
+            ui(env).error "Chef client key not found at #{client_key_path(env)}"
+          rescue Exception => e
+            ui(env).error "Could not connect to Chef Server: #{e}"
           end
-          @conn
         end
 
         def delete_resource(resource, env)

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

@@ -6,53 +6,19 @@ module Vagrant
       module KeyFiles
 
         def cache_dir(env)
-          @cache_dir ||= butcher_config(env).cache_dir
-        end
-
-        def cache_dir_mapping(env)
-          unless @cache_dir_mapping
-            # Grab all enabled synced_folders
-            synced_folders = vm_config(env).synced_folders.values.find_all { |f| !f[:disabled] }
-
-            # Expand the hostpath of each folder
-            synced_folders.each { |f| f[:hostpath] = File.expand_path(f[:hostpath]) }
-
-            # Select the folder wherein the cache_dir is contained
-            cache_dir_mappings = synced_folders.select { |f| cache_dir(env) =~ /^#{f[:hostpath]}/ }
-            @cache_dir_mapping = cache_dir_mappings.first if cache_dir_mappings.any?
-          end
-          @cache_dir_mapping
-        end
-
-        def guest_cache_dir(env)
-          unless @guest_cache_dir
-            if cache_dir_mapping(env)
-              # Return the path to the cache dir inside the VM
-              @guest_cache_dir = cache_dir(env).gsub(cache_dir_mapping(env)[:hostpath], cache_dir_mapping(env)[:guestpath])
-              ui(env).info "Guest cache dir at #{@guest_cache_dir}"
-            else
-              ui(env).error "We couldn't find a synced folder to access the cache dir on the guest."
-              ui(env).error "Did you disable the /vagrant folder or set a butcher.cache_path that isn't shared with the guest?"
-              raise ::Vagrant::Butcher::Errors::NoSyncedFolder
-            end
-          end
-          @guest_cache_dir
+          @cache_dir ||= File.expand_path(File.join(root_path(env), butcher_config(env).cache_dir))
         end
 
         def guest_key_path(env)
           @guest_key_path ||= butcher_config(env).guest_key_path
         end
 
-        def guest_key_filename(env)
-          @guest_key ||= "#{env[:machine].name}-client.pem"
-        end
-
-        def guest_cache_key_path(env)
-          @guest_cache_key_path ||= "#{guest_cache_dir(env)}/#{guest_key_filename(env)}"
+        def key_filename(env)
+          @key_filename ||= "#{env[:machine].name}-client.pem"
         end
 
-        def client_key(env)
-          @client_key ||= butcher_config(env).client_key || "#{cache_dir(env)}/#{guest_key_filename(env)}"
+        def client_key_path(env)
+          @client_key_path ||= butcher_config(env).client_key || "#{cache_dir(env)}/#{key_filename(env)}"
         end
 
         def create_cache_dir(env)
@@ -62,35 +28,31 @@ module Vagrant
           end
         end
 
-        def copy_key_file(env)
+        def grab_key_from_guest(env)
           create_cache_dir(env)
 
-          begin
-            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)}"
-            ui(env).error e
-            raise ::Vagrant::Butcher::Errors::KeyCopyFailure
+          machine(env).communicate.execute("cat #{guest_key_path(env)}", sudo: true) do |type,data|
+            File.open("#{cache_dir(env)}/#{key_filename(env)}", "w") { |f| f << data } if type == :stdout
           end
+
+          ui(env).info "Saved client key to #{cache_dir(env)}/#{key_filename(env)}"
         end
 
         def cleanup_cache_dir(env)
           unless @failed_deletions
-            key_file = "#{cache_dir(env)}/#{guest_key_filename(env)}"
+            key_file = "#{cache_dir(env)}/#{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)}"
+            ui(env).warn "#{@failed_deletions} not butchered from the Chef Server. Client key was left at #{client_key_path(env)}"
           end
         end
 
         def copy_guest_key(env)
           begin
-            guest_cache_dir(env)
-            copy_key_file(env)
+            grab_key_from_guest(env)
           rescue ::Vagrant::Errors::VagrantError => e
-            ui(env).error "Failed to copy Chef client key from the guest: #{e.class}"
+            ui(env).error "Failed to create #{cache_dir(env)}/#{key_filename(env)}: #{e.class} - #{e}"
           end
         end
 

data/lib/vagrant-butcher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-butcher
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Cassiano Leal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley