vagrant-lxc 0.6.0 → 0.6.1

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

@@ -1,6 +1,7 @@
 module Vagrant
   module LXC
     module Action
+      # XXX: Is this really needed? Should we contribute this back to Vagrant's core?
       class Message
         def initialize(app, env, msg_key, type = :info)
           @app     = app

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

@@ -45,6 +45,7 @@ module Vagrant
           box_dir = @env[:machine].box.directory
           FileUtils.cp box_dir.join('lxc-template').to_s, @env['package.directory'].to_s
           FileUtils.cp box_dir.join('metadata.json').to_s, @env['package.directory'].to_s
+          # TODO: Update built-on metadata.json
           if (conf = box_dir.join('lxc.conf')).exist?
             FileUtils.cp conf.to_s, @env['package.directory'].to_s
           end

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

@@ -1,25 +1,25 @@
 # This acts like a backport of Vagrant's built in action from 1.3+ for older versions
+# and will probably be deprecated on 0.8+
 #   https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/action/builtin/wait_for_communicator.rb
 module Vagrant
   module LXC
     module Action
       class WaitForCommunicator
-        def initialize(app, env, states = [])
+        def initialize(app, env)
           @app    = app
-          @states = states
         end
 
         def call(env)
           @env = env
-          raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
+
+          raise Vagrant::Errors::VMFailedToBoot if !wait_for_communicator
+
           @app.call env
         end
 
-        # Stolen from the an old version of VagrantPlugins::ProviderVirtualBox::Action::Boot
-        def wait_for_boot
-          @env[:ui].info I18n.t("vagrant_lxc.messages.waiting_for_start")
-
-          @env[:machine].config.ssh.max_tries.to_i.times do |i|
+        def wait_for_communicator
+          max_tries = @env[:machine].config.ssh.max_tries.to_i
+          max_tries.times do |i|
             if @env[:machine].communicate.ready?
               @env[:ui].info I18n.t("vagrant_lxc.messages.container_ready")
               return true
@@ -29,12 +29,7 @@ module Vagrant
             # get shown
             return true if @env[:interrupted]
 
-            # If the VM is not starting or running, something went wrong
-            # and we need to show a useful error.
-            state = @env[:machine].provider.state.id
-            raise Vagrant::Errors::VMFailedToRun unless @states.include?(state)
-
-            sleep 2 if !@env["vagrant.test"]
+            sleep 1 if !@env["vagrant.test"]
           end
 
           @env[:ui].error I18n.t("vagrant.actions.vm.boot.failed")

data/lib/vagrant-lxc/driver.rb

@@ -111,9 +111,7 @@ module Vagrant
           @sudo_wrapper.run('tar', '--numeric-owner', '-czf', target_path, 'rootfs')
 
           @logger.info "Changing rootfs tarball owner"
-
-          user_details=Etc.getpwnam(Etc.getlogin)
-
+          user_details = Etc.getpwnam(Etc.getlogin)
           @sudo_wrapper.run('chown', "#{user_details.uid}:#{user_details.gid}", target_path)
         end
 
@@ -151,12 +149,16 @@ module Vagrant
         template_name     = "vagrant-tmp-#{@container_name}"
         tmp_template_path = templates_path.join("lxc-#{template_name}").to_s
 
-        @logger.debug 'Copying LXC template into place'
+        @logger.info 'Copying LXC template into place'
         @sudo_wrapper.run('cp', path, tmp_template_path)
+        @sudo_wrapper.run('chmod', '+x', tmp_template_path)
 
         yield template_name
       ensure
-        @sudo_wrapper.run('rm', tmp_template_path)
+        @logger.info 'Removing LXC template'
+        if tmp_template_path
+          @sudo_wrapper.run('rm', tmp_template_path)
+        end
       end
 
       TEMPLATES_PATH_LOOKUP = %w(
@@ -169,8 +171,9 @@ module Vagrant
         return @templates_path if @templates_path
 
         path = TEMPLATES_PATH_LOOKUP.find { |candidate| File.directory?(candidate) }
-        # TODO: Raise an user friendly error
-        raise 'Unable to identify lxc templates path!' unless path
+        if !path
+          raise Errors::TemplatesDirMissing.new paths: TEMPLATES_PATH_LOOKUP.inspect
+        end
 
         @templates_path = Pathname(path)
       end

data/lib/vagrant-lxc/driver/cli.rb

@@ -81,7 +81,12 @@ module Vagrant
           if cmd.last.is_a?(Hash)
             opts       = cmd.pop
             namespaces = Array(opts[:namespaces]).map(&:upcase).join('|')
-            extra      = ['--namespaces', namespaces] if namespaces
+
+            if run(:attach, '-h').include?('--namespaces')
+              extra = ['--namespaces', namespaces] if namespaces
+            else
+              raise LXC::Errors::NamespacesNotSupported
+            end
           end
 
           run :attach, '--name', @name, *((extra || []) + cmd)
@@ -99,6 +104,7 @@ module Vagrant
           end
 
           unless last_state == target_state
+            # TODO: Raise an user friendly message
             raise TargetStateNotReached.new target_state, last_state
           end
         end

data/lib/vagrant-lxc/errors.rb

@@ -6,6 +6,8 @@ module Vagrant
       class ExecuteError < Vagrant::Errors::VagrantError
         error_key(:lxc_execute_error)
       end
+      class NamespacesNotSupported < Vagrant::Errors::VagrantError
+      end
 
       class LxcNotInstalled < Vagrant::Errors::VagrantError
         error_key(:lxc_not_installed)
@@ -15,6 +17,9 @@ module Vagrant
       class TemplateFileMissing < Vagrant::Errors::VagrantError
         error_key(:lxc_template_file_missing)
       end
+      class TemplatesDirMissing < Vagrant::Errors::VagrantError
+        error_key(:lxc_templates_dir_missing)
+      end
       class RootFSTarballMissing < Vagrant::Errors::VagrantError
         error_key(:lxc_invalid_box_version)
       end

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/locales/en.yml

@@ -10,12 +10,13 @@ en:
         was declined.
       starting: |-
         Starting container...
+      force_shutdown: |-
+        Forcing shutdown of container...
+      # TODO: Remove the following keys after we drop support for vagrant < 1.3
       waiting_for_start: |-
         Waiting for container to start. This should not take long.
       container_ready: |-
         Container started and ready for use!
-      force_shutdown: |-
-        Forcing shutdown of container...
 
   vagrant:
     commands:
@@ -45,6 +46,11 @@ en:
         The template file used for creating the container was not found for %{name}
         box.
 
+      lxc_templates_dir_missing: |-
+        Unable to identify lxc templates path.
+
+        Looked up under: %{paths}
+
       lxc_not_installed: |-
         The `lxc` package does not seem to be installed or is not accessible on the PATH.
 

data/spec/Vagrantfile

@@ -5,17 +5,22 @@ Vagrant.require_plugin 'vagrant-lxc'
 Vagrant.require_plugin 'vagrant-cachier'
 
 ENV['BOX_NAME'] ||= 'quantal64'
+puts "Running specs using #{ENV['BOX_NAME']} box"
 
 Vagrant.configure("2") do |config|
   config.vm.box = ENV['BOX_NAME']
   config.vm.hostname = 'lxc-test-box'
+  config.vm.network :forwarded_port, guest: 80, host: 8080
+
+  config.cache.auto_detect = true
 
-  config.cache.enable :apt
+  config.vm.provider :lxc do |lxc|
+    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.network :forwarded_port, guest: 80, host: 8080
   config.vm.provision :shell,
     inline: 'sudo apt-get install apache2 -y'
 end

data/spec/unit/driver/cli_spec.rb

@@ -146,9 +146,17 @@ describe Vagrant::LXC::Driver::CLI do
     end
 
     it 'supports a "namespaces" parameter' do
+      subject.stub(:run).with(:attach, '-h').and_return('--namespaces')
       subject.attach *(command + [{namespaces: ['network', 'mount']}])
       subject.should have_received(:run).with(:attach, '--name', name, '--namespaces', 'NETWORK|MOUNT', '--', *command)
     end
+
+    it 'raises a NamespacesNotSupported error if not supported' do
+      subject.stub(:run).with(:attach, '-h').and_return('not supported')
+      expect {
+        subject.attach *(command + [{namespaces: ['network', 'mount']}])
+      }.to raise_error(Vagrant::LXC::Errors::NamespacesNotSupported)
+    end
   end
 
   describe 'transition block' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -21,13 +21,17 @@ files:
 - .rspec
 - .travis.yml
 - .vimrc
+- BOXES.md
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- boxes/build-debian-box.sh
+- boxes/build-ubuntu-box.sh
 - boxes/common/cleanup
 - boxes/common/install-babushka
 - boxes/common/install-chef
@@ -36,26 +40,13 @@ files:
 - boxes/common/lxc-template
 - boxes/common/lxc.conf
 - boxes/common/metadata.json
-- boxes/debian/download
-- boxes/debian/finalize
-- boxes/debian/lxc-template
-- boxes/debian/metadata.json.template
-- boxes/ubuntu/download
-- boxes/ubuntu/finalize
-- boxes/ubuntu/lxc-template
-- boxes/ubuntu/metadata.json.template
 - development/Vagrantfile
 - development/lxc-configs/lxc-dev-box
 - development/lxc-configs/sid
 - development/lxc-configs/squeeze
 - development/lxc-configs/vbox
 - development/lxc-configs/wheezy
-- development/shell-provisioning/upgrade-kernel
 - development/site.pp
-- example/Vagrantfile
-- example/cookbooks/hello-world/recipes/default.rb
-- example/puppet/manifests/site.pp
-- example/puppet/modules/hello_world/manifests/init.pp
 - lib/vagrant-lxc.rb
 - lib/vagrant-lxc/action.rb
 - lib/vagrant-lxc/action/boot.rb
@@ -106,8 +97,6 @@ files:
 - spec/unit/driver_spec.rb
 - spec/unit/support/unit_example_group.rb
 - spec/unit_helper.rb
-- tasks/boxes.rake
-- tasks/boxes.v2.rake
 - tasks/spec.rake
 - vagrant-lxc.gemspec
 homepage: https://github.com/fgrehm/vagrant-lxc
@@ -130,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Linux Containers provider for Vagrant
@@ -153,3 +142,4 @@ test_files:
 - spec/unit/driver_spec.rb
 - spec/unit/support/unit_example_group.rb
 - spec/unit_helper.rb
+has_rdoc: 

data/boxes/debian/download

@@ -1,156 +0,0 @@
-#!/bin/bash
-
-# This is the code extracted from /usr/share/lxc/templates/lxc-debian
-# that comes with Ubuntu 13.04 which is responsible for downloading the
-# rootfs files / packages
-
-set -e
-
-suggest_flush()
-{
-  echo <<EOF
-Container upgrade failed.  The container cache may be out of date,
-in which case flushing the case (see -F in the hep output) may help.
-EOF
-}
-
-cleanup()
-{
-  rm -rf $cache/partial
-  rm -rf $cache/rootfs
-}
-
-write_sourceslist()
-{
-  rootfs=$1
-  arch=$2
-  release=$3
-
-  MIRROR=${MIRROR:-http://ftp.debian.org/debian}
-  SECURITY_MIRROR=${SECURITY_MIRROR:-http://security.debian.org/debian-security}
-
-
-  if [ 'sid' == "${release}" -o 'unstable' == "${release}" ]; then
-    cat <<EOF > ${rootfs}/etc/apt/sources.list
-# ${release}
-#------------------------------------------------------------------------------
-deb ${MIRROR} ${release} main contrib non-free
-EOF
-  else
-    cat <<EOF > ${rootfs}/etc/apt/sources.list
-# ${release}
-#------------------------------------------------------------------------------
-deb ${MIRROR} ${release} main contrib non-free
-
-# ${release} security
-#------------------------------------------------------------------------------
-deb ${SECURITY_MIRROR} ${release}/updates main contrib non-free
-
-# ${release} updates
-#------------------------------------------------------------------------------
-deb ${MIRROR} ${release}-updates main contrib non-free
-
-# ${release} proposed updates
-#------------------------------------------------------------------------------
-deb ${MIRROR} ${release}-proposed-updates main contrib non-free
-EOF
-  fi
-}
-
-download_debian()
-{
-  cache=$1
-  arch=$2
-  release=$3
-
-  packages=\
-sudo,\
-ifupdown,\
-locales,\
-libui-dialog-perl,\
-dialog,\
-isc-dhcp-client,\
-netbase,\
-net-tools,\
-iproute,\
-openssh-server,\
-vim,\
-jed,\
-jed-extra,\
-ssh,\
-curl,\
-wget,\
-bash-completion,\
-manpages,\
-man-db,\
-psmisc,\
-bind9-host,\
-telnet,\
-mtr-tiny,\
-iputils-ping,\
-ca-certificates
-
-  if [ ! -z "${ADDITIONAL_PACKAGES}" ]; then
-      packages=${ADDITIONAL_PACKAGES},${packages}
-  fi
-
-  echo "installing packages: ${packages}"
-
-  trap cleanup EXIT SIGHUP SIGINT SIGTERM
-  # check the mini debian was not already downloaded
-  partial=${cache}/partial
-  mkdir -p ${partial}
-  if [ $? -ne 0 ]; then
-      echo "Failed to create '${partial}' directory"
-      return 1
-  fi
-
-  # download a mini debian into a cache
-  echo "Downloading debian ${release} minimal ..."
-  debootstrap \
-      --variant=minbase \
-      --verbose \
-      --components=main,contrib,non-free \
-      --arch=${arch} \
-      --include=${packages} ${release} ${partial} ${MIRROR}
-
-  if [ $? -ne 0 ]; then
-      echo 'Failed to download the rootfs, aborting.'
-      return 1
-  fi
-
-  echo 'Installing updates'
-  write_sourceslist ${partial} ${arch} ${release}
-
-  chroot ${partial} apt-get update
-  if [ $? -ne 0 ]; then
-      echo 'Failed to update the apt cache'
-      return 1
-  fi
-
-  lxc-unshare -s MOUNT -- chroot ${partial} \
-      apt-get dist-upgrade -y || { suggest_flush; false; }
-
-  chroot ${partial} apt-get clean
-
-  mv ${partial} ${cache}/rootfs
-  trap EXIT
-  trap SIGINT
-  trap SIGTERM
-  trap SIGHUP
-  echo 'Download complete'
-  return 0
-}
-
-declare cache=`readlink -f .` \
-        arch=$1 \
-        release=$2
-
-if [ -d ${cache}/rootfs ]; then
-    echo <<EOF
-The rootfs cache has been built already, please remove it if you want to update
-EOF
-    exit 1
-fi
-
-download_debian ${cache} ${arch} ${release}