vagrant-lxc 0.4.0 → 0.5.0

data/lib/vagrant-lxc/sudo_wrapper.rb

@@ -0,0 +1,79 @@
+module Vagrant
+  module LXC
+    class SudoWrapper
+      # Include this so we can use `Subprocess` more easily.
+      include Vagrant::Util::Retryable
+
+      def initialize(wrapper_path = nil)
+        @wrapper_path = wrapper_path
+        @logger       = Log4r::Logger.new("vagrant::lxc::shell")
+      end
+
+      def run(*command)
+        command.unshift @wrapper_path if @wrapper_path
+        execute *(['sudo'] + command)
+      end
+
+      def su_c(command)
+        su_command = if @wrapper_path
+            "#{@wrapper_path} \"#{command}\""
+          else
+            "su root -c \"#{command}\""
+          end
+        @logger.debug "Running 'sudo #{su_command}'"
+        system "sudo #{su_command}"
+      end
+
+      private
+
+      # TODO: Review code below this line, it was pretty much a copy and
+      #       paste from VirtualBox base driver and has no tests
+      def execute(*command, &block)
+        # Get the options hash if it exists
+        opts = {}
+        opts = command.pop if command.last.is_a?(Hash)
+
+        tries = 0
+        tries = 3 if opts[:retryable]
+
+        sleep = opts.fetch(:sleep, 1)
+
+        # Variable to store our execution result
+        r = nil
+
+        retryable(:on => LXC::Errors::ExecuteError, :tries => tries, :sleep => sleep) do
+          # Execute the command
+          r = raw(*command, &block)
+
+          # If the command was a failure, then raise an exception that is
+          # nicely handled by Vagrant.
+          if r.exit_code != 0
+            if @interrupted
+              @logger.info("Exit code != 0, but interrupted. Ignoring.")
+            else
+              raise LXC::Errors::ExecuteError, :command => command.inspect
+            end
+          end
+        end
+
+        # Return the output, making sure to replace any Windows-style
+        # newlines with Unix-style.
+        r.stdout.gsub("\r\n", "\n")
+      end
+
+      def raw(*command, &block)
+        int_callback = lambda do
+          @interrupted = true
+          @logger.info("Interrupted.")
+        end
+
+        # Append in the options for subprocess
+        command << { :notify => [:stdout, :stderr] }
+
+        Vagrant::Util::Busy.busy(int_callback) do
+          Vagrant::Util::Subprocess.execute(*command, &block)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/version.rb

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

data/locales/en.yml

@@ -44,3 +44,9 @@ en:
       lxc_template_file_missing: |-
         The template file used for creating the container was not found for %{name}
         box.
+
+      lxc_not_installed: |-
+        The `lxc` package does not seem to be installed or is not accessible on the PATH.
+
+      lxc_redir_not_installed: |-
+        `redir` is not installed or is not accessible on the PATH.

data/spec/unit/action/clear_forwarded_ports_spec.rb

@@ -29,7 +29,7 @@ describe Vagrant::LXC::Action::ClearForwardedPorts do
 
   context 'with a valid redir pid' do
     it 'kills known processes' do
-      subject.should have_received(:system).with("sudo pkill -TERM -P #{pid}")
+      subject.should have_received(:system).with("pkill -TERM -P #{pid}")
     end
   end
 
@@ -37,7 +37,7 @@ describe Vagrant::LXC::Action::ClearForwardedPorts do
     let(:pid_cmd) { 'sudo ls' }
 
     it 'does not kill the process' do
-      subject.should_not have_received(:system).with("sudo pkill -TERM -P #{pid}")
+      subject.should_not have_received(:system).with("pkill -TERM -P #{pid}")
     end
   end
 end

data/spec/unit/action/forward_ports_spec.rb

@@ -1,5 +1,7 @@
 require 'unit_helper'
 
+require 'tmpdir'
+require 'vagrant-lxc/errors'
 require 'vagrant-lxc/action/forward_ports'
 
 describe Vagrant::LXC::Action::ForwardPorts do
@@ -7,13 +9,14 @@ describe Vagrant::LXC::Action::ForwardPorts do
   let(:env)          { {machine: machine, ui: double(info: true)} }
   let(:machine)      { double(:machine) }
   let!(:data_dir)    { Pathname.new(Dir.mktmpdir) }
-  let(:networks)     { [[:other_config, {}], [:forwarded_port, {guest: guest_port, host: host_port}]] }
+  let(:provider)     { instance_double('Vagrant::LXC::Provider', ssh_info: {host: container_ip}) }
+  let(:host_ip)      { '127.0.0.1' }
   let(:host_port)    { 8080 }
   let(:guest_port)   { 80 }
-  let(:provider)     { instance_double('Vagrant::LXC::Provider', driver: driver) }
-  let(:driver)       { instance_double('Vagrant::LXC::Driver', assigned_ip: container_ip) }
   let(:container_ip) { '10.0.1.234' }
   let(:pid)          { 'a-pid' }
+  let(:forward_conf) { {guest: guest_port, host: host_port, host_ip: host_ip} }
+  let(:networks)     { [[:other_config, {}], [:forwarded_port, forward_conf]] }
 
   subject { described_class.new(app, env) }
 
@@ -23,19 +26,36 @@ describe Vagrant::LXC::Action::ForwardPorts do
 
     subject.stub(exec: true)
     subject.stub(spawn: pid)
-    subject.call(env)
   end
 
   after { FileUtils.rm_rf data_dir.to_s }
 
   it 'forwards ports using redir' do
+    subject.stub(system: true)
+    subject.call(env)
+    subject.should have_received(:spawn).with(
+      "redir --laddr=#{host_ip} --lport=#{host_port} --caddr=#{container_ip} --cport=#{guest_port} 2>/dev/null"
+    )
+  end
+
+  it 'skips --laddr parameter if host_ip is nil' do
+    forward_conf.delete(:host_ip)
+    subject.stub(system: true)
+    subject.call(env)
     subject.should have_received(:spawn).with(
-      "sudo redir --laddr=127.0.0.1 --lport=#{host_port} --cport=#{guest_port} --caddr=#{container_ip} 2>/dev/null"
+      "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)
     pid_file = data_dir.join('pids', "redir_#{host_port}.pid").read
     pid_file.should == pid
   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)
+  end
 end

data/spec/unit/driver/cli_spec.rb

@@ -3,6 +3,10 @@ require 'unit_helper'
 require 'vagrant-lxc/driver/cli'
 
 describe Vagrant::LXC::Driver::CLI do
+  let(:sudo_wrapper) { instance_double('Vagrant::LXC::SudoWrapper', run: true) }
+
+  subject { described_class.new(sudo_wrapper) }
+
   describe 'list' do
     let(:lxc_ls_out) { "dup-container\na-container dup-container" }
     let(:result)     { @result }
@@ -41,7 +45,7 @@ describe Vagrant::LXC::Driver::CLI do
     let(:config_file)   { 'config' }
     let(:template_args) { { '--extra-param' => 'param', '--other' => 'value' } }
 
-    subject { described_class.new(name) }
+    subject { described_class.new(sudo_wrapper, name) }
 
     before do
       subject.stub(:run) { |*args| @run_args = args }
@@ -64,7 +68,7 @@ describe Vagrant::LXC::Driver::CLI do
   describe 'destroy' do
     let(:name) { 'a-container-for-destruction' }
 
-    subject { described_class.new(name) }
+    subject { described_class.new(sudo_wrapper, name) }
 
     before do
       subject.stub(:run)
@@ -78,7 +82,7 @@ describe Vagrant::LXC::Driver::CLI do
 
   describe 'start' do
     let(:name) { 'a-container' }
-    subject    { described_class.new(name) }
+    subject    { described_class.new(sudo_wrapper, name) }
 
     before do
       subject.stub(:run)
@@ -92,19 +96,11 @@ describe Vagrant::LXC::Driver::CLI do
         '--name',  name
       )
     end
-
-    it 'uses provided array to override container configs' do
-      subject.start([['config', 'value'], ['other', 'value']])
-      subject.should have_received(:run).with(:start, '-d', '--name', name,
-        '-s', 'lxc.config=value',
-        '-s', 'lxc.other=value'
-      )
-    end
   end
 
   describe 'shutdown' do
     let(:name) { 'a-running-container' }
-    subject    { described_class.new(name) }
+    subject    { described_class.new(sudo_wrapper, name) }
 
     before do
       subject.stub(:run)
@@ -118,7 +114,7 @@ describe Vagrant::LXC::Driver::CLI do
 
   describe 'state' do
     let(:name) { 'a-container' }
-    subject    { described_class.new(name) }
+    subject    { described_class.new(sudo_wrapper, name) }
 
     before do
       subject.stub(:run).and_return("state: STOPPED\npid: 2")
@@ -138,7 +134,7 @@ describe Vagrant::LXC::Driver::CLI do
     let(:name)           { 'a-running-container' }
     let(:command)        { ['ls', 'cat /tmp/file'] }
     let(:command_output) { 'folders list' }
-    subject              { described_class.new(name) }
+    subject              { described_class.new(sudo_wrapper, name) }
 
     before do
       subject.stub(run: command_output)

data/spec/unit/driver_spec.rb

@@ -6,9 +6,9 @@ require 'vagrant-lxc/driver/cli'
 
 describe Vagrant::LXC::Driver do
   describe 'container name validation' do
-    let(:unknown_container) { described_class.new('unknown', cli) }
-    let(:valid_container)   { described_class.new('valid', cli) }
-    let(:new_container)     { described_class.new(nil) }
+    let(:unknown_container) { described_class.new('unknown', nil, cli) }
+    let(:valid_container)   { described_class.new('valid', nil, cli) }
+    let(:new_container)     { described_class.new(nil, nil) }
     let(:cli)               { instance_double('Vagrant::LXC::Driver::CLI', list: ['valid']) }
 
     it 'raises a ContainerNotFound error if an unknown container name gets provided' do
@@ -39,7 +39,7 @@ describe Vagrant::LXC::Driver do
     let(:rootfs_tarball) { '/path/to/cache/rootfs.tar.gz' }
     let(:cli)            { instance_double('Vagrant::LXC::Driver::CLI', :create => true, :name= => true) }
 
-    subject { described_class.new(nil, cli) }
+    subject { described_class.new(nil, nil, cli) }
 
     before do
       subject.stub(:import_template).and_yield(template_name)
@@ -62,7 +62,7 @@ describe Vagrant::LXC::Driver do
   describe 'destruction' do
     let(:cli) { instance_double('Vagrant::LXC::Driver::CLI', destroy: true) }
 
-    subject { described_class.new('name', cli) }
+    subject { described_class.new('name', nil, cli) }
 
     before { subject.destroy }
 
@@ -75,8 +75,9 @@ describe Vagrant::LXC::Driver do
     let(:customizations)         { [['a', '1'], ['b', '2']] }
     let(:internal_customization) { ['internal', 'customization'] }
     let(:cli)                    { instance_double('Vagrant::LXC::Driver::CLI', start: true) }
+    let(:sudo)                   { instance_double('Vagrant::LXC::SudoWrapper', su_c: true) }
 
-    subject { described_class.new('name', cli) }
+    subject { described_class.new('name', sudo, cli) }
 
     before do
       cli.stub(:transition_to).and_yield(cli)
@@ -84,8 +85,12 @@ describe Vagrant::LXC::Driver do
       subject.start(customizations)
     end
 
+    it 'prunes previous customizations before writing'
+
+    it 'writes configurations to config file'
+
     it 'starts container with configured customizations' do
-      cli.should have_received(:start).with(customizations + [internal_customization], nil)
+      cli.should have_received(:start)
     end
 
     it 'expects a transition to running state to take place' do
@@ -96,7 +101,7 @@ describe Vagrant::LXC::Driver do
   describe 'halt' do
     let(:cli) { instance_double('Vagrant::LXC::Driver::CLI', shutdown: true) }
 
-    subject { described_class.new('name', cli) }
+    subject { described_class.new('name', nil, cli) }
 
     before do
       cli.stub(:transition_to).and_yield(cli)
@@ -124,45 +129,21 @@ describe Vagrant::LXC::Driver do
     let(:cli_state) { :something }
     let(:cli)       { instance_double('Vagrant::LXC::Driver::CLI', state: cli_state) }
 
-    subject { described_class.new('name', cli) }
+    subject { described_class.new('name', nil, cli) }
 
     it 'delegates to cli' do
       subject.state.should == cli_state
     end
   end
 
-  pending 'assigned ip' do
-    # This ip is set on the sample-ip-addr-output fixture
-    let(:ip)              { "10.0.254.137" }
-    let(:ifconfig_output) { File.read('spec/fixtures/sample-ip-addr-output') }
-    let(:cli)             { instance_double('Vagrant::LXC::Driver::CLI', :attach => ifconfig_output) }
-
-    subject { described_class.new('name', cli) }
-
-    context 'when ip for eth0 gets returned from lxc-attach call' do
-      it 'gets parsed from `ip addr` output' do
-        subject.assigned_ip.should == ip
-        cli.should have_received(:attach).with(
-          '/sbin/ip',
-          '-4',
-          'addr',
-          'show',
-          'scope',
-          'global',
-          'eth0',
-          namespaces: 'network'
-        )
-      end
-    end
-  end
-
   describe 'folder sharing' do
     let(:shared_folder)       { {guestpath: '/vagrant', hostpath: '/path/to/host/dir'} }
     let(:folders)             { [shared_folder] }
     let(:rootfs_path)         { Pathname('/path/to/rootfs') }
     let(:expected_guest_path) { "#{rootfs_path}/vagrant" }
+    let(:sudo_wrapper)        { instance_double('Vagrant::LXC::SudoWrapper', run: true) }
 
-    subject { described_class.new('name') }
+    subject { described_class.new('name', sudo_wrapper) }
 
     before do
       subject.stub(rootfs_path: rootfs_path, system: true)
@@ -170,7 +151,7 @@ describe Vagrant::LXC::Driver do
     end
 
     it "creates guest folder under container's rootfs" do
-      subject.should have_received(:system).with("sudo mkdir -p #{expected_guest_path}")
+      sudo_wrapper.should have_received(:run).with("mkdir", "-p", expected_guest_path)
     end
 
     it 'adds a mount.entry to its local customizations' do

data/tasks/boxes.rake

@@ -57,6 +57,7 @@ end
 
 puppet   = ENV['PUPPET']   == '1'
 babushka = ENV['BABUSHKA'] == '1'
+salt     = ENV['SALT']     == '1'
 
 namespace :boxes do
   namespace :ubuntu do
@@ -65,20 +66,25 @@ namespace :boxes do
       desc 'Build an Ubuntu Precise 64 bits box'
       BuildUbuntuBoxTaskV3.
         new(:precise64,
-            :precise, 'amd64', puppet: puppet, babushka: babushka)
+            :precise, 'amd64', puppet: puppet, babushka: babushka, salt: salt)
 
       desc 'Build an Ubuntu Quantal 64 bits box'
       BuildUbuntuBoxTaskV3.
         new(:quantal64,
-            :quantal, 'amd64', puppet: puppet, babushka: babushka)
+            :quantal, 'amd64', puppet: puppet, babushka: babushka, salt: salt)
 
       desc 'Build an Ubuntu Raring 64 bits box'
       BuildUbuntuBoxTaskV3.
         new(:raring64,
-            :raring, 'amd64', puppet: puppet, babushka: babushka)
+            :raring, 'amd64', puppet: puppet, babushka: babushka, salt: salt)
+
+      desc 'Build an Ubuntu Saucy 64 bits box'
+      BuildUbuntuBoxTaskV3.
+        new(:saucy64,
+            :saucy, 'amd64', puppet: puppet, babushka: babushka, salt: salt)
 
       desc 'Build all Ubuntu boxes'
-      task :all => %w( precise64 quantal64 raring64 )
+      task :all => %w( precise64 quantal64 raring64 saucy64 )
     end
   end
 
@@ -87,17 +93,17 @@ namespace :boxes do
       desc 'Build an Debian Squeeze 64 bits box'
       BuildDebianBoxTaskV3.
         new(:squeeze64,
-            :squeeze, 'amd64', puppet: puppet, babushka: babushka)
+            :squeeze, 'amd64', puppet: puppet, babushka: babushka, salt: false)
 
       desc 'Build an Debian Wheezy 64 bits box'
       BuildDebianBoxTaskV3.
         new(:wheezy64,
-            :wheezy, 'amd64', puppet: puppet, babushka: babushka)
+            :wheezy, 'amd64', puppet: puppet, babushka: babushka, salt: false)
 
       desc 'Build an Debian Sid/unstable 64 bits box'
       BuildDebianBoxTaskV3.
         new(:sid64,
-            :sid, 'amd64', puppet: puppet, babushka: babushka)
+            :sid, 'amd64', puppet: puppet, babushka: babushka, salt: false)
 
       desc 'Build all Debian boxes'
       task :all => %w( squeeze64 wheezy64 sid64 )

data/tasks/boxes.v2.rake

@@ -14,6 +14,7 @@ class BuildGenericBoxTaskV2 < ::Rake::TaskLib
     @install_chef     = opts.fetch(:chef, false)
     @install_puppet   = opts.fetch(:puppet, true)
     @install_babushka = opts.fetch(:babushka, true)
+    @install_salt     = opts.fetch(:salt, true)
     @file             = opts[:file] || default_box_file
     @scripts_path     = Pathname(Dir.pwd).join('boxes')
 
@@ -86,7 +87,7 @@ class BuildGenericBoxTaskV2 < ::Rake::TaskLib
   end
 
   def install_cfg_engines
-    [ :puppet, :chef, :babushka ].each do |cfg_engine|
+    [ :puppet, :chef, :babushka, :salt ].each do |cfg_engine|
       next unless instance_variable_get :"@install_#{cfg_engine}"
       script_name = "install-#{cfg_engine}"
       run script_name
@@ -125,6 +126,7 @@ end
 chef     = ENV['CHEF']     == '1'
 puppet   = ENV['PUPPET']   == '1'
 babushka = ENV['BABUSHKA'] == '1'
+salt     = ENV['SALT']     == '1'
 
 namespace :boxes do
   namespace :v2 do
@@ -134,21 +136,26 @@ namespace :boxes do
         desc 'Build an Ubuntu Precise 64 bits box'
         BuildUbuntuBoxTaskV2.
           new(:precise64,
-              :precise, 'amd64', chef: chef, puppet: puppet, babushka: babushka)
+              :precise, 'amd64', chef: chef, puppet: puppet, babushka: babushka, salt: salt)
 
         desc 'Build an Ubuntu Quantal 64 bits box'
         BuildUbuntuBoxTaskV2.
           new(:quantal64,
-              :quantal, 'amd64', chef: chef, puppet: puppet, babushka: babushka)
+              :quantal, 'amd64', chef: chef, puppet: puppet, babushka: babushka, salt: salt)
 
         # FIXME: Find out how to install chef on raring
         desc 'Build an Ubuntu Raring 64 bits box'
         BuildUbuntuBoxTaskV2.
           new(:raring64,
-              :raring, 'amd64', chef: chef, puppet: puppet, babushka: babushka)
+              :raring, 'amd64', chef: chef, puppet: puppet, babushka: babushka, salt: salt)
+
+        desc 'Build an Ubuntu Saucy 64 bits box'
+        BuildUbuntuBoxTaskV2.
+          new(:saucy64,
+              :saucy, 'amd64', chef: chef, puppet: puppet, babushka: babushka, salt: salt)
 
         desc 'Build all Ubuntu boxes'
-        task :all => %w( precise64 quantal64 raring64 )
+        task :all => %w( precise64 quantal64 raring64 saucy64 )
       end
     end
 
@@ -158,17 +165,17 @@ namespace :boxes do
         desc 'Build an Debian Squeeze 64 bits box'
         BuildDebianBoxTaskV2.
           new(:squeeze64,
-              :squeeze, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+              :squeeze, 'amd64', chef: false, puppet: puppet, babushka: babushka, salt: false)
 
         desc 'Build an Debian Wheezy 64 bits box'
         BuildDebianBoxTaskV2.
           new(:wheezy64,
-              :wheezy, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+              :wheezy, 'amd64', chef: false, puppet: puppet, babushka: babushka, salt: false)
 
         desc 'Build an Debian Sid/unstable 64 bits box'
         BuildDebianBoxTaskV2.
           new(:sid64,
-              :sid, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+              :sid, 'amd64', chef: false, puppet: puppet, babushka: babushka, salt: false)
 
         desc 'Build all Debian boxes'
         task :all => %w( squeeze64 wheezy64 sid64 )