Update 'README.md'

dnf plugin

.gitignore

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

CHANGELOG.md

@@ -1,3 +1,144 @@
+## [1.2.1](https://github.com/fgrehm/vagrant-cachier/compare/v1.2.0...v1.2.1) (July 3, 2015)
+
+IMPROVEMENTS:
+
+  - Add chef\_zero support to chef bucket [[GH-153]]
+
+[GH-153]: https://github.com/fgrehm/vagrant-cachier/issues/153
+
+## [1.2.0](https://github.com/fgrehm/vagrant-cachier/compare/v1.1.0...v1.2.0) (Jan 14, 2015)
+
+FEATURES:
+
+  - [Chef Gems bucket](http://fgrehm.viewdocs.io/vagrant-cachier/buckets/chef_rubygems) [[GH-129]]
+
+[GH-129]: https://github.com/fgrehm/vagrant-cachier/pull/129
+
+BUG FIXES:
+
+  - Fix provisioner resolution on Vagrant 1.7+ [[GH-133]] / [[GH-134]]
+  - Do not modify Vagrant core object, preventing unpredictable behavior [[GH-135]]
+
+[GH-133]: https://github.com/fgrehm/vagrant-cachier/issues/133
+[GH-134]: https://github.com/fgrehm/vagrant-cachier/pull/134
+[GH-135]: https://github.com/fgrehm/vagrant-cachier/pull/135
+
+
+## [1.1.0](https://github.com/fgrehm/vagrant-cachier/compare/v1.0.0...v1.1.0) (Oct 15, 2014)
+
+FEATURES:
+
+  - [Bower bucket](http://fgrehm.viewdocs.io/vagrant-cachier/buckets/bower) [[GH-125]]
+
+[GH-125]: https://github.com/fgrehm/vagrant-cachier/pull/125
+
+IMPROVEMENTS:
+
+  - Resolve $HOME even if VM spits bogus new lines [[GH-122]] / [[GH-124]]
+
+[GH-122]: https://github.com/fgrehm/vagrant-cachier/issues/122
+[GH-124]: https://github.com/fgrehm/vagrant-cachier/pull/124
+
+## [1.0.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.9.0...v1.0.0) (Sep 22, 2014)
+
+Public API is considered stable.
+
+
+## [0.9.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.8.0...v0.9.0) (Aug 9, 2014)
+
+FEATURES:
+
+  - Suport for caching packages for Docker containers that doesn't have a base box specified [[GH-116]]
+
+[GH-116]: https://github.com/fgrehm/vagrant-cachier/pull/116
+
+## [0.8.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.7.2...v0.8.0) (Jul 20, 2014)
+
+BACKWARDS INCOMPATIBILITIES:
+
+  - Removed deprecated `config.enable_nfs` config.
+  - Changed composer cache bucket to use `$HOME/.composer/cache` [[GH-89]]
+
+IMPROVEMENTS:
+
+  - Set composer cache bucket ownership to the configured SSH user.
+
+BUG FIXES:
+
+  - Automatically disable apt-lists bucket when a Windows host is detected [[GH-106]]
+  - Skip `chmod 777` for `smb` mounted folders [[GH-107]]
+  - Do not error if base box has been removed and `:box` is configured as the cache scope [[GH-86]]
+
+[GH-86]: https://github.com/fgrehm/vagrant-cachier/issues/86
+[GH-89]: https://github.com/fgrehm/vagrant-cachier/issues/89
+[GH-106]: https://github.com/fgrehm/vagrant-cachier/issues/106
+[GH-107]: https://github.com/fgrehm/vagrant-cachier/issues/107
+
+## [0.7.2](https://github.com/fgrehm/vagrant-cachier/compare/v0.7.1...v0.7.2) (May 08, 2014)
+
+IMPROVEMENTS:
+
+  - Add `azure`, `brightbox`, `cloudstack`, `vcloud` and `vsphere` to the list
+    of known cloud providers [[GH-104]]
+
+[GH-104]: https://github.com/fgrehm/vagrant-cachier/pull/104
+
+## [0.7.1](https://github.com/fgrehm/vagrant-cachier/compare/v0.7.0...v0.7.1) (May 04, 2014)
+
+BUG FIXES:
+
+  - Fix support for using multiple generic buckets [[GH-101]]
+
+[GH-101]: https://github.com/fgrehm/vagrant-cachier/pull/101
+
+
+## [0.7.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.6.0...v0.7.0) (Apr 06, 2014)
+
+FEATURES:
+
+  - ["Generic" cache bucket](http://fgrehm.viewdocs.io/vagrant-cachier/buckets/generic) [[GH-94]] / [[GH-4]].
+
+BUG FIXES:
+
+  - Fix apt-cacher bucket undefined method error [[GH-96]]
+
+[GH-94]: https://github.com/fgrehm/vagrant-cachier/pull/94
+[GH-4]: https://github.com/fgrehm/vagrant-cachier/issues/4
+[GH-96]: https://github.com/fgrehm/vagrant-cachier/issues/96
+
+## [0.6.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.5.1...v0.6.0) (Feb 26, 2014)
+
+BACKWARDS INCOMPATIBILITIES:
+
+  - Plugin activation is now triggered by the `cache.scope` config and that config
+    is now required. Previous versions of the plugin had it set to `:box` but
+    there is no consensus whether `:box` and `:machine` is better. This is to
+    highlight that you need to think about the caching strategy you are going
+    to use. For more information and to discuss this move please check [GH-17](https://github.com/fgrehm/vagrant-cachier/issues/17).
+  - Because `cache.scope` is now a requirement and in order to reduce the amount of
+    configuration required by the plugin, we enabled automatic bucket detection by
+    default. To revert to the old behavior you can disable it globally from your
+    `~/.vagrant.d/Vagrantfile`.
+  - Support for Vagrant < 1.4 is gone, please use a previous plugin version if
+    you are running Vagrant 1.2 / 1.3
+  - Automatic handling of multiple machine scoped cache dirs from versions
+    prior to 0.3.0 of this plugin was removed.
+  - Support for `enable_nfs` has been deprecated and will be removed on 0.7.0,
+    please use `cache.synced_folder_opts = {type: :nfs}` instead.
+
+FEATURES:
+
+  - Warm up cache buckets with files available on guest in case bucket is empty
+  - Support for offline provisioning of apt-packages by caching `/var/lib/apt/lists` [GH-84]
+  - Support for specifying custom cache bucket synced folder opts
+  - Support to force disabe the plugin [GH-72]
+  - Automatically disable the plugin for cloud providers [GH-45]
+  - Skip configuration of buckets that have been configured already [GH-85]
+
+BUG FIXES:
+
+  - Properly fix NFS support for Vagrant 1.4+ [GH-76]
+
 ## [0.5.1](https://github.com/fgrehm/vagrant-cachier/compare/v0.5.0...v0.5.1) (Dec 20, 2013)
 
 BUG FIXES:

Gemfile

@@ -1,14 +1,13 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in vagrant-cachier.gemspec
-gemspec
-
 group :development do
-  gem 'vagrant',               github: 'mitchellh/vagrant'
+  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.7.2'
-  gem 'vagrant-lxc',           github: 'fgrehm/vagrant-lxc'
-  gem 'vagrant-pristine',      github: 'fgrehm/vagrant-pristine'
-  gem 'vagrant-global-status', github: 'fgrehm/vagrant-global-status'
-  gem 'vagrant-librarian-chef'
-  gem 'vagrant-omnibus'
   gem 'rake'
 end
+
+group :plugins do
+  gemspec
+  gem 'vagrant-lxc',      github: 'fgrehm/vagrant-lxc'
+  gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine'
+  gem 'vagrant-omnibus'
+end

Gemfile.lock

@@ -1,104 +1,119 @@
-GIT
-  remote: git://github.com/fgrehm/vagrant-global-status.git
-  revision: a0295400a0e47756cbcb8f97ed9f4449b1fb6b56
-  specs:
-    vagrant-global-status (0.1.1)
-
 GIT
   remote: git://github.com/fgrehm/vagrant-lxc.git
-  revision: 225af5622767059708278db29d42941e93d41994
+  revision: c9cd671a32f730fff4b6e4fdd3687a531af0663c
   specs:
-    vagrant-lxc (0.6.4.dev)
+    vagrant-lxc (1.1.0)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-pristine.git
-  revision: 4638491786943bfbf6f115b1fc379f069963fe46
+  revision: 503dbc47848c81d0fbfa6840491856f518d244a1
   specs:
     vagrant-pristine (0.3.0)
 
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: 57e95323b6600b146167f0f14f83b22dd31dd03f
+  revision: 1cd667b243f4a263cd5322b6455165cc676b6f7f
+  tag: v1.7.2
   specs:
-    vagrant (1.3.6.dev)
+    vagrant (1.7.2)
-      childprocess (~> 0.3.7)
+      bundler (>= 1.5.2, < 1.8.0)
+      childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
+      hashicorp-checkpoint (~> 0.1.1)
       i18n (~> 0.6.0)
-      log4r (~> 1.1.9)
+      listen (~> 2.8.0)
+      log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
-      net-ssh (~> 2.6.6)
+      net-sftp (~> 2.1)
+      net-ssh (>= 2.6.6, < 2.10.0)
+      nokogiri (= 1.6.3.1)
+      rb-kqueue (~> 0.2.0)
+      rest-client (>= 1.6.0, < 2.0)
+      wdm (~> 0.1.0)
+      winrm (~> 1.1.3)
 
 PATH
   remote: .
   specs:
-    vagrant-cachier (0.5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
+    akami (1.2.2)
-    chef (11.6.0)
+      gyoku (>= 0.4.0)
-      erubis
+      nokogiri
-      highline (>= 1.6.9)
+    builder (3.2.2)
-      json (>= 1.4.4, <= 1.7.7)
+    celluloid (0.16.0)
-      mixlib-authentication (>= 1.3.0)
+      timers (~> 4.0.0)
-      mixlib-cli (~> 1.3.0)
+    childprocess (0.5.5)
-      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.9.0)
+    ffi (1.9.6)
-    highline (1.6.19)
+    gssapi (1.0.3)
-    i18n (0.6.5)
+      ffi (>= 1.0.1)
-    ipaddress (0.8.0)
+    gyoku (1.2.2)
-    json (1.7.7)
+      builder (>= 2.1.2)
-    librarian (0.1.0)
+    hashicorp-checkpoint (0.1.4)
-      highline
+    hitimes (1.2.2)
-      thor (~> 0.15)
+    httpclient (2.6.0.1)
-    librarian-chef (0.0.1)
+    httpi (0.9.7)
-      archive-tar-minitar (>= 0.5.2)
+      rack
-      chef (>= 0.10)
+    i18n (0.6.11)
-      librarian (~> 0.1.0)
+    listen (2.8.5)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    little-plugger (1.1.3)
     log4r (1.1.10)
-    mime-types (1.23)
+    logging (1.8.2)
-    mixlib-authentication (1.3.0)
+      little-plugger (>= 1.1.3)
-      mixlib-log
+      multi_json (>= 1.8.4)
-    mixlib-cli (1.3.0)
+    mime-types (2.4.3)
-    mixlib-config (1.1.2)
+    mini_portile (0.6.0)
-    mixlib-log (1.6.0)
+    multi_json (1.10.1)
-    mixlib-shellout (1.2.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
+    net-sftp (2.1.2)
-    net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.1)
+    net-ssh (2.9.2)
-      net-ssh (>= 2.1.4)
+    netrc (0.10.2)
-      net-ssh-gateway (>= 0.99.0)
+    nokogiri (1.6.3.1)
-    ohai (6.18.0)
+      mini_portile (= 0.6.0)
-      ipaddress
+    nori (1.1.5)
-      mixlib-cli
+    rack (1.6.0)
-      mixlib-config
+    rake (10.4.2)
-      mixlib-log
+    rb-fsevent (0.9.4)
-      mixlib-shellout
+    rb-inotify (0.9.5)
-      systemu
+      ffi (>= 0.5.0)
-      yajl-ruby
+    rb-kqueue (0.2.3)
-    rake (10.1.0)
+      ffi (>= 0.5.0)
-    rest-client (1.6.7)
+    rest-client (1.7.2)
-      mime-types (>= 1.16)
+      mime-types (>= 1.16, < 3.0)
-    systemu (2.5.2)
+      netrc (~> 0.7)
-    thor (0.18.1)
+    rubyntlm (0.1.1)
-    vagrant-librarian-chef (0.1.2)
+    savon (0.9.5)
-      librarian-chef
+      akami (~> 1.0)
-    vagrant-omnibus (1.1.2)
+      builder (>= 2.1.2)
-    yajl-ruby (1.1.0)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 1.0)
+    timers (4.0.1)
+      hitimes
+    uuidtools (2.1.5)
+    vagrant-omnibus (1.4.1)
+    wasabi (1.0.0)
+      nokogiri (>= 1.4.0)
+    wdm (0.1.0)
+    winrm (1.1.3)
+      gssapi (~> 1.0.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (~> 1.6, >= 1.6.1)
+      nokogiri (~> 1.5)
+      rubyntlm (~> 0.1.1)
+      savon (= 0.9.5)
+      uuidtools (~> 2.1.2)
 
 PLATFORMS
   ruby
@@ -107,8 +122,9 @@ DEPENDENCIES
   rake
   vagrant!
   vagrant-cachier!
-  vagrant-global-status!
-  vagrant-librarian-chef
   vagrant-lxc!
   vagrant-omnibus
   vagrant-pristine!
+
+BUNDLED WITH
+   1.10.4

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Fabio Rehm
+Copyright (c) 2013-2014 Fabio Rehm
 
 MIT License
 

README.md

@@ -1,15 +1,22 @@
+🟢 We plan to support and maintain vagrant-lxc, as well as clean it up.<br/>
+🟢 Please feel free to contribute Issues and pull requests.<br/>
+🟢 P.S: Thanks [Fabio Rehm](https://fabiorehm.com) for the amazing initial project.
+
+--------
+
 # vagrant-cachier
 
+[![Gem Version](https://badge.fury.io/rb/vagrant-cachier.png)](http://badge.fury.io/rb/vagrant-cachier) [![Gitter chat](https://badges.gitter.im/fgrehm/vagrant-cachier.png)](https://gitter.im/fgrehm/vagrant-cachier)
+
 A [Vagrant](http://www.vagrantup.com/) plugin that helps you reduce the amount of
 coffee you drink while waiting for boxes to be provisioned by sharing a common
-package cache among similiar VM instances. Kinda like [vagrant-apt_cache](https://github.com/avit/vagrant-apt_cache)
+package cache among similar VM instances. Kinda like [vagrant-apt_cache](https://github.com/avit/vagrant-apt_cache)
-or [this magical snippet](http://gist.github.com/juanje/3797297) but targetting
+or [this magical snippet](http://gist.github.com/juanje/3797297) but targeting
 multiple package managers and Linux distros.
 
-
 ## Installation
 
-Make sure you have Vagrant 1.2+ and run:
+Make sure you have Vagrant 1.4+ and run:
 
 ```
 vagrant plugin install vagrant-cachier
@@ -17,15 +24,27 @@ vagrant plugin install vagrant-cachier
 
 ## Quick start
 
-The easiest way to set things up is just to enable [cache buckets auto detection](http://fgrehm.viewdocs.io/vagrant-cachier/usage)
-from within your `Vagrantfile`:
-
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.box = 'your-box'
-  config.cache.auto_detect = true
+  if Vagrant.has_plugin?("vagrant-cachier")
-  # If you are using VirtualBox, you might want to enable NFS for shared folders
+    # Configure cached packages to be shared between instances of the same base box.
-  # config.cache.enable_nfs  = true
+    # More info on http://fgrehm.viewdocs.io/vagrant-cachier/usage
+    config.cache.scope = :box
+
+    # OPTIONAL: If you are using VirtualBox, you might want to use that to enable
+    # NFS for shared folders. This is also very useful for vagrant-libvirt if you
+    # want bi-directional sync
+    config.cache.synced_folder_opts = {
+      type: :nfs,
+      # The nolock option can be useful for an NFSv3 client that wants to avoid the
+      # NLM sideband protocol. Without this option, apt-get might hang if it tries
+      # to lock files needed for /var/cache/* operations. All of this can be avoided
+      # by using NFSv4 everywhere. Please note that the tcp option is not the default.
+      mount_options: ['rw', 'vers=3', 'tcp', 'nolock']
+    }
+    # For more information please check http://docs.vagrantup.com/v2/synced-folders/basic_usage.html
+  end
 end
 ```
 
@@ -33,12 +52,19 @@ For more information please read the documentation available at
 http://fgrehm.viewdocs.io/vagrant-cachier.
 
 
-## Compatible providers
+## Providers that are known to work
 
-* Vagrant's built in VirtualBox provider
+* Vagrant's built in VirtualBox and Docker providers
 * [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc)
 * [VMware providers](http://www.vagrantup.com/vmware) with NFS enabled (See
   [GH-24](https://github.com/fgrehm/vagrant-cachier/issues/24) for more info)
+* [vagrant-parallels](https://github.com/Parallels/vagrant-parallels)
+* [vagrant-libvirt](https://github.com/pradels/vagrant-libvirt)
+* [vagrant-kvm](https://github.com/adrahon/vagrant-kvm)
+* _[Let us know if it is compatible with other providers!](https://github.com/fgrehm/vagrant-cachier/issues/new)_
+
+_Please note that as of v0.6.0 the plugin will automatically disable any
+previously defined configs for [cloud providers](lib/vagrant-cachier/plugin.rb#L19-22)_
 
 
 ## Contributing
@@ -48,5 +74,3 @@ http://fgrehm.viewdocs.io/vagrant-cachier.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/fgrehm/vagrant-cachier/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

development/Cheffile.lock

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

development/Vagrantfile

@@ -1,127 +1,132 @@
 # -*- mode: ruby -*-
 # 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'
 
   config.cache.scope = :machine
   config.cache.auto_detect = true
-  config.cache.enable_nfs  = true
+  config.cache.synced_folder_opts = { type: :nfs }
 
-  config.omnibus.chef_version = :latest
+  config.vm.provider :virtualbox do |vb|
-  config.vm.provision :chef_solo do |chef|
+    vb.customize [ "modifyvm", :id, "--memory", 256, "--cpus", "1" ]
-    chef.add_recipe "java::oracle"
-    chef.json = {
-      :java => {
-        :oracle => {
-          :accept_oracle_download_terms => true
-        }
-      }
-    }
   end
 
-  # Installs RVM
+  config.vm.provider :lxc do |lxc|
-  config.vm.provision :shell, inline: '
+    lxc.customize 'aa_profile', 'unconfined'
-    if ! [ -d /home/vagrant/.rvm ]; then
+  end
-      HOME=/home/vagrant su -p vagrant -l -c "curl -L https://get.rvm.io | bash -s stable"
-    fi
-  '
-
-  # Here we have the RVM cache bucket configured, so we install 2.0.0
-  config.vm.provision :shell, inline: '
-    if ! [ -d /home/vagrant/.rvm/rubies/ruby-1.9.3* ]; then
-      HOME=/home/vagrant su -p vagrant -l -c "rvm install 1.9.3 && rvm use 1.9.3 --default"
-    fi
-  '
-
-  config.vm.provision :shell, inline: '
-    if ! [ -d /home/vagrant/.nvm ]; then
-      apt-get install git -y
-      HOME=/home/vagrant su -p vagrant -l -c "
-        curl https://raw.github.com/creationix/nvm/master/install.sh | sh
-      "
-    fi
-  '
-
-  config.vm.provision :shell, inline: '
-    if ! [ -d /home/vagrant/.nvm/v0.10* ]; then
-      HOME=/home/vagrant su -p vagrant -l -c "
-        nvm install 0.10
-        nvm alias default 0.10
-      "
-    fi
-  '
 
   configure_private_network = lambda do |node, suffix|
     node.vm.network :private_network, ip: "192.168.50.#{suffix}"
   end
 
-  debian_like_configs = lambda do |debian|
+  initial_debian_setup = lambda do |debian, git_pkg = 'git'|
-    # Here we have the RubyGems cache bucket configured to the right path, so we
+    debian.vm.provision :shell, inline: "apt-get update && apt-get install -y #{git_pkg} php5-cli curl wget htop"
-    # bundle the project
+  end
-    debian.vm.provision :shell, inline: '
+
-      sudo apt-get install -y git php5-cli
+  install_nvm_and_rvm = lambda do |node|
-      HOME=/home/vagrant su -p vagrant -l -c "cd /vagrant && bundle"
+    # Installs RVM
+    node.vm.provision :shell, inline: '
+      if ! [ -d /home/vagrant/.rvm ]; then
+        HOME=/home/vagrant su -p vagrant -l -c "curl -L https://get.rvm.io | bash -s stable"
+      fi
+    '
+
+    # Here we have the RVM cache bucket configured, so we install 2.0.0
+    node.vm.provision :shell, inline: '
+      if ! [ -d /home/vagrant/.rvm/rubies/ruby-2.0.0* ]; then
+        HOME=/home/vagrant su -p vagrant -l -c "rvm install 2.0.0 && rvm use 2.0.0 --default"
+      fi
+    '
+
+    node.vm.provision :shell, inline: '
+      if ! [ -d /home/vagrant/.nvm ]; then
+        apt-get install git -y
+        HOME=/home/vagrant su -p vagrant -l -c "
+          curl https://raw.github.com/creationix/nvm/master/install.sh | sh
+        "
+      fi
+    '
+
+    node.vm.provision :shell, inline: '
+      if ! [ -d /home/vagrant/.nvm/v0.10* ]; then
+        HOME=/home/vagrant su -p vagrant -l -c "
+          nvm install 0.10
+          nvm alias default 0.10
+        "
+      fi
     '
   end
 
   config.vm.define :ubuntu do |ubuntu|
-    ubuntu.vm.box = "quantal64"
+    ubuntu.vm.box = "raring64"
-    debian_like_configs.call ubuntu
+    ubuntu.vm.provider :lxc do |_, override|
+      override.vm.box = 'fgrehm/raring64-lxc'
+    end
+
     configure_private_network.call ubuntu, 10
+
+    initial_debian_setup.call(ubuntu)
+    install_nvm_and_rvm.call(ubuntu)
+
+    ubuntu.omnibus.chef_version = :latest
+    ubuntu.vm.provision :chef_solo do |chef|
+      chef.add_recipe "cachier::default"
+    end
   end
 
   config.vm.define :lucid do |lucid|
     lucid.vm.box = "lucid64"
-    debian_like_configs.call lucid
+    # Disable NFS
+    lucid.cache.synced_folder_opts = { }
     configure_private_network.call lucid, 11
+
+    initial_debian_setup.call(lucid, 'git-core')
+    install_nvm_and_rvm.call(lucid)
   end
 
   config.vm.define :debian do |debian|
     debian.vm.box     = "squeeze64"
     debian.vm.box_url = 'http://f.willianfernandes.com.br/vagrant-boxes/DebianSqueeze64.box'
-    debian_like_configs.call debian
     configure_private_network.call debian, 12
+
+    initial_debian_setup.call(debian)
+    install_nvm_and_rvm.call(debian)
   end
 
   config.vm.define :centos do |centos|
     centos.vm.box     = 'centos6_64'
     centos.vm.box_url = 'http://developer.nrel.gov/downloads/vagrant-boxes/CentOS-6.4-x86_64-v20130309.box'
     configure_private_network.call centos, 13
-    # Here we have the RubyGems cache bucket configured to the right path, so we
+
-    # bundle the project
     centos.vm.provision :shell, inline: '
-        yum install -y libffi-devel ruby-devel git
+      (
-        HOME=/home/vagrant su -p vagrant -l -c "cd /vagrant && bundle"'
+        mkdir -p /tmp/epel
+        cd /tmp/epel
+        wget http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
+        wget http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
+        sudo rpm -Uvh remi-release-6*.rpm epel-release-6*.rpm
+      )
+      yum install -y libffi-devel ruby-devel git
+    '
+    centos.vm.provision :shell, inline: 'gem install bundler'
   end
 
   config.vm.define :arch do |arch|
     arch.vm.box     = 'arch64'
-    arch.vm.box_url = 'http://vagrant.pouss.in/archlinux_2012-07-02.box'
+    arch.vm.box_url = 'https://dl.dropboxusercontent.com/u/6750592/Arch_Linux_2013.11_x64.box'
-    configure_private_network.call arch, 14
+    # Disable NFS
-    arch.vm.provision :shell, inline: '
+    arch.cache.synced_folder_opts = { }
-        pacman -Syu --noconfirm libffi git
+
-        HOME=/home/vagrant su -p vagrant -l -c "cd /vagrant && bundle"'
+    arch.vm.provision :shell, inline: 'pacman -Syu --noconfirm libffi git ruby && gem install bundler'
   end
 
-  # Please note that we are not able to install chef on the VM, so when bringing
-  # this up we should always pass in `--provision-with=shell`
-  #
-  # TODO: Find out how to install chef on this or other box or find one that has
-  #       it pre installed
   config.vm.define :opensuse do |suse|
     suse.vm.box     = 'opensuse-12'
     suse.vm.box_url = 'http://sourceforge.net/projects/opensusevagrant/files/12.3/opensuse-12.3-64.box/download'
-    configure_private_network.call suse, 15
+    # Disable NFS
-    suse.cache.enable_nfs = false
+    suse.cache.synced_folder_opts = { }
-    # This seems to not be working
+
-    suse.omnibus.chef_version = nil
     suse.vm.provision :shell, inline: 'time zypper install -y git'
   end
 end

development/cookbooks/cachier/recipes/default.rb

@@ -0,0 +1,4 @@
+zip_filepath = "#{Chef::Config['file_cache_path']}/vagrant-cachier.tar.gz"
+zip_url      = "https://github.com/fgrehm/vagrant-cachier/archive/v0.6.0.tar.gz"
+
+remote_file(zip_filepath) { source zip_url }

docs/buckets/apt-lists.md

@@ -0,0 +1,27 @@
+# APT lists
+
+Used by Debian-like Linux distros, will get configured under guest's `/var/lib/apt/lists`.
+
+As explained on [Wikipedia](http://en.wikipedia.org/wiki/Advanced_Packaging_Tool#Files),
+`/var/lib/apt/lists` is the "storage area for state information for each package
+resource specified in sources.list". By enabling this bucket, `apt` will be able
+to install cached packages without hitting the remote repositories for the main
+package lists, [being particularly useful when developing offline](https://github.com/fgrehm/vagrant-cachier/pull/84#issue-27311414).
+
+To manually enable it:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = 'some-debian-box'
+  config.cache.enable :apt_lists
+end
+```
+
+## Heads up!
+
+This bucket is automatically disabled for Windows hosts, please have a look at
+the following issues for more information:
+
+* https://github.com/fgrehm/vagrant-cachier/issues/106
+* https://github.com/fgrehm/vagrant-cachier/issues/109
+* https://github.com/fgrehm/vagrant-cachier/issues/113

docs/buckets/bower.md

@@ -0,0 +1,13 @@
+# [Bower](http://bower.io/)
+
+Compatible with probably any type of linux guest distro, will cache guests'
+`$HOME/.cache/bower` if bower is detected.
+
+To manually enable it:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = 'some-box-with-bower-installed'
+  config.cache.enable :bower
+end
+```

docs/buckets/chef_rubygems.md

@@ -0,0 +1,18 @@
+# Chef RubyGems
+
+When a Chef installation is detected, this bucket caches its embedded gems.
+Most of these gems are part of the Chef omnibus package but sometimes cookbooks
+need to install extra gems to run within the context of a Chef recipe using the
+`chef_gem` resource.
+
+The embedded Chef gem location is returned by running the
+`/opt/chef/embedded/bin/gem env gemdir` command.
+
+To manually enable it:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = 'some-box-using-chef-provisioner'
+  config.cache.enable :chef_gem
+end
+```

docs/buckets/composer.md

@@ -1,7 +1,7 @@
 # [Composer](http://getcomposer.org/)
 
 Compatible with probably any type of linux guest distro, will cache guests'
-`$HOME/.composer` if PHP is detected.
+`$HOME/.composer/cache` if PHP is detected.
 
 To manually enable it:
 

docs/buckets/dnf.md

@@ -0,0 +1,20 @@
+# DNF
+
+Used by Fedora guests, will get configured under guest's `/var/cache/dnf`. It will
+also [make sure](lib/vagrant-cachier/bucket/dnf.rb#L20) that `keepcache` is set to
+`1` on guest's `/etc/dnf/dnf.conf`.
+
+To manually enable it:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = 'some-fedora-box'
+  config.cache.enable :dnf
+end
+```
+
+### :warning: Notice about Windows hosts :warning:
+
+In case this bucket is enabled and a Windows host is in use, you might see an
+ugly stacktrace as described on [this comment](https://github.com/fgrehm/vagrant-cachier/issues/117#issuecomment-50548393)
+if some DNF repository is not available during provisioning.

docs/buckets/generic.md

@@ -0,0 +1,46 @@
+# Generic
+
+This bucket is never enabled by default. You have to enable it explicitly like
+this:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.cache.enable :generic, { :cache_dir => "/var/cache/some" }
+end
+```
+
+The `:cache_dir` parameter is required. It specifies the directory on the guest
+that will be cached under the "/tmp/vagrant-cache/generic" bucket.
+
+You may enable more than one generic bucket by giving them different names,
+like this:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.cache.enable :generic, {
+    "one" => { cache_dir: "/var/cache/one" },
+    "two" => { cache_dir: "/var/cache/two" },
+  }
+end
+```
+
+In this case you get two buckets called "one" and "two" under the guest's
+`/tmp/vagrant-cache` directory.
+
+The Generic bucket is useful if you want to implement a caching mechanism by
+hand. For instance, if you want to cache your wget downloads under
+`/var/cache/wget` you can do this:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.cache.enable :generic, {
+    "wget" => { cache_dir: "/var/cache/wget" },
+  }
+end
+```
+
+Then, you invoke wget like this:
+
+```sh
+wget -N -P /var/cache/wget URL
+```

docs/buckets/pip.md

@@ -0,0 +1,15 @@
+# [pip](https://pip.pypa.io/)
+
+Compatible with probably any type of linux guest distro, will hook into pip's
+http and wheels cache directory under `$HOME/.cache/pip/http` and `$HOME/.cache/pip/wheels` as
+the default SSH user (usually `vagrant`) on your guest.
+
+To manually enable it:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = 'some-box-with-pip-installed'
+  config.cache.enable :pip
+end
+```
+

docs/buckets/yum.md

@@ -12,3 +12,9 @@ Vagrant.configure("2") do |config|
   config.cache.enable :yum
 end
 ```
+
+### :warning: Notice about Windows hosts :warning:
+
+In case this bucket is enabled and a Windows host is in use, you might see an
+ugly stacktrace as described on [this comment](https://github.com/fgrehm/vagrant-cachier/issues/117#issuecomment-50548393)
+if some Yum repository is not available during provisioning.

docs/how-does-it-work.md

@@ -11,7 +11,7 @@ Regarding configurations, right now the plugin does not make any assumptions for
 you and you have to configure things properly from your `Vagrantfile`. In other
 words, _the plugin is disabled by default_.
 
-Cache buckets will always be available from `/tmp/vagrant-cachier` on your guest and
+Cache buckets will always be available from `/tmp/vagrant-cache` on your guest and
 the appropriate folders will get symlinked to the right path _after_ the machine is
 up but _right before_ it gets provisioned. We _could_ potentially do it on one go
 and share bucket's folders directly to the right path if we were only using VirtualBox
@@ -20,12 +20,11 @@ _as part of_ the boot process (synced folders are actually `lxc-start` parameter
 and as of now we are not able to get some information that this plugin requires
 about the guest machine / container before it is actually up and running.
 
-Under the hood, the plugin will monkey patch `Vagrant::Builtin::Provision` and
+Under the hood, the plugin will hook into Vagrant in order to set things up for each
-will set things up for each configured cache bucket _before and after_ running each
+configured cache bucket _before and after_ running each defined provisioner. Before
-defined provisioner. Before halting the machine, it will also revert the changes
+halting the machine, it will also revert the changes required to set things up by
-required to set things up by hooking into calls to `Vagrant::Builtin::GracefulHalt`
+hooking into calls to `Vagrant::Builtin::GracefulHalt` so that you can repackage
-so that you can repackage the machine for others to use without requiring users to
+the machine for others to use without requiring users to install the plugin as well.
-install the plugin as well.
 
 Please keep in mind that this plugin won't do magic, if you are compiling things
 during provisioning or manually downloading packages outside of a bucket you

docs/index.md

@@ -9,7 +9,7 @@ multiple package managers and Linux distros.
 
 ## Installation
 
-Make sure you have Vagrant 1.2+ and run:
+Make sure you have Vagrant 1.4+ and run:
 
 ```
 vagrant plugin install vagrant-cachier
@@ -23,21 +23,40 @@ from within your `Vagrantfile`:
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.box = 'your-box'
-  config.cache.auto_detect = true
+  if Vagrant.has_plugin?("vagrant-cachier")
-  # If you are using VirtualBox, you might want to enable NFS for shared folders
+    # Configure cached packages to be shared between instances of the same base box.
-  # config.cache.enable_nfs  = true
+    # More info on the "Usage" link above
+    config.cache.scope = :box
+
+    # OPTIONAL: If you are using VirtualBox, you might want to use that to enable
+    # NFS for shared folders. This is also very useful for vagrant-libvirt if you
+    # want bi-directional sync
+    config.cache.synced_folder_opts = {
+      type: :nfs,
+      # The nolock option can be useful for an NFSv3 client that wants to avoid the
+      # NLM sideband protocol. Without this option, apt-get might hang if it tries
+      # to lock files needed for /var/cache/* operations. All of this can be avoided
+      # by using NFSv4 everywhere. Please note that the tcp option is not the default.
+      mount_options: ['rw', 'vers=3', 'tcp', 'nolock']
+    }
+  end
 end
 ```
 
 For more information please check out the links on the menu above.
 
 
-## Compatible providers
+## Providers that are known to work
 
 * Vagrant's built in VirtualBox provider
 * [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc)
 * [VMware providers](http://www.vagrantup.com/vmware) with NFS enabled (See
   [GH-24](https://github.com/fgrehm/vagrant-cachier/issues/24) for more info)
+* [vagrant-libvirt](https://github.com/pradels/vagrant-libvirt)
+* [vagrant-kvm](https://github.com/adrahon/vagrant-kvm)
+
+_Please note that as of v0.6.0 the plugin will automatically disable any
+previously defined configs for [cloud providers](lib/vagrant-cachier/plugin.rb#L19-22)_
 
 
 ## Contributing

docs/template.html

@@ -82,21 +82,30 @@
               <li class="dropdown">
                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">Available Buckets <span class="caret"></span></a>
                 <ul class="dropdown-menu">
+                  <li><a tabindex="-1" href="buckets/generic">Generic</a></li>
                   <li><a tabindex="-1" href="buckets/apt">APT</a></li>
+                  <li><a tabindex="-1" href="buckets/apt-lists">apt-lists</a></li>
                   <li><a tabindex="-1" href="buckets/apt-cacher">apt-cacher</a></li>
                   <li><a tabindex="-1" href="buckets/chef">Chef</a></li>
+                  <li><a tabindex="-1" href="buckets/chef_rubygems">Chef Gems</a></li>
                   <li><a tabindex="-1" href="buckets/composer">Composer</a></li>
+                  <li><a tabindex="-1" href="buckets/dnf">DNF</a></li>
+                  <li><a tabindex="-1" href="buckets/bower">Bower</a></li>
                   <li><a tabindex="-1" href="buckets/pacman">Pacman</a></li>
                   <li><a tabindex="-1" href="buckets/npm">npm</a></li>
                   <li><a tabindex="-1" href="buckets/rubygems">RubyGems</a></li>
                   <li><a tabindex="-1" href="buckets/rvm">rvm</a></li>
                   <li><a tabindex="-1" href="buckets/yum">Yum</a></li>
                   <li><a tabindex="-1" href="buckets/zypper">Zypper</a></li>
+                  <li><a tabindex="-1" href="buckets/pip">pip</a></li>
                 </ul>
               </li>
               <li>
                 <a href="development">Development</a>
               </li>
+              <li>
+                <li><a href="https://gitter.im/fgrehm/vagrant-cachier" target="_blank">Chat</li>
+              </li>
             </ul>
 
             <ul class="nav navbar-nav navbar-right visible-md visible-lg">

docs/usage.md

@@ -1,51 +1,46 @@
 # Usage
 
-## Auto detect supported cache buckets
+## Being nice to others
 
-This is the easiest way to get started with plugin. By adding the code below to
+It is a good practice to wrap plugin specific configuration with `has_plugin?` checks
-your `Vagrantfile` you can enable automatic detection of supported cache _buckets_:
+so the user's Vagrantfiles do not break if `vagrant-cachier` is uninstalled or
+the Vagrantfile is shared with people that don't have the plugin installed:
 
 ```ruby
 Vagrant.configure("2") do |config|
   # ...
-  config.cache.auto_detect = true
+  if Vagrant.has_plugin?("vagrant-cachier")
+    # ... vagrant-cachier configs ...
+  end
 end
 ```
 
-This will make vagrant-cachier do its best to find out what is supported on the
-guest machine and will set buckets accordingly.
-
-## Enable buckets as needed
-
-If for whatever reason you need to have a fined grained control over what buckets
-are configured, you can do so by "cherry picking" them on your `Vagrantfile`:
-
-```ruby
-Vagrant.configure("2") do |config|
-  config.cache.enable :apt
-  config.cache.enable :gem
-end
-```
-
-_Please refer to the "Available Buckets" menu above to find out which buckets
-are supported._
-
 ## Cache scope
 
-By default downloaded packages will get stored on a folder scoped to base boxes
+This is the only required configuration for the plugin to work and should be present
-under your `$HOME/.vagrant.d/cache`. The idea is to leverage the cache by allowing
+on your project's specific `Vagrantfile` or on your `~/.vagrant.d/Vagrantfile` in
-downloaded packages to be reused across projects. So, if your `Vagrantfile` has
+order to enable it.
-something like:
+
+### `:box` scope
+
+By setting `cache.scope` to `:box`, downloaded packages will get stored on a folder
+scoped to base boxes under your `~/.vagrant.d/cache`. The idea is to leverage the
+cache by allowing downloaded packages to be reused across projects. So, if your
+`Vagrantfile` has something like:
 
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.box = 'some-box'
-  config.cache.auto_detect = true
+  if Vagrant.has_plugin?("vagrant-cachier")
+    config.cache.scope = :box
+  end
 end
 ```
 
 The cached files will be stored under `$HOME/.vagrant.d/cache/some-box`.
 
+### `:machine` scope
+
 If you are on a [multi VM environment](http://docs.vagrantup.com/v2/multi-machine/index.html),
 there is a huge chance that you'll end up having issues by sharing the same bucket
 across different machines. For example, if you `apt-get install` from two machines
@@ -56,13 +51,71 @@ to be based on machines:
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.box = 'some-box'
-  config.cache.scope = :machine
+  if Vagrant.has_plugin?("vagrant-cachier")
+    config.cache.scope = :machine
+  end
 end
 ```
 
 This will tell vagrant-cachier to download packages to `.vagrant/machines/<machine-name>/cache`
 on your current project directory.
 
+## Cache buckets automatic detection
+
+This is the easiest way to get started with plugin and is enabled by default.
+Under the hood, `vagrant-cachier` does its best to find out what is supported on the
+guest machine and will set buckets accordingly.
+
+If you want that behavior to be disabled, you can set `cache.auto_detect` to `false`
+from your Vagrantfile:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = 'some-box'
+  if Vagrant.has_plugin?("vagrant-cachier")
+    config.cache.scope       = :machine # or :box
+    config.cache.auto_detect = false
+  end
+end
+```
+
+## Enable buckets as needed
+
+If for whatever reason you need to have a fined grained control over what buckets
+are configured, you can do so by "cherry picking" them on your `Vagrantfile`:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.cache.auto_detect = false
+  config.cache.enable :apt
+  config.cache.enable :gem
+end
+```
+
+_Please refer to the "Available Buckets" menu above to find out which buckets
+are supported._
+
+## Custom cache buckets synced folders options
+
+For fine grained control over the cache bucket synced folder options you can use
+the `synced_folder_opts` config. That's useful if, for example, you are using
+VirtualBox and want to enable NFS for improved performance:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.cache.synced_folder_opts = {
+    type: :nfs,
+    # The nolock option can be useful for an NFSv3 client that wants to avoid the
+    # NLM sideband protocol. Without this option, apt-get might hang if it tries
+    # to lock files needed for /var/cache/* operations. All of this can be avoided
+    # by using NFSv4 everywhere. Please note that the tcp option is not the default.
+    mount_options: ['rw', 'vers=3', 'tcp', 'nolock']
+  }
+end
+```
+
+Please referer to http://docs.vagrantup.com/v2/synced-folders/basic_usage.html for
+more information about the supported parameters.
 
 ## Finding out disk space used by buckets
 
@@ -95,5 +148,5 @@ the code below if you are on a Linux machine:
 $ rm -rf $HOME/.vagrant.d/cache/<box-name>/<optional-bucket-name>
 
 # scope = :machine
-$ rm -rf .vagrant/cache/<box-name>/<optional-bucket-name>
+$ rm -rf .vagrant/machines/<machine-name>/cache/<optional-bucket-name>
 ```

lib/vagrant-cachier/action/clean.rb

@@ -56,7 +56,7 @@ module VagrantPlugins
 
         def remove_symlink(symlink)
           if @machine.communicate.test("test -L #{symlink}")
-            @logger.debug "Removing symlink for '#{symlink}'"
+            @logger.info "Removing symlink for '#{symlink}'"
             @machine.communicate.sudo("unlink #{symlink}")
           end
         end

lib/vagrant-cachier/action/configure_bucket_root.rb

@@ -0,0 +1,67 @@
+require 'timeout'
+
+module VagrantPlugins
+  module Cachier
+    class Action
+      class ConfigureBucketRoot
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::cachier::action::clean")
+        end
+
+        def call(env)
+          @env = env
+
+          if !env[:cache_buckets_folder_configured] && env[:machine].config.cache.enabled?
+            setup_buckets_folder
+            env[:cache_buckets_folder_configured] = true
+          end
+
+          @app.call env
+        end
+
+        def setup_buckets_folder
+          FileUtils.mkdir_p(cache_root.to_s) unless 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[:cache_dirs] = []
+        end
+
+        def cache_root
+          @cache_root ||= case @env[:machine].config.cache.scope.to_sym
+            when :box
+              @box_name = box_name
+              # Box is optional with docker provider
+              if @box_name.nil? && @env[:machine].provider_name.to_sym == :docker
+                @image_name = image_name
+                # Use the image name if it's set
+                if @image_name
+                  bucket_name = @image_name.gsub(':', '-')
+                else
+                  raise "Cachier plugin only supported with docker provider when image is used"
+                end
+              else
+                bucket_name = @box_name
+              end
+              @env[:home_path].join('cache', bucket_name)
+            when :machine
+              @env[:machine].data_dir.parent.join('cache')
+            else
+              raise "Unknown cache scope: '#{@env[:machine].config.cache.scope}'"
+          end
+        end
+
+        def box_name
+          @env[:machine].config.vm.box
+        end
+
+        def image_name
+          @env[:machine].provider_config.image
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/action/ensure_single_cache_root.rb

@@ -1,64 +0,0 @@
-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.enabled? &&
-            @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

lib/vagrant-cachier/action/install_buckets.rb

@@ -0,0 +1,66 @@
+require_relative '../bucket'
+
+module VagrantPlugins
+  module Cachier
+    class Action
+      class InstallBuckets
+        def initialize(app, env, opts = {})
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::cachier::action::clean")
+          @opts   = opts
+        end
+
+        def call(env)
+          @app.call(env)
+
+          return unless env[:machine].config.cache.enabled?
+
+          chmod_bucket_root(env[:machine]) if @opts[:chmod]
+          configure_cache_buckets(env)
+        end
+
+        def chmod_bucket_root(machine)
+          machine.communicate.sudo 'mkdir -p /tmp/vagrant-cache'
+
+          # https://github.com/fgrehm/vagrant-cachier/issues/107
+          if ! smb_synced_folder_enabled?(machine)
+            @logger.info "'chmod'ing bucket root dir to 777..."
+            machine.communicate.sudo 'chmod 777 /tmp/vagrant-cache'
+          end
+        end
+
+        def configure_cache_buckets(env)
+          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|
+            @logger.info "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 smb_synced_folder_enabled?(machine)
+          synced_folder_opts = machine.config.cache.synced_folder_opts
+          synced_folder_opts ||= {}
+
+          # If smb was explicitly enabled
+          if synced_folder_opts[:type] && synced_folder_opts[:type].to_s == 'smb'
+            return true
+          elsif machine.provider_name.to_sym == :hyperv
+            # If the provider in use is hyperv, the default synced folder is 'smb'
+            # unless specified
+            return synced_folder_opts[:type] == nil
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/bucket.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
 
       def self.auto_detect(env)
         @buckets.each do |bucket|
-          if env[:machine].guest.capability?(bucket.capability)
+          if bucket.respond_to?(:capability) && env[:machine].guest.capability?(bucket.capability)
             env[:machine].config.cache.enable bucket.bucket_name
           end
         end
@@ -29,6 +29,60 @@ module VagrantPlugins
         @env     = env
         @configs = configs
       end
+
+      def machine
+        @env[:machine]
+      end
+
+      def guest
+        machine.guest
+      end
+
+      def comm
+        machine.communicate
+      end
+
+      # TODO: "merge" symlink and user_symlink methods
+      def symlink(guest_path, bucket_path = "/tmp/vagrant-cache/#{@name}")
+        return if @env[:cache_dirs].include?(guest_path)
+
+        @env[:cache_dirs] << guest_path
+        comm.execute("mkdir -p #{bucket_path}")
+        unless symlink?(guest_path)
+          comm.sudo("mkdir -p `dirname #{guest_path}`")
+          if empty_dir?(bucket_path) && !empty_dir?(guest_path)
+            # Warm up cache with guest machine data
+            comm.sudo("shopt -s dotglob && mv #{guest_path}/* #{bucket_path}")
+          end
+          comm.sudo("rm -rf #{guest_path}")
+          comm.sudo("ln -s #{bucket_path} #{guest_path}")
+        end
+      end
+
+      def user_symlink(guest_path)
+        return if @env[:cache_dirs].include?(guest_path)
+
+        @env[:cache_dirs] << guest_path
+        bucket_path = "/tmp/vagrant-cache/#{@name}"
+        comm.execute("mkdir -p #{bucket_path}")
+        unless symlink?(guest_path)
+          comm.execute("mkdir -p `dirname #{guest_path}`")
+          if empty_dir?(bucket_path) && !empty_dir?(guest_path)
+            # Warm up cache with guest machine data
+            comm.execute("shopt -s dotglob && mv #{guest_path}/* #{bucket_path}")
+          end
+          comm.execute("rm -rf #{guest_path}")
+          comm.execute("ln -s #{bucket_path} #{guest_path}")
+        end
+      end
+
+      def empty_dir?(path)
+        not comm.test("test \"$(ls -A #{path} 2>/dev/null)\"")
+      end
+
+      def symlink?(path)
+        comm.test("test -L #{path}")
+      end
     end
   end
 end
@@ -36,10 +90,16 @@ end
 require_relative "bucket/apt"
 require_relative "bucket/chef"
 require_relative "bucket/gem"
+require_relative "bucket/chef_gem"
 require_relative "bucket/pacman"
 require_relative "bucket/yum"
+require_relative "bucket/dnf"
 require_relative "bucket/rvm"
 require_relative "bucket/apt_cacher"
+require_relative "bucket/apt_lists"
 require_relative "bucket/composer"
+require_relative "bucket/bower"
 require_relative "bucket/npm"
 require_relative "bucket/zypper"
+require_relative "bucket/generic"
+require_relative "bucket/pip"

lib/vagrant-cachier/bucket/apt.rb

@@ -7,22 +7,13 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:apt_cache_dir)
             guest_path = guest.capability(:apt_cache_dir)
 
-            @env[:cache_dirs] << guest_path
+            return if @env[:cache_dirs].include?(guest_path)
 
-            machine.communicate.tap do |comm|
+            symlink(guest_path)
-              comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}/partial")
+            comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}/partial")
-              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: 'APT')
           end

lib/vagrant-cachier/bucket/apt_cacher.rb

@@ -9,24 +9,13 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:apt_cacher_dir)
             if guest_path = guest.capability(:apt_cacher_dir)
-              if machine.config.cache.enable_nfs
+              synced_folder_type = (machine.config.cache.synced_folder_opts || {})[:type]
-                @env[:cache_dirs] << guest_path
+              if synced_folder_type && synced_folder_type.to_sym == :nfs
-
+                symlink(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.nfs_required', bucket: 'apt-cacher')
+                @env[:ui].warn I18n.t('vagrant_cachier.nfs_required', bucket: 'apt-cacher')
               end
             end
           else

lib/vagrant-cachier/bucket/apt_lists.rb

@@ -0,0 +1,28 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class AptLists < Bucket
+        def self.capability
+          :apt_lists_dir
+        end
+
+        def install
+          # Apt lists bucket can't be used on windows hosts
+          #   https://github.com/fgrehm/vagrant-cachier/issues/106
+          return if Vagrant::Util::Platform.windows?
+
+          if guest.capability?(:apt_lists_dir)
+            guest_path = guest.capability(:apt_lists_dir)
+
+            return if @env[:cache_dirs].include?(guest_path)
+
+            symlink(guest_path)
+            comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}/partial")
+          else
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'apt-lists')
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/bucket/bower.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class Bower < Bucket
+        def self.capability
+          :bower_path
+        end
+
+        def install
+          if guest.capability?(:bower_path)
+            if bower_path = guest.capability(:bower_path)
+              user_symlink(bower_path)
+            end
+          else
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Bower')
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/bucket/chef.rb

@@ -7,22 +7,9 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:chef_file_cache_path)
             guest_path = guest.capability(:chef_file_cache_path)
-
+            symlink(guest_path) if guest_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

lib/vagrant-cachier/bucket/chef_gem.rb

@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class ChefGem < Bucket
+        def self.capability
+          :chef_gemdir
+        end
+
+        def install
+          if guest.capability?(:chef_gemdir)
+            if gemdir_path = guest.capability(:chef_gemdir)
+              prefix         = gemdir_path.split('/').last
+              bucket_path    = "/tmp/vagrant-cache/#{@name}/#{prefix}"
+              gem_cache_path = "#{gemdir_path}/cache"
+
+              symlink(gem_cache_path, bucket_path)
+            end
+          else
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'ChefRubyGems')
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/bucket/composer.rb

@@ -7,22 +7,9 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:composer_path)
             if composer_path = guest.capability(:composer_path)
-              bucket_path = "/tmp/vagrant-cache/#{@name}"
+              user_symlink(composer_path)
-              @env[:cache_dirs] << composer_path
-
-              machine.communicate.tap do |comm|
-                comm.execute("mkdir -p #{bucket_path}")
-
-                unless comm.test("test -L #{composer_path}")
-                  comm.sudo("rm -rf #{composer_path}")
-                  comm.sudo("ln -s #{bucket_path} #{composer_path}")
-               end
-              end
             end
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Composer')

lib/vagrant-cachier/bucket/dnf.rb

@@ -0,0 +1,27 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class Dnf < Bucket
+        def self.capability
+          :dnf_cache_dir
+        end
+
+        def install
+          if guest.capability?(:dnf_cache_dir)
+            if guest_path = guest.capability(:dnf_cache_dir)
+              return if @env[:cache_dirs].include?(guest_path)
+
+              # Ensure caching is enabled
+              comm.sudo("sed -i '/keepcache=/d' /etc/dnf/dnf.conf")
+              comm.sudo("sed -i '/^[main]/a keepcache=1' /etc/dnf/dnf.conf")
+
+              symlink(guest_path)
+            end
+          else
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'DNF')
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/bucket/gem.rb

@@ -7,26 +7,13 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:gemdir)
             if gemdir_path = guest.capability(:gemdir)
-              prefix      = gemdir_path.split('/').last
+              prefix         = gemdir_path.split('/').last
-              bucket_path = "/tmp/vagrant-cache/#{@name}/#{prefix}"
+              bucket_path    = "/tmp/vagrant-cache/#{@name}/#{prefix}"
-              machine.communicate.tap do |comm|
+              gem_cache_path = "#{gemdir_path}/cache"
-                comm.execute("mkdir -p #{bucket_path}")
 
-                gem_cache_path = "#{gemdir_path}/cache"
+              symlink(gem_cache_path, bucket_path)
-
-                @env[:cache_dirs] << gem_cache_path
-
-                unless comm.test("test -L #{gem_cache_path}")
-                  comm.sudo("rm -rf #{gem_cache_path}")
-                  comm.sudo("mkdir -p `dirname #{gem_cache_path}`")
-                  comm.sudo("ln -s #{bucket_path} #{gem_cache_path}")
-                end
-              end
             end
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RubyGems')

lib/vagrant-cachier/bucket/generic.rb

@@ -0,0 +1,26 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class Generic < Bucket
+        def install
+
+          # First we normalize the @configs hash as a hash of hashes
+          if @configs.has_key?(:cache_dir)
+            @configs = { @name => @configs }
+          end
+
+          # Now we iterate through all generic buckets's configurations and
+          # set them up.
+          @configs.each do |key, conf|
+            if conf.has_key?(:cache_dir)
+              symlink(conf[:cache_dir], "/tmp/vagrant-cache/#{key}")
+            else
+              @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: "Generic[#{key}]")
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/bucket/npm.rb

@@ -7,22 +7,9 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:npm_cache_dir)
             guest_path = guest.capability(:npm_cache_dir)
-
+            user_symlink(guest_path) if guest_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.execute("rm -rf #{guest_path}")
-                comm.execute("mkdir -p `dirname #{guest_path}`")
-                comm.execute("ln -s /tmp/vagrant-cache/#{@name} #{guest_path}")
-              end
-            end
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'npm')
           end

lib/vagrant-cachier/bucket/pacman.rb

@@ -7,22 +7,9 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:pacman_cache_dir)
             guest_path = guest.capability(:pacman_cache_dir)
-
+            symlink(guest_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: 'Pacman')
           end

lib/vagrant-cachier/bucket/pip.rb

@@ -0,0 +1,22 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class Pip < Bucket
+        def self.capability
+          :pip_cache_dir
+        end
+
+        def install
+          if guest.capability?(:pip_cache_dir)
+            if guest_path = guest.capability(:pip_cache_dir)
+              symlink("#{guest_path}/http", "/tmp/vagrant-cache/#{@name}/http")
+              symlink("#{guest_path}/wheels", "/tmp/vagrant-cache/#{@name}/wheels")
+            end
+          else
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'pip')
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/bucket/rvm.rb

@@ -7,26 +7,13 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:rvm_path)
             if rvm_path = guest.capability(:rvm_path)
-              prefix      = rvm_path.split('/').last
+              prefix         = rvm_path.split('/').last
-              bucket_path = "/tmp/vagrant-cache/#{@name}/#{prefix}"
+              bucket_path    = "/tmp/vagrant-cache/#{@name}/#{prefix}"
-              machine.communicate.tap do |comm|
+              rvm_cache_path = "#{rvm_path}/archives"
-                comm.execute("mkdir -p #{bucket_path}")
 
-                rvm_cache_path = "#{rvm_path}/archives"
+              symlink(rvm_cache_path, bucket_path)
-
-                @env[:cache_dirs] << rvm_cache_path
-
-                unless comm.test("test -L #{rvm_cache_path}")
-                  comm.sudo("rm -rf #{rvm_cache_path}")
-                  comm.sudo("mkdir -p `dirname #{rvm_cache_path}`")
-                  comm.sudo("ln -s #{bucket_path} #{rvm_cache_path}")
-                end
-              end
             end
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RVM')

lib/vagrant-cachier/bucket/yum.rb

@@ -7,24 +7,14 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:yum_cache_dir)
-            guest_path = guest.capability(:yum_cache_dir)
+            if guest_path = guest.capability(:yum_cache_dir)
+              return if @env[:cache_dirs].include?(guest_path)
 
-            @env[:cache_dirs] << guest_path
-
-            machine.communicate.tap do |comm|
               # Ensure caching is enabled
               comm.sudo("sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf")
 
-              comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}")
+              symlink(guest_path)
-              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: 'Yum')

lib/vagrant-cachier/bucket/zypper.rb

@@ -7,25 +7,14 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:zypper_cache_dir)
             guest_path = guest.capability(:zypper_cache_dir)
+            return if @env[:cache_dirs].include?(guest_path)
 
-            @env[:cache_dirs] << guest_path
+            # Ensure caching is enabled
+            comm.sudo("zypper modifyrepo --keep-packages --all")
 
-            machine.communicate.tap do |comm|
+            symlink(guest_path)
-              # Ensure caching is enabled
-              comm.sudo("zypper modifyrepo --keep-packages --all")
-
-              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: 'Zypper')
           end

lib/vagrant-cachier/cap/arch/pacman_cache_dir.rb

@@ -4,7 +4,6 @@ module VagrantPlugins
       module Arch
         module PacmanCacheDir
           def self.pacman_cache_dir(machine)
-            # TODO: Find out if there is a config file we can read from
             '/var/cache/pacman/pkg'
           end
         end

lib/vagrant-cachier/cap/debian/apt_cache_dir.rb

@@ -4,7 +4,6 @@ module VagrantPlugins
       module Debian
         module AptCacheDir
           def self.apt_cache_dir(machine)
-            # TODO: Find out if there is a config file we can read from
             '/var/cache/apt/archives'
           end
         end

lib/vagrant-cachier/cap/debian/apt_lists_dir.rb

@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module Cachier
+    module Cap
+      module Debian
+        module AptListsDir
+          def self.apt_lists_dir(machine)
+            '/var/lib/apt/lists'
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/cap/linux/bower_path.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Cachier
+    module Cap
+      module Linux
+        module BowerPath
+          def self.bower_path(machine)
+            bower_path = nil
+            machine.communicate.tap do |comm|
+              return unless comm.test('which bower')
+              comm.execute 'echo $HOME' do |buffer, output|
+                bower_path = output.chomp if buffer == :stdout
+              end
+            end
+            return "#{bower_path}/.cache/bower"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,8 +5,8 @@ module VagrantPlugins
         module ChefFileCachePath
           def self.chef_provisioner?(machine)
             provisioners = machine.config.vm.provisioners
-            chef_provisioners = [:chef_solo, :chef_client]
+            chef_provisioners = [:chef_solo, :chef_client, :chef_zero]
-            compat_provisioners = provisioners.keep_if { |p| chef_provisioners.include? p.name }
+            compat_provisioners = provisioners.select { |p| chef_provisioners.include? p.name || p.type }
 
             if compat_provisioners.size > 1
               raise "One machine is using multiple chef provisioners, which is unsupported."
@@ -19,7 +19,6 @@ module VagrantPlugins
 
           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

lib/vagrant-cachier/cap/linux/chef_gemdir.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Cachier
+    module Cap
+      module Linux
+        module ChefGemdir
+          def self.chef_gemdir(machine)
+            gemdir = nil
+            machine.communicate.tap do |comm|
+              return unless comm.test('test -f /opt/chef/embedded/bin/gem')
+              comm.execute '/opt/chef/embedded/bin/gem env gemdir' do |buffer, output|
+                gemdir = output.chomp if buffer == :stdout
+              end
+            end
+            return gemdir
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/cap/linux/composer_path.rb

@@ -7,11 +7,14 @@ module VagrantPlugins
             composer_path = nil
             machine.communicate.tap do |comm|
               return unless comm.test('which php')
+              # on some VMs an extra new line seems to come out, so we loop over
+              # the output just in case
+              composer_path = ''
               comm.execute 'echo $HOME' do |buffer, output|
-                composer_path = output.chomp if buffer == :stdout
+                composer_path += output.chomp if buffer == :stdout
               end
             end
-            return "#{composer_path}/.composer"
+            return "#{composer_path}/.composer/cache"
           end
         end
       end

lib/vagrant-cachier/cap/linux/pip_cache_dir.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Cachier
+    module Cap
+      module Linux
+        module PipCacheDir
+          def self.pip_cache_dir(machine)
+            pip_cache_dir = nil
+            machine.communicate.tap do |comm|
+              return unless comm.test('which pip')
+              comm.execute 'echo $HOME' do |buffer, output|
+                pip_cache_dir = output.chomp if buffer == :stdout
+              end
+            end
+            return "#{pip_cache_dir}/.cache/pip"
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/cap/redhat/dnf_cache_dir.rb

@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module Cachier
+    module Cap
+      module RedHat
+        module DnfCacheDir
+          def self.dnf_cache_dir(machine)
+            dnf_cache_dir = nil
+            machine.communicate.tap do |comm|
+              return unless comm.test('which dnf')
+              dnf_cache_dir = '/var/cache/dnf'
+            end
+            return dnf_cache_dir
+          end
+        end
+      end
+    end
+  end
+end

lib/vagrant-cachier/cap/redhat/yum_cache_dir.rb

@@ -4,8 +4,13 @@ module VagrantPlugins
       module RedHat
         module YumCacheDir
           def self.yum_cache_dir(machine)
-            # TODO: Find out if there is a config file we can read from
+            yum_cache_dir = nil
-            '/var/cache/yum'
+            machine.communicate.tap do |comm|
+              # In case yum is only forwarding to dnf do not cache
+              return unless not comm.test('yum --version 2>&1 | grep /usr/bin/dnf')
+              yum_cache_dir = '/var/cache/yum'
+            end
+            return yum_cache_dir
           end
         end
       end

lib/vagrant-cachier/cap/suse/zypper_cache_dir.rb

@@ -4,7 +4,6 @@ module VagrantPlugins
       module SuSE
         module ZypperCacheDir
           def self.zypper_cache_dir(machine)
-            # TODO: Find out if there is a config file we can read from
             '/var/cache/zypp/packages'
           end
         end

lib/vagrant-cachier/capabilities.rb

@@ -0,0 +1,84 @@
+module VagrantPlugins
+  module Cachier
+    class Plugin < Vagrant.plugin('2')
+      guest_capability 'linux', 'gemdir' do
+        require_relative 'cap/linux/gemdir'
+        Cap::Linux::Gemdir
+      end
+
+      guest_capability 'linux', 'chef_gemdir' do
+        require_relative 'cap/linux/chef_gemdir'
+        Cap::Linux::ChefGemdir
+      end
+
+      guest_capability 'linux', 'rvm_path' do
+        require_relative 'cap/linux/rvm_path'
+        Cap::Linux::RvmPath
+      end
+
+      guest_capability 'linux', 'composer_path' do
+        require_relative 'cap/linux/composer_path'
+        Cap::Linux::ComposerPath
+      end
+
+      guest_capability 'linux', 'bower_path' do
+        require_relative 'cap/linux/bower_path'
+        Cap::Linux::BowerPath
+      end
+
+      guest_capability 'linux', 'chef_file_cache_path' do
+        require_relative 'cap/linux/chef_file_cache_path'
+        Cap::Linux::ChefFileCachePath
+      end
+
+      guest_capability 'linux', 'npm_cache_dir' do
+        require_relative 'cap/linux/npm_cache_dir'
+        Cap::Linux::NpmCacheDir
+      end
+
+      guest_capability 'linux', 'pip_cache_dir' do
+        require_relative 'cap/linux/pip_cache_dir'
+        Cap::Linux::PipCacheDir
+      end
+      
+      guest_capability 'debian', 'apt_cache_dir' do
+        require_relative 'cap/debian/apt_cache_dir'
+        Cap::Debian::AptCacheDir
+      end
+
+      guest_capability 'debian', 'apt_cacher_dir' do
+        require_relative 'cap/debian/apt_cacher_dir'
+        Cap::Debian::AptCacherDir
+      end
+
+      guest_capability 'debian', 'apt_lists_dir' do
+        require_relative 'cap/debian/apt_lists_dir'
+        Cap::Debian::AptListsDir
+      end
+
+      guest_capability 'redhat', 'yum_cache_dir' do
+        require_relative 'cap/redhat/yum_cache_dir'
+        Cap::RedHat::YumCacheDir
+      end
+
+      guest_capability 'redhat', 'dnf_cache_dir' do
+        require_relative 'cap/redhat/dnf_cache_dir'
+        Cap::RedHat::DnfCacheDir
+      end
+
+      guest_capability 'suse', 'yum_cache_dir' do
+        # Disable Yum on suse guests
+      end
+
+      guest_capability 'arch', 'pacman_cache_dir' do
+        require_relative 'cap/arch/pacman_cache_dir'
+        Cap::Arch::PacmanCacheDir
+      end
+
+      guest_capability 'suse', 'zypper_cache_dir' do
+        require_relative 'cap/suse/zypper_cache_dir'
+        Cap::SuSE::ZypperCacheDir
+      end
+    end
+  end
+end

lib/vagrant-cachier/config.rb

@@ -1,15 +1,16 @@
 module VagrantPlugins
   module Cachier
     class Config < Vagrant.plugin(2, :config)
-      attr_accessor :scope, :auto_detect, :enable_nfs
+      attr_accessor :scope, :auto_detect, :synced_folder_opts
       attr_reader   :buckets
 
       ALLOWED_SCOPES = %w( box machine )
 
       def initialize
-        @scope       = UNSET_VALUE
+        @scope = UNSET_VALUE
         @auto_detect = UNSET_VALUE
-        @enable_nfs  = UNSET_VALUE
+        @synced_folder_opts = UNSET_VALUE
+        @ui = Vagrant::UI::Colored.new
       end
 
       def enable(bucket, opts = {})
@@ -19,6 +20,12 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
 
+        if enabled? && backed_by_cloud_provider?(machine)
+          machine.ui.warn(I18n.t('vagrant_cachier.backed_by_cloud_provider',
+                                 provider: machine.provider_name))
+          disable!
+        end
+
         if enabled? && ! ALLOWED_SCOPES.include?(@scope.to_s)
           errors << I18n.t('vagrant_cachier.unknown_cache_scope',
                             allowed:     ALLOWED_SCOPES.inspect,
@@ -28,18 +35,28 @@ module VagrantPlugins
         { "vagrant cachier" => errors }
       end
 
+      def enabled?
+        return @enabled unless @enabled.nil?
+
+        @enabled = @scope != UNSET_VALUE
+      end
+
+      def disable!
+        @enabled = false
+      end
+
       def finalize!
         return unless enabled?
 
-        @scope       = :box  if @scope == UNSET_VALUE
+        @auto_detect = true if @auto_detect == UNSET_VALUE
-        @auto_detect = false if @auto_detect == UNSET_VALUE
+        @synced_folder_opts = nil if @synced_folder_opts == UNSET_VALUE
-        @enable_nfs  = false if @enable_nfs == UNSET_VALUE
+        @buckets = @buckets ? @buckets.dup : {}
-        @buckets     = @buckets ? @buckets.dup : {}
       end
 
-      def enabled?
+      private
-        @enabled ||= @auto_detect != UNSET_VALUE ||
+
-                     @buckets != nil
+      def backed_by_cloud_provider?(machine)
+        CLOUD_PROVIDERS.include?(machine.provider_name.to_s)
       end
     end
   end

lib/vagrant-cachier/errors.rb

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

lib/vagrant-cachier/hooks.rb

@@ -0,0 +1,27 @@
+module VagrantPlugins
+  module Cachier
+    class Plugin < Vagrant.plugin('2')
+      action_hook VagrantPlugins::Cachier::Plugin::ALL_ACTIONS do |hook|
+        require_relative 'action/configure_bucket_root'
+        require_relative 'action/install_buckets'
+
+        hook.before Vagrant::Action::Builtin::Provision, Action::ConfigureBucketRoot
+        # This will do the initial buckets installation
+        hook.after Vagrant::Action::Builtin::Provision, Action::InstallBuckets, chmod: true
+      end
+
+      # This ensure buckets are reconfigured after provisioners runs
+      action_hook :provisioner_run do |hook|
+        require_relative 'action/install_buckets'
+        hook.after :run_provisioner, Action::InstallBuckets
+      end
+
+      clean_action_hook = lambda do |hook|
+        require_relative 'action/clean'
+        hook.before Vagrant::Action::Builtin::GracefulHalt, Action::Clean
+      end
+      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

lib/vagrant-cachier/plugin.rb

@@ -1,6 +1,5 @@
-require_relative 'provision_ext'
+unless Gem::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(Vagrant::VERSION))
-Vagrant::Action::Builtin::Provision.class_eval do
+  raise 'vagrant-cachier requires Vagrant >= 1.4.0 in order to work!'
-  include VagrantPlugins::Cachier::ProvisionExt
 end
 
 # Add our custom translations to the load path
@@ -10,87 +9,19 @@ module VagrantPlugins
   module Cachier
     class Plugin < Vagrant.plugin('2')
       name 'vagrant-cachier'
-
       config 'cache' do
         require_relative "config"
         Config
       end
-
-      guest_capability 'linux', 'gemdir' do
-        require_relative 'cap/linux/gemdir'
-        Cap::Linux::Gemdir
-      end
-
-      guest_capability 'linux', 'rvm_path' do
-        require_relative 'cap/linux/rvm_path'
-        Cap::Linux::RvmPath
-      end
-
-      guest_capability 'linux', 'composer_path' do
-        require_relative 'cap/linux/composer_path'
-        Cap::Linux::ComposerPath
-      end
-
-      guest_capability 'linux', 'chef_file_cache_path' do
-        require_relative 'cap/linux/chef_file_cache_path'
-        Cap::Linux::ChefFileCachePath
-      end
-
-      guest_capability 'linux', 'npm_cache_dir' do
-        require_relative 'cap/linux/npm_cache_dir'
-        Cap::Linux::NpmCacheDir
-      end
-
-      guest_capability 'debian', 'apt_cache_dir' do
-        require_relative 'cap/debian/apt_cache_dir'
-        Cap::Debian::AptCacheDir
-      end
-
-      guest_capability 'debian', 'apt_cacher_dir' do
-        require_relative 'cap/debian/apt_cacher_dir'
-        Cap::Debian::AptCacherDir
-      end
-
-      guest_capability 'redhat', 'yum_cache_dir' do
-        require_relative 'cap/redhat/yum_cache_dir'
-        Cap::RedHat::YumCacheDir
-      end
-
-      guest_capability 'suse', 'yum_cache_dir' do
-        # Disable Yum on suse guests
-      end
-
-      guest_capability 'arch', 'pacman_cache_dir' do
-        require_relative 'cap/arch/pacman_cache_dir'
-        Cap::Arch::PacmanCacheDir
-      end
-
-      guest_capability 'suse', 'zypper_cache_dir' do
-        require_relative 'cap/suse/zypper_cache_dir'
-        Cap::SuSE::ZypperCacheDir
-      end
-
-      # 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 '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/clean'
-        hook.before Vagrant::Action::Builtin::GracefulHalt, Action::Clean
-      end
-      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
+
+    # Keep an eye on https://github.com/mitchellh/vagrant/wiki/Available-Vagrant-Plugins#wiki-providers
+    # for more.
+    CLOUD_PROVIDERS = %w( aws cloudstack digitalocean hp joyent openstack rackspace
+                          softlayer proxmox managed azure brightbox cloudstack vcloud
+                          vsphere )
   end
 end
+
+require_relative "hooks"
+require_relative "capabilities"

lib/vagrant-cachier/provision_ext.rb

@@ -1,74 +0,0 @@
-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)
-            @env = env
-
-            return old_call(env) unless env[:machine].config.cache.enabled?
-
-            FileUtils.mkdir_p(cache_root.to_s) unless cache_root.exist?
-
-            synced_folder_opts = {id: "vagrant-cache"}
-            if env[:machine].config.cache.enable_nfs
-              # REFACTOR: Drop the `nfs: true` argument once we drop support for Vagrant < 1.4
-              synced_folder_opts.merge!({ nfs: true, type: 'nfs' })
-            end
-            env[:machine].config.vm.synced_folder cache_root, '/tmp/vagrant-cache', synced_folder_opts
-
-            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
-            return unless @env[:machine].config.cache.enabled?
-
-            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

lib/vagrant-cachier/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cachier
-    VERSION = "0.5.1"
+    VERSION = "1.2.1"
   end
 end

locales/en.yml

@@ -8,18 +8,9 @@ en:
       Unknown cache scope '%{cache_scope}' (allowed scopes: %{allowed})
     nfs_required: |-
       The '%{bucket}' cache bucket requires NFS to be enabled, please add
-      `config.cache.enable_nfs = true` to your Vagrantfile.
+      `config.cache.synced_folder_opts = {type: :nfs}` to your Vagrantfile.
-    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.
     unable_to_ssh: |-
       vagrant-cachier was unable to SSH into the VM to remove symlinks!
-  vagrant:
+    backed_by_cloud_provider: |-
-    errors:
+      The machine is backed by a cloud provider (%{provider}), caching
-      multiple_provider_specific_cache_dirs_found: |-
+      will be disabled.
-        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.

spec/acceptance/fixtures/auto-detect-with-provisioning.rb

@@ -1,10 +1,14 @@
-Vagrant.require_plugin 'vagrant-cachier'
-Vagrant.require_plugin 'vagrant-lxc'
 Vagrant.configure("2") do |config|
+  config.vm.provider :virtualbox do |_, override|
+    override.vm.box = "chef/ubuntu-14.04"
+  end
+
+  config.vm.provider :lxc do |_, override|
+    override.vm.box = "fgrehm/trusty64-lxc"
+  end
+
   config.cache.auto_detect = true
   config.cache.scope = :machine
 
-  config.vm.box = 'precise64'
-  config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
   config.vm.provision :shell, inline: 'apt-get update && apt-get install -y git'
 end

spec/acceptance/fixtures/auto-detect.rb

@@ -1,8 +1,12 @@
-Vagrant.require_plugin 'vagrant-cachier'
-Vagrant.require_plugin 'vagrant-lxc'
 Vagrant.configure("2") do |config|
+  config.vm.provider :virtualbox do |_, override|
+    override.vm.box = "chef/ubuntu-14.04"
+  end
+  config.vm.provider :lxc do |_, override|
+    override.vm.box = "fgrehm/trusty64-lxc"
+  end
+
   config.cache.auto_detect = true
-  config.vm.box = 'precise64'
+
-  config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
   config.vm.provision :shell, inline: 'echo Hello!'
 end

spec/acceptance/fixtures/no-cachier-simple.rb

@@ -1,6 +1,8 @@
-Vagrant.require_plugin 'vagrant-cachier'
-Vagrant.require_plugin 'vagrant-lxc'
 Vagrant.configure("2") do |config|
-  config.vm.box = 'precise64'
+  config.vm.provider :virtualbox do |_, override|
-  config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
+    override.vm.box = "chef/ubuntu-14.04"
+  end
+  config.vm.provider :lxc do |_, override|
+    override.vm.box = "fgrehm/trusty64-lxc"
+  end
 end

spec/acceptance/fixtures/no-cachier-with-provisioning.rb

@@ -1,7 +1,10 @@
-Vagrant.require_plugin 'vagrant-cachier'
-Vagrant.require_plugin 'vagrant-lxc'
 Vagrant.configure("2") do |config|
-  config.vm.box = 'precise64'
+  config.vm.provider :virtualbox do |_, override|
-  config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
+    override.vm.box = "chef/ubuntu-14.04"
+  end
+  config.vm.provider :lxc do |_, override|
+    override.vm.box = "fgrehm/trusty64-lxc"
+  end
+
   config.vm.provision :shell, inline: 'echo Hello!'
 end

vagrant-cachier.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = VagrantPlugins::Cachier::VERSION
   spec.authors       = ["Fabio Rehm"]
   spec.email         = ["fgrehm@gmail.com"]
-  spec.description   = %q{Speed up vagrant boxes provisioning}
+  spec.description   = %q{Caffeine reducer}
   spec.summary       = spec.description
   spec.homepage      = "https://github.com/fgrehm/vagrant-cachier"
   spec.license       = "MIT"