vagrant-cachier 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e29dab2a44617162f50a1deb9d7876d29884703
-  data.tar.gz: d59cd1552a6f2218c86fed45a181e0c89590a2e8
+  metadata.gz: aa1898e86e3760ce3e427d1d46ec53f4240a7f61
+  data.tar.gz: d0e4b10327abed29d0b4a4ac68e724f7a9eeb780
 SHA512:
-  metadata.gz: e5918455a5a95171335c2544d78844cba773f3355f45067e46634808ecb91556b2862cf960a24a8db7ed8b3a9ff397f56bc7630e4d1e32f44b29a875bcbf2969
-  data.tar.gz: 7160457fe320c9c600347290bade8ff2831756557a76554904d0106792ef0efdee1a9cee1275b5527bbd8fc555b984f55e8eae5cf54a8daabea30ae4a01167eb
+  metadata.gz: 25080e62dcbb8421053c858f5961415e88592de246a822f3909e23dc12609df91a181abd29a817e10c0d58d4d29bae4da7d7bef2d65ae38d00e7029c4a02d1f0
+  data.tar.gz: c3f6801886da3fa6e959deb9bfd59ddba73e9bcc711178ce3d301af59a241d41e7dfec53430ca4106326f1481d9cbe4e842d8f0d92496413c16d739c23949dbe

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.3.2](https://github.com/fgrehm/vagrant-cachier/compare/v0.3.1...v0.3.2) (Aug 14, 2013)
+
+BUG FIXES:
+
+  - Prevent errors when caching is disabled and a provisioner is enabled [GH-41]
+
 ## [0.3.1](https://github.com/fgrehm/vagrant-cachier/compare/v0.3.0...v0.3.1) (Aug 13, 2013)
 
 BUG FIXES:

data/Gemfile.lock

@@ -25,7 +25,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-cachier (0.3.1)
+    vagrant-cachier (0.3.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -226,6 +226,25 @@ $ vagrant cache clean apt
 ```
 
 
+## Development
+
+If you want to install the plugin from sources:
+
+```bash
+git clone https://github.com/fgrehm/vagrant-cachier.git
+cd vagrant-cachier
+bundle install
+bundle exec rake build
+vagrant plugin install pkg/vagrant-cachier-VERSION.gem
+```
+
+There are also some [Bats](https://github.com/sstephenson/bats) tests that basically
+acts as a [sanity check](spec/acceptance/sanity_check.bats) that you can run with
+`bats spec/acceptance` in case you are planning to submit a Pull Request :) Just
+keep in mind that it might take a while to run if you are using the default
+VirtualBox provider.
+
+
 ## Contributing
 
 1. Fork it

data/development/Vagrantfile

@@ -30,13 +30,27 @@ Vagrant.configure("2") do |config|
     }
   end
 
+  # Installs RVM
+  config.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
+  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
+  '
+
   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: '
-      if ! (which bundle > /dev/null); then
-        sudo gem install bundler --no-ri --no-rdoc
-        sudo apt-get install -y build-essential libffi-dev ruby1.9.1-dev git
-        cd /vagrant && bundle
-      fi'
+      sudo apt-get install git -y
+      HOME=/home/vagrant su -p vagrant -l -c "cd /vagrant && bundle"
+    '
   end
 
   config.vm.define :ubuntu do |ubuntu|
@@ -53,26 +67,19 @@ Vagrant.configure("2") do |config|
   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'
+    # Here we have the RubyGems cache bucket configured to the right path, so we
+    # bundle the project
     centos.vm.provision :shell, inline: '
-      if ! (which bundle > /dev/null); then
-        time sudo gem install bundler --no-ri --no-rdoc
-        time sudo yum install -y libffi-devel ruby-devel git
-      fi'
+        yum install -y libffi-devel ruby-devel git
+        HOME=/home/vagrant su -p vagrant -l -c "cd /vagrant && bundle"'
   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.provision :shell, inline: '
-      if ! (which bundle > /dev/null); then
-        time sudo gem install bundler --no-ri --no-rdoc
-        time sudo pacman -Syu --noconfirm libffi git
-      fi'
+        pacman -Syu --noconfirm libffi git
+        HOME=/home/vagrant su -p vagrant -l -c "cd /vagrant && bundle"'
   end
 
-  config.vm.provision :shell, inline: '
-    if ! [ -d /home/vagrant/.rvm ]; then
-      HOME=/home/vagrant su -p vagrant -c "curl -L https://get.rvm.io | bash -s stable"
-    fi
-  '
 end

data/lib/vagrant-cachier/provision_ext.rb

@@ -11,10 +11,10 @@ module VagrantPlugins
 
           alias :old_call :call
           def call(env)
-            return old_call(env) unless env[:machine].config.cache.enabled?
-
             @env = env
 
+            return old_call(env) unless env[:machine].config.cache.enabled?
+
             FileUtils.mkdir_p(cache_root.to_s) unless cache_root.exist?
 
             nfs_flag = env[:machine].config.cache.enable_nfs

data/lib/vagrant-cachier/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cachier
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

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

@@ -0,0 +1,9 @@
+Vagrant.require_plugin 'vagrant-cachier'
+Vagrant.require_plugin 'vagrant-lxc'
+Vagrant.configure("2") do |config|
+  config.cache.auto_detect = true
+  config.cache.scope = :machine
+
+  config.vm.box = 'raring64'
+  config.vm.provision :shell, inline: 'apt-get update && apt-get install -y git'
+end

data/spec/acceptance/fixtures/auto-detect.rb

@@ -0,0 +1,7 @@
+Vagrant.require_plugin 'vagrant-cachier'
+Vagrant.require_plugin 'vagrant-lxc'
+Vagrant.configure("2") do |config|
+  config.cache.auto_detect = true
+  config.vm.box = 'quantal64'
+  config.vm.provision :shell, inline: 'echo Hello!'
+end

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

@@ -0,0 +1,5 @@
+Vagrant.require_plugin 'vagrant-cachier'
+Vagrant.require_plugin 'vagrant-lxc'
+Vagrant.configure("2") do |config|
+  config.vm.box = 'quantal64'
+end

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

@@ -0,0 +1,6 @@
+Vagrant.require_plugin 'vagrant-cachier'
+Vagrant.require_plugin 'vagrant-lxc'
+Vagrant.configure("2") do |config|
+  config.vm.box = 'quantal64'
+  config.vm.provision :shell, inline: 'echo Hello!'
+end

data/spec/acceptance/sanity_check.bats

@@ -0,0 +1,45 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "Vagrantfile without cachier statement does not blow up when bringing the VM up" {
+  configure_env "no-cachier-simple.rb"
+  vagrant_up
+  [ "$status" -eq 0 ]
+  vagrant_destroy
+
+  configure_env "no-cachier-with-provisioning.rb"
+  vagrant_up
+  [ "$status" -eq 0 ]
+  vagrant_destroy
+}
+
+@test "Vagrantfile with cachier auto_detect statement does not blow up when bringing the VM up" {
+  configure_env "auto-detect.rb"
+  vagrant_up
+  [ "$status" -eq 0 ]
+  vagrant_destroy
+}
+
+@test "APT cache bucket configures the cache dir properly and keeps cache dir around" {
+  configure_env "auto-detect-with-provisioning.rb"
+
+  # Make sure cache dir does not exist
+  test ! -d tmp/.vagrant/machines/default/cache/apt
+
+  vagrant_up
+  [ "$status" -eq 0 ]
+
+  # Make sure packages are being cached
+  test -d tmp/.vagrant/machines/default/cache/apt
+  FILES=(`ls tmp/.vagrant/machines/default/cache/apt/git*.deb`)
+  [ ${#FILES[@]} -gt 0 ]
+
+  vagrant_destroy
+
+  # Make sure packages are not removed between machine rebuilds
+  FILES=(`ls tmp/.vagrant/machines/default/cache/apt/git*.deb`)
+  [ ${#FILES[@]} -gt 0 ]
+
+  empty_cache
+}

data/spec/acceptance/test_helper.bash

@@ -0,0 +1,26 @@
+vagrant_up() {
+  pushd tmp
+    run bundle exec vagrant up > /tmp/vagrant-cachier-tests.log
+  popd
+}
+
+vagrant_destroy() {
+  pushd tmp
+    run bundle exec vagrant destroy -f
+  popd
+}
+
+configure_env() {
+  fixture=$1
+
+  mkdir -p tmp/
+  cp spec/acceptance/fixtures/${fixture} tmp/Vagrantfile
+
+  vagrant_destroy
+  [ "$status" -eq 0 ]
+  rm -rf tmp/.vagrant
+}
+
+empty_cache() {
+  rm -rf tmp/.vagrant/cache
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cachier
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies: []
 description: Speed up vagrant boxes provisioning
 email:
@@ -49,6 +49,12 @@ files:
 - lib/vagrant-cachier/provision_ext.rb
 - lib/vagrant-cachier/version.rb
 - locales/en.yml
+- spec/acceptance/fixtures/auto-detect-with-provisioning.rb
+- spec/acceptance/fixtures/auto-detect.rb
+- spec/acceptance/fixtures/no-cachier-simple.rb
+- spec/acceptance/fixtures/no-cachier-with-provisioning.rb
+- spec/acceptance/sanity_check.bats
+- spec/acceptance/test_helper.bash
 - vagrant-cachier.gemspec
 homepage: https://github.com/fgrehm/vagrant-cachier
 licenses:
@@ -74,4 +80,10 @@ rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Speed up vagrant boxes provisioning
-test_files: []
+test_files:
+- spec/acceptance/fixtures/auto-detect-with-provisioning.rb
+- spec/acceptance/fixtures/auto-detect.rb
+- spec/acceptance/fixtures/no-cachier-simple.rb
+- spec/acceptance/fixtures/no-cachier-with-provisioning.rb
+- spec/acceptance/sanity_check.bats
+- spec/acceptance/test_helper.bash