vagrant-lxc 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c9e378441e40002c34e265155c4066485bf4e00
-  data.tar.gz: 26cfdc7e029ba157e961944c2346fa1e3d3b5135
+  metadata.gz: 8eff41cebc459233af4d304d3234bb3b3d0d2e64
+  data.tar.gz: 0feb0dc99a45e4cad8937734bd1a52d8def4ca2c
 SHA512:
-  metadata.gz: 20495f21d5311e8397de76cfab8d01cb40247dca891a5051382b16e5b4ba6a948f4708addcafc691384a6f82aca1dc64b7318ea03b98a65c3ca3bb64bcd43010
-  data.tar.gz: d9b10838087a6d919a83c28430e8c657bd2fddf0223f9cd910d64f6051591a912cf7308ece39f5535ea4c24b02dcdb2124af5d5633b14680b73e09ad9d986b2c
+  metadata.gz: 3c96f674a532fec707df11a5ead708535207c37263365042404cdffedc5b92638ab42deb6773a1eb521da8dbe0938b5c0530180e9dbeb5d5ced09a8d49397002
+  data.tar.gz: 7f62bd81a6cbaf7683cc918157b942c7c55bd0f87a8da28c328c311fc09c5e57cd3c5bd1829e4dcf8f6c9c8430a9dc4cd548c289566d9531713ba5e3b7670e92

data/.travis.yml

@@ -5,4 +5,4 @@ rvm:
 matrix:
   allow_failures:
     - rvm: 2.0.0
-script: "bundle exec rake ci"
+script: "bundle exec rake"

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## [0.3.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.2.0...v0.3.0)
+## [0.3.1](https://github.com/fgrehm/vagrant-lxc/compare/v0.3.0...master) (April 18, 2013)
+
+  - Improved output to match lxc "verbiage"
+
+## [0.3.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.2.0...v0.3.0) (April 10, 2013)
 
 BACKWARDS INCOMPATIBILITIES:
 
@@ -11,32 +15,32 @@ IMPROVEMENTS:
 
   - lxc templates are removed from lxc template dir after container is created
   - Treat NFS shared folders as a normal shared folder instead of ignoring it so we can share the same Vagrantfile with VBox environments
-  - Support for lxc 0.7.5 (tested on Ubuntu 12.04) [#49](https://github.com/fgrehm/vagrant-lxc/issues/49)
-  - Remove `/tmp` files when packaging quantal64 base box [#48](https://github.com/fgrehm/vagrant-lxc/issues/48)
-  - Avoid picking the best mirror on quantal64 base box [#38](https://github.com/fgrehm/vagrant-lxc/issues/38)
+  - Support for lxc 0.7.5 (tested on Ubuntu 12.04) [#49][]
+  - Remove `/tmp` files when packaging quantal64 base box [#48][]
+  - Avoid picking the best mirror on quantal64 base box [#38][]
 
 BUG FIXES:
 
-  - Redirect `redir`'s stderr output to `/dev/null` [#51](https://github.com/fgrehm/vagrant-lxc/issues/51)
-  - Switch from `ifconfig` to `ip` to grab container's IP to avoid localization issues [#50](https://github.com/fgrehm/vagrant-lxc/issues/50)
+  - Redirect `redir`'s stderr output to `/dev/null` [#51][]
+  - Switch from `ifconfig` to `ip` to grab container's IP to avoid localization issues [#50][]
 
-## [0.2.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.1.1...v0.2.0)
+## [0.2.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.1.1...v0.2.0) (March 30, 2013)
 
   - Experimental box packaging (only tested with Ubuntu 64 base box)
 
-## [0.1.1](https://github.com/fgrehm/vagrant-lxc/compare/v0.1.0...v0.1.1)
+## [0.1.1](https://github.com/fgrehm/vagrant-lxc/compare/v0.1.0...v0.1.1) (March 29, 2013)
 
   - Removed support for development under Vagrant < 1.1
-  - Removed rsync from base quantal64 box to speed up containers creation [#40](https://github.com/fgrehm/vagrant-lxc/issues/40)
-  - Containers are now named after project's root dir [#14](https://github.com/fgrehm/vagrant-lxc/issues/14)
+  - Removed rsync from base quantal64 box to speed up containers creation [#40][]
+  - Containers are now named after project's root dir [#14][]
   - Skip Vagrant's built in SSH redirect
-  - Allow setting rootfs from Vagrantfile [#30](https://github.com/fgrehm/vagrant-lxc/issues/30)
+  - Allow setting rootfs from Vagrantfile [#30][]
 
-## [0.1.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.0.3...v0.1.0)
+## [0.1.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.0.3...v0.1.0) (March 27, 2013)
 
   - 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)
+  - Port forwarding support added [#6][]
 
 ## Previous
 

data/Gemfile

@@ -12,7 +12,6 @@ group :development do
   gem 'guard-bundler'
   gem 'guard-ctags-bundler'
   gem 'rb-inotify'
-  gem 'simplecov', require: false
 end
 
 
@@ -21,4 +20,5 @@ group :development, :test do
   gem 'rspec'
   gem 'rspec-fire',  require: 'rspec/fire'
   gem 'rspec-spies', require: false
+  gem 'coveralls',   require: false
 end

data/Gemfile.lock

@@ -15,7 +15,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.3.0)
+    vagrant-lxc (0.3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -23,6 +23,13 @@ GEM
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.9)
+    colorize (0.5.8)
+    coveralls (0.6.5)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
     diff-lcs (1.2.2)
     erubis (2.7.0)
     ffi (1.6.0)
@@ -47,6 +54,7 @@ GEM
     log4r (1.1.10)
     lumberjack (1.0.3)
     method_source (0.8.1)
+    mime-types (1.22)
     multi_json (1.7.2)
     net-scp (1.1.0)
       net-ssh (>= 2.6.5)
@@ -58,6 +66,8 @@ GEM
     rake (10.0.4)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -81,6 +91,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  coveralls
   guard
   guard-bundler
   guard-ctags-bundler
@@ -90,6 +101,5 @@ DEPENDENCIES
   rspec
   rspec-fire
   rspec-spies
-  simplecov
   vagrant!
   vagrant-lxc!

data/README.md

@@ -1,4 +1,4 @@
-# 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)
+# 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)
 
 Linux Containers support for Vagrant 1.1+
 
@@ -7,7 +7,8 @@ Linux Containers support for Vagrant 1.1+
 
 * Vagrant 1.1+ (1.1.3+ recommended)
 * lxc 0.7.5+ (0.8.0-rc1+ recommended)
-* redir
+* redir (if you are planning to use port forwarding)
+* arch command (uname -m) on PATH
 * A Kernel [higher than 3.5.0-17.28](#help-im-unable-to-restart-containers)
 
 On a clean Ubuntu 12.10 machine it means something like:
@@ -172,8 +173,8 @@ to a bug on linux kernel, so make sure you are using a bug-free kernel
 * https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1065434
 
 Sometimes the dev boxes I'm using are not able to `lxc-start` containers
-anymore. Most of the times it was an issue with the arguments [I provided](https://github.com/fgrehm/vagrant-lxc/blob/master/example/Vagrantfile#L14-L18)
-to it (or a *buggy* kernel). If you run into that, rollback your changes
+anymore. Most of the times it was an issue with the arguments I provided
+to it for customization (or a *buggy* kernel). If you run into that, rollback your changes
 and try to `vagrant reload` the dev box. If it still doesn't work,
 please file a bug at the [issue tracker](https://github.com/fgrehm/vagrant-lxc/issues).
 

data/Rakefile

@@ -1,5 +1,3 @@
 Dir['./tasks/**/*.rake'].each { |f| load f }
 
 require 'bundler/gem_tasks'
-
-task :ci => ['spec:unit']

data/development/shell-provisioning/upgrade-kernel

@@ -9,6 +9,6 @@ fi
 echo 'An old kernel was found on the guest machine and it will be upgraded' 1>&2
 echo 'Please reload the box after provisioning when finished' 1>&2
 sudo apt-get update
-sudo apt-get install linux-image-3.5.0-26-generic linux-headers-3.5.0-26-generic -y
+sudo apt-get install linux-image-3.5.0-27-generic linux-headers-3.5.0-27-generic -y
 sudo apt-get dist-upgrade -y
 sudo apt-get autoremove -y

data/lib/vagrant-lxc/action.rb

@@ -5,12 +5,14 @@ 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/destroy_confirm'
 require 'vagrant-lxc/action/disconnect'
 require 'vagrant-lxc/action/compress_rootfs'
 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/message'
 require 'vagrant-lxc/action/setup_package_files'
 require 'vagrant-lxc/action/share_folders'
 
@@ -25,8 +27,7 @@ module Vagrant
           # 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
+              b2.use Message, :not_created
               next
             end
 
@@ -60,15 +61,13 @@ module Vagrant
           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
+              b2.use Message, :not_created
               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
+                b3.use Message, :not_running
                 next
               end
 
@@ -127,8 +126,7 @@ module Vagrant
                 end
               end
             else
-              # TODO: Implement our own MessageNotCreated
-              b2.use VagrantPlugins::ProviderVirtualBox::Action::MessageNotCreated
+              b2.use Message, :not_created
             end
           end
         end
@@ -141,21 +139,18 @@ module Vagrant
           # 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
+              b2.use Message, :not_created
               next
             end
 
-            # TODO: Implement our own DestroyConfirm
-            b2.use Vagrant::Action::Builtin::Call, VagrantPlugins::ProviderVirtualBox::Action::DestroyConfirm do |env2, b3|
+            b2.use Vagrant::Action::Builtin::Call, DestroyConfirm do |env2, b3|
               if env2[:result]
                 b3.use Vagrant::Action::Builtin::ConfigValidate
                 b3.use Vagrant::Action::Builtin::EnvSet, :force_halt => true
                 b3.use action_halt
                 b3.use Destroy
               else
-                # TODO: Implement our own MessageWillNotDestroy
-                b3.use VagrantPlugins::ProviderVirtualBox::Action::MessageWillNotDestroy
+                b3.use Message, :will_not_destroy
               end
             end
           end
@@ -168,8 +163,7 @@ module Vagrant
           # 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
+              b2.use Message, :not_created
               next
             end
 

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

@@ -11,7 +11,7 @@ module Vagrant
 
           config = env[:machine].provider_config
 
-          env[:ui].info I18n.t("vagrant.actions.vm.boot.booting")
+          env[:ui].info I18n.t("vagrant_lxc.messages.starting")
           env[:machine].provider.driver.start(config.customizations)
           raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
 
@@ -20,11 +20,11 @@ module Vagrant
 
         # Stolen from on VagrantPlugins::ProviderVirtualBox::Action::Boot
         def wait_for_boot
-          @env[:ui].info I18n.t("vagrant.actions.vm.boot.waiting")
+          @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.actions.vm.boot.ready")
+              @env[:ui].info I18n.t("vagrant_lxc.messages.container_ready")
               return true
             end
 

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

@@ -0,0 +1,17 @@
+require "vagrant/action/builtin/confirm"
+
+module Vagrant
+  module LXC
+    module Action
+      class DestroyConfirm < Vagrant::Action::Builtin::Confirm
+        def initialize(app, env)
+          force_key = :force_confirm_destroy
+          message   = I18n.t("vagrant.commands.destroy.confirmation",
+                             :name => env[:machine].name)
+
+          super(app, env, message, force_key)
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Vagrant
 
         def call(env)
           if env[:machine].provider.state.id == :running
-            env[:ui].info I18n.t("vagrant.actions.vm.halt.force")
+            env[:ui].info I18n.t("vagrant_lxc.messages.force_shutdown")
             # TODO: Driver#halt is kinda graceful as well, if it doesn't
             #       work we can issue a lxc-stop.
             env[:machine].provider.driver.halt

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

@@ -0,0 +1,22 @@
+module Vagrant
+  module LXC
+    module Action
+      class Message
+        def initialize(app, env, msg_key, type = :info)
+          @app     = app
+          @msg_key = msg_key
+          @type    = type
+        end
+
+        def call(env)
+          machine = env[:machine]
+          message = I18n.t("vagrant_lxc.messages.#{@msg_key}", name: machine.name)
+
+          env[:ui].send @type, message
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/driver.rb

@@ -105,22 +105,6 @@ module Vagrant
       end
 
       def assigned_ip
-        ip = ''
-        retryable(:on => LXC::Errors::ExecuteError, :tries => 10, :sleep => 3) do
-          unless ip = get_container_ip_from_ip_addr
-            # retry
-            raise LXC::Errors::ExecuteError, :command => "lxc-attach"
-          end
-        end
-        ip
-      end
-
-      # From: https://github.com/lxc/lxc/blob/staging/src/python-lxc/lxc/__init__.py#L371-L385
-      def get_container_ip_from_ip_addr
-        output = @cli.attach '/sbin/ip', '-4', 'addr', 'show', 'scope', 'global', 'eth0', namespaces: 'network'
-        if output =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
-          return $1.to_s
-        end
       end
 
       protected

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/locales/en.yml

@@ -1,4 +1,23 @@
 en:
+  vagrant_lxc:
+    messages:
+      not_created: |-
+        The container hasn't been created yet.
+      not_running: |-
+        The container is not currently running.
+      will_not_destroy: |-
+        The container '%{name}' will not be destroyed, since the confirmation
+        was declined.
+      starting: |-
+        Starting container...
+      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...
+
+  # TODO: Review messages below
   vagrant:
     actions:
       lxc:

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
 if ENV['COVERAGE']
   require 'simplecov'
+  require 'coveralls'
+
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+
   SimpleCov.start do
     add_filter { |source_file| source_file.filename =~ /\/spec\/support/ }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -50,11 +50,13 @@ files:
 - lib/vagrant-lxc/action/create.rb
 - lib/vagrant-lxc/action/created.rb
 - lib/vagrant-lxc/action/destroy.rb
+- lib/vagrant-lxc/action/destroy_confirm.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/message.rb
 - lib/vagrant-lxc/action/setup_package_files.rb
 - lib/vagrant-lxc/action/share_folders.rb
 - lib/vagrant-lxc/config.rb