vagrant-cachier 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358ed900ee09d49b65042a0bf76b3d6b888c60b8
-  data.tar.gz: c24d390fbd5c1fc4446a956c6c65bacb56dee603
+  metadata.gz: 9d005d0ebd01b54b6648f88f5c3f1a5f103147f1
+  data.tar.gz: 40b706c52c2111de471c191c2a16aff8cfa7f2ef
 SHA512:
-  metadata.gz: 2e64ed67cbd86f0fb5ab18583f4a637ba9114f33a3bb64032b20293b09fc41cb1d2677fb1fc8980139efcfad27523bb92c1d5f026b9fa6b38ce43a6efa94899d
-  data.tar.gz: 266406520e8f8cd08a9e6914399b526813b512fb9279ca21aef489f7c1cf00bda47a0e0db98de047501cd217c367507b4c62cb1698dea9ce2117be27482eac32
+  metadata.gz: b2bdb5ddeb225925825c14cc82e79fb21864ca9b969ce0689d98e6cd21196d920ab31f88568bbdc7c5dc07613f036baf751d6809760cc1dc9eb1cd6f5d9ac86d
+  data.tar.gz: b00798e93230d7f3c2ddd364d3d584575e68ded7ebe0b47ede21ac9ebc11fb7ecd9f25b665acc8ed26111b4ecef7d3983658949153d3edd40d79220c0054b7f0

data/.gitignore

@@ -15,3 +15,4 @@ test/tmp
 test/version_tmp
 tmp
 .vagrant
+development/cookbooks

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [0.3.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.2.0...v0.3.0) (Aug 5, 2013)
+
+BACKWARDS INCOMPATIBILITIES:
+
+  - Machine scoped cache dirs are now kept on `.vagrant/machines/MACHINE/cache`
+    to allow downloaded packages to be reused between providers. If a single cache
+    directory exists, the plugin will automatically move it to the right place,
+    if multiple directories are found, it will halt execution and will error out,
+    letting the user know what has to be done in order to fix things.
+
+FEATURES:
+
+  - Add `file_cache_path` support for Chef. [GH-14]
+  - Reconfigure buckets before each provisioner. [GH-26] / [GH-32]
+
+IMPROVEMENTS:
+
+  - Don't error out if a bucket is configured for a non-capable guest. [GH-27]
+
 ## [0.2.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.1.0...v0.2.0) (July 10, 2013)
 
 FEATURES:

data/Gemfile

@@ -4,7 +4,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant',     github: 'mitchellh/vagrant'
-  gem 'vagrant-lxc', github: 'fgrehm/vagrant-lxc'
+  gem 'vagrant',          github: 'mitchellh/vagrant'
+  gem 'vagrant-lxc',      github: 'fgrehm/vagrant-lxc'
+  gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine'
+  gem 'vagrant-librarian-chef'
+  gem 'vagrant-omnibus'
   gem 'rake'
 end

data/Gemfile.lock

@@ -1,18 +1,23 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-lxc.git
-  revision: 2f88a060c911c466d304768dd349708336f8af1c
+  revision: 5ae82681cdedaf2a6f778e005dd65014fc7c2cec
   specs:
-    vagrant-lxc (0.3.4)
+    vagrant-lxc (0.5.1.dev)
+
+GIT
+  remote: git://github.com/fgrehm/vagrant-pristine.git
+  revision: 5c400d7850fc5f98d9601b59f4c3bd74818650de
+  specs:
+    vagrant-pristine (0.2.0)
 
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: ccfd321ef98dc5c12b180cc3a26f12d870c0eff5
+  revision: 16002d03c07f842a23497543129fa99f40f2bbc0
   specs:
-    vagrant (1.2.3.dev)
+    vagrant (1.2.8.dev)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
-      json (>= 1.5.1, < 1.8.0)
       log4r (~> 1.1.9)
       net-scp (~> 1.1.0)
       net-ssh (~> 2.6.6)
@@ -20,22 +25,74 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-cachier (0.2.0)
+    vagrant-cachier (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    archive-tar-minitar (0.5.2)
+    chef (11.6.0)
+      erubis
+      highline (>= 1.6.9)
+      json (>= 1.4.4, <= 1.7.7)
+      mixlib-authentication (>= 1.3.0)
+      mixlib-cli (~> 1.3.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.3.0)
+      mixlib-shellout
+      net-ssh (~> 2.6)
+      net-ssh-multi (~> 1.1.0)
+      ohai (>= 0.6.0)
+      rest-client (>= 1.0.4, < 1.7.0)
+      yajl-ruby (~> 1.1)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     erubis (2.7.0)
-    ffi (1.8.1)
+    ffi (1.9.0)
+    highline (1.6.19)
     i18n (0.6.4)
+    ipaddress (0.8.0)
     json (1.7.7)
+    librarian (0.1.0)
+      highline
+      thor (~> 0.15)
+    librarian-chef (0.0.1)
+      archive-tar-minitar (>= 0.5.2)
+      chef (>= 0.10)
+      librarian (~> 0.1.0)
     log4r (1.1.10)
-    net-scp (1.1.0)
+    mime-types (1.23)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.3.0)
+    mixlib-config (1.1.2)
+    mixlib-log (1.6.0)
+    mixlib-shellout (1.2.0)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.8)
+    net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
-    rake (10.0.4)
+    net-ssh-multi (1.1)
+      net-ssh (>= 2.1.4)
+      net-ssh-gateway (>= 0.99.0)
+    ohai (6.18.0)
+      ipaddress
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      mixlib-shellout
+      systemu
+      yajl-ruby
+    rake (10.1.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    systemu (2.5.2)
+    thor (0.18.1)
+    vagrant-librarian-chef (0.1.2)
+      librarian-chef
+    vagrant-omnibus (1.1.0)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
@@ -44,4 +101,7 @@ DEPENDENCIES
   rake
   vagrant!
   vagrant-cachier!
+  vagrant-librarian-chef
   vagrant-lxc!
+  vagrant-omnibus
+  vagrant-pristine!

data/README.md

@@ -36,10 +36,8 @@ For more information about available buckets, please see the [configuration sect
 
 * Vagrant's built in VirtualBox provider
 * [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc)
-
-_It is possibly compatible with the [VMware providers](http://www.vagrantup.com/vmware)
-as well but I haven't tried yet._
-
+* [VMware providers](http://www.vagrantup.com/vmware) with NFS enabled (See
+  [GH-24](https://github.com/fgrehm/vagrant-cachier/issues/24) for more info)
 
 ## How does it work?
 
@@ -48,12 +46,12 @@ configure things properly from your `Vagrantfile`. Please have a look at
 the [available cache buckets](#available-cache-buckets) section below for more
 information.
 
-Under the hood, the plugin will hook into calls to `Vagrant::Builtin::Provision`
-during `vagrant up` / `vagrant reload` and will set things up for each configured
-cache bucket. Before halting the machine, it will revert the changes required
-to set things up by hooking into calls to `Vagrant::Builtin::GracefulHalt` so
-that you can repackage the machine for others to use without requiring users to
-install the plugin as well.
+Under the hood, the plugin will monkey patch `Vagrant::Builtin::Provision` and
+will set things up for each configured cache bucket before running each defined
+provisioner and after all provisioners are done. Before halting the machine,
+it will revert the changes required to set things up by hooking into calls to
+`Vagrant::Builtin::GracefulHalt` so that you can repackage the machine for others
+to use without requiring users to install the plugin as well.
 
 Cache buckets will be available from `/tmp/vagrant-cachier` on your guest and
 the appropriate folders will get symlinked to the right path _after_ the machine is
@@ -168,6 +166,18 @@ end
 
 Used by Arch Linux, will get configured under guest's `/var/cache/pacman/pkg`.
 
+#### Chef
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = 'some-box-using-chef-provisioner'
+  config.cache.enable :chef
+end
+```
+
+When a Chef provisioner is detected, this bucket caches the default
+`file_cache_path` directory, `/var/chef/cache`. Requires Vagrant 1.2.4+.
+
 #### RubyGems
 
 ```ruby
@@ -183,7 +193,6 @@ folder under the result of running `gem env gemdir` as the default SSH user (usu
 it is already installed before enabling the bucket, otherwise you won't benefit
 from this plugin.
 
-
 #### RVM
 
 ```ruby

data/development/Cheffile

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
+site 'http://community.opscode.com/api/v1'
+
+cookbook 'java'

data/development/Cheffile.lock

@@ -0,0 +1,12 @@
+SITE
+  remote: http://community.opscode.com/api/v1
+  specs:
+    chef_handler (1.1.4)
+    java (1.12.0)
+      windows (>= 0.0.0)
+    windows (1.10.0)
+      chef_handler (>= 0.0.0)
+
+DEPENDENCIES
+  java (>= 0)
+

data/development/Vagrantfile

@@ -2,7 +2,10 @@
 # vi: set ft=ruby :
 
 Vagrant.require_plugin 'vagrant-cachier'
+Vagrant.require_plugin 'vagrant-librarian-chef'
 Vagrant.require_plugin 'vagrant-lxc'
+Vagrant.require_plugin 'vagrant-omnibus'
+Vagrant.require_plugin 'vagrant-pristine'
 
 Vagrant.configure("2") do |config|
   config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root'#, nfs: true
@@ -15,6 +18,18 @@ Vagrant.configure("2") do |config|
     vb.vm.network :private_network, ip: "192.168.50.123"
   end
 
+  config.omnibus.chef_version = :latest
+  config.vm.provision :chef_solo do |chef|
+    chef.add_recipe "java::oracle"
+    chef.json = {
+      :java => {
+        :oracle => {
+          :accept_oracle_download_terms => true
+        }
+      }
+    }
+  end
+
   debian_like_configs = lambda do |debian|
     debian.vm.provision :shell, inline: '
       if ! (which bundle > /dev/null); then

data/lib/vagrant-cachier/action/clean.rb

@@ -0,0 +1,39 @@
+module VagrantPlugins
+  module Cachier
+    class Action
+      class Clean
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::cachier::action::clean")
+        end
+
+        def call(env)
+          @env = env
+
+          if env[:machine].state.id == :running && symlinks.any?
+            env[:ui].info I18n.t('vagrant_cachier.cleanup')
+            symlinks.each do |symlink|
+              remove_symlink symlink
+            end
+
+            File.delete env[:machine].data_dir.join('cache_dirs').to_s
+          end
+
+          @app.call env
+        end
+
+        def symlinks
+          # TODO: Check if file exists instead of a blank rescue
+          @symlinks ||= @env[:machine].data_dir.join('cache_dirs').read.split rescue []
+        end
+
+        def remove_symlink(symlink)
+          if @env[:machine].communicate.test("test -L #{symlink}")
+            @logger.debug "Removing symlink for '#{symlink}'"
+            @env[:machine].communicate.sudo("unlink #{symlink}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/action/ensure_single_cache_root.rb

@@ -0,0 +1,63 @@
+require_relative '../errors'
+
+module VagrantPlugins
+  module Cachier
+    class Action
+      class EnsureSingleCacheRoot
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          @env = env
+
+          # If the cache is scoped to boxes or the existing cache dirs are not
+          # provider specific, there's nothing we need to do
+          if cache_scoped_to_machine? && provider_specific_cache_dirs.any?
+            ensure_single_cache_root_exists!
+          end
+
+          @app.call(env)
+        end
+
+        def cache_scoped_to_machine?
+          @env[:machine].config.cache.scope.to_sym == :machine
+        end
+
+        def ensure_single_cache_root_exists!
+          if provider_specific_cache_dirs.size > 1
+            cache_dirs = provider_specific_cache_dirs.map do |dir|
+              "  - #{dir.to_s.gsub(/^#{@env[:root_path]}\//, '')}"
+            end
+            machine_path = @env[:machine].data_dir.parent.to_s.gsub(/^#{@env[:root_path]}\//, '')
+            raise Cachier::Errors::MultipleProviderSpecificCacheDirsFound,
+                      machine:      @env[:machine].name,
+                      machine_path: machine_path,
+                      dirs:         cache_dirs.join("\n")
+          else
+            current_path = provider_specific_cache_dirs.first.to_s.gsub(/^#{@env[:root_path]}\//, '')
+            new_path     = @env[:machine].data_dir.parent.join('cache')
+            FileUtils.rm_rf new_path.to_s if new_path.directory?
+
+            new_path = new_path.to_s.gsub(/^#{@env[:root_path]}\//, '')
+            # If we got here there is a single provider specific cacher dir, so
+            # let's be nice with users and just fix it ;)
+            @env[:ui].warn I18n.t('vagrant_cachier.will_fix_machine_cache_dir',
+                                  current_path: current_path,
+                                  new_path:     new_path)
+            FileUtils.mv current_path, new_path
+          end
+        end
+
+        def provider_specific_cache_dirs
+          return @provider_specific_cache_dirs if @provider_specific_cache_dirs
+
+          # By default data_dir points to ./.vagrant/machines/<NAME>/<PROVIDER>,
+          # so we go one directory up
+          machine_dir = @env[:machine].data_dir.parent
+          @provider_specific_cache_dirs = Pathname.glob(machine_dir.join('*/cache'))
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/bucket.rb

@@ -34,6 +34,7 @@ module VagrantPlugins
 end
 
 require_relative "bucket/apt"
+require_relative "bucket/chef"
 require_relative "bucket/gem"
 require_relative "bucket/pacman"
 require_relative "bucket/yum"

data/lib/vagrant-cachier/bucket/apt.rb

@@ -24,8 +24,7 @@ module VagrantPlugins
               end
             end
           else
-            # TODO: Raise a better error
-            raise "You've configured an APT cache for a guest machine that does not support it!"
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'APT')
           end
         end
       end

data/lib/vagrant-cachier/bucket/chef.rb

@@ -0,0 +1,33 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class Chef < Bucket
+        def self.capability
+          :chef_file_cache_path
+        end
+
+        def install
+          machine = @env[:machine]
+          guest   = machine.guest
+
+          if guest.capability?(:chef_file_cache_path)
+            guest_path = guest.capability(:chef_file_cache_path)
+
+            @env[:cache_dirs] << guest_path
+
+            machine.communicate.tap do |comm|
+              comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}")
+              unless comm.test("test -L #{guest_path}")
+                comm.sudo("rm -rf #{guest_path}")
+                comm.sudo("mkdir -p `dirname #{guest_path}`")
+                comm.sudo("ln -s /tmp/vagrant-cache/#{@name} #{guest_path}")
+              end
+            end
+          else
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Chef')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/bucket/gem.rb

@@ -29,8 +29,7 @@ module VagrantPlugins
               end
             end
           else
-            # TODO: Raise a better error
-            raise "You've configured a RubyGems cache for a guest machine that does not support it!"
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RubyGems')
           end
         end
       end

data/lib/vagrant-cachier/bucket/pacman.rb

@@ -24,8 +24,7 @@ module VagrantPlugins
               end
             end
           else
-            # TODO: Raise a better error
-            raise "You've configured a Pacman cache for a guest machine that does not support it!"
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Pacman')
           end
         end
       end

data/lib/vagrant-cachier/bucket/rvm.rb

@@ -29,8 +29,7 @@ module VagrantPlugins
               end
             end
           else
-            # TODO: Raise a better error
-            raise "You've configured a RVM cache for a guest machine that does not support it!"
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RVM')
           end
         end
       end

data/lib/vagrant-cachier/bucket/yum.rb

@@ -27,8 +27,7 @@ module VagrantPlugins
               end
             end
           else
-            # TODO: Raise a better error
-            raise "You've configured a Yum cache for a guest machine that does not support it!"
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Yum')
           end
         end
       end

data/lib/vagrant-cachier/cap/linux/chef_file_cache_path.rb

@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module Cachier
+    module Cap
+      module Linux
+        module ChefFileCachePath
+          def self.chef_provisioner?(machine)
+            provisioners = machine.config.vm.provisioners
+            chef_provisioners = [:chef_solo, :chef_client]
+            compat_provisioners = provisioners.keep_if { |p| chef_provisioners.include? p.name }
+
+            if compat_provisioners.size > 1
+              raise "One machine is using multiple chef provisioners, which is unsupported."
+            end
+
+            using_chef = compat_provisioners.empty? ? false : true
+
+            using_chef
+          end
+
+          def self.chef_file_cache_path(machine)
+            chef_file_cache_path = nil
+            # TODO: Determine paths rather than using default.
+            chef_file_cache_path = '/var/chef/cache' if chef_provisioner?(machine)
+
+            return chef_file_cache_path
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/config.rb

@@ -4,6 +4,8 @@ module VagrantPlugins
       attr_accessor :scope, :auto_detect, :enable_nfs
       attr_reader   :buckets
 
+      ALLOWED_SCOPES = %w( box machine )
+
       def initialize
         @scope       = UNSET_VALUE
         @auto_detect = UNSET_VALUE
@@ -14,6 +16,18 @@ module VagrantPlugins
         (@buckets ||= {})[bucket] = opts
       end
 
+      def validate(machine)
+        errors = _detected_errors
+
+        if enabled? && ! ALLOWED_SCOPES.include?(@scope.to_s)
+          errors << I18n.t('vagrant_cachier.unknown_cache_scope',
+                            allowed:     ALLOWED_SCOPES.inspect,
+                            cache_scope: @scope)
+        end
+
+        { "vagrant cachier" => errors }
+      end
+
       def finalize!
         return unless enabled?
 

data/lib/vagrant-cachier/errors.rb

@@ -0,0 +1,9 @@
+module VagrantPlugins
+  module Cachier
+    module Errors
+      class MultipleProviderSpecificCacheDirsFound < Vagrant::Errors::VagrantError
+        error_key(:multiple_provider_specific_cache_dirs_found)
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/plugin.rb

@@ -1,3 +1,11 @@
+require_relative 'provision_ext'
+Vagrant::Action::Builtin::Provision.class_eval do
+  include VagrantPlugins::Cachier::ProvisionExt
+end
+
+# Add our custom translations to the load path
+I18n.load_path << File.expand_path("../../../locales/en.yml", __FILE__)
+
 module VagrantPlugins
   module Cachier
     class Plugin < Vagrant.plugin('2')
@@ -18,6 +26,11 @@ module VagrantPlugins
         Cap::Linux::RvmPath
       end
 
+      guest_capability 'linux', 'chef_file_cache_path' do
+        require_relative 'cap/linux/chef_file_cache_path'
+        Cap::Linux::ChefFileCachePath
+      end
+
       guest_capability 'debian', 'apt_cache_dir' do
         require_relative 'cap/debian/apt_cache_dir'
         Cap::Debian::AptCacheDir
@@ -33,19 +46,27 @@ module VagrantPlugins
         Cap::Arch::PacmanCacheDir
       end
 
-      install_action_hook = lambda do |hook|
-        require_relative 'action'
-        hook.after Vagrant::Action::Builtin::Provision, VagrantPlugins::Cachier::Action::Install
+      # TODO: This should be generic, we don't want to hard code every single
+      #       possible provider action class that Vagrant might have
+      ensure_single_cache_root = lambda do |hook|
+        require_relative 'action/ensure_single_cache_root'
+        hook.before VagrantPlugins::ProviderVirtualBox::Action::Boot, Action::EnsureSingleCacheRoot
+
+        if defined?(Vagrant::LXC)
+          # TODO: Require just the boot action file once its "require dependencies" are sorted out
+          require 'vagrant-lxc/action'
+          hook.before Vagrant::LXC::Action::Boot, Action::EnsureSingleCacheRoot
+        end
       end
-      action_hook 'set-shared-cache-on-machine-up',     :machine_action_up, &install_action_hook
-      action_hook 'set-shared-cache-on-machine-reload', :machine_action_reload, &install_action_hook
+      action_hook 'ensure-single-cache-root-exists-on-up',     :machine_action_up,     &ensure_single_cache_root
+      action_hook 'ensure-single-cache-root-exists-on-reload', :machine_action_reload, &ensure_single_cache_root
 
       clean_action_hook = lambda do |hook|
-        require_relative 'action'
-        hook.before Vagrant::Action::Builtin::GracefulHalt, VagrantPlugins::Cachier::Action::Clean
+        require_relative 'action/clean'
+        hook.before Vagrant::Action::Builtin::GracefulHalt, Action::Clean
       end
-      action_hook 'remove-guest-symlinks-on-machine-halt',    :machine_action_halt, &clean_action_hook
-      action_hook 'remove-guest-symlinks-on-machine-package', :machine_action_package, &clean_action_hook
+      action_hook 'remove-guest-symlinks-on-halt',    :machine_action_halt,    &clean_action_hook
+      action_hook 'remove-guest-symlinks-on-package', :machine_action_package, &clean_action_hook
     end
   end
 end

data/lib/vagrant-cachier/provision_ext.rb

@@ -0,0 +1,68 @@
+require_relative 'bucket'
+
+module VagrantPlugins
+  module Cachier
+    module ProvisionExt
+      def self.included(base)
+        base.class_eval do
+          def cachier_debug(msg)
+            @logger.debug "[CACHIER] #{msg}"
+          end
+
+          alias :old_call :call
+          def call(env)
+            return old_call(env) unless env[:machine].config.cache.enabled?
+
+            @env = env
+
+            FileUtils.mkdir_p(cache_root.to_s) unless cache_root.exist?
+
+            nfs_flag = env[:machine].config.cache.enable_nfs
+            env[:machine].config.vm.synced_folder cache_root, '/tmp/vagrant-cache', id: "vagrant-cache", nfs: nfs_flag
+
+            env[:cache_dirs] = []
+
+            old_call(env)
+
+            configure_cache_buckets
+          end
+
+          alias :old_run_provisioner :run_provisioner
+          def run_provisioner(*args)
+            configure_cache_buckets
+            old_run_provisioner(*args)
+          end
+
+          def configure_cache_buckets
+            if @env[:machine].config.cache.auto_detect
+              Bucket.auto_detect(@env)
+            end
+
+            return unless @env[:machine].config.cache.buckets.any?
+
+            @env[:ui].info 'Configuring cache buckets...'
+            cache_config = @env[:machine].config.cache
+            cache_config.buckets.each do |bucket_name, configs|
+              cachier_debug "Installing #{bucket_name} with configs #{configs.inspect}"
+              Bucket.install(bucket_name, @env, configs)
+            end
+
+            data_file = @env[:machine].data_dir.join('cache_dirs')
+            data_file.open('w') { |f| f.print @env[:cache_dirs].uniq.join("\n") }
+          end
+
+          def cache_root
+            @cache_root ||= case @env[:machine].config.cache.scope.to_sym
+              when :box
+                @env[:home_path].join('cache', @env[:machine].box.name)
+              when :machine
+                @env[:machine].data_dir.parent.join('cache')
+              else
+                raise "Unknown cache scope: '#{@env[:machine].config.cache.scope}'"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cachier
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/locales/en.yml

@@ -0,0 +1,20 @@
+en:
+  vagrant_cachier:
+    cleanup: |-
+      Removing cache buckets symlinks...
+    skipping_bucket: |-
+      Skipping %{bucket} cache bucket as the guest machine does not support it
+    unknown_cache_scope: |-
+      Unknown cache scope '%{cache_scope}' (allowed scopes: %{allowed})
+    will_fix_machine_cache_dir: |-
+      A vagrant-cachier provider specific cache dir was found under
+      '%{current_path}' and it will be moved to
+      '%{new_path}' as it is the new path for keeping machine
+      scoped cache dirs starting with the 0.3.0 version of the plugin.
+  vagrant:
+    errors:
+      multiple_provider_specific_cache_dirs_found: |-
+        There are multiple provider specific cache dirs for the '%{machine}' machine:
+        %{dirs}
+        Please move one of them up to `%{machine_path}/cache` and remove the others
+        before bringing the machine up again.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cachier
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies: []
 description: Speed up vagrant boxes provisioning
 email:
@@ -24,23 +24,31 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- development/Cheffile
+- development/Cheffile.lock
 - development/Vagrantfile
 - lib/vagrant-cachier.rb
-- lib/vagrant-cachier/action.rb
+- lib/vagrant-cachier/action/clean.rb
+- lib/vagrant-cachier/action/ensure_single_cache_root.rb
 - lib/vagrant-cachier/bucket.rb
 - lib/vagrant-cachier/bucket/apt.rb
+- lib/vagrant-cachier/bucket/chef.rb
 - lib/vagrant-cachier/bucket/gem.rb
 - lib/vagrant-cachier/bucket/pacman.rb
 - lib/vagrant-cachier/bucket/rvm.rb
 - lib/vagrant-cachier/bucket/yum.rb
 - lib/vagrant-cachier/cap/arch/pacman_cache_dir.rb
 - lib/vagrant-cachier/cap/debian/apt_cache_dir.rb
+- lib/vagrant-cachier/cap/linux/chef_file_cache_path.rb
 - lib/vagrant-cachier/cap/linux/gemdir.rb
 - lib/vagrant-cachier/cap/linux/rvm_path.rb
 - lib/vagrant-cachier/cap/redhat/yum_cache_dir.rb
 - lib/vagrant-cachier/config.rb
+- lib/vagrant-cachier/errors.rb
 - lib/vagrant-cachier/plugin.rb
+- lib/vagrant-cachier/provision_ext.rb
 - lib/vagrant-cachier/version.rb
+- locales/en.yml
 - vagrant-cachier.gemspec
 homepage: https://github.com/fgrehm/vagrant-cachier
 licenses:

data/lib/vagrant-cachier/action.rb

@@ -1,90 +0,0 @@
-require_relative 'bucket'
-
-module VagrantPlugins
-  module Cachier
-    class Action
-      class Install
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant::cachier::action::install")
-        end
-
-        def call(env)
-          return @app.call(env) unless env[:machine].config.cache.enabled?
-
-          @env = env
-
-          FileUtils.mkdir_p(cache_root.to_s) unless cache_root.exist?
-
-          nfs_flag = env[:machine].config.cache.enable_nfs
-          env[:machine].config.vm.synced_folder cache_root, '/tmp/vagrant-cache', id: "vagrant-cache", nfs: nfs_flag
-
-          @app.call env
-
-          env[:cache_dirs] = []
-
-          if env[:machine].config.cache.auto_detect
-            Bucket.auto_detect(env)
-          end
-
-          if env[:machine].config.cache.buckets.any?
-            env[:ui].info 'Configuring cache buckets...'
-            cache_config = env[:machine].config.cache
-            cache_config.buckets.each do |bucket_name, configs|
-              @logger.debug "Installing #{bucket_name} with configs #{configs.inspect}"
-              Bucket.install(bucket_name, env, configs)
-            end
-
-            data_file = env[:machine].data_dir.join('cache_dirs')
-            data_file.open('w') { |f| f.print env[:cache_dirs].join("\n") }
-          end
-        end
-
-        def cache_root
-          @cache_root ||= case @env[:machine].config.cache.scope
-            when :box
-              @env[:home_path].join('cache', @env[:machine].box.name)
-            when :machine
-              @env[:machine].data_dir.join('cache')
-            else
-              raise "Unknown cache scope: '#{@env[:machine].config.cache.scope}'"
-          end
-        end
-      end
-
-      class Clean
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant::cachier::action::clean")
-        end
-
-        def call(env)
-          @env = env
-
-          if env[:machine].state.id == :running && symlinks.any?
-            env[:ui].info 'Removing cache buckets symlinks...'
-            symlinks.each do |symlink|
-              remove_symlink symlink
-            end
-
-            File.delete env[:machine].data_dir.join('cache_dirs').to_s
-          end
-
-          @app.call env
-        end
-
-        def symlinks
-          # TODO: Check if file exists instead of a blank rescue
-          @symlinks ||= @env[:machine].data_dir.join('cache_dirs').read.split rescue []
-        end
-
-        def remove_symlink(symlink)
-          if @env[:machine].communicate.test("test -L #{symlink}")
-            @logger.debug "Removing symlink for '#{symlink}'"
-            @env[:machine].communicate.sudo("unlink #{symlink}")
-          end
-        end
-      end
-    end
-  end
-end