vagrant-lxc 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b9bb037d03a6aea1bdc901bbf62a7829461f0be
-  data.tar.gz: 83a7cba30a46a536ef30844e9de0a66751554634
+  metadata.gz: e016d9b9740eb13e9c7ea4a907b11b68985c4375
+  data.tar.gz: 87be64028dec8c58df5d0ae1620f4dc6eccaab57
 SHA512:
-  metadata.gz: 20fdc6c3d3a915661720a30394e8d0b7acfd162f080a2c2a447af71cd1e9e280aa6154ac8fd7e61eef6b1f758bb2396700401e33c584eaf09e6af9bd039cfa12
-  data.tar.gz: 74ef01c112c43bfce60403a09952721b3d17fe22f7c893a095314a7b3b3876e6f6a5128a009253875d5e00ac5e92767b9f98e703a5f26d617bc01a5041f6f26f
+  metadata.gz: 3cb85194a618d8f52280ae67bb87be6a02c8fe69089ec0eb9858dbe34fad8328a11fbf21cc97378a1cb5cbd810191639b944f86329ace4289eb9dfecf1965e48
+  data.tar.gz: 6aff2121764c2d6f9149c861949cd2148b429d3df03d7adf95c1fbf5499f878aa23ab34786b7f63c421f3f280d3a3c5fbb10d187d6cd90c712b9e35f77266e91

data/.gitignore

@@ -24,6 +24,7 @@ doc/
 /cache
 
 /boxes/**/*.tar.gz
-/boxes/quantal64/partial/
-/boxes/quantal64/rootfs/
+/boxes/**/partial/
+/boxes/**/rootfs/
+/boxes/temp/
 /boxes/output/

data/.travis.yml

@@ -5,4 +5,4 @@ rvm:
 matrix:
   allow_failures:
     - rvm: 2.0.0
-script: "bundle exec rake"
+script: "bundle exec rake ci"

data/.vimrc

@@ -1 +1 @@
-set wildignore+=*/boxes/quantal64/rootfs/*,*/boxes/quantal64/partial/*
+set wildignore+=*/boxes/*/rootfs/*,*/boxes/*/partial/*

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.3.3](https://github.com/fgrehm/vagrant-lxc/compare/v0.3.2...v0.3.3) (April 23, 2013)
+
+BUG FIXES:
+
+  - Properly kill `redir` child processes [#59][]
+
+IMPROVEMENTS:
+
+  - Initial acceptance test suite
+  - New rake tasks for building Ubuntu precise and raring base amd64 boxes
+
 ## [0.3.2](https://github.com/fgrehm/vagrant-lxc/compare/v0.3.1...v0.3.2) (April 18, 2013)
 
   - Do not display port forwarding message in case no forwarded ports were set
@@ -14,6 +25,7 @@ BACKWARDS INCOMPATIBILITIES:
   - `start_opts` config was renamed to `customize`, please check the README for the expected parameters
   - V1 boxes are no longer supported
   - `target_rootfs_path` is no longer supported, just symlink `/var/lib/lxc` to the desired folder in case you want to point it to another partition
+  - Removed support for configuring private networks. It will come back at some point in the future but if you need it you should be able to set using `customize 'network.ipv4', '1.2.3.4'`
 
 IMPROVEMENTS:
 

data/Gemfile.lock

@@ -15,7 +15,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.3.2)
+    vagrant-lxc (0.3.3)
 
 GEM
   remote: https://rubygems.org/

data/Guardfile

@@ -1,6 +1,3 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
 guard 'bundler' do
   watch('Gemfile')
   watch(/^.+\.gemspec/)
@@ -15,20 +12,7 @@ guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/vagrant-lxc/(.+)\.rb$}) { |m| "spec/unit/#{m[1]}_spec.rb" }
   watch('spec/unit_helper.rb')          { "spec/unit" }
+  watch('spec/acceptance_helper.rb')    { "spec/acceptance" }
   watch('spec/spec_helper.rb')          { "spec/" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+  watch(%r{^spec/support/(.+)\.rb$})    { "spec/" }
 end

data/README.md

@@ -8,7 +8,6 @@ Linux Containers support for Vagrant 1.1+
 * Vagrant 1.1+ (1.1.3+ recommended)
 * lxc 0.7.5+ (0.8.0-rc1+ recommended)
 * redir (if you are planning to use port forwarding)
-* arch command (uname -m) on PATH
 * A Kernel [higher than 3.5.0-17.28](#help-im-unable-to-restart-containers)
 
 On a clean Ubuntu 12.10 machine it means something like:
@@ -22,7 +21,7 @@ sudo dpkg -i /tmp/vagrant.deb
 ```
 
 
-## What is currently supported? (v0.3.0)
+## What is currently supported?
 
 Pretty much everything you need from Vagrant:
 
@@ -40,8 +39,6 @@ and the [changelog](CHANGELOG.md) for most up to date information.*
 
 * Does not detect forwarded ports collision, right now you are responsible for taking care of that
 * A hell lot of `sudo`s (this will probably be like this until [user namespaces](http://s3hh.wordpress.com/2013/02/12/user-namespaces-lxc-meeting/) are supported)
-* Only a [single ubuntu box supported](boxes)
-* "[works on  my machine](https://github.com/fgrehm/vagrant-lxc/issues/20)" (TM)
 * [Does not tell you if dependencies are not met](https://github.com/fgrehm/vagrant-lxc/issues/11)
   (will probably just throw up some random error)
 * + bunch of other [core features](https://github.com/fgrehm/vagrant-lxc/issues?labels=core&milestone=&page=1&state=open)
@@ -56,16 +53,17 @@ vagrant plugin install vagrant-lxc
 
 ## Usage
 
-After installing, add the quantal64 base box using any name you want:
+After installing, add a [base box](#available-boxes) using any name you want, for example:
 
 ```
-vagrant box add lxc-quantal64 http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-10.box
+vagrant box add lxc-quantal64 http://dl.dropbox.com/u/13510779/lxc-quantal-amd64-2013-04-21.box
 ```
 
 Make a Vagrantfile that looks like the following, filling in your information where necessary:
 
 ```ruby
 Vagrant.configure("2") do |config|
+  # Change it to the name of the box you have just added
   config.vm.box = "lxc-quantal64"
 
   # You can omit this block if you don't need to override any container setting
@@ -83,6 +81,24 @@ And finally run `vagrant up --provider=lxc`.
 If you are on a mac or window host and still want to try this plugin out, you
 can use the [same Vagrant VirtualBox machine I use for development](#using-virtualbox-for-development).
 
+### Available boxes
+
+| LINK | DESCRIPTION |
+| --- | ---         |
+| [lxc-raring-amd64-2013-04-21.box](http://dl.dropbox.com/u/13510779/lxc-raring-amd64-2013-04-21.box) | Ubuntu 13.04 Raring x86_64 (Puppet 3.1.1) |
+| [lxc-quantal-amd64-2013-04-21.box](http://dl.dropbox.com/u/13510779/lxc-quantal-amd64-2013-04-21.box) | Ubuntu 12.10 Quantal x86_64 (Puppet 3.1.1 & Chef 11.4.0) |
+| [lxc-precise-amd64-2013-04-21.box](http://dl.dropbox.com/u/13510779/lxc-precise-amd64-2013-04-21.box) | Ubuntu 12.04 Precise x86_64 (Puppet 3.1.1 & Chef 11.4.0) |
+
+*Please note that I'm currently using only the quantal x86_64 on a daily basis,
+and I've only done some basic testing with the others*
+
+You can also build a clean box by providing `CHEF=0` and `PUPPET=0` to the available
+[rake tasks](tasks/boxes.rake). For example:
+
+```
+CHEF=0 PUPPET=0 rake boxes:ubuntu:build:precise64
+```
+
 ### Storing container's rootfs on a separate partition
 
 Before the 0.3.0 version of this plugin, there used to be a support for specifying
@@ -104,7 +120,13 @@ If  want to develop from your physical machine, just sing that same old song:
 git clone git://github.com/fgrehm/vagrant-lxc.git
 cd vagrant-lxc
 bundle install
-bundle exec rake # to run all specs
+bundle exec rake # to run unit specs
+```
+
+To run acceptance specs, you'll have to ssh into one of the [development boxes](development/Vagrantfile) and run:
+
+```
+bundle exec rake spec:acceptance
 ```
 
 To build the provided quantal64 box:
@@ -179,6 +201,11 @@ and try to `vagrant reload` the dev box. If it still doesn't work,
 please file a bug at the [issue tracker](https://github.com/fgrehm/vagrant-lxc/issues).
 
 
+## Similar projects
+
+* [vagabond](https://github.com/chrisroberts/vagabond) - "a tool integrated with Chef to build local nodes easily"
+* [vagueant](https://github.com/neerolyte/vagueant) - "vaguely like Vagrant for linux containers (lxc)"
+
 ## Contributing
 
 1. Fork it

data/boxes/{quantal64/download-ubuntu → ubuntu/download}

@@ -3,7 +3,6 @@
 # This is the code extracted from /usr/share/lxc/templates/lxc-ubuntu
 # that comes with Ubuntu 12.10 which is responsible for downloading the
 # rootfs files / packages
-# It also installs puppet and chef on the container
 
 set -e
 
@@ -92,8 +91,8 @@ EOF
 }
 
 declare cache=`readlink -f .` \
-        arch=amd64 \
-        release=quantal
+        arch=$1 \
+        release=$2
 
 if [ -d "${cache}/rootfs" ]; then
   echo 'The rootfs cache has been built already, please remove it if you want to update'
@@ -101,21 +100,3 @@ if [ -d "${cache}/rootfs" ]; then
 fi
 
 download_ubuntu $cache $arch $release
-
-rootfs="${cache}/rootfs"
-
-echo "installing puppet"
-wget http://apt.puppetlabs.com/puppetlabs-release-precise.deb -O "${rootfs}/tmp/puppetlabs-release-${release}.deb"
-chroot $rootfs dpkg -i "/tmp/puppetlabs-release-${release}.deb"
-chroot $rootfs apt-get update
-chroot $rootfs apt-get install puppet -y
-
-echo "installing chef"
-cat > $rootfs/tmp/install-chef.sh << EOF
-#!/bin/sh
-curl -L https://www.opscode.com/chef/install.sh -k | sudo bash
-EOF
-chmod +x $rootfs/tmp/install-chef.sh
-chroot $rootfs /tmp/install-chef.sh
-
-rm -rf $rootfs/tmp/*

data/boxes/ubuntu/install-chef

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+cache=`readlink -f .`
+rootfs="${cache}/rootfs"
+
+echo "installing chef"
+cat > $rootfs/tmp/install-chef.sh << EOF
+#!/bin/sh
+curl -L https://www.opscode.com/chef/install.sh -k | sudo bash
+EOF
+chmod +x $rootfs/tmp/install-chef.sh
+chroot $rootfs /tmp/install-chef.sh
+
+rm -rf $rootfs/tmp/*

data/boxes/ubuntu/install-puppet

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+cache=`readlink -f .`
+rootfs="${cache}/rootfs"
+
+echo "installing puppet"
+wget http://apt.puppetlabs.com/puppetlabs-release-stable.deb -O "${rootfs}/tmp/puppetlabs-release-stable.deb"
+chroot $rootfs dpkg -i "/tmp/puppetlabs-release-stable.deb"
+chroot $rootfs apt-get update
+chroot $rootfs apt-get install puppet -y
+
+rm -rf $rootfs/tmp/*

data/boxes/{quantal64 → ubuntu}/lxc-template

@@ -469,7 +469,7 @@ if [ -f /etc/lsb-release ]; then
     fi
 fi
 
-arch=$(arch)
+arch=$(uname -m)
 
 # Code taken from debootstrap
 if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
@@ -477,7 +477,7 @@ if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; t
 elif type udpkg >/dev/null 2>&1 && udpkg --print-architecture >/dev/null 2>&1; then
     arch=`/usr/bin/udpkg --print-architecture`
 else
-    arch=$(arch)
+    arch=$(uname -m)
     if [ "$arch" = "i686" ]; then
         arch="i386"
     elif [ "$arch" = "x86_64" ]; then

data/boxes/{quantal64/metadata.json → ubuntu/metadata.json.template}

@@ -3,7 +3,7 @@
   "version":  "2",
 
   "template-opts": {
-    "--arch":    "amd64",
-    "--release": "quantal"
+    "--arch":    "ARCH",
+    "--release": "RELEASE"
   }
 }

data/development/Vagrantfile

@@ -25,17 +25,11 @@ end
 Vagrant.require_plugin 'vagrant-lxc'
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "quantal64"
-
-  config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root'
-
-  cache_dir = local_apt_cache(config.vm.box)
-  config.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
-
-  cache_dir = local_gem_cache(config.vm.box)
-  config.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", id: "vagrant-gem-cache"
+  config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root', nfs: true
 
   config.vm.define :vbox do |vb_config|
+    vb_config.vm.network :private_network, ip: "192.168.50.33"
+    vb_config.vm.box      = 'quantal64'
     vb_config.vm.box_url  = "https://github.com/downloads/roderik/VagrantQuantal64Box/quantal64.box"
     vb_config.vm.hostname = 'vbox'
 
@@ -47,17 +41,62 @@ Vagrant.configure("2") do |config|
         "--cpus", '2'
       ]
     end
+
+    cache_dir = local_apt_cache(vb_config.vm.box)
+    vb_config.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
+
+    cache_dir = local_gem_cache(vb_config.vm.box)
+    vb_config.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", id: "vagrant-gem-cache"
   end
 
   config.vm.define :precise do |precise|
+    precise.vm.network :private_network, ip: "192.168.50.32"
     precise.vm.box      = 'precise64'
     precise.vm.hostname = 'vbox'
     precise.vm.box_url  = 'http://files.vagrantup.com/precise64.box'
+
+    precise.vm.provider :virtualbox do |vb|
+      # Configure VM to use 1.5gb of ram and 2 cpus
+      vb.customize [
+        "modifyvm", :id,
+        "--memory", '1536',
+        "--cpus", '2'
+      ]
+    end
+
+    cache_dir = local_apt_cache(precise.vm.box)
+    precise.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
+
+    cache_dir = local_gem_cache(precise.vm.box)
+    precise.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", id: "vagrant-gem-cache"
+  end
+
+  config.vm.define :raring do |raring|
+    raring.vm.network :private_network, ip: "192.168.50.34"
+    raring.vm.box      = 'raring64'
+    raring.vm.hostname = 'vbox'
+    raring.vm.box_url  = 'http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-amd64-vagrant-disk1.box'
+
+    raring.vm.provider :virtualbox do |vb|
+      # Configure VM to use 1.5gb of ram and 2 cpus
+      vb.customize [
+        "modifyvm", :id,
+        "--memory", '1536',
+        "--cpus", '2'
+      ]
+    end
+
+    cache_dir = local_apt_cache(raring.vm.box)
+    raring.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
+
+    cache_dir = local_gem_cache(raring.vm.box)
+    raring.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", id: "vagrant-gem-cache"
   end
 
   config.vm.define :lxc do |lxc_config|
+    lxc_config.vm.box      = 'quantal64'
     lxc_config.vm.hostname = 'lxc-dev-box'
-    lxc_config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-10.box'
+    lxc_config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-21.box'
     # Uncomment to test boxes built locally:
     # lxc_config.vm.box_url  = '../boxes/output/lxc-quantal64.box'
 

data/development/site.pp

@@ -21,7 +21,7 @@ exec {
 # Install dependencies
 package {
   [ 'libffi-dev', 'bsdtar', 'exuberant-ctags', 'ruby1.9.1-dev', 'htop', 'git',
-    'build-essential', 'redir' ]:
+    'build-essential', 'redir', 'curl' ]:
     ensure   => 'installed'
   ;
 
@@ -43,7 +43,7 @@ if $hostname == 'vbox' {
 
 # TMUX
 package {
-  'tmux':       ensure => 'installed';
+  'tmux': ensure => 'installed';
 }
 
 # Allow gems to be installed on vagrant user home avoiding "sudo"s

data/example/Vagrantfile

@@ -5,15 +5,8 @@
 Vagrant.require_plugin 'vagrant-lxc'
 
 Vagrant.configure("2") do |config|
-  config.vm.box      = "quantal64"
-  config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-10.box'
-  # Uncomment if you want to try out a box built locally
-  # config.vm.box_url  = '../boxes/output/lxc-quantal64.box'
-  config.vm.hostname = 'lxc-quantal64-example'
-
   config.vm.synced_folder "/tmp", "/vagrant_data"
 
-
   config.vm.provider :lxc do |lxc|
     lxc.customize 'cgroup.memory.limit_in_bytes', '400M'
     lxc.customize 'cgroup.memory.memsw.limit_in_bytes', '500M'
@@ -33,4 +26,17 @@ echo "Hi there I'm a shell script used for provisioning"
     chef.add_recipe "hello-world"
     chef.log_level = :debug
   end
+
+  port     = 8080
+  releases = %w(precise quantal raring)
+  releases.each do |release|
+    config.vm.define(release) do |lxc_config|
+      lxc_config.vm.box      = "#{release}64"
+      lxc_config.vm.box_url  = "http://dl.dropbox.com/u/13510779/lxc-#{release}-amd64-2013-04-21.box"
+      # Uncomment if you want to try out a box built locally
+      # lxc_config.vm.box_url  = "../boxes/output/lxc-#{release}64.box"
+      lxc_config.vm.hostname = "lxc-#{release}64-example"
+      lxc_config.vm.network :forwarded_port, guest: 80, host: (port += 1)
+    end
+  end
 end

data/lib/vagrant-lxc/action/clear_forwarded_ports.rb

@@ -15,7 +15,7 @@ module Vagrant
             redir_pids.each do |pid|
               next unless is_redir_pid?(pid)
               @logger.debug "Killing pid #{pid}"
-              system "sudo pkill -9 -P #{pid}"
+              system "sudo pkill -TERM -P #{pid}"
             end
 
             remove_redir_pids

data/lib/vagrant-lxc/action/forward_ports.rb

@@ -68,7 +68,7 @@ module Vagrant
           redir_cmd = "sudo redir --laddr=127.0.0.1 --lport=#{host} --cport=#{guest} --caddr=#{@container_ip} 2>/dev/null"
 
           @logger.debug "Forwarding port with `#{redir_cmd}`"
-          fork { exec redir_cmd }
+          spawn redir_cmd
         end
 
         def store_redir_pid(host_port, redir_pid)

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/spec/Vagrantfile

@@ -0,0 +1,33 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+def local_apt_cache(box_name)
+  cache_dir = File.join(File.expand_path(Vagrant::Environment::DEFAULT_HOME),
+                        'cache',
+                        'apt',
+                        box_name)
+  partial_dir = File.join(cache_dir, 'partial')
+  FileUtils.mkdir_p(partial_dir) unless File.exists? partial_dir
+  cache_dir
+end
+
+Vagrant.require_plugin 'vagrant-lxc'
+
+Vagrant.configure("2") do |config|
+  config.vm.box      = "quantal64"
+  config.vm.hostname = 'lxc-test-box'
+
+  config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-10.box'
+  # Uncomment to test boxes built locally:
+  # config.vm.box_url = '../boxes/output/lxc-quantal64.box'
+
+  cache_dir = local_apt_cache(config.vm.box)
+  config.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
+
+  config.vm.provision :shell,
+    inline: 'mkdir -p /vagrant/tmp && echo -n "Provisioned" > /vagrant/tmp/provisioning'
+
+  config.vm.network :forwarded_port, guest: 80, host: 8080
+  config.vm.provision :shell,
+    inline: 'sudo apt-get install nginx -y && sudo service nginx start'
+end

data/spec/acceptance/sanity_check_spec.rb

@@ -0,0 +1,79 @@
+require 'acceptance_helper'
+
+describe 'Sanity check' do
+  after(:all) { destroy_container }
+
+  context 'running `vagrant up` from scratch' do
+    before(:all) do
+      destroy_container
+      vagrant_up
+    end
+
+    it 'creates a container' do
+      containers = `sudo lxc-ls`.chomp.split(/\s+/).uniq
+      expect(containers).to include vagrant_container_name
+    end
+
+    it 'starts the newly created container' do
+      status = `sudo lxc-info -n #{vagrant_container_name}`
+      expect(status).to include 'RUNNING'
+    end
+
+    it "is able to be SSH'ed" do
+      expect(vagrant_ssh('hostname')).to eq 'lxc-test-box'
+    end
+
+    it 'mounts shared folders with the right permissions' do
+      vagrant_ssh 'mkdir -p /vagrant/tmp && echo -n "Shared" > /vagrant/tmp/shared'
+      shared_file_contents = File.read('/vagrant/spec/tmp/shared')
+      expect(shared_file_contents).to eq 'Shared'
+    end
+
+    it 'provisions the container based on Vagrantfile configs' do
+      provisioned_file_contents = File.read('/vagrant/spec/tmp/provisioning')
+      expect(provisioned_file_contents).to eq 'Provisioned'
+    end
+
+    it 'forwards configured ports' do
+      output = `curl -s localhost:8080`.strip.chomp
+      expect(output).to include 'Welcome to nginx!'
+    end
+  end
+
+  context '`vagrant halt` on a running container' do
+    before(:all) do
+      destroy_container
+      vagrant_up
+      vagrant_halt
+    end
+
+    it 'shuts down container' do
+      status = `sudo lxc-info -n #{vagrant_container_name}`
+      expect(status).to include 'STOPPED'
+    end
+
+    it 'clears forwarded ports' do
+      `curl -s localhost:8080 --connect-timeout 2`
+      expect($?.exitstatus).to_not eq 0
+    end
+
+    it 'kills redir processes' do
+      processes = `pgrep redir`
+      expect($?.exitstatus).to_not eq 0
+    end
+  end
+
+  context '`vagrant destroy`' do
+    before(:all) do
+      destroy_container
+      vagrant_up
+      @container_name = vagrant_container_name
+      vagrant_destroy
+    end
+
+    it 'destroys the underlying container' do
+      containers = `sudo lxc-ls`.chomp.split(/\s+/).uniq
+      expect(containers).to_not include @container_name
+    end
+  end
+end

data/spec/acceptance/support/acceptance_example_group.rb

@@ -0,0 +1,56 @@
+module AcceptanceExampleGroup
+  def self.included(base)
+    base.metadata[:type] = :acceptance
+  end
+
+  ID_FILE = "/vagrant/spec/.vagrant/machines/default/lxc/id"
+  def vagrant_container_name
+    File.read(ID_FILE).strip.chomp if File.exists?(ID_FILE)
+  end
+
+  def destroy_container
+    if name = vagrant_container_name
+      `sudo lxc-shutdown -n #{name} 2>/dev/null`
+      `sudo lxc-wait -n #{name} --state STOPPED 2>/dev/null`
+      `sudo lxc-destroy -n #{name} 2>/dev/null`
+    end
+    `sudo killall -9 redir 2>/dev/null`
+  end
+
+  def with_vagrant_environment
+    opts = { cwd: 'spec', ui_class: TestUI }
+    env  = Vagrant::Environment.new(opts)
+    yield env
+    env.unload
+  end
+
+  def vagrant_up
+    with_vagrant_environment do |env|
+      env.cli('up', '--provider', 'lxc')
+    end
+  end
+
+  def vagrant_halt
+    with_vagrant_environment do |env|
+      env.cli('halt')
+    end
+  end
+
+  def vagrant_destroy
+    with_vagrant_environment do |env|
+      env.cli('destroy', '-f')
+    end
+  end
+
+  def vagrant_ssh(cmd)
+    output = nil
+    with_vagrant_environment do |env|
+      result = env.cli('ssh', '-c', cmd)
+      if result.to_i != 0
+        raise "SSH command failed: '#{cmd}'\n#{env.ui.messages.inspect}"
+      end
+      output = env.ui.messages[:info].join("\n").chomp
+    end
+    output
+  end
+end

data/spec/acceptance/support/machine_ext.rb

@@ -0,0 +1,13 @@
+# Monkey patch vagrant in order to reuse the UI test object that is set on
+# our Vagrant::Environments
+#
+# TODO: Find out if this makes sense to be on vagrant core itself
+require 'vagrant/machine'
+Vagrant::Machine.class_eval do
+  alias :old_action :action
+
+  define_method :action do |name, extra_env = nil|
+    extra_env = { ui: @env.ui }.merge(extra_env || {})
+    old_action name, extra_env
+  end
+end

data/spec/acceptance/support/test_ui.rb

@@ -0,0 +1,22 @@
+class TestUI < Vagrant::UI::Interface
+  attr_reader :messages
+
+  METHODS = [:clear_line, :report_progress, :warn, :error, :info, :success]
+
+  def initialize(resource = nil)
+    super
+    @messages = METHODS.each_with_object({}) { |m, h| h[m] = [] }
+  end
+
+  def ask(*args)
+    super
+    # Automated tests should not depend on user input, obviously.
+    raise Errors::UIExpectsTTY
+  end
+
+  METHODS.each do |method|
+    define_method(method) do |message, *opts|
+      @messages[method].push message
+    end
+  end
+end

data/spec/acceptance_helper.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+unless ENV['USER'] == 'vagrant'
+  puts 'Acceptance specs are supposed to run from one of the vagrant-lxc dev machines'
+  exit 1
+end
+
+if defined? SimpleCov
+  SimpleCov.command_name 'acceptance'
+end
+
+require 'vagrant'
+require 'vagrant-lxc'
+
+Dir[File.dirname(__FILE__) + "/acceptance/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  config.include AcceptanceExampleGroup, :type => :acceptance, :example_group => {
+    :file_path => /\bspec\/acceptance\//
+  }
+end

data/spec/spec_helper.rb

@@ -2,14 +2,8 @@ if ENV['COVERAGE']
   require 'simplecov'
   require 'coveralls'
 
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-
-  SimpleCov.start do
-    add_filter { |source_file| source_file.filename =~ /\/spec\/support/ }
-  end
+  SimpleCov.start { add_filter '/spec/' }
+  SimpleCov.merge_timeout 300
 end
 
 require 'bundler/setup'

data/spec/unit/action/clear_forwarded_ports_spec.rb

@@ -28,15 +28,15 @@ describe Vagrant::LXC::Action::ClearForwardedPorts do
 
   context 'with a valid redir pid' do
     it 'kills known processes' do
-      subject.should have_received(:system).with("sudo pkill -9 -P #{pid}")
+      subject.should have_received(:system).with("sudo pkill -TERM -P #{pid}")
     end
   end
 
   context 'with an invalid pid' do
-    let(:pid_cmd)   { 'sudo ls' }
+    let(:pid_cmd) { 'sudo ls' }
 
     it 'does not kill the process' do
-      subject.should_not have_received(:system).with("sudo pkill -9 -P #{pid}")
+      subject.should_not have_received(:system).with("sudo pkill -TERM -P #{pid}")
     end
   end
 end

data/spec/unit/action/forward_ports_spec.rb

@@ -22,14 +22,14 @@ describe Vagrant::LXC::Action::ForwardPorts do
     machine.stub(provider: provider, data_dir: data_dir)
 
     subject.stub(exec: true)
-    subject.stub(:fork) { |&block| block.call; pid }
+    subject.stub(spawn: pid)
     subject.call(env)
   end
 
   after { FileUtils.rm_rf data_dir.to_s }
 
   it 'forwards ports using redir' do
-    subject.should have_received(:exec).with(
+    subject.should have_received(:spawn).with(
       "sudo redir --laddr=127.0.0.1 --lport=#{host_port} --cport=#{guest_port} --caddr=#{container_ip} 2>/dev/null"
     )
   end

data/spec/{support → unit/support}/unit_example_group.rb

@@ -14,6 +14,9 @@ module UnitExampleGroup
       Object.any_instance.stub(:fork) { |*args, &block|
         UnitExampleGroup.prevent_system_calls(*args, &block)
       }
+      Object.any_instance.stub(:spawn) { |*args, &block|
+        UnitExampleGroup.prevent_system_calls(*args, &block)
+      }
       require 'vagrant/util/subprocess'
       Vagrant::Util::Subprocess.stub(:execute) { |*args, &block|
         UnitExampleGroup.prevent_system_calls(*args, &block)

data/spec/unit_helper.rb

@@ -1,5 +1,11 @@
 require 'spec_helper'
 
+Dir[File.dirname(__FILE__) + "/unit/support/**/*.rb"].each { |f| require f }
+
+if defined? SimpleCov
+  SimpleCov.command_name 'unit'
+end
+
 RSpec.configure do |config|
   config.include RSpec::Fire
 

data/tasks/boxes.rake

@@ -1,18 +1,79 @@
-namespace :boxes do
-  namespace :quantal64 do
-    desc 'Build Ubuntu Quantal 64 bits Vagrant LXC box'
-    task :build do
-      if File.exists?('./boxes/output/lxc-quantal64.box')
-        puts 'Box has been built already!'
-        exit 1
+require 'rake/tasklib'
+
+class BuildUbuntuBoxTask < ::Rake::TaskLib
+  include ::Rake::DSL
+
+  attr_reader :name
+
+  def initialize(name, release, arch, opts = {})
+    @name           = name
+    @release        = release.to_s
+    @arch           = arch.to_s
+    @install_chef   = opts.fetch(:chef, true)
+    @install_puppet = opts.fetch(:puppet, true)
+    @file           = opts[:file] || default_box_file
+
+    desc "Build an Ubuntu #{release} #{arch} box" unless ::Rake.application.last_comment
+    task name do
+      RakeFileUtils.send(:verbose, true) do
+        run_task
       end
+    end
+  end
+
+  def run_task
+    if File.exists?("./boxes/output/#{@file}")
+      puts 'Box has been built already!'
+      exit 1
+    end
+
+    if Dir.exists?('boxes/temp')
+      puts "There is a partially built box under #{File.expand_path('./boxes/temp')}, please remove it before building a new box"
+      exit 1
+    end
+
+    sh 'mkdir -p boxes/temp/'
+    Dir.chdir 'boxes/temp' do
+      sh "sudo ../ubuntu/download #{@arch} #{@release}"
+      sh "sudo ../ubuntu/install-puppet" if @install_puppet
+      sh "sudo ../ubuntu/install-chef" if @install_chef
+      sh 'sudo rm -f rootfs.tar.gz'
+      sh 'sudo tar --numeric-owner -czf rootfs.tar.gz ./rootfs/*'
+      sh 'sudo rm -rf rootfs'
+      sh "sudo chown #{ENV['USER']}:#{ENV['USER']} rootfs.tar.gz"
+      sh "cp ../ubuntu/lxc-template ."
+      metadata = File.read('../ubuntu/metadata.json.template')
+      metadata.gsub!('ARCH', @arch)
+      metadata.gsub!('RELEASE', @release)
+      File.open('metadata.json', 'w') { |f| f.print metadata }
+      sh "tar -czf tmp-package.box ./*"
+    end
+
+    sh "cp boxes/temp/tmp-package.box boxes/output/#{@file}"
+    sh "rm -rf boxes/temp"
+  end
+
+  def default_box_file
+    require 'time'
+    "lxc-#{@release}-#{@arch}-#{Date.today}.box"
+  end
+end
+
+namespace :boxes do
+  namespace :ubuntu do
+    namespace :build do
+      chef   = ENV['CHEF'] != '0'
+      puppet = ENV['PUPPET'] != '0'
+
+      desc 'Build an Ubuntu Precise 64 bits box'
+      BuildUbuntuBoxTask.new(:precise64, :precise, 'amd64', chef: chef, puppet: puppet)
+
+      desc 'Build an Ubuntu Quantal 64 bits box'
+      BuildUbuntuBoxTask.new(:quantal64, :quantal, 'amd64', chef: chef, puppet: puppet)
 
-      sh 'mkdir -p boxes/output'
-      sh 'cd boxes/quantal64 && sudo ./download-ubuntu'
-      sh 'rm -f boxes/quantal64/rootfs.tar.gz'
-      sh 'cd boxes/quantal64 && sudo tar --numeric-owner -czf rootfs.tar.gz ./rootfs/*'
-      sh 'cd boxes/quantal64 && sudo rm -rf rootfs'
-      sh "cd boxes/quantal64 && sudo chown #{ENV['USER']}:#{ENV['USER']} rootfs.tar.gz && tar -czf ../output/lxc-quantal64.box ./* --exclude=download-ubuntu"
+      # FIXME: Find out how to install chef on raring
+      desc 'Build an Ubuntu Raring 64 bits box'
+      BuildUbuntuBoxTask.new(:raring64, :raring, 'amd64', chef: false, puppet: puppet)
     end
   end
 end

data/tasks/spec.rake

@@ -1,12 +1,15 @@
 begin
   require 'rspec/core/rake_task'
+  require 'coveralls/rake/task'
 
-  # TODO: add 'spec:acceptance' and 'spec:integration' then they are in place
   desc 'Run all specs'
-  task :spec    => ['spec:unit']
+  task :spec => ['spec:unit', 'spec:acceptance']
 
   desc 'Default task which runs all specs with code coverage enabled'
-  task :default => ['spec:set_coverage', 'spec']
+  task :default => ['spec:set_coverage', 'spec:unit']
+
+  Coveralls::RakeTask.new
+  task :ci => ['spec:set_coverage', 'spec:unit', 'coveralls:push']
 rescue LoadError; end
 
 namespace :spec do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -28,9 +28,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- boxes/quantal64/download-ubuntu
-- boxes/quantal64/lxc-template
-- boxes/quantal64/metadata.json
+- boxes/ubuntu/download
+- boxes/ubuntu/install-chef
+- boxes/ubuntu/install-puppet
+- boxes/ubuntu/lxc-template
+- boxes/ubuntu/metadata.json.template
 - development/Vagrantfile
 - development/lxc-configs/lxc-dev-box
 - development/lxc-configs/vbox
@@ -70,9 +72,15 @@ files:
 - lib/vagrant-lxc/provider.rb
 - lib/vagrant-lxc/version.rb
 - locales/en.yml
+- spec/Vagrantfile
+- spec/acceptance/sanity_check_spec.rb
+- spec/acceptance/support/acceptance_example_group.rb
+- spec/acceptance/support/machine_ext.rb
+- spec/acceptance/support/test_ui.rb
+- spec/acceptance_helper.rb
 - spec/fixtures/sample-ip-addr-output
 - spec/spec_helper.rb
-- spec/support/unit_example_group.rb
+- spec/support/.gitkeep
 - spec/unit/action/clear_forwarded_ports_spec.rb
 - spec/unit/action/compress_rootfs_spec.rb
 - spec/unit/action/forward_ports_spec.rb
@@ -80,6 +88,7 @@ files:
 - spec/unit/action/setup_package_files_spec.rb
 - spec/unit/driver/cli_spec.rb
 - spec/unit/driver_spec.rb
+- spec/unit/support/unit_example_group.rb
 - spec/unit_helper.rb
 - tasks/boxes.rake
 - tasks/spec.rake
@@ -108,9 +117,15 @@ signing_key:
 specification_version: 4
 summary: Linux Containers provider for Vagrant
 test_files:
+- spec/Vagrantfile
+- spec/acceptance/sanity_check_spec.rb
+- spec/acceptance/support/acceptance_example_group.rb
+- spec/acceptance/support/machine_ext.rb
+- spec/acceptance/support/test_ui.rb
+- spec/acceptance_helper.rb
 - spec/fixtures/sample-ip-addr-output
 - spec/spec_helper.rb
-- spec/support/unit_example_group.rb
+- spec/support/.gitkeep
 - spec/unit/action/clear_forwarded_ports_spec.rb
 - spec/unit/action/compress_rootfs_spec.rb
 - spec/unit/action/forward_ports_spec.rb
@@ -118,4 +133,5 @@ test_files:
 - spec/unit/action/setup_package_files_spec.rb
 - spec/unit/driver/cli_spec.rb
 - spec/unit/driver_spec.rb
+- spec/unit/support/unit_example_group.rb
 - spec/unit_helper.rb