vagrant-lxc 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e892dfb1ea3897de7672db8cee129a7f5b65c8
-  data.tar.gz: 9a2767f8b694f2c3a9bbb94674c9cef9c5eec8bc
+  metadata.gz: 0fd5ca05e6456d793879dd160fe0746fba08541a
+  data.tar.gz: 25437c338c3a8a41122e8ff35bdba2bdf9ca5dac
 SHA512:
-  metadata.gz: ca4237b0ce604a2e66e0c53252d5d5b6491e764dee60ff76e224eb0669a6171b3321422ebcf84ad6ef4c99f756d807d9987a52e28f3050c5f5f9bbc85aa5dcc0
-  data.tar.gz: 1db202a14678a2a86cab86d4c0cc607d676b30d29b0a125193dc610f7452f19cd0dc0b43c0b0b5111d3cc43c5d6bf1a031e14b8b6d34d4c75be251b138ea5677
+  metadata.gz: 16ea43d6b1f598fc62ae3930a2f81ca2f917689144cc313973ae171c695e65daa6aba15e15980fae891c1c7b0867ce8878a84bda4b3c0503a498bbbcd4060980
+  data.tar.gz: 5ab9575aefa1ddefdcb988232d988c095238a613799c5f3353d2721c5bf53fac0219f413cd96804166f34d9462a6931889e7dfcb060d74e8f2f763e99357d7b2

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.6.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.5.0...v0.6.0) (Sep 12, 2013)
+
+IMPROVEMENTS:
+
+  - Compatibility with Vagrant 1.3+ [#136](https://github.com/fgrehm/vagrant-lxc/pull/136)
+  - Set plugin name to `vagrant-lxc` so that it is easier to check if the plugin is
+    installed with the newly added `Vagrant.has_plugin?`
+
+BUG FIXES:
+
+  - Fix box package ownership on `vagrant package` [#140](https://github.com/fgrehm/vagrant-lxc/pull/140)
+  - Fix error while compressing container's rootfs under Debian hosts [#131](https://github.com/fgrehm/vagrant-lxc/issues/131) /
+    [#133](https://github.com/fgrehm/vagrant-lxc/issues/133)
+
 ## [0.5.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.4.0...v0.5.0) (Aug 1, 2013)
 
 BACKWARDS INCOMPATIBILITIES:

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-cachier.git
-  revision: f5d9ce507239535326a0a0395c890cc7a27d73f1
+  revision: 11defb0b290a34d069f3ec014fb30d4461aab04b
   specs:
-    vagrant-cachier (0.3.0.dev)
+    vagrant-cachier (0.3.3)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-pristine.git
@@ -12,9 +12,9 @@ GIT
 
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: 2282a88f3dfde65b881758b4643480cba4468c4a
+  revision: 7b440339f3d801e60e2451823dec04aae772d86a
   specs:
-    vagrant (1.2.7.dev)
+    vagrant (1.3.2.dev)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
@@ -25,7 +25,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.5.0)
+    vagrant-lxc (0.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -44,25 +44,25 @@ GEM
     erubis (2.7.0)
     ffi (1.9.0)
     formatador (0.2.4)
-    guard (1.8.1)
+    guard (1.8.2)
       formatador (>= 0.2.4)
       listen (>= 1.0.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-rspec (3.0.2)
+    guard-rspec (3.0.3)
       guard (>= 1.8)
       rspec (~> 2.13)
-    i18n (0.6.4)
-    listen (1.2.2)
+    i18n (0.6.5)
+    listen (1.3.1)
       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.23)
-    multi_json (1.7.7)
+    mime-types (1.25)
+    multi_json (1.8.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
@@ -72,7 +72,7 @@ GEM
       slop (~> 3.4)
     rake (10.1.0)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
+    rb-inotify (0.9.1)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
@@ -96,7 +96,7 @@ GEM
     simplecov-html (0.7.1)
     slop (3.4.6)
     thor (0.18.1)
-    vagrant-omnibus (1.1.0)
+    vagrant-omnibus (1.1.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -28,8 +28,9 @@ and the [changelog](CHANGELOG.md) for most up to date information.*
 * A [bug-free](https://github.com/fgrehm/vagrant-lxc/wiki/Troubleshooting#im-unable-to-restart-containers) kernel
 
 The plugin is known to work better and pretty much out of the box on Ubuntu 12.04+
-hosts and installing the dependencies on it basically means a `apt-get install lxc redir`
-and a `apt-get update && apt-get dist-upgrade` to upgrade the kernel.
+hosts and installing the dependencies on it basically means a `apt-get install lxc lxc-templates cgroup-lite redir`
+and a `apt-get update && apt-get dist-upgrade` to upgrade the kernel. For Debian
+hosts you'll need to follow the instructions described on the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-debian-hosts).
 
 Some manual steps are required to set up a Linode machine prior to using this
 plugin, please check https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-Linode
@@ -53,7 +54,7 @@ vagrant plugin install vagrant-lxc
 After installing, add a [base box](#base-boxes) using any name you want, for example:
 
 ```
-vagrant box add quantal64 http://dl.dropbox.com/u/13510779/lxc-quantal-amd64-2013-07-12.box
+vagrant box add quantal64 http://bit.ly/vagrant-lxc-quantal64-2013-07-12
 ```
 
 Then create a Vagrantfile that looks like the following, changing the box name
@@ -97,41 +98,9 @@ For other configuration options, please check the [lxc.conf manpages](http://man
 ### Avoiding `sudo` passwords
 
 This plugin requires **a lot** of `sudo`ing since [user namespaces](https://wiki.ubuntu.com/UserNamespace)
-are not supported on mainstream kernels. In order to work around that we can use
-a really dumb **AND INSECURE** Ruby wrapper script like the one below and add
-a `NOPASSWD` entry to our `/etc/sudoers` file:
-
-```ruby
-#!/usr/bin/env ruby
-exec ARGV.join(' ')
-```
-
-For example, you can save the code above under your `/usr/bin/lxc-vagrant-wrapper`,
-turn it into an executable script by running `chmod +x /usr/bin/lxc-vagrant-wrapper`
-and add the line below to your `/etc/sudoers` file:
-
-```
-USERNAME ALL=NOPASSWD:/usr/bin/lxc-vagrant-wrapper
-```
-
-*__WARNING__: the `/usr/bin/lxc-vagrant-wrapper` + `/etc/sudoers` combination
-above allows `USERNAME` to run any privileged command without a password. You
-might want to think twice before using that on a machine with sensitive data.*
-
-In order to tell vagrant-lxc to use that script when `sudo` is needed, you can
-pass in the path to the script as a configuration for the provider:
-
-```ruby
-Vagrant.configure("2") do |config|
-  config.vm.provider :lxc do |lxc|
-    lxc.sudo_wrapper = '/usr/bin/lxc-vagrant-wrapper'
-  end
-end
-```
-
-If you want to set the `sudo_wrapper` globally, just add the code above to your
-`~/.vagrant.d/Vagrantfile`.
-
+are not supported on mainstream kernels. Have a look at the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Avoiding-'sudo'-passwords)
+to find out how to work around that specially if you are running an OS with sudo
+< 1.8.4 (like Ubuntu 12.04) as you might be affected by a bug.
 
 ### Base boxes
 

data/lib/vagrant-lxc/action.rb

@@ -19,6 +19,11 @@ require 'vagrant-lxc/action/remove_temporary_files'
 require 'vagrant-lxc/action/setup_package_files'
 require 'vagrant-lxc/action/share_folders'
 
+unless Vagrant::LXC.vagrant_1_3_or_later
+  require 'vagrant-lxc/action/wait_for_communicator'
+  Vagrant::Action::Builtin.const_set :WaitForCommunicator, Vagrant::LXC::Action::WaitForCommunicator
+end
+
 module Vagrant
   module LXC
     module Action
@@ -40,7 +45,6 @@ module Vagrant
         end
       end
 
-
       # This action boots the VM, assuming the VM is in a state that requires
       # a bootup (i.e. not saved).
       def self.action_boot
@@ -52,6 +56,7 @@ module Vagrant
           b.use Vagrant::Action::Builtin::SetHostname
           b.use ForwardPorts
           b.use Boot
+          b.use Vagrant::Action::Builtin::WaitForCommunicator, [:starting, :running]
         end
       end
 
@@ -146,6 +151,9 @@ module Vagrant
                 b3.use Vagrant::Action::Builtin::EnvSet, :force_halt => true
                 b3.use action_halt
                 b3.use Destroy
+                if Vagrant::LXC.vagrant_1_3_or_later
+                  b3.use Vagrant::Action::Builtin::ProvisionerCleanup
+                end
               else
                 b3.use Message, :will_not_destroy
               end

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

@@ -15,41 +15,9 @@ module Vagrant
 
           env[:ui].info I18n.t("vagrant_lxc.messages.starting")
           env[:machine].provider.driver.start(config.customizations)
-          raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
 
           @app.call env
         end
-
-        # Stolen from on 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|
-            if @env[:machine].communicate.ready?
-              @env[:ui].info I18n.t("vagrant_lxc.messages.container_ready")
-              return true
-            end
-
-            # Return true so that the vm_failed_to_boot error doesn't
-            # get shown
-            return true if @env[:interrupted]
-
-            # TODO: Find out if there is a command to check if the machine is
-            #       starting, `lxc-monitor` shows this information, but I've
-            #       never seen it on `lxc-info` which is what it is being used
-            #       to determine container status
-
-            # 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 if state != :starting && state != :running
-
-            sleep 2 if !@env["vagrant.test"]
-          end
-
-          @env[:ui].error I18n.t("vagrant.actions.vm.boot.failed")
-          false
-        end
       end
     end
   end

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

@@ -0,0 +1,46 @@
+# This acts like a backport of Vagrant's built in action from 1.3+ for older versions
+#   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 = [])
+          @app    = app
+          @states = states
+        end
+
+        def call(env)
+          @env = env
+          raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
+          @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|
+            if @env[:machine].communicate.ready?
+              @env[:ui].info I18n.t("vagrant_lxc.messages.container_ready")
+              return true
+            end
+
+            # Return true so that the vm_failed_to_boot error doesn't
+            # 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"]
+          end
+
+          @env[:ui].error I18n.t("vagrant.actions.vm.boot.failed")
+          false
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/driver.rb

@@ -4,6 +4,8 @@ require "vagrant/util/subprocess"
 require "vagrant-lxc/errors"
 require "vagrant-lxc/driver/cli"
 
+require "etc"
+
 module Vagrant
   module LXC
     class Driver
@@ -76,7 +78,7 @@ module Vagrant
         prune_customizations
         write_customizations(customizations + @customizations)
 
-        @cli.transition_to(:running) { |c| c.start(extra) }
+        @cli.start(extra)
       end
 
       def forced_halt
@@ -100,18 +102,19 @@ module Vagrant
 
       # TODO: This needs to be reviewed and specs needs to be written
       def compress_rootfs
-        rootfs_dirname = File.dirname rootfs_path
-        basename       = rootfs_path.to_s.gsub(/^#{Regexp.escape rootfs_dirname}\//, '')
         # 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, "#{basename}/*")
+          @sudo_wrapper.run('tar', '--numeric-owner', '-czf', target_path, 'rootfs')
+
+          @logger.info "Changing rootfs tarball owner"
+
+          user_details=Etc.getpwnam(Etc.getlogin)
 
-          @logger.info "Changing rootfs tarbal owner"
-          @sudo_wrapper.run('chown', "#{ENV['USER']}:#{ENV['USER']}", target_path)
+          @sudo_wrapper.run('chown', "#{user_details.uid}:#{user_details.gid}", target_path)
         end
 
         target_path

data/lib/vagrant-lxc/plugin.rb

@@ -3,7 +3,7 @@ require "vagrant"
 module Vagrant
   module LXC
     class Plugin < Vagrant.plugin("2")
-      name "Linux Containers (LXC) provider"
+      name "vagrant-lxc"
       description <<-EOF
       The LXC provider allows Vagrant to manage and control
       LXC-based virtual machines.
@@ -23,5 +23,9 @@ module Vagrant
         Config
       end
     end
+
+    def self.vagrant_1_3_or_later
+      Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.3.0')
+    end
   end
 end

data/lib/vagrant-lxc/version.rb

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

data/spec/unit/driver_spec.rb

@@ -80,7 +80,6 @@ describe Vagrant::LXC::Driver do
     subject { described_class.new('name', sudo, cli) }
 
     before do
-      cli.stub(:transition_to).and_yield(cli)
       subject.customizations << internal_customization
       subject.start(customizations)
     end
@@ -92,10 +91,6 @@ describe Vagrant::LXC::Driver do
     it 'starts container with configured customizations' do
       cli.should have_received(:start)
     end
-
-    it 'expects a transition to running state to take place' do
-      cli.should have_received(:transition_to).with(:running)
-    end
   end
 
   describe 'halt' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -78,6 +78,7 @@ files:
 - lib/vagrant-lxc/action/remove_temporary_files.rb
 - 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/config.rb
 - lib/vagrant-lxc/driver.rb
 - lib/vagrant-lxc/driver/cli.rb
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Linux Containers provider for Vagrant