From f5966d5166d8afbeb180e1c1aaf4d8d9cb0a7357 Mon Sep 17 00:00:00 2001
From: Torben <mail@tknerr.de>
Date: Sat, 8 Mar 2014 14:52:54 +0100
Subject: [PATCH] refactor, code cleanup, remove println debugging

---
 .../action/configure_bucket_root.rb           | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/lib/vagrant-cachier/action/configure_bucket_root.rb b/lib/vagrant-cachier/action/configure_bucket_root.rb
index f041720..233c089 100644
--- a/lib/vagrant-cachier/action/configure_bucket_root.rb
+++ b/lib/vagrant-cachier/action/configure_bucket_root.rb
@@ -14,45 +14,33 @@ module VagrantPlugins
 
           if !env[:cache_buckets_folder_configured] && env[:machine].config.cache.enabled?
             setup_buckets_folder
+            setup_omnibus_cache_folder
             env[:cache_buckets_folder_configured] = true
-            if cache_vagrant_omnibus?
-              setup_omnibus_cache_folder
-            end
           end
 
           @app.call env
         end
 
-        def cache_vagrant_omnibus?
-          plugin_defined = defined?(VagrantPlugins::Omnibus::Plugin)
-          puts "xxx - cap: vagrant-omnibus defined? #{plugin_defined}"
-          return false unless plugin_defined
-
-          chef_version = @env[:machine].config.omnibus.chef_version
-          puts "xxx - cap: chef_version? #{chef_version}"
-          return chef_version != nil
-        end
-
-        def setup_omnibus_cache_folder
-          # since it's not configurable via the vagrant-omnibus plugin (yet)
-          # we specify the directory where to download the omnibus package here
-          omnibus_cache_dir = File.join(cache_root.to_s, 'omnibus')
-          FileUtils.mkdir_p(omnibus_cache_dir) unless File.exist? omnibus_cache_dir
-          ENV['OMNIBUS_DOWNLOAD_DIR'] = "/tmp/vagrant-cache/omnibus"
-        end
-
         def setup_buckets_folder
-          FileUtils.mkdir_p(cache_root.to_s) unless cache_root.exist?
+          FileUtils.mkdir_p(host_cache_root.to_s) unless host_cache_root.exist?
 
           synced_folder_opts = {id: "vagrant-cache"}
           synced_folder_opts.merge!(@env[:machine].config.cache.synced_folder_opts || {})
 
-          @env[:machine].config.vm.synced_folder cache_root, '/tmp/vagrant-cache', synced_folder_opts
+          @env[:machine].config.vm.synced_folder host_cache_root, guest_cache_root, synced_folder_opts
           @env[:cache_dirs] = []
         end
 
-        def cache_root
-          @cache_root ||= case @env[:machine].config.cache.scope.to_sym
+        def setup_omnibus_cache_folder
+          # unfortunately vagrant-omnibus hooks in before our buckets are installed, yet
+          # this is early enough to tell it to download to the vagrant-omnibus pseudo bucket
+          if omnibus_plugin_detected? && omnibus_plugin_enabled?
+            ENV['OMNIBUS_DOWNLOAD_DIR'] ||= "#{guest_cache_root}/vagrant-omnibus"
+          end
+        end
+
+        def host_cache_root
+          @host_cache_root ||= case @env[:machine].config.cache.scope.to_sym
             when :box
               @env[:home_path].join('cache', @env[:machine].box.name)
             when :machine
@@ -61,6 +49,18 @@ module VagrantPlugins
               raise "Unknown cache scope: '#{@env[:machine].config.cache.scope}'"
           end
         end
+
+        def guest_cache_root
+          '/tmp/vagrant-cache'
+        end
+
+        def omnibus_plugin_detected?
+          defined?(VagrantPlugins::Omnibus::Plugin)
+        end
+
+        def omnibus_plugin_enabled?
+          @env[:machine].config.omnibus.chef_version != nil
+        end
       end
     end
   end