vagrant-lxc 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da07b6b0d3b29fc7b29cb7433180abc52e31a900
-  data.tar.gz: 8502aefc759fef3438c3d8ef6cc8ebcaa9385080
+  metadata.gz: e595cc6f680e584b60fd1a734c4f174bddba99fa
+  data.tar.gz: 9e432b94e595b4da4d33a6d724728a11a06fd4bb
 SHA512:
-  metadata.gz: 55d597dd781cc4d7d4c2e20a8ea666f166aa3dbbdf6f8b0ac7ba3ebf1c6fbfad054f086d4e02dcc320cafe983bf75f22cacaaae943fb3d4f82b4f75e48620ff4
-  data.tar.gz: 1907baa7cc4833b121b43a76320360cd6ea836ebc6c6ade118fd821ca9cc2ed89dbe58afd0c24590e2f84936f68205a840332fcef78c094b687aa578bd8664dc
+  metadata.gz: 8542b6cbd0bcf756ef6846cb0cc87dc489ed47460255b3c16526021cd80c4ae8d52dc42617298f258f5ee51cf64a357b082dabec99265ad80a49cbd32430b00a
+  data.tar.gz: 4dee7221dbc5dacb6e0a290a89174d450f714e6b83c891cea1f11fccd870df144acb2b30e8cf0a62917feac5b6d527d90d28a93f4d2310ff8323786f36c475f3

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.7.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.6.4...v0.7.0) (unreleased)
+
+IMPROVEMENTS:
+
+  - Support for `vagrant up` in parallel [#152](https://github.com/fgrehm/vagrant-lxc/issues/152)
+  - Warn users about unsupported private / public networking configs [#154](https://github.com/fgrehm/vagrant-lxc/issues/154)
+  - Respect Vagrantfile options to disable forwarded port [#149](https://github.com/fgrehm/vagrant-lxc/issues/149)
+
+BUG FIXES:
+
+  - Error out in case an invalid IPs are provided for forwarded ports [#170](https://github.com/fgrehm/vagrant-lxc/issues/170)
+  - Fix "Permission denied" when starting/destroying containers after lxc
+    security update in Ubuntu [#180](https://github.com/fgrehm/vagrant-lxc/issues/180)
+  - Fix `vagrant package` [#172](https://github.com/fgrehm/vagrant-lxc/issues/172)
+
+
 ## [0.6.4](https://github.com/fgrehm/vagrant-lxc/compare/v0.6.3...v0.6.4) (Oct 27, 2013)
 
 IMPROVEMENTS:

data/CONTRIBUTING.md

@@ -4,7 +4,8 @@
   but I'll most likely close the issue right away and will continue the discussion
   with the issue closed. If you have any questions about the plugin, make sure
   you go through the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki) pages
-  first and if you still need answers please ask a question on [Stack Overflow](http://stackoverflow.com/questions/tagged/vagrant-lxc)
+  first (specially the [Troubleshooting Section](https://github.com/fgrehm/vagrant-lxc/wiki/Troubleshooting))
+  and if you still need answers please ask a question on [Stack Overflow](http://stackoverflow.com/questions/tagged/vagrant-lxc)
   using the `vagrant-lxc` tag on it so that I get notified :)
 
 * Please do a small search on the issues tracker before submitting your issue to

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant',          github: 'mitchellh/vagrant', tag: 'v1.3.3'
+  gem 'vagrant',          github: 'mitchellh/vagrant'
   gem 'vagrant-cachier',  github: 'fgrehm/vagrant-cachier'
   gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine'
   gem 'vagrant-omnibus'

data/Gemfile.lock

@@ -1,21 +1,20 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-cachier.git
-  revision: 11defb0b290a34d069f3ec014fb30d4461aab04b
+  revision: 536ca7ad54b3096644993f91f363df8a884d4600
   specs:
-    vagrant-cachier (0.3.3)
+    vagrant-cachier (0.4.2.dev)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-pristine.git
-  revision: 5c400d7850fc5f98d9601b59f4c3bd74818650de
+  revision: 4638491786943bfbf6f115b1fc379f069963fe46
   specs:
-    vagrant-pristine (0.2.0)
+    vagrant-pristine (0.3.0)
 
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: db8e7a9c79b23264da129f55cf8569167fc22415
-  tag: v1.3.3
+  revision: a92e03cf4ce936243d3959b7b5603262a234a58d
   specs:
-    vagrant (1.3.3)
+    vagrant (1.3.6.dev)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
@@ -26,44 +25,45 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.6.4)
+    vagrant-lxc (0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.9)
-    colorize (0.5.8)
-    coveralls (0.6.7)
-      colorize
+    coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
+      term-ansicolor
       thor
     diff-lcs (1.2.4)
     erubis (2.7.0)
-    ffi (1.9.0)
+    ffi (1.9.3)
     formatador (0.2.4)
-    guard (1.8.2)
+    guard (2.2.3)
       formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (3.0.3)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (3.1.0)
       guard (>= 1.8)
       rspec (~> 2.13)
     i18n (0.6.5)
-    listen (1.3.1)
+    listen (2.2.0)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     log4r (1.1.10)
     lumberjack (1.0.4)
     method_source (0.8.2)
-    mime-types (1.25)
-    multi_json (1.8.0)
+    mime-types (2.0)
+    multi_json (1.8.2)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
@@ -73,9 +73,7 @@ GEM
       slop (~> 3.4)
     rake (10.1.0)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.1)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-inotify (0.9.2)
       ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -96,8 +94,12 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.4.6)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     thor (0.18.1)
-    vagrant-omnibus (1.1.1)
+    timers (1.1.0)
+    tins (0.12.0)
+    vagrant-omnibus (1.1.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -5,7 +5,9 @@
 [LXC](http://lxc.sourceforge.net/) provider for [Vagrant](http://www.vagrantup.com/) 1.1+
 
 This is a Vagrant plugin that allows it to control and provision Linux Containers
-as an alternative to the built in VirtualBox provider for Linux hosts.
+as an alternative to the built in VirtualBox provider for Linux hosts. Check out
+[this blog post](http://fabiorehm.com/blog/2013/04/28/lxc-provider-for-vagrant/)
+to see it in action.
 
 
 ## Features / Limitations
@@ -37,6 +39,9 @@ If you are on a Mac or Windows machine, you might want to have a look at [this](
 blog post for some ideas on how to set things up or check out [this other repo](https://github.com/fgrehm/vagrant-lxc-vbox-hosts)
 for a set of Vagrant VirtualBox machines ready for vagrant-lxc usage.
 
+**NOTE: Some users have been experiencing networking issues and right now you might need to
+disable checksum offloading as described on [this comment](https://github.com/fgrehm/vagrant-lxc/issues/153#issuecomment-26441273)**
+
 
 ## Installation
 
@@ -78,7 +83,7 @@ using the [provider block](http://docs.vagrantup.com/v2/providers/configuration.
 Vagrant.configure("2") do |config|
   config.vm.box = "quantal64"
   config.vm.provider :lxc do |lxc|
-    # Same effect as as 'customize ["modifyvm", :id, "--memory", "1024"]' for VirtualBox
+    # Same effect as 'customize ["modifyvm", :id, "--memory", "1024"]' for VirtualBox
     lxc.customize 'cgroup.memory.limit_in_bytes', '1024M'
   end
 end
@@ -118,7 +123,7 @@ list if you have a problem and feel free to use the [issue tracker](https://gith
 propose new functionality and / or report bugs.
 
 
-## Donating
+## Support
 
 Support this project and [others by fgrehm](https://github.com/fgrehm)
 via [gittip](https://www.gittip.com/fgrehm/).
@@ -133,3 +138,5 @@ via [gittip](https://www.gittip.com/fgrehm/).
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/fgrehm/vagrant-lxc/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/boxes/build-all.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# set -x
+set -e
+
+# Convenience script used for building all of the base boxes available
+
+# Ubuntu boxes
+sudo -E ./build-ubuntu-box.sh precise
+sudo -E ./build-ubuntu-box.sh quantal
+sudo -E ./build-ubuntu-box.sh raring
+sudo -E ./build-ubuntu-box.sh saucy
+
+# Debian boxes
+sudo -E ./build-debian-box.sh squeeze
+sudo -E ./build-debian-box.sh wheezy
+sudo -E ./build-debian-box.sh sid
+
+for box in precise raring quantal saucy squeeze wheezy sid; do
+  box="vagrant-lxc-${box}-amd64-`date +%Y-%m-%d`.box"
+  ~/bin/dropbox_uploader.sh upload output/${box} Public/
+done

data/development/Vagrantfile

@@ -2,16 +2,16 @@
 # vi: set ft=ruby :
 
 require 'pathname'
-BASE_URL          = 'http://dl.dropbox.com/u/13510779'
-LAST_RELEASE_DATE = '2013-07-12'
+BASE_URL          = 'http://bit.ly/'
+LAST_RELEASE_DATE = '2013-09-28'
 LOCAL_BOXES_PATH  = Pathname('../boxes/output').expand_path
 def lxc_box_url(release_name)
-  file_name      = "lxc-#{release_name}-amd64-#{LAST_RELEASE_DATE}.box"
-  local_box_file = LOCAL_BOXES_PATH.join(file_name)
+  box_name       = "vagrant-lxc-#{release_name}-amd64-#{LAST_RELEASE_DATE}"
+  local_box_file = LOCAL_BOXES_PATH.join("#{box_name}.box")
 
   local_box_file.exist? ?
     local_box_file.to_s :
-    "#{BASE_URL}/#{file_name}"
+    "#{BASE_URL}/#{box_name}"
 end
 
 BOXES = {
@@ -25,7 +25,7 @@ BOXES = {
   },
   raring:  {
     lxc_url:  lxc_box_url('raring'),
-    vbox_url: 'http://goo.gl/Y4aRr'
+    vbox_url: 'http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-amd64-vagrant-disk1.box'
   },
   saucy: {
     vbox_url: 'http://cloud-images.ubuntu.com/vagrant/saucy/current/saucy-server-cloudimg-amd64-vagrant-disk1.box'

data/development/site.pp

@@ -37,7 +37,7 @@ exec {
 # Install dependencies
 package {
   [ 'libffi-dev', 'bsdtar', 'exuberant-ctags', 'ruby1.9.1-dev', 'htop', 'git',
-    'build-essential', 'redir', 'curl', 'vim', 'btrfs-tools' ]:
+    'build-essential', 'redir', 'curl', 'vim', 'btrfs-tools', 'psmisc' ]:
     ensure   => 'installed'
   ;
 
@@ -146,8 +146,6 @@ file {
   '/usr/bin/lxc-vagrant-wrapper':
     ensure  => 'present',
     mode    => '0755',
-    content => "
-#!/usr/bin/env ruby
-exec ARGV.join(' ')
-    "
+    content => "#!/usr/bin/env ruby
+exec ARGV.join(' ')"
 }

data/lib/vagrant-lxc/action.rb

@@ -18,6 +18,7 @@ require 'vagrant-lxc/action/message'
 require 'vagrant-lxc/action/remove_temporary_files'
 require 'vagrant-lxc/action/setup_package_files'
 require 'vagrant-lxc/action/share_folders'
+require 'vagrant-lxc/action/warn_networks'
 
 unless Vagrant::LXC.vagrant_1_3_or_later
   require 'vagrant-lxc/action/wait_for_communicator'
@@ -58,6 +59,7 @@ module Vagrant
           b.use Builtin::HandleForwardedPortCollisions
           b.use ShareFolders
           b.use Builtin::SetHostname
+          b.use WarnNetworks
           b.use ForwardPorts
           b.use Boot
           b.use Builtin::WaitForCommunicator

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

@@ -7,7 +7,7 @@ module Vagrant
         end
 
         def call(env)
-          container_name = "#{env[:root_path].basename.to_s}_#{env[:machine].name}"
+          container_name = "#{env[:root_path].basename}_#{env[:machine].name}"
           container_name.gsub!(/[^-a-z0-9_]/i, "")
           container_name << "-#{Time.now.to_i}"
 

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

@@ -63,7 +63,11 @@ module Vagrant
           mappings = {}
 
           config.vm.networks.each do |type, options|
+            next if options[:disabled]
+
+            # TODO: Deprecate this behavior of "automagically" skipping ssh forwarded ports
             if type == :forwarded_port && options[:id] != 'ssh'
+              options.delete(:host_ip) if options.fetch(:host_ip, '').to_s.strip.empty?
               mappings[options[:host]] = options
             end
           end

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

@@ -0,0 +1,25 @@
+module Vagrant
+  module LXC
+    module Action
+      class WarnNetworks
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if public_or_private_network_configured?(env[:machine].config)
+            env[:ui].warn(I18n.t("vagrant_lxc.messages.warn_networks"))
+          end
+
+          @app.call(env)
+        end
+
+        def public_or_private_network_configured?(config)
+          config.vm.networks.find do |type, _|
+            [:private_network, :public_network].include?(type.to_sym)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/driver.rb

@@ -36,11 +36,15 @@ module Vagrant
       end
 
       def rootfs_path
-        Pathname.new(base_path.join('config').read.match(/^lxc\.rootfs\s+=\s+(.+)$/)[1])
+        Pathname.new(config_string.match(/^lxc\.rootfs\s+=\s+(.+)$/)[1])
       end
 
       def mac_address
-        @mac_address ||= base_path.join('config').read.match(/^lxc\.network\.hwaddr\s+=\s+(.+)$/)[1]
+        @mac_address ||= config_string.match(/^lxc\.network\.hwaddr\s+=\s+(.+)$/)[1]
+      end
+
+      def config_string
+        @sudo_wrapper.run('cat', base_path.join('config').to_s)
       end
 
       def create(name, template_path, config_file, template_options = {})
@@ -106,15 +110,17 @@ module Vagrant
         # TODO: Pass in tmpdir so we can clean up from outside
         target_path    = "#{Dir.mktmpdir}/rootfs.tar.gz"
 
-        Dir.chdir base_path do
-          @logger.info "Compressing '#{rootfs_path}' rootfs to #{target_path}"
-          @sudo_wrapper.run('rm', '-f', 'rootfs.tar.gz')
-          @sudo_wrapper.run('tar', '--numeric-owner', '-czf', target_path, 'rootfs')
-
-          @logger.info "Changing rootfs tarball owner"
-          user_details = Etc.getpwnam(Etc.getlogin)
-          @sudo_wrapper.run('chown', "#{user_details.uid}:#{user_details.gid}", target_path)
-        end
+        @logger.info "Compressing '#{rootfs_path}' rootfs to #{target_path}"
+        cmds = [
+          "cd #{base_path}",
+          "rm -f rootfs.tar.gz",
+          "tar --numeric-owner -czf #{target_path} -C #{rootfs_path} './.'"
+        ]
+        @sudo_wrapper.su_c(cmds.join(' && '))
+
+        @logger.info "Changing rootfs tarball owner"
+        user_details = Etc.getpwnam(Etc.getlogin)
+        @sudo_wrapper.run('chown', "#{user_details.uid}:#{user_details.gid}", target_path)
 
         target_path
       end

data/lib/vagrant-lxc/plugin.rb

@@ -9,7 +9,7 @@ module Vagrant
       LXC-based virtual machines.
       EOF
 
-      provider(:lxc) do
+      provider(:lxc, parallel: true) do
         require File.expand_path("../provider", __FILE__)
 
         I18n.load_path << File.expand_path(File.dirname(__FILE__) + '/../../locales/en.yml')

data/lib/vagrant-lxc/sudo_wrapper.rb

@@ -6,7 +6,7 @@ module Vagrant
 
       def initialize(wrapper_path = nil)
         @wrapper_path = wrapper_path
-        @logger       = Log4r::Logger.new("vagrant::lxc::shell")
+        @logger       = Log4r::Logger.new("vagrant::lxc::sudo_wrapper")
       end
 
       def run(*command)

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.6.4"
+    VERSION = "0.7.0"
   end
 end

data/locales/en.yml

@@ -17,6 +17,10 @@ en:
         Waiting for container to start. This should not take long.
       container_ready: |-
         Container started and ready for use!
+      warn_networks: |-
+        Warning! The LXC provider doesn't support any of the Vagrant public / private
+        network configurations (ex: `config.vm.network :private_network, ip: "some-ip"`).
+        They will be silently ignored.
 
   vagrant:
     commands:

data/spec/Vagrantfile

@@ -5,22 +5,26 @@ Vagrant.require_plugin 'vagrant-lxc'
 Vagrant.require_plugin 'vagrant-cachier'
 
 ENV['BOX_NAME'] ||= 'quantal64'
-puts "Running specs using #{ENV['BOX_NAME']} box"
+puts "Running vagrant commands using #{ENV['BOX_NAME']} box"
 
 Vagrant.configure("2") do |config|
   config.vm.box = ENV['BOX_NAME']
   config.vm.hostname = 'lxc-test-box'
+  config.vm.box_url = ENV['BOX_URL']
   config.vm.network :forwarded_port, guest: 80, host: 8080
 
   config.cache.auto_detect = true
 
   config.vm.provider :lxc do |lxc|
-    lxc.sudo_wrapper = '/usr/bin/lxc-vagrant-wrapper'
+    # lxc.sudo_wrapper = '/usr/bin/lxc-vagrant-wrapper'
   end
 
   config.vm.provision :shell,
     inline: 'mkdir -p /vagrant/tmp && echo -n "Provisioned" > /vagrant/tmp/provisioning'
 
   config.vm.provision :shell,
-    inline: 'sudo apt-get install apache2 -y'
+    inline: 'apt-get install apache2 -y'
+
+  config.vm.provision :shell, privileged: false,
+    inline: "if ! [ -f $HOME/original-box ]; then echo '#{ENV['BOX_NAME']}' > $HOME/original-box; fi"
 end

data/spec/acceptance/sanity_check_spec.rb

@@ -48,7 +48,7 @@ describe 'Sanity check' do
       vagrant_halt
     end
 
-    it 'shuts down container' do
+    it 'shuts down the container' do
       status = `sudo lxc-info -n #{vagrant_container_name}`
       expect(status).to include 'STOPPED'
     end
@@ -63,9 +63,10 @@ describe 'Sanity check' do
       expect($?.exitstatus).to_not eq 0
     end
 
-    it 'removes files under `/tmp`' do
-      container_tmp = Pathname("/var/lib/lxc/#{vagrant_container_name}/rootfs/tmp")
-      expect(container_tmp.entries).to have(2).items # basically '.' and '..'
+    xit 'removes files under `/tmp`' do
+      container_tmp_files = `sudo ls -l "/var/lib/lxc/#{vagrant_container_name}/rootfs/tmp"`.split("\n")
+      puts container_tmp_files.join("\n")
+      expect(container_tmp_files).to be_empty
     end
   end
 
@@ -82,4 +83,29 @@ describe 'Sanity check' do
       expect(containers).to_not include @container_name
     end
   end
+
+  pending 'box packaging' do
+    before(:all) do
+      destroy_container
+      vagrant_box_remove('new-box')
+      vagrant_up
+      vagrant_package
+      @box_name = ENV['BOX_NAME']
+      # This will make
+      ENV["BOX_NAME"] = 'new-box'
+      ENV['BOX_URL']  = '/vagrant/spec/tmp/package.box'
+    end
+
+    after(:all) do
+      vagrant_box_remove('new-box')
+      ENV["BOX_NAME"] = @box_name
+      ENV['BOX_URL']  = nil
+    end
+
+    it 'creates a package that can be successfully brought up on a later `vagrant up`' do
+      vagrant_up
+      # Just to make sure we packaged it properly
+      expect(vagrant_ssh('cat /home/vagrant/original-box')).to eq @box_name
+    end
+  end
 end

data/spec/acceptance/support/acceptance_example_group.rb

@@ -13,12 +13,13 @@ module AcceptanceExampleGroup
       `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`
+      `rm -rf /vagrant/spec/.vagrant/`
     end
     `sudo killall -9 redir 2>/dev/null`
   end
 
   def with_vagrant_environment
-    opts = { cwd: 'spec', ui_class: TestUI }
+    opts = { cwd: '/vagrant/spec', ui_class: TestUI }
     env  = Vagrant::Environment.new(opts)
     yield env
     env.unload
@@ -53,4 +54,23 @@ module AcceptanceExampleGroup
     end
     output
   end
+
+  def vagrant_package
+    with_vagrant_environment do |env|
+      pkg = '/vagrant/spec/tmp/package.box'
+      `rm -f #{pkg}`
+      env.cli('package', '--output', pkg)
+    end
+  end
+
+  def vagrant_box_remove(name)
+    with_vagrant_environment do |env|
+      env.cli('box', 'list')
+      output = env.ui.messages[:info].join("\n").chomp
+
+      if output.include?(name)
+        env.cli('box', 'remove', name)
+      end
+    end
+  end
 end

data/spec/acceptance/support/machine_ext.rb

@@ -1,13 +1,12 @@
 # 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|
+  define_method :action do |action_name, extra_env = nil|
     extra_env = { ui: @env.ui }.merge(extra_env || {})
-    old_action name, extra_env
+    old_action action_name, extra_env
   end
 end

data/spec/acceptance/support/test_ui.rb

@@ -15,8 +15,8 @@ class TestUI < Vagrant::UI::Interface
   end
 
   METHODS.each do |method|
-    define_method(method) do |message, *opts|
-      @messages[method].push message
+    define_method(method) do |*args|#message, *opts|
+      @messages[method].push args[0]
     end
   end
 end

data/spec/unit/action/forward_ports_spec.rb

@@ -47,6 +47,15 @@ describe Vagrant::LXC::Action::ForwardPorts do
     )
   end
 
+  it 'skips --laddr parameter if host_ip is a blank string' do
+    forward_conf[:host_ip] = ' '
+    subject.stub(system: true)
+    subject.call(env)
+    subject.should have_received(:spawn).with(
+      "redir --lport=#{host_port} --caddr=#{container_ip} --cport=#{guest_port} 2>/dev/null"
+    )
+  end
+
   it "stores redir pids on machine's data dir" do
     subject.stub(system: true)
     subject.call(env)
@@ -54,6 +63,13 @@ describe Vagrant::LXC::Action::ForwardPorts do
     pid_file.should == pid
   end
 
+  it 'allows disabling a previously forwarded port' do
+    forward_conf[:disabled] = true
+    subject.stub(system: true)
+    subject.call(env)
+    subject.should_not have_received(:spawn)
+  end
+
   it 'raises RedirNotInstalled error if `redir` is not installed' do
     subject.stub(system: false)
     lambda { subject.call(env) }.should raise_error(Vagrant::LXC::Errors::RedirNotInstalled)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -30,6 +30,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- boxes/build-all.sh
 - boxes/build-debian-box.sh
 - boxes/build-openmandriva-box.sh
 - boxes/build-ubuntu-box.sh
@@ -73,6 +74,7 @@ files:
 - lib/vagrant-lxc/action/setup_package_files.rb
 - lib/vagrant-lxc/action/share_folders.rb
 - lib/vagrant-lxc/action/wait_for_communicator.rb
+- lib/vagrant-lxc/action/warn_networks.rb
 - lib/vagrant-lxc/config.rb
 - lib/vagrant-lxc/driver.rb
 - lib/vagrant-lxc/driver/cli.rb