Compare commits

..

No commits in common. "master" and "v0.5.1" have entirely different histories.

66 changed files with 648 additions and 1291 deletions

1
.gitignore vendored
View file

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

View file

@ -1,144 +1,3 @@
## [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) ## [0.5.1](https://github.com/fgrehm/vagrant-cachier/compare/v0.5.0...v0.5.1) (Dec 20, 2013)
BUG FIXES: BUG FIXES:

13
Gemfile
View file

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

View file

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

View file

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

View file

@ -1,22 +1,15 @@
🟢 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 # 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 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 coffee you drink while waiting for boxes to be provisioned by sharing a common
package cache among similar VM instances. Kinda like [vagrant-apt_cache](https://github.com/avit/vagrant-apt_cache) package cache among similiar 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 targeting or [this magical snippet](http://gist.github.com/juanje/3797297) but targetting
multiple package managers and Linux distros. multiple package managers and Linux distros.
## Installation ## Installation
Make sure you have Vagrant 1.4+ and run: Make sure you have Vagrant 1.2+ and run:
``` ```
vagrant plugin install vagrant-cachier vagrant plugin install vagrant-cachier
@ -24,27 +17,15 @@ vagrant plugin install vagrant-cachier
## Quick start ## 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 ```ruby
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = 'your-box' config.vm.box = 'your-box'
if Vagrant.has_plugin?("vagrant-cachier") config.cache.auto_detect = true
# Configure cached packages to be shared between instances of the same base box. # If you are using VirtualBox, you might want to enable NFS for shared folders
# More info on http://fgrehm.viewdocs.io/vagrant-cachier/usage # config.cache.enable_nfs = true
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 end
``` ```
@ -52,19 +33,12 @@ For more information please read the documentation available at
http://fgrehm.viewdocs.io/vagrant-cachier. http://fgrehm.viewdocs.io/vagrant-cachier.
## Providers that are known to work ## Compatible providers
* Vagrant's built in VirtualBox and Docker providers * Vagrant's built in VirtualBox provider
* [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc) * [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc)
* [VMware providers](http://www.vagrantup.com/vmware) with NFS enabled (See * [VMware providers](http://www.vagrantup.com/vmware) with NFS enabled (See
[GH-24](https://github.com/fgrehm/vagrant-cachier/issues/24) for more info) [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 ## Contributing
@ -74,3 +48,5 @@ previously defined configs for [cloud providers](lib/vagrant-cachier/plugin.rb#L
3. Commit your changes (`git commit -am 'Add some feature'`) 3. Commit your changes (`git commit -am 'Add some feature'`)
4. Push to the branch (`git push origin my-new-feature`) 4. Push to the branch (`git push origin my-new-feature`)
5. Create new Pull Request 5. Create new Pull Request
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/fgrehm/vagrant-cachier/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

View file

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

View file

@ -1,45 +1,46 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=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| Vagrant.configure("2") do |config|
config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root' config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root'
config.cache.scope = :machine config.cache.scope = :machine
config.cache.auto_detect = true config.cache.auto_detect = true
config.cache.synced_folder_opts = { type: :nfs } config.cache.enable_nfs = true
config.vm.provider :virtualbox do |vb| config.omnibus.chef_version = :latest
vb.customize [ "modifyvm", :id, "--memory", 256, "--cpus", "1" ] config.vm.provision :chef_solo do |chef|
chef.add_recipe "java::oracle"
chef.json = {
:java => {
:oracle => {
:accept_oracle_download_terms => true
}
}
}
end end
config.vm.provider :lxc do |lxc|
lxc.customize 'aa_profile', 'unconfined'
end
configure_private_network = lambda do |node, suffix|
node.vm.network :private_network, ip: "192.168.50.#{suffix}"
end
initial_debian_setup = lambda do |debian, git_pkg = 'git'|
debian.vm.provision :shell, inline: "apt-get update && apt-get install -y #{git_pkg} php5-cli curl wget htop"
end
install_nvm_and_rvm = lambda do |node|
# Installs RVM # Installs RVM
node.vm.provision :shell, inline: ' config.vm.provision :shell, inline: '
if ! [ -d /home/vagrant/.rvm ]; then if ! [ -d /home/vagrant/.rvm ]; then
HOME=/home/vagrant su -p vagrant -l -c "curl -L https://get.rvm.io | bash -s stable" HOME=/home/vagrant su -p vagrant -l -c "curl -L https://get.rvm.io | bash -s stable"
fi fi
' '
# Here we have the RVM cache bucket configured, so we install 2.0.0 # Here we have the RVM cache bucket configured, so we install 2.0.0
node.vm.provision :shell, inline: ' config.vm.provision :shell, inline: '
if ! [ -d /home/vagrant/.rvm/rubies/ruby-2.0.0* ]; then if ! [ -d /home/vagrant/.rvm/rubies/ruby-1.9.3* ]; then
HOME=/home/vagrant su -p vagrant -l -c "rvm install 2.0.0 && rvm use 2.0.0 --default" HOME=/home/vagrant su -p vagrant -l -c "rvm install 1.9.3 && rvm use 1.9.3 --default"
fi fi
' '
node.vm.provision :shell, inline: ' config.vm.provision :shell, inline: '
if ! [ -d /home/vagrant/.nvm ]; then if ! [ -d /home/vagrant/.nvm ]; then
apt-get install git -y apt-get install git -y
HOME=/home/vagrant su -p vagrant -l -c " HOME=/home/vagrant su -p vagrant -l -c "
@ -48,7 +49,7 @@ Vagrant.configure("2") do |config|
fi fi
' '
node.vm.provision :shell, inline: ' config.vm.provision :shell, inline: '
if ! [ -d /home/vagrant/.nvm/v0.10* ]; then if ! [ -d /home/vagrant/.nvm/v0.10* ]; then
HOME=/home/vagrant su -p vagrant -l -c " HOME=/home/vagrant su -p vagrant -l -c "
nvm install 0.10 nvm install 0.10
@ -56,77 +57,71 @@ Vagrant.configure("2") do |config|
" "
fi 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|
# Here we have the RubyGems cache bucket configured to the right path, so we
# bundle the project
debian.vm.provision :shell, inline: '
sudo apt-get install -y git php5-cli
HOME=/home/vagrant su -p vagrant -l -c "cd /vagrant && bundle"
'
end end
config.vm.define :ubuntu do |ubuntu| config.vm.define :ubuntu do |ubuntu|
ubuntu.vm.box = "raring64" ubuntu.vm.box = "quantal64"
ubuntu.vm.provider :lxc do |_, override| debian_like_configs.call ubuntu
override.vm.box = 'fgrehm/raring64-lxc'
end
configure_private_network.call ubuntu, 10 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 end
config.vm.define :lucid do |lucid| config.vm.define :lucid do |lucid|
lucid.vm.box = "lucid64" lucid.vm.box = "lucid64"
# Disable NFS debian_like_configs.call lucid
lucid.cache.synced_folder_opts = { }
configure_private_network.call lucid, 11 configure_private_network.call lucid, 11
initial_debian_setup.call(lucid, 'git-core')
install_nvm_and_rvm.call(lucid)
end end
config.vm.define :debian do |debian| config.vm.define :debian do |debian|
debian.vm.box = "squeeze64" debian.vm.box = "squeeze64"
debian.vm.box_url = 'http://f.willianfernandes.com.br/vagrant-boxes/DebianSqueeze64.box' debian.vm.box_url = 'http://f.willianfernandes.com.br/vagrant-boxes/DebianSqueeze64.box'
debian_like_configs.call debian
configure_private_network.call debian, 12 configure_private_network.call debian, 12
initial_debian_setup.call(debian)
install_nvm_and_rvm.call(debian)
end end
config.vm.define :centos do |centos| config.vm.define :centos do |centos|
centos.vm.box = 'centos6_64' centos.vm.box = 'centos6_64'
centos.vm.box_url = 'http://developer.nrel.gov/downloads/vagrant-boxes/CentOS-6.4-x86_64-v20130309.box' centos.vm.box_url = 'http://developer.nrel.gov/downloads/vagrant-boxes/CentOS-6.4-x86_64-v20130309.box'
configure_private_network.call centos, 13 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: ' centos.vm.provision :shell, inline: '
(
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 yum install -y libffi-devel ruby-devel git
' HOME=/home/vagrant su -p vagrant -l -c "cd /vagrant && bundle"'
centos.vm.provision :shell, inline: 'gem install bundler'
end end
config.vm.define :arch do |arch| config.vm.define :arch do |arch|
arch.vm.box = 'arch64' arch.vm.box = 'arch64'
arch.vm.box_url = 'https://dl.dropboxusercontent.com/u/6750592/Arch_Linux_2013.11_x64.box' arch.vm.box_url = 'http://vagrant.pouss.in/archlinux_2012-07-02.box'
# Disable NFS configure_private_network.call arch, 14
arch.cache.synced_folder_opts = { } arch.vm.provision :shell, inline: '
pacman -Syu --noconfirm libffi git
arch.vm.provision :shell, inline: 'pacman -Syu --noconfirm libffi git ruby && gem install bundler' HOME=/home/vagrant su -p vagrant -l -c "cd /vagrant && bundle"'
end 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| config.vm.define :opensuse do |suse|
suse.vm.box = 'opensuse-12' suse.vm.box = 'opensuse-12'
suse.vm.box_url = 'http://sourceforge.net/projects/opensusevagrant/files/12.3/opensuse-12.3-64.box/download' suse.vm.box_url = 'http://sourceforge.net/projects/opensusevagrant/files/12.3/opensuse-12.3-64.box/download'
# Disable NFS configure_private_network.call suse, 15
suse.cache.synced_folder_opts = { } suse.cache.enable_nfs = false
# This seems to not be working
suse.omnibus.chef_version = nil
suse.vm.provision :shell, inline: 'time zypper install -y git' suse.vm.provision :shell, inline: 'time zypper install -y git'
end end
end end

View file

@ -1,4 +0,0 @@
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 }

View file

@ -1,27 +0,0 @@
# 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

View file

@ -1,13 +0,0 @@
# [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
```

View file

@ -1,18 +0,0 @@
# 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
```

View file

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

View file

@ -1,20 +0,0 @@
# 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.

View file

@ -1,46 +0,0 @@
# 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
```

View file

@ -1,15 +0,0 @@
# [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
```

View file

@ -12,9 +12,3 @@ Vagrant.configure("2") do |config|
config.cache.enable :yum config.cache.enable :yum
end 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.

View file

@ -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 you and you have to configure things properly from your `Vagrantfile`. In other
words, _the plugin is disabled by default_. words, _the plugin is disabled by default_.
Cache buckets will always be available from `/tmp/vagrant-cache` on your guest and Cache buckets will always be available from `/tmp/vagrant-cachier` on your guest and
the appropriate folders will get symlinked to the right path _after_ the machine is 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 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 and share bucket's folders directly to the right path if we were only using VirtualBox
@ -20,11 +20,12 @@ _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 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. about the guest machine / container before it is actually up and running.
Under the hood, the plugin will hook into Vagrant in order to set things up for each Under the hood, the plugin will monkey patch `Vagrant::Builtin::Provision` and
configured cache bucket _before and after_ running each defined provisioner. Before will set things up for each configured cache bucket _before and after_ running each
halting the machine, it will also revert the changes required to set things up by defined provisioner. Before halting the machine, it will also revert the changes
hooking into calls to `Vagrant::Builtin::GracefulHalt` so that you can repackage required to set things up by hooking into calls to `Vagrant::Builtin::GracefulHalt`
the machine for others to use without requiring users to install the plugin as well. so that you can repackage the machine for others to use without requiring users to
install the plugin as well.
Please keep in mind that this plugin won't do magic, if you are compiling things 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 during provisioning or manually downloading packages outside of a bucket you

View file

@ -9,7 +9,7 @@ multiple package managers and Linux distros.
## Installation ## Installation
Make sure you have Vagrant 1.4+ and run: Make sure you have Vagrant 1.2+ and run:
``` ```
vagrant plugin install vagrant-cachier vagrant plugin install vagrant-cachier
@ -23,40 +23,21 @@ from within your `Vagrantfile`:
```ruby ```ruby
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = 'your-box' config.vm.box = 'your-box'
if Vagrant.has_plugin?("vagrant-cachier") config.cache.auto_detect = true
# Configure cached packages to be shared between instances of the same base box. # If you are using VirtualBox, you might want to enable NFS for shared folders
# More info on the "Usage" link above # config.cache.enable_nfs = true
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 end
``` ```
For more information please check out the links on the menu above. For more information please check out the links on the menu above.
## Providers that are known to work ## Compatible providers
* Vagrant's built in VirtualBox provider * Vagrant's built in VirtualBox provider
* [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc) * [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc)
* [VMware providers](http://www.vagrantup.com/vmware) with NFS enabled (See * [VMware providers](http://www.vagrantup.com/vmware) with NFS enabled (See
[GH-24](https://github.com/fgrehm/vagrant-cachier/issues/24) for more info) [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 ## Contributing

View file

@ -82,30 +82,21 @@
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Available Buckets <span class="caret"></span></a> <a class="dropdown-toggle" data-toggle="dropdown" href="#">Available Buckets <span class="caret"></span></a>
<ul class="dropdown-menu"> <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">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/apt-cacher">apt-cacher</a></li>
<li><a tabindex="-1" href="buckets/chef">Chef</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/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/pacman">Pacman</a></li>
<li><a tabindex="-1" href="buckets/npm">npm</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/rubygems">RubyGems</a></li>
<li><a tabindex="-1" href="buckets/rvm">rvm</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/yum">Yum</a></li>
<li><a tabindex="-1" href="buckets/zypper">Zypper</a></li> <li><a tabindex="-1" href="buckets/zypper">Zypper</a></li>
<li><a tabindex="-1" href="buckets/pip">pip</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<a href="development">Development</a> <a href="development">Development</a>
</li> </li>
<li>
<li><a href="https://gitter.im/fgrehm/vagrant-cachier" target="_blank">Chat</li>
</li>
</ul> </ul>
<ul class="nav navbar-nav navbar-right visible-md visible-lg"> <ul class="nav navbar-nav navbar-right visible-md visible-lg">

View file

@ -1,46 +1,51 @@
# Usage # Usage
## Being nice to others ## Auto detect supported cache buckets
It is a good practice to wrap plugin specific configuration with `has_plugin?` checks This is the easiest way to get started with plugin. By adding the code below to
so the user's Vagrantfiles do not break if `vagrant-cachier` is uninstalled or your `Vagrantfile` you can enable automatic detection of supported cache _buckets_:
the Vagrantfile is shared with people that don't have the plugin installed:
```ruby ```ruby
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
# ... # ...
if Vagrant.has_plugin?("vagrant-cachier") config.cache.auto_detect = true
# ... vagrant-cachier configs ...
end
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 ## Cache scope
This is the only required configuration for the plugin to work and should be present By default downloaded packages will get stored on a folder scoped to base boxes
on your project's specific `Vagrantfile` or on your `~/.vagrant.d/Vagrantfile` in under your `$HOME/.vagrant.d/cache`. The idea is to leverage the cache by allowing
order to enable it. downloaded packages to be reused across projects. So, if your `Vagrantfile` has
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 ```ruby
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = 'some-box' config.vm.box = 'some-box'
if Vagrant.has_plugin?("vagrant-cachier") config.cache.auto_detect = true
config.cache.scope = :box
end
end end
``` ```
The cached files will be stored under `$HOME/.vagrant.d/cache/some-box`. 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), 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 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 across different machines. For example, if you `apt-get install` from two machines
@ -51,71 +56,13 @@ to be based on machines:
```ruby ```ruby
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = 'some-box' config.vm.box = 'some-box'
if Vagrant.has_plugin?("vagrant-cachier")
config.cache.scope = :machine config.cache.scope = :machine
end
end end
``` ```
This will tell vagrant-cachier to download packages to `.vagrant/machines/<machine-name>/cache` This will tell vagrant-cachier to download packages to `.vagrant/machines/<machine-name>/cache`
on your current project directory. 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 ## Finding out disk space used by buckets
@ -148,5 +95,5 @@ the code below if you are on a Linux machine:
$ rm -rf $HOME/.vagrant.d/cache/<box-name>/<optional-bucket-name> $ rm -rf $HOME/.vagrant.d/cache/<box-name>/<optional-bucket-name>
# scope = :machine # scope = :machine
$ rm -rf .vagrant/machines/<machine-name>/cache/<optional-bucket-name> $ rm -rf .vagrant/cache/<box-name>/<optional-bucket-name>
``` ```

View file

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

View file

@ -1,67 +0,0 @@
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

View file

@ -0,0 +1,64 @@
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

View file

@ -1,66 +0,0 @@
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

View file

@ -8,7 +8,7 @@ module VagrantPlugins
def self.auto_detect(env) def self.auto_detect(env)
@buckets.each do |bucket| @buckets.each do |bucket|
if bucket.respond_to?(:capability) && env[:machine].guest.capability?(bucket.capability) if env[:machine].guest.capability?(bucket.capability)
env[:machine].config.cache.enable bucket.bucket_name env[:machine].config.cache.enable bucket.bucket_name
end end
end end
@ -29,60 +29,6 @@ module VagrantPlugins
@env = env @env = env
@configs = configs @configs = configs
end 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 end
end end
@ -90,16 +36,10 @@ end
require_relative "bucket/apt" require_relative "bucket/apt"
require_relative "bucket/chef" require_relative "bucket/chef"
require_relative "bucket/gem" require_relative "bucket/gem"
require_relative "bucket/chef_gem"
require_relative "bucket/pacman" require_relative "bucket/pacman"
require_relative "bucket/yum" require_relative "bucket/yum"
require_relative "bucket/dnf"
require_relative "bucket/rvm" require_relative "bucket/rvm"
require_relative "bucket/apt_cacher" require_relative "bucket/apt_cacher"
require_relative "bucket/apt_lists"
require_relative "bucket/composer" require_relative "bucket/composer"
require_relative "bucket/bower"
require_relative "bucket/npm" require_relative "bucket/npm"
require_relative "bucket/zypper" require_relative "bucket/zypper"
require_relative "bucket/generic"
require_relative "bucket/pip"

View file

@ -7,13 +7,22 @@ module VagrantPlugins
end end
def install def install
machine = @env[:machine]
guest = machine.guest
if guest.capability?(:apt_cache_dir) if guest.capability?(:apt_cache_dir)
guest_path = guest.capability(:apt_cache_dir) guest_path = guest.capability(:apt_cache_dir)
return if @env[:cache_dirs].include?(guest_path) @env[:cache_dirs] << guest_path
symlink(guest_path) machine.communicate.tap do |comm|
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 else
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'APT') @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'APT')
end end

View file

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

View file

@ -1,28 +0,0 @@
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

View file

@ -1,21 +0,0 @@
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

View file

@ -7,9 +7,22 @@ module VagrantPlugins
end end
def install def install
machine = @env[:machine]
guest = machine.guest
if guest.capability?(:chef_file_cache_path) if guest.capability?(:chef_file_cache_path)
guest_path = 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 else
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Chef') @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Chef')
end end

View file

@ -1,25 +0,0 @@
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

View file

@ -7,9 +7,22 @@ module VagrantPlugins
end end
def install def install
machine = @env[:machine]
guest = machine.guest
if guest.capability?(:composer_path) if guest.capability?(:composer_path)
if composer_path = guest.capability(:composer_path) if composer_path = guest.capability(:composer_path)
user_symlink(composer_path) bucket_path = "/tmp/vagrant-cache/#{@name}"
@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 end
else else
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Composer') @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Composer')

View file

@ -1,27 +0,0 @@
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

View file

@ -7,13 +7,26 @@ module VagrantPlugins
end end
def install def install
machine = @env[:machine]
guest = machine.guest
if guest.capability?(:gemdir) if guest.capability?(:gemdir)
if gemdir_path = 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|
comm.execute("mkdir -p #{bucket_path}")
gem_cache_path = "#{gemdir_path}/cache" 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 end
else else
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RubyGems') @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RubyGems')

View file

@ -1,26 +0,0 @@
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

View file

@ -7,9 +7,22 @@ module VagrantPlugins
end end
def install def install
machine = @env[:machine]
guest = machine.guest
if guest.capability?(:npm_cache_dir) if guest.capability?(:npm_cache_dir)
guest_path = 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 else
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'npm') @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'npm')
end end

View file

@ -7,9 +7,22 @@ module VagrantPlugins
end end
def install def install
machine = @env[:machine]
guest = machine.guest
if guest.capability?(:pacman_cache_dir) if guest.capability?(:pacman_cache_dir)
guest_path = 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 else
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Pacman') @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Pacman')
end end

View file

@ -1,22 +0,0 @@
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

View file

@ -7,13 +7,26 @@ module VagrantPlugins
end end
def install def install
machine = @env[:machine]
guest = machine.guest
if guest.capability?(:rvm_path) if guest.capability?(:rvm_path)
if rvm_path = 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|
comm.execute("mkdir -p #{bucket_path}")
rvm_cache_path = "#{rvm_path}/archives" 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 end
else else
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RVM') @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RVM')

View file

@ -7,14 +7,24 @@ module VagrantPlugins
end end
def install def install
if guest.capability?(:yum_cache_dir) machine = @env[:machine]
if guest_path = guest.capability(:yum_cache_dir) guest = machine.guest
return if @env[:cache_dirs].include?(guest_path)
if guest.capability?(:yum_cache_dir)
guest_path = guest.capability(:yum_cache_dir)
@env[:cache_dirs] << guest_path
machine.communicate.tap do |comm|
# Ensure caching is enabled # Ensure caching is enabled
comm.sudo("sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf") comm.sudo("sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf")
symlink(guest_path) 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 end
else else
@env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Yum') @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Yum')

View file

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

View file

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

View file

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

View file

@ -1,13 +0,0 @@
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

View file

@ -1,20 +0,0 @@
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

View file

@ -5,8 +5,8 @@ module VagrantPlugins
module ChefFileCachePath module ChefFileCachePath
def self.chef_provisioner?(machine) def self.chef_provisioner?(machine)
provisioners = machine.config.vm.provisioners provisioners = machine.config.vm.provisioners
chef_provisioners = [:chef_solo, :chef_client, :chef_zero] chef_provisioners = [:chef_solo, :chef_client]
compat_provisioners = provisioners.select { |p| chef_provisioners.include? p.name || p.type } compat_provisioners = provisioners.keep_if { |p| chef_provisioners.include? p.name }
if compat_provisioners.size > 1 if compat_provisioners.size > 1
raise "One machine is using multiple chef provisioners, which is unsupported." raise "One machine is using multiple chef provisioners, which is unsupported."
@ -19,6 +19,7 @@ module VagrantPlugins
def self.chef_file_cache_path(machine) def self.chef_file_cache_path(machine)
chef_file_cache_path = nil chef_file_cache_path = nil
# TODO: Determine paths rather than using default.
chef_file_cache_path = '/var/chef/cache' if chef_provisioner?(machine) chef_file_cache_path = '/var/chef/cache' if chef_provisioner?(machine)
return chef_file_cache_path return chef_file_cache_path

View file

@ -1,20 +0,0 @@
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

View file

@ -7,14 +7,11 @@ module VagrantPlugins
composer_path = nil composer_path = nil
machine.communicate.tap do |comm| machine.communicate.tap do |comm|
return unless comm.test('which php') 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| comm.execute 'echo $HOME' do |buffer, output|
composer_path += output.chomp if buffer == :stdout composer_path = output.chomp if buffer == :stdout
end end
end end
return "#{composer_path}/.composer/cache" return "#{composer_path}/.composer"
end end
end end
end end

View file

@ -1,20 +0,0 @@
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

View file

@ -1,18 +0,0 @@
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

View file

@ -4,13 +4,8 @@ module VagrantPlugins
module RedHat module RedHat
module YumCacheDir module YumCacheDir
def self.yum_cache_dir(machine) def self.yum_cache_dir(machine)
yum_cache_dir = nil # TODO: Find out if there is a config file we can read from
machine.communicate.tap do |comm| '/var/cache/yum'
# 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 end
end end

View file

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

View file

@ -1,84 +0,0 @@
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

View file

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

View file

@ -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

View file

@ -1,27 +0,0 @@
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

View file

@ -1,5 +1,6 @@
unless Gem::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(Vagrant::VERSION)) require_relative 'provision_ext'
raise 'vagrant-cachier requires Vagrant >= 1.4.0 in order to work!' Vagrant::Action::Builtin::Provision.class_eval do
include VagrantPlugins::Cachier::ProvisionExt
end end
# Add our custom translations to the load path # Add our custom translations to the load path
@ -9,19 +10,87 @@ module VagrantPlugins
module Cachier module Cachier
class Plugin < Vagrant.plugin('2') class Plugin < Vagrant.plugin('2')
name 'vagrant-cachier' name 'vagrant-cachier'
config 'cache' do config 'cache' do
require_relative "config" require_relative "config"
Config Config
end end
guest_capability 'linux', 'gemdir' do
require_relative 'cap/linux/gemdir'
Cap::Linux::Gemdir
end end
# Keep an eye on https://github.com/mitchellh/vagrant/wiki/Available-Vagrant-Plugins#wiki-providers guest_capability 'linux', 'rvm_path' do
# for more. require_relative 'cap/linux/rvm_path'
CLOUD_PROVIDERS = %w( aws cloudstack digitalocean hp joyent openstack rackspace Cap::Linux::RvmPath
softlayer proxmox managed azure brightbox cloudstack vcloud end
vsphere )
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
end end
end end
require_relative "hooks"
require_relative "capabilities"

View file

@ -0,0 +1,74 @@
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

View file

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

View file

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

View file

@ -1,14 +1,10 @@
Vagrant.require_plugin 'vagrant-cachier'
Vagrant.require_plugin 'vagrant-lxc'
Vagrant.configure("2") do |config| 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.auto_detect = true
config.cache.scope = :machine 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' config.vm.provision :shell, inline: 'apt-get update && apt-get install -y git'
end end

View file

@ -1,12 +1,8 @@
Vagrant.require_plugin 'vagrant-cachier'
Vagrant.require_plugin 'vagrant-lxc'
Vagrant.configure("2") do |config| 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.auto_detect = true
config.vm.box = 'precise64'
config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
config.vm.provision :shell, inline: 'echo Hello!' config.vm.provision :shell, inline: 'echo Hello!'
end end

View file

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

View file

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

View file

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