vagrant-lxc 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e595cc6f680e584b60fd1a734c4f174bddba99fa
-  data.tar.gz: 9e432b94e595b4da4d33a6d724728a11a06fd4bb
+  metadata.gz: ee93b037eb8ad8145d874a64f28a585bba51ab3f
+  data.tar.gz: 41040fa650a3be3ec3bf59c9f8eed18a9a84cdfa
 SHA512:
-  metadata.gz: 8542b6cbd0bcf756ef6846cb0cc87dc489ed47460255b3c16526021cd80c4ae8d52dc42617298f258f5ee51cf64a357b082dabec99265ad80a49cbd32430b00a
-  data.tar.gz: 4dee7221dbc5dacb6e0a290a89174d450f714e6b83c891cea1f11fccd870df144acb2b30e8cf0a62917feac5b6d527d90d28a93f4d2310ff8323786f36c475f3
+  metadata.gz: 48855758f0ed808c6caa4a5c48852811c128e0ab223204f2b01b5091695475e541d15283a3588d1202b795460e1d02086d1c622a2148d4a9adddfdde252460a0
+  data.tar.gz: 25e57b7957bec28488416a534313cf431147c88cf131549b163b37ec823f427f00beef8ffa716d7f1f01ffaf477035c219e925b8f5b3ca12f9a8e8be6d5eff24

data/CHANGELOG.md

@@ -1,4 +1,21 @@
-## [0.7.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.6.4...v0.7.0) (unreleased)
+## [0.8.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.7.0...v0.8.0) (Feb 26, 2014)
+
+FEATURES:
+
+  - Support for naming containers from Vagrantfiles [#132](https://github.com/fgrehm/vagrant-lxc/issues/132)
+
+IMPROVEMENTS:
+
+  - Use a safer random name for containers [#152](https://github.com/fgrehm/vagrant-lxc/issues/152)
+  - Improve Ubuntu 13.10 compatibility [#190](https://github.com/fgrehm/vagrant-lxc/pull/190) / [#197](https://github.com/fgrehm/vagrant-lxc/pull/197)
+  - Improved mac address detection from lxc configs [#226](https://github.com/fgrehm/vagrant-lxc/pull/226)
+
+BUG FIXES:
+
+  - Properly detect if lxc is installed on hosts that do not have `lxc-version` on their paths [#186](https://github.com/fgrehm/vagrant-lxc/issues/186)
+
+
+## [0.7.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.6.4...v0.7.0) (Nov 8, 2013)
 
 IMPROVEMENTS:
 
@@ -8,7 +25,7 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
-  - Error out in case an invalid IPs are provided for forwarded ports [#170](https://github.com/fgrehm/vagrant-lxc/issues/170)
+  - Nicely handle blank strings provided to `:host_ip` when specifying 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)
@@ -16,6 +33,10 @@ BUG FIXES:
 
 ## [0.6.4](https://github.com/fgrehm/vagrant-lxc/compare/v0.6.3...v0.6.4) (Oct 27, 2013)
 
+FEATURES:
+
+  - New script for building OpenMandriva base boxes [#167](https://github.com/fgrehm/vagrant-lxc/issues/167)
+
 IMPROVEMENTS:
 
   - Make `lxc-template` compatible with Ubuntu 13.10 [#150](https://github.com/fgrehm/vagrant-lxc/issues/150)

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-cachier.git
-  revision: 536ca7ad54b3096644993f91f363df8a884d4600
+  revision: a9f41c5f01297773f209c0525400e22704b40c93
   specs:
-    vagrant-cachier (0.4.2.dev)
+    vagrant-cachier (0.5.0)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-pristine.git
@@ -25,7 +25,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.7.0)
+    vagrant-lxc (0.8.0)
 
 GEM
   remote: https://rubygems.org/
@@ -41,7 +41,7 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi (1.9.3)
     formatador (0.2.4)
@@ -84,8 +84,8 @@ GEM
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-fire (1.2.0)
-      rspec (~> 2.11)
+    rspec-fire (1.3.0)
+      rspec (>= 2.11, < 4)
     rspec-mocks (2.13.1)
     rspec-spies (2.1.4)
       rspec (~> 2.0)
@@ -98,7 +98,7 @@ GEM
       tins (~> 0.8)
     thor (0.18.1)
     timers (1.1.0)
-    tins (0.12.0)
+    tins (0.13.0)
     vagrant-omnibus (1.1.2)
 
 PLATFORMS

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Fábio Rehm
+Copyright (c) 2013-2014 Fábio Rehm
 
 MIT License
 

data/README.md

@@ -1,6 +1,6 @@
 # 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) [![Coverage Status](https://coveralls.io/repos/fgrehm/vagrant-lxc/badge.png?branch=master)](https://coveralls.io/r/fgrehm/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) [![Coverage Status](https://coveralls.io/repos/fgrehm/vagrant-lxc/badge.png?branch=master)](https://coveralls.io/r/fgrehm/vagrant-lxc) [![Gittip](http://img.shields.io/gittip/fgrehm.svg)](https://www.gittip.com/fgrehm/)
 
 [LXC](http://lxc.sourceforge.net/) provider for [Vagrant](http://www.vagrantup.com/) 1.1+
 
@@ -23,7 +23,7 @@ to see it in action.
 * [Vagrant 1.1+](http://downloads.vagrantup.com/)
 * lxc 0.7.5+
 * redir (if you are planning to use port forwarding)
-* A [bug-free](https://github.com/fgrehm/vagrant-lxc/wiki/Troubleshooting#im-unable-to-restart-containers) kernel
+* A [kernel != 3.5.0-17.28](https://github.com/fgrehm/vagrant-lxc/wiki/Troubleshooting#wiki-im-unable-to-restart-containers)
 
 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 lxc-templates cgroup-lite redir`
@@ -55,7 +55,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://bit.ly/vagrant-lxc-quantal64-2013-07-12
+vagrant box add quantal64 http://bit.ly/vagrant-lxc-quantal64-2013-10-23
 ```
 
 Then create a Vagrantfile that looks like the following, changing the box name
@@ -95,11 +95,30 @@ prior to starting it.
 
 For other configuration options, please check the [lxc.conf manpages](http://manpages.ubuntu.com/manpages/quantal/man5/lxc.conf.5.html).
 
+### Container naming
+
+By default vagrant-lxc will attempt to generate a unique container name
+for you. However, if the container name is important to you, you may use the
+`container_name` attribute to set it explicitly from the `provider` block:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = "quantal64"
+
+  config.vm.define "db" do |node|
+    node.vm.provider :lxc do |lxc|
+      lxc.container_name = :machine # Sets the container name to 'db'
+      lxc.container_name = 'mysql'  # Sets the container name to 'mysql'
+    end
+  end
+end
+```
+
 ### 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. 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
+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
@@ -123,14 +142,6 @@ list if you have a problem and feel free to use the [issue tracker](https://gith
 propose new functionality and / or report bugs.
 
 
-## Support
-
-Support this project and [others by fgrehm](https://github.com/fgrehm)
-via [gittip](https://www.gittip.com/fgrehm/).
-
-[![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.png)](https://www.gittip.com/fgrehm/)
-
-
 ## Contributing
 
 1. Fork it
@@ -138,5 +149,3 @@ 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/lib/vagrant-lxc/action/create.rb

@@ -7,9 +7,20 @@ module Vagrant
         end
 
         def call(env)
-          container_name = "#{env[:root_path].basename}_#{env[:machine].name}"
-          container_name.gsub!(/[^-a-z0-9_]/i, "")
-          container_name << "-#{Time.now.to_i}"
+          container_name = env[:machine].provider_config.container_name
+
+          case container_name
+            when :machine
+              container_name = env[:machine].name.to_s
+            when String
+              # Nothing to do here, move along...
+            else
+              container_name = "#{env[:root_path].basename}_#{env[:machine].name}"
+              container_name.gsub!(/[^-a-z0-9_]/i, "")
+              # milliseconds + random number suffix to allow for simultaneous
+              # `vagrant up` of the same box in different dirs
+              container_name << "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
+          end
 
           env[:machine].provider.driver.create(
             container_name,

data/lib/vagrant-lxc/config.rb

@@ -12,9 +12,14 @@ module Vagrant
       # on /etc/sudoers
       attr_accessor :sudo_wrapper
 
+      # A string to explicitly set the container name. To use the vagrant
+      # machine name, set this to :machine
+      attr_accessor :container_name
+
       def initialize
         @customizations = []
         @sudo_wrapper   = UNSET_VALUE
+        @container_name = UNSET_VALUE
       end
 
       # Customize the container by calling `lxc-start` with the given
@@ -34,6 +39,7 @@ module Vagrant
 
       def finalize!
         @sudo_wrapper = nil if @sudo_wrapper == UNSET_VALUE
+        @container_name = nil if @container_name == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-lxc/driver.rb

@@ -40,7 +40,7 @@ module Vagrant
       end
 
       def mac_address
-        @mac_address ||= config_string.match(/^lxc\.network\.hwaddr\s+=\s+(.+)$/)[1]
+        @mac_address ||= config_string.match(/^lxc\.network\.hwaddr\s*+=\s*+(.+)$/)[1]
       end
 
       def config_string
@@ -111,6 +111,11 @@ module Vagrant
         target_path    = "#{Dir.mktmpdir}/rootfs.tar.gz"
 
         @logger.info "Compressing '#{rootfs_path}' rootfs to #{target_path}"
+        # "vagrant package" will copy the existing lxc-template in the new box file
+        # To keep this function backwards compatible with existing boxes, the path
+        # included in the tarball needs to have the same amount of path components (2)
+        # that will be stripped before extraction, hence the './.'
+        # TODO: This should be reviewed before 1.0
         cmds = [
           "cd #{base_path}",
           "rm -f rootfs.tar.gz",

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

@@ -38,7 +38,7 @@ module Vagrant
         end
 
         def state
-          if @name && run(:info, '--name', @name, retryable: true) =~ /^state:[^A-Z]+([A-Z]+)$/
+          if @name && run(:info, '--name', @name, retryable: true) =~ /^state:[^A-Z]+([A-Z]+)$/i
             $1.downcase.to_sym
           elsif @name
             :unknown
@@ -58,6 +58,12 @@ module Vagrant
               '--name',     @name,
               *(config_opts),
               *extra
+        rescue Errors::ExecuteError => e
+          if e.stderr =~ /already exists/i
+            raise Errors::ContainerAlreadyExists, name: @name
+          else
+            raise
+          end
         end
 
         def destroy
@@ -69,6 +75,7 @@ module Vagrant
         end
 
         def stop
+          attach '/sbin/halt'
           run :stop, '--name', @name
         end
 

data/lib/vagrant-lxc/errors.rb

@@ -5,7 +5,16 @@ module Vagrant
     module Errors
       class ExecuteError < Vagrant::Errors::VagrantError
         error_key(:lxc_execute_error)
+        attr_reader :stderr, :stdout
+        def initialize(message, *args)
+          super
+          if message.is_a?(Hash)
+            @stderr = message[:stderr]
+            @stdout = message[:stdout]
+          end
+        end
       end
+
       class NamespacesNotSupported < Vagrant::Errors::VagrantError
       end
 
@@ -13,6 +22,10 @@ module Vagrant
         error_key(:lxc_not_installed)
       end
 
+      class ContainerAlreadyExists < Vagrant::Errors::VagrantError
+        error_key(:lxc_container_already_exists)
+      end
+
       # Box related errors
       class TemplateFileMissing < Vagrant::Errors::VagrantError
         error_key(:lxc_template_file_missing)

data/lib/vagrant-lxc/provider.rb

@@ -26,7 +26,9 @@ module Vagrant
       end
 
       def ensure_lxc_installed!
-        unless system("which lxc-version > /dev/null")
+        begin
+          sudo_wrapper.run("which", "lxc-create")
+        rescue Vagrant::LXC::Errors::ExecuteError
           raise Errors::LxcNotInstalled
         end
       end

data/lib/vagrant-lxc/sudo_wrapper.rb

@@ -51,7 +51,8 @@ module Vagrant
             if @interrupted
               @logger.info("Exit code != 0, but interrupted. Ignoring.")
             else
-              raise LXC::Errors::ExecuteError, :command => command.inspect
+              raise LXC::Errors::ExecuteError,
+                command: command.inspect, stderr: r.stderr, stdout: r.stdout
             end
           end
         end

data/lib/vagrant-lxc/version.rb

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

data/locales/en.yml

@@ -60,3 +60,8 @@ en:
 
       lxc_redir_not_installed: |-
         `redir` is not installed or is not accessible on the PATH.
+
+      lxc_container_already_exists: |-
+        There is container on your system with the same name you've specified
+        on your Vagrantfile (%{name}), please choose a different one or
+        run `lxc-destroy --name %{name}` and try again.

data/spec/unit/driver/cli_spec.rb

@@ -49,20 +49,27 @@ describe Vagrant::LXC::Driver::CLI do
 
     before do
       subject.stub(:run) { |*args| @run_args = args }
+    end
+
+    it 'issues a lxc-create with provided template, container name and hash of arguments' do
       subject.create(template, config_file, template_args)
+      subject.should have_received(:run).with(
+        :create,
+        '--template', template,
+        '--name',     name,
+        '-f',         config_file,
+        '--',
+        '--extra-param', 'param',
+        '--other',       'value'
+      )
     end
 
-      it 'issues a lxc-create with provided template, container name and hash of arguments' do
-        subject.should have_received(:run).with(
-          :create,
-          '--template', template,
-          '--name',     name,
-          '-f',         config_file,
-          '--',
-          '--extra-param', 'param',
-          '--other',       'value'
-        )
-      end
+    it 'wraps a low level error into something more meaningful in case the container already exists' do
+      subject.stub(:run) { raise Vagrant::LXC::Errors::ExecuteError, stderr: 'alreAdy Exists' }
+      expect {
+        subject.create(template, config_file, template_args)
+      }.to raise_error(Vagrant::LXC::Errors::ContainerAlreadyExists)
+    end
   end
 
   describe 'destroy' do
@@ -134,6 +141,11 @@ describe Vagrant::LXC::Driver::CLI do
     it 'maps the output of lxc-info status out to a symbol' do
       subject.state.should == :stopped
     end
+
+    it 'is not case sensitive' do
+      subject.stub(:run).and_return("StatE: STarTED\npid: 2")
+      subject.state.should == :started
+    end
   end
 
   describe 'attach' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -17,10 +17,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .vimrc
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".vimrc"
 - BOXES.md
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -114,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Linux Containers provider for Vagrant