vagrant-lxc 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd1975bccf20eba75300c481bdf0278fe909151c
-  data.tar.gz: 6d9d53e02972c5f080aec5f26a750066d695bd57
+  metadata.gz: 0a4f7310beee8c22199a005050da4b4e7ec6d4ce
+  data.tar.gz: 8a821d1fd168ca8b76ceb56842c919140f411e75
 SHA512:
-  metadata.gz: 7e7803f41a9bb9b45c2656e38711a7180b700f5e11d96d07a2b28c04009f3fc3fc72f63c985a6ade6af446914f7a2e0aa09308d7cbddfa90b24bc03fd88ad3ea
-  data.tar.gz: 3e5ad8c62617b4e385773ff4fec76b14005c53304e4302bd487094cdd77bc0838bc47cbbfec5c4dc9d2b3094111ac4336e157fbffacc736e168cad0c75fc981d
+  metadata.gz: a60f7cc7e0a0539f779bb8a3f5c957521d59d43692cb56c511713f60d47d995e951398a83c5e87460842daffbae1e26d438534361881d0bac2c78b411a6c5824
+  data.tar.gz: 6f464caf8224f223e234eff0b1346336b7d27044d8dd7f242e5abdf33d484d57121954d44602826ea2c4682910575d9573ed771cefbe1b7591c7aab34c3e31bc

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## 0.1.0
+
+  - Support for chef added to base quantal64 box
+  - Puppet upgraded to 3.1.1 on base quantal64 box
+  - Port forwarding support added [#6](https://github.com/fgrehm/vagrant-lxc/issues/6)
+
+## Previous
+
+The changelog began with version 0.1.0 so any changes prior to that
+can be seen by checking the tagged releases and reading git commit
+messages.

data/Gemfile.lock

@@ -1,20 +1,20 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 327ca544efdd6a0d0988509152a369fdb09c904d
+  revision: 87613ec9392d4660ffcb1d5755307136c06af08c
   specs:
-    vagrant (1.1.1.dev)
+    vagrant (1.1.4)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
       json (>= 1.5.1, < 1.8.0)
       log4r (~> 1.1.9)
-      net-scp (~> 1.0.4)
-      net-ssh (~> 2.2.2)
+      net-scp (~> 1.1.0)
+      net-ssh (~> 2.6.6)
 
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.0.3.dev)
+    vagrant-lxc (0.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -24,7 +24,7 @@ GEM
     coderay (1.0.9)
     diff-lcs (1.2.1)
     erubis (2.7.0)
-    ffi (1.4.0)
+    ffi (1.6.0)
     guard (1.6.2)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
@@ -36,45 +36,45 @@ GEM
       guard (~> 1.1)
     guard-ctags-bundler (0.1.6)
       guard (>= 1.1)
-    guard-rspec (2.5.0)
+    guard-rspec (2.5.1)
       guard (>= 1.1)
       rspec (~> 2.11)
     i18n (0.6.4)
     json (1.7.7)
     listen (0.7.3)
     log4r (1.1.10)
-    lumberjack (1.0.2)
+    lumberjack (1.0.3)
     method_source (0.8.1)
-    multi_json (1.6.1)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.2.2)
+    multi_json (1.7.2)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.6)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.0.3)
+    rake (10.0.4)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
+    rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-fire (1.1.3)
       rspec (~> 2.11)
     rspec-mocks (2.13.0)
-    rspec-spies (2.1.3)
+    rspec-spies (2.1.4)
       rspec (~> 2.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.3)
+    slop (3.4.4)
     terminal-table (1.4.5)
-    thor (0.17.0)
+    thor (0.18.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,29 +1,28 @@
-# vagrant-lxc
+# vagrant-lxc [![Build Status](https://travis-ci.org/fgrehm/vagrant-lxc.png?branch=master)](https://travis-ci.org/fgrehm/vagrant-lxc) [![Gem Version](https://badge.fury.io/rb/vagrant-lxc.png)](http://badge.fury.io/rb/vagrant-lxc) [![Code Climate](https://codeclimate.com/github/fgrehm/vagrant-lxc.png)](https://codeclimate.com/github/fgrehm/vagrant-lxc)
 
-[![Build Status](https://travis-ci.org/fgrehm/vagrant-lxc.png?branch=master)](https://travis-ci.org/fgrehm/vagrant-lxc)
-
-Highly experimental Linux Containers support for Vagrant 1.1.
+Experimental Linux Containers support for Vagrant > 1.1.
 
 
 ## Dependencies
 
-Vagrant >= 1.1.0, the `lxc` package and a Kernel [higher than 3.5.0-17.28](#help-im-unable-to-restart-containers),
+Vagrant >= 1.1.0, `lxc` and `redir` packages and a Kernel [higher than 3.5.0-17.28](#help-im-unable-to-restart-containers),
 which on Ubuntu 12.10 means something like:
 
 ```
 sudo apt-get update && sudo apt-get dist-upgrade
-sudo apt-get install lxc
-wget "http://files.vagrantup.com/packages/67bd4d30f7dbefa7c0abc643599f0244986c38c8/vagrant_`uname -m`.deb" -O /tmp/vagrant.deb
+sudo apt-get install lxc redir
+wget "http://files.vagrantup.com/packages/87613ec9392d4660ffcb1d5755307136c06af08c/vagrant_`uname -m`.deb" -O /tmp/vagrant.deb
 sudo dpkg -i /tmp/vagrant.deb
 ```
 
 
-## What is currently supported?
+## What is currently supported? (v0.1.0)
 
 * Vagrant's `up`, `halt`, `reload`, `destroy`, and `ssh` commands
 * Shared folders
-* Provisioning with shell scripts and puppet (should work with chef but I [haven't had the chance](https://github.com/fgrehm/vagrant-lxc/issues/37) to set it up on the base box)
+* Provisioning
 * Setting container's host name
+* Port forwarding
 
 *Please refer to the [closed issues](https://github.com/fgrehm/vagrant-lxc/issues?labels=&milestone=&page=1&state=closed)
 for the most up to date list.*
@@ -31,11 +30,13 @@ for the most up to date list.*
 
 ## Current limitations
 
-* Port forwarding does not work [yet](https://github.com/fgrehm/vagrant-lxc/issues/6)
+* Port forwarding collision detection
 * A hell lot of `sudo`s
 * Only a [single ubuntu box supported](boxes), I'm still [figuring out what should go
   on the .box file](https://github.com/fgrehm/vagrant-lxc/issues/4)
 * "[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)
   and some known [bugs](https://github.com/fgrehm/vagrant-lxc/issues?labels=bug&page=1&state=open)
 
@@ -51,9 +52,11 @@ vagrant plugin install vagrant-lxc
 After that you can create a `Vagrantfile` like the one below and run `vagrant up --provider=lxc`:
 
 ```ruby
+Vagrant.require_plugin 'vagrant-lxc'
+
 Vagrant.configure("2") do |config|
   config.vm.box     = "lxc-quantal64"
-  config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-10.box'
+  config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-26.box'
 
   # Share an additional folder to the guest Container. The first argument
   # is the path on the host to the actual folder. The second argument is

data/boxes/quantal64/download-ubuntu

@@ -3,6 +3,7 @@
 # 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
 
@@ -21,8 +22,8 @@ cleanup()
 write_sourceslist()
 {
     # $1 => path to the rootfs
-    # $2 => architecture we want to add
 
+    # TODO: Mirrors sometimes are giving us some 404s
     MIRROR=${MIRROR:-mirror://mirrors.ubuntu.com/mirrors.txt}
     SECURITY_MIRROR=${SECURITY_MIRROR:-http://security.ubuntu.com/ubuntu}
 
@@ -35,7 +36,7 @@ EOF
 
 download_ubuntu()
 {
-    packages=vim,ssh,curl,wget,bash-completion,manpages,puppet
+    packages=vim,ssh,curl,wget,bash-completion,manpages,man-db,psmisc
     echo "installing packages: $packages"
 
     trap cleanup EXIT SIGHUP SIGINT SIGTERM
@@ -101,3 +102,19 @@ if [ -d "${cache}/rootfs-${arch}" ]; then
 fi
 
 download_ubuntu $cache $arch $release
+
+rootfs="${cache}/rootfs-${arch}"
+
+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

data/development/Vagrantfile.1.1

@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-def local_cache(box_name)
+def local_apt_cache(box_name)
   cache_dir = File.join(File.expand_path(Vagrant::Environment::DEFAULT_HOME),
                         'cache',
                         'apt',
@@ -11,6 +11,16 @@ def local_cache(box_name)
   cache_dir
 end
 
+def local_gem_cache(box_name)
+  cache_dir = File.join(File.expand_path(Vagrant::Environment::DEFAULT_HOME),
+                        'cache',
+                        'gems',
+                        'source',
+                        box_name)
+  FileUtils.mkdir_p(cache_dir) unless File.exists? cache_dir
+  cache_dir
+end
+
 Vagrant.require_plugin 'vagrant-lxc'
 
 Vagrant.configure("2") do |config|
@@ -18,28 +28,29 @@ Vagrant.configure("2") do |config|
 
   config.vm.synced_folder "../", "/vagrant", name: 'vagrant-root'
 
-  cache_dir = local_cache(config.vm.box)
-  config.vm.synced_folder cache_dir, "/var/cache/apt/archives", name: "vagrant-cache"
+  cache_dir = local_apt_cache(config.vm.box)
+  config.vm.synced_folder cache_dir, "/var/cache/apt/archives", name: "vagrant-apt-cache"
+
+  cache_dir = local_gem_cache(config.vm.box)
+  config.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", name: "vagrant-gem-cache"
 
   config.vm.define :vbox do |vb_config|
     vb_config.vm.box_url  = "https://github.com/downloads/roderik/VagrantQuantal64Box/quantal64.box"
     vb_config.vm.hostname = 'vbox'
 
     vb_config.vm.provider :virtualbox do |vb|
-      # Configure VM to use 1.5gb of ram and 3 cpus
+      # Configure VM to use 1.5gb of ram and 2 cpus
       vb.customize [
         "modifyvm", :id,
         "--memory", '1536',
-        "--cpus", '4'
+        "--cpus", '2'
       ]
     end
-
-    vb_config.vm.provision :shell, :path => 'shell-provisioning/upgrade-kernel'
   end
 
   config.vm.define :lxc do |lxc_config|
     lxc_config.vm.hostname = 'lxc-dev-box'
-    lxc_config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-10.box'
+    lxc_config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-26.box'
 
     lxc_config.vm.provider :lxc do |lxc|
       # Required to boot nested containers
@@ -47,6 +58,8 @@ Vagrant.configure("2") do |config|
     end
   end
 
+  config.vm.provision :shell, :path => 'shell-provisioning/upgrade-kernel'
+
   config.vm.provision :puppet do |puppet|
     puppet.manifests_path = "."
     puppet.manifest_file  = "site.pp"

data/development/site.pp

@@ -20,7 +20,8 @@ exec {
 
 # Install dependencies
 package {
-  [ 'libffi-dev', 'bsdtar', 'exuberant-ctags', 'ruby1.9.1-dev', 'htop', 'git', 'build-essential' ]:
+  [ 'libffi-dev', 'bsdtar', 'exuberant-ctags', 'ruby1.9.1-dev', 'htop', 'git',
+    'build-essential', 'redir' ]:
     ensure   => 'installed'
   ;
 

data/example/Vagrantfile

@@ -15,7 +15,7 @@ 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-03-10.box'
+  config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-26.box'
   config.vm.hostname = 'lxc-quantal64'
 
   config.vm.synced_folder "/tmp", "/vagrant_data"

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

@@ -0,0 +1,47 @@
+module Vagrant
+  module LXC
+    module Action
+      class ClearForwardedPorts
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant::lxc::action::clear_forwarded_ports")
+        end
+
+        def call(env)
+          @env = env
+
+          if redir_pids.any?
+            env[:ui].info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
+            redir_pids.each do |pid|
+              next unless is_redir_pid?(pid)
+              @logger.debug "Killing pid #{pid}"
+              system "sudo pkill -9 -P #{pid}"
+            end
+
+            remove_redir_pids
+          end
+
+          @app.call env
+        end
+
+        protected
+
+        def redir_pids
+          @redir_pids = Dir[@env[:machine].data_dir.join('pids').to_s + "/redir_*.pid"].map do |file|
+            File.read(file).strip.chomp
+          end
+        end
+
+        def is_redir_pid?(pid)
+          `ps -o cmd= #{pid}`.strip.chomp =~ /redir/
+        end
+
+        def remove_redir_pids
+          Dir[@env[:machine].data_dir.join('pids').to_s + "/redir_*.pid"].each do |file|
+            File.delete file
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+module Vagrant
+  module LXC
+    module Action
+      class ForwardPorts
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::lxc::action::forward_ports")
+        end
+
+        def call(env)
+          @env = env
+
+          # Continue, we need the VM to be booted in order to grab its IP
+          @app.call env
+
+          # Get the ports we're forwarding
+          env[:forwarded_ports] = compile_forwarded_ports(env[:machine].config)
+
+          # Warn if we're port forwarding to any privileged ports
+          env[:forwarded_ports].each do |fp|
+            if fp[:host] <= 1024
+              env[:ui].warn I18n.t("vagrant.actions.vm.forward_ports.privileged_ports")
+              break
+            end
+          end
+
+          env[:ui].info I18n.t("vagrant.actions.vm.forward_ports.forwarding")
+          forward_ports
+        end
+
+        def forward_ports
+          @container_ip = @env[:machine].provider.container.assigned_ip
+
+          @env[:forwarded_ports].each do |fp|
+            message_attributes = {
+              # TODO: Add support for multiple adapters
+              :adapter    => 'eth0',
+              :guest_port => fp[:guest],
+              :host_port  => fp[:host]
+            }
+
+            # TODO: Remove adapter from logging
+            @env[:ui].info(I18n.t("vagrant.actions.vm.forward_ports.forwarding_entry",
+                                  message_attributes))
+
+            redir_pid = redirect_port(fp[:host], fp[:guest])
+            store_redir_pid(fp[:host], redir_pid)
+          end
+        end
+
+        private
+
+        def compile_forwarded_ports(config)
+          mappings = {}
+
+          config.vm.networks.each do |type, options|
+            if type == :forwarded_port
+              mappings[options[:host]] = options
+            end
+          end
+
+          mappings.values
+        end
+
+        def redirect_port(host, guest)
+          redir_cmd = "sudo redir --laddr=127.0.0.1 --lport=#{host} --cport=#{guest} --caddr=#{@container_ip}"
+
+          @logger.debug "Forwarding port with `#{redir_cmd}`"
+          fork { exec redir_cmd }
+        end
+
+        def store_redir_pid(host_port, redir_pid)
+          data_dir = @env[:machine].data_dir.join('pids')
+          data_dir.mkdir unless data_dir.directory?
+
+          data_dir.join("redir_#{host_port}.pid").open('w') do |pid_file|
+            pid_file.write(redir_pid)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/action.rb

@@ -1,13 +1,17 @@
+# TODO: Remove base action
 require 'vagrant-lxc/action/base_action'
 
+# TODO: Use require_relative
 require 'vagrant-lxc/action/boot'
 require 'vagrant-lxc/action/check_created'
 require 'vagrant-lxc/action/check_running'
+require 'vagrant-lxc/action/clear_forwarded_ports'
 require 'vagrant-lxc/action/create'
 require 'vagrant-lxc/action/created'
 require 'vagrant-lxc/action/destroy'
 require 'vagrant-lxc/action/disconnect'
 require 'vagrant-lxc/action/forced_halt'
+require 'vagrant-lxc/action/forward_ports'
 require 'vagrant-lxc/action/handle_box_metadata'
 require 'vagrant-lxc/action/is_running'
 require 'vagrant-lxc/action/network'
@@ -21,9 +25,10 @@ module Vagrant
       # machine back up with the new configuration.
       def self.action_reload
         Vagrant::Action::Builder.new.tap do |b|
-          # b.use CheckLXC
+          # b.use CheckDependencies
           b.use Vagrant::Action::Builtin::Call, Created do |env1, b2|
             if !env1[:result]
+              # TODO: Implement our own MessageNotCreated
               b2.use VagrantPlugins::ProviderVirtualBox::Action::MessageNotCreated
               next
             end
@@ -52,10 +57,10 @@ module Vagrant
           # b.use ClearSharedFolders
           b.use ShareFolders
           b.use Network
-          # b.use ForwardPorts
           b.use Vagrant::Action::Builtin::SetHostname
           # b.use SaneDefaults
           # b.use Customize
+          b.use ForwardPorts
           b.use Boot
         end
       end
@@ -63,16 +68,18 @@ module Vagrant
       # This action just runs the provisioners on the machine.
       def self.action_provision
         Vagrant::Action::Builder.new.tap do |b|
-          # b.use CheckLXC
+          # b.use CheckDependencies
           b.use Vagrant::Action::Builtin::ConfigValidate
           b.use Vagrant::Action::Builtin::Call, Created do |env1, b2|
             if !env1[:result]
+              # TODO: Implement our own MessageNotCreated
               b2.use VagrantPlugins::ProviderVirtualBox::Action::MessageNotCreated
               next
             end
 
             b2.use Vagrant::Action::Builtin::Call, IsRunning do |env2, b3|
               if !env2[:result]
+                # TODO: Implement our own MessageNotRunning
                 b3.use VagrantPlugins::ProviderVirtualBox::Action::MessageNotRunning
                 next
               end
@@ -88,7 +95,7 @@ module Vagrant
       # A precondition of this action is that the container exists.
       def self.action_start
         Vagrant::Action::Builder.new.tap do |b|
-          # b.use CheckLXC
+          # b.use CheckDependencies
           b.use Vagrant::Action::Builtin::ConfigValidate
           b.use Vagrant::Action::Builtin::Call, IsRunning do |env, b2|
             # If the VM is running, then our work here is done, exit
@@ -103,7 +110,7 @@ module Vagrant
       # container, configuring metadata, and booting.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
-          # b.use CheckLXC
+          # b.use CheckDependencies
           b.use Vagrant::Action::Builtin::ConfigValidate
           b.use Vagrant::Action::Builtin::Call, Created do |env, b2|
             # If the VM is NOT created yet, then do the setup steps
@@ -121,16 +128,19 @@ module Vagrant
       # the virtual machine, gracefully or by force.
       def self.action_halt
         Vagrant::Action::Builder.new.tap do |b|
-          # b.use CheckLXC
+          # b.use CheckDependencies
           b.use Vagrant::Action::Builtin::Call, Created do |env, b2|
             if env[:result]
+              # TODO: If vagrant >=...
               b2.use Disconnect
+              b2.use ClearForwardedPorts
               b2.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :stopped, :running do |env2, b3|
                 if !env2[:result] && env2[:machine].provider.state.running?
                   b3.use ForcedHalt
                 end
               end
             else
+              # TODO: Implement our own MessageNotCreated
               b2.use VagrantPlugins::ProviderVirtualBox::Action::MessageNotCreated
             end
           end
@@ -141,9 +151,10 @@ module Vagrant
       # freeing the resources of the underlying virtual machine.
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
-          # b.use CheckLXC
+          # b.use CheckDependencies
           b.use Vagrant::Action::Builtin::Call, Created do |env1, b2|
             if !env1[:result]
+              # TODO: Implement our own MessageNotCreated
               b2.use VagrantPlugins::ProviderVirtualBox::Action::MessageNotCreated
               next
             end
@@ -167,7 +178,7 @@ module Vagrant
       # This is the action that will exec into an SSH shell.
       def self.action_ssh
         Vagrant::Action::Builder.new.tap do |b|
-          # b.use CheckLXC
+          # b.use CheckDependencies
           b.use CheckCreated
           # b.use CheckAccessible
           b.use CheckRunning
@@ -178,7 +189,7 @@ module Vagrant
       # This is the action that will run a single SSH command.
       def self.action_ssh_run
         Vagrant::Action::Builder.new.tap do |b|
-          # b.use CheckLXC
+          # b.use CheckDependencies
           b.use CheckCreated
           # b.use CheckAccessible
           b.use CheckRunning

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/spec/spec_helper.rb

@@ -1,17 +1,24 @@
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start do
-    # This can probably go away once we stop using vagrant as submodule
     add_filter { |source_file| source_file.filename =~ /\/spec\/support/ }
   end
 end
 
 require 'bundler/setup'
 
+require 'i18n'
+
 require 'rspec-spies'
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
+# If we should verify constant names, eager loads
+if ENV['VERIFY_CONSTANT_NAMES']
+  require 'vagrant-lxc/plugin'
+  require 'vagrant-lxc/provider'
+end
+
 require 'rspec/fire'
 RSpec::Fire.configure do |config|
   config.verify_constant_names = ENV['VERIFY_CONSTANT_NAMES'] == '1'

data/spec/support/unit_example_group.rb

@@ -8,6 +8,12 @@ module UnitExampleGroup
       Object.any_instance.stub(:`) { |*args, &block|
         UnitExampleGroup.prevent_system_calls(*args, &block)
       }
+      Object.any_instance.stub(:exec) { |*args, &block|
+        UnitExampleGroup.prevent_system_calls(*args, &block)
+      }
+      Object.any_instance.stub(:fork) { |*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)
@@ -22,6 +28,7 @@ module UnitExampleGroup
 Somehow your code under test is trying to execute a command on your system,
 please stub it out or move your spec code to an acceptance spec.
 
+Block:   #{block.inspect}
 Command: "#{args.join(' ')}"
     MSG
   end

data/spec/unit/action/clear_forwarded_ports_spec.rb

@@ -0,0 +1,42 @@
+require 'unit_helper'
+
+require 'vagrant-lxc/action/clear_forwarded_ports'
+
+describe Vagrant::LXC::Action::ClearForwardedPorts do
+  let(:app)       { mock(:app, call: true) }
+  let(:env)       { {machine: machine, ui: stub(info: true)} }
+  let(:machine)   { mock(:machine, data_dir: data_dir) }
+  let!(:data_dir) { Pathname.new(Dir.mktmpdir) }
+  let(:pids_dir)  { data_dir.join('pids') }
+  let(:pid)       { 'a-pid' }
+  let(:pid_cmd)   { 'redir' }
+
+  subject { described_class.new(app, env) }
+
+  before do
+    pids_dir.mkdir
+    pids_dir.join('redir_1234.pid').open('w') { |f| f.write(pid) }
+    subject.stub(system: true, :` => pid_cmd)
+    subject.call(env)
+  end
+
+  after { FileUtils.rm_rf data_dir.to_s }
+
+  it 'removes all files under pid directory' do
+    Dir[pids_dir.to_s + "/redir_*.pid"].should be_empty
+  end
+
+  context 'with a valid redir pid' do
+    it 'kills known processes' do
+      subject.should have_received(:system).with("sudo pkill -9 -P #{pid}")
+    end
+  end
+
+  context 'with an invalid pid' do
+    let(:pid_cmd)   { 'sudo ls' }
+
+    it 'does not kill the process' do
+      subject.should_not have_received(:system).with("sudo pkill -9 -P #{pid}")
+    end
+  end
+end

data/spec/unit/action/forward_ports_spec.rb

@@ -0,0 +1,41 @@
+require 'unit_helper'
+
+require 'vagrant-lxc/action/forward_ports'
+
+describe Vagrant::LXC::Action::ForwardPorts do
+  let(:app)          { mock(:app, call: true) }
+  let(:env)          { {machine: machine, ui: stub(info: true)} }
+  let(:machine)      { mock(:machine) }
+  let!(:data_dir)    { Pathname.new(Dir.mktmpdir) }
+  let(:networks)     { [[:other_config, {}], [:forwarded_port, {guest: guest_port, host: host_port}]] }
+  let(:host_port)    { 8080 }
+  let(:guest_port)   { 80 }
+  let(:provider)     { fire_double('Vagrant::LXC::Provider', container: container) }
+  let(:container)    { fire_double('Vagrant::LXC::Container', assigned_ip: container_ip) }
+  let(:container_ip) { '10.0.1.234' }
+  let(:pid)          { 'a-pid' }
+
+  subject { described_class.new(app, env) }
+
+  before do
+    machine.stub_chain(:config, :vm, :networks).and_return(networks)
+    machine.stub(provider: provider, data_dir: data_dir)
+
+    subject.stub(exec: true)
+    subject.stub(:fork) { |&block| block.call; 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(
+      "sudo redir --laddr=127.0.0.1 --lport=#{host_port} --cport=#{guest_port} --caddr=#{container_ip}"
+    )
+  end
+
+  it "stores redir pids on machine's data dir" do
+    pid_file = data_dir.join('pids', "redir_#{host_port}.pid").read
+    pid_file.should == pid
+  end
+end

data/tasks/boxes.rake

@@ -12,6 +12,7 @@ namespace :boxes do
       sh 'rm -f boxes/quantal64/rootfs.tar.gz'
       sh 'cd boxes/quantal64 && sudo tar --numeric-owner -czf rootfs.tar.gz ./rootfs-amd64/*'
       sh "cd boxes/quantal64 && sudo chown #{ENV['USER']}:#{ENV['USER']} rootfs.tar.gz && tar -czf ../output/lxc-quantal64.box ./* --exclude=rootfs-amd64 --exclude=download-ubuntu"
+      sh 'cd boxes/quantal64 && sudo rm -rf rootfs-amd64'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -21,6 +21,7 @@ files:
 - .rspec
 - .travis.yml
 - .vimrc
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -45,11 +46,13 @@ files:
 - lib/vagrant-lxc/action/boot.rb
 - lib/vagrant-lxc/action/check_created.rb
 - lib/vagrant-lxc/action/check_running.rb
+- lib/vagrant-lxc/action/clear_forwarded_ports.rb
 - lib/vagrant-lxc/action/create.rb
 - lib/vagrant-lxc/action/created.rb
 - lib/vagrant-lxc/action/destroy.rb
 - lib/vagrant-lxc/action/disconnect.rb
 - lib/vagrant-lxc/action/forced_halt.rb
+- lib/vagrant-lxc/action/forward_ports.rb
 - lib/vagrant-lxc/action/handle_box_metadata.rb
 - lib/vagrant-lxc/action/is_running.rb
 - lib/vagrant-lxc/action/network.rb
@@ -66,6 +69,8 @@ files:
 - spec/fixtures/sample-ifconfig-output
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
+- spec/unit/action/clear_forwarded_ports_spec.rb
+- spec/unit/action/forward_ports_spec.rb
 - spec/unit/action/handle_box_metadata_spec.rb
 - spec/unit/container/cli_spec.rb
 - spec/unit/container_spec.rb
@@ -101,6 +106,8 @@ test_files:
 - spec/fixtures/sample-ifconfig-output
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
+- spec/unit/action/clear_forwarded_ports_spec.rb
+- spec/unit/action/forward_ports_spec.rb
 - spec/unit/action/handle_box_metadata_spec.rb
 - spec/unit/container/cli_spec.rb
 - spec/unit/container_spec.rb