vagrant-lxc 0.2.0 → 0.3.0

data/spec/unit/action/forward_ports_spec.rb

@@ -10,8 +10,8 @@ describe Vagrant::LXC::Action::ForwardPorts do
   let(:networks)     { [[:other_config, {}], [:forwarded_port, {guest: guest_port, host: host_port}]] }
   let(:host_port)    { 8080 }
   let(:guest_port)   { 80 }
-  let(:provider)     { fire_double('Vagrant::LXC::Provider', container: container) }
-  let(:container)    { fire_double('Vagrant::LXC::Container', assigned_ip: container_ip) }
+  let(:provider)     { fire_double('Vagrant::LXC::Provider', driver: driver) }
+  let(:driver)       { fire_double('Vagrant::LXC::Driver', assigned_ip: container_ip) }
   let(:container_ip) { '10.0.1.234' }
   let(:pid)          { 'a-pid' }
 
@@ -30,7 +30,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
 
   it 'forwards ports using redir' do
     subject.should have_received(:exec).with(
-      "sudo redir --laddr=127.0.0.1 --lport=#{host_port} --cport=#{guest_port} --caddr=#{container_ip}"
+      "sudo redir --laddr=127.0.0.1 --lport=#{host_port} --cport=#{guest_port} --caddr=#{container_ip} 2>/dev/null"
     )
   end
 

data/spec/unit/action/handle_box_metadata_spec.rb

@@ -1,44 +1,70 @@
 require 'unit_helper'
 
-require 'vagrant-lxc/action/base_action'
+require 'vagrant'
+require 'vagrant-lxc/errors'
 require 'vagrant-lxc/action/handle_box_metadata'
 
 describe Vagrant::LXC::Action::HandleBoxMetadata do
-  let(:metadata)      { {'template-opts' => {'--foo' => 'bar'}} }
-  let(:box)           { mock(:box, name: 'box-name', metadata: metadata, directory: box_directory) }
-  let(:box_directory) { Pathname.new('/path/to/box') }
-  let(:machine)       { mock(:machine, box: box) }
   let(:app)           { mock(:app, call: true) }
   let(:env)           { {machine: machine, ui: stub(info: true)} }
-  let(:tmpdir)        { '/tmp/rootfs/dir' }
+  let(:machine)       { mock(:machine, box: box) }
+  let(:box)           { mock(:box, name: 'box-name', metadata: metadata, directory: box_directory) }
+  let(:box_directory) { Pathname.new('/path/to/box') }
+  let(:version)       { '2' }
+  let(:metadata)      { {'template-opts' => {'--foo' => 'bar'}, 'version' => version} }
+  let(:vagrant_key)   { Vagrant.source_root.join('keys', 'vagrant.pub').expand_path.to_s }
 
   subject { described_class.new(app, env) }
 
-  before do
-    Dir.stub(mktmpdir: tmpdir)
-    File.stub(exists?: true)
-    subject.stub(:system)
-    subject.call(env)
-  end
+  context 'with valid contents' do
+    before do
+      File.stub(exists?: true)
+      subject.call(env)
+    end
 
-  it 'creates a tmp directory to store rootfs-cache-path' do
-    metadata['rootfs-cache-path'].should == tmpdir
-  end
+    it 'sets the tarball argument for the template' do
+      env[:lxc_template_opts].should include(
+        '--tarball' => box_directory.join('rootfs.tar.gz').to_s
+      )
+    end
 
-  it 'prepends vagrant and box name to template-name' do
-    metadata['template-name'].should == "vagrant-#{box.name}"
-  end
+    it 'sets the auth key argument for the template' do
+      env[:lxc_template_opts].should include(
+        '--auth-key' => vagrant_key
+      )
+    end
 
-  it 'copies box template file to the right folder' do
-    src  = box_directory.join('lxc-template').to_s
-    dest = "/usr/share/lxc/templates/lxc-#{metadata['template-name']}"
+    it 'sets the template options from metadata on env hash' do
+      env[:lxc_template_opts].should include(metadata['template-opts'])
+    end
 
-    subject.should have_received(:system).
-                   with("sudo su root -c \"cp #{src} #{dest}\"")
+    it 'sets the template source path on env hash' do
+      env[:lxc_template_src].should == box_directory.join('lxc-template').to_s
+    end
   end
 
-  it 'extracts rootfs into a tmp folder' do
-    subject.should have_received(:system).
-                   with(%Q[sudo su root -c "cd #{box_directory} && tar xfz rootfs.tar.gz -C #{tmpdir} 2>/dev/null"])
+  describe 'with invalid contents' do
+    before { File.stub(exists?: true) }
+
+    it 'raises an error if the version is != 2' do
+      metadata['version'] = '1'
+      expect {
+        subject.call(env)
+      }.to raise_error(Vagrant::LXC::Errors::InvalidBoxVersion)
+    end
+
+    it 'raises an error if the rootfs tarball cant be found' do
+      File.stub(:exists?).with(box_directory.join('rootfs.tar.gz').to_s).and_return(false)
+      expect {
+        subject.call(env)
+      }.to raise_error(Vagrant::LXC::Errors::RootFSTarballMissing)
+    end
+
+    it 'raises an error if the lxc-template script cant be found' do
+      File.stub(:exists?).with(box_directory.join('lxc-template').to_s).and_return(false)
+      expect {
+        subject.call(env)
+      }.to raise_error(Vagrant::LXC::Errors::TemplateFileMissing)
+    end
   end
 end

data/spec/unit/{container → driver}/cli_spec.rb

@@ -1,12 +1,10 @@
 require 'unit_helper'
 
-require 'vagrant'
-require 'vagrant-lxc/container/cli'
+require 'vagrant-lxc/driver/cli'
 
-describe Vagrant::LXC::Container::CLI do
+describe Vagrant::LXC::Driver::CLI do
   describe 'list' do
     let(:lxc_ls_out) { "dup-container\na-container dup-container" }
-    let(:exec_args)  { @exec_args }
     let(:result)     { @result }
 
     before do
@@ -25,6 +23,18 @@ describe Vagrant::LXC::Container::CLI do
     end
   end
 
+  describe 'version' do
+    let(:lxc_version_out) { "lxc version:  0.x.y-rc1\n" }
+
+    before do
+      subject.stub(:run).with(:version).and_return(lxc_version_out)
+    end
+
+    it 'parses the version from the output' do
+      subject.version.should == '0.x.y-rc1'
+    end
+  end
+
   describe 'create' do
     let(:template)      { 'quantal-64' }
     let(:name)          { 'quantal-container' }
@@ -34,12 +44,9 @@ describe Vagrant::LXC::Container::CLI do
 
     before do
       subject.stub(:run) { |*args| @run_args = args }
-      subject.create(template, rootfs, template_args)
+      subject.create(template, template_args)
     end
 
-    context 'when no rootfs is passed' do
-      let(:rootfs) { nil }
-
       it 'issues a lxc-create with provided template, container name and hash of arguments' do
         subject.should have_received(:run).with(
           :create,
@@ -50,15 +57,6 @@ describe Vagrant::LXC::Container::CLI do
           '--other',       'value'
         )
       end
-    end
-
-    context 'when the rootfs is passed' do
-      let(:rootfs) { 'rootfs_path' }
-
-      it 'issues a lxc-create with the right rootfs arguments' do
-        @run_args.join(' ').should =~ /-B dir --dir #{rootfs}/
-      end
-    end
   end
 
   describe 'destroy' do
@@ -93,8 +91,8 @@ describe Vagrant::LXC::Container::CLI do
       )
     end
 
-    it 'uses provided hash to configure the container' do
-      subject.start(['lxc.config=value', 'lxc.other=value'])
+    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'

data/spec/unit/driver_spec.rb

@@ -0,0 +1,173 @@
+require 'unit_helper'
+
+require 'vagrant'
+require 'vagrant-lxc/driver'
+
+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(:cli)               { fire_double('Vagrant::LXC::Driver::CLI', list: ['valid']) }
+
+    it 'raises a ContainerNotFound error if an unknown container name gets provided' do
+      expect {
+        unknown_container.validate!
+      }.to raise_error(Vagrant::LXC::Driver::ContainerNotFound)
+    end
+
+    it 'does not raise a ContainerNotFound error if a valid container name gets provided' do
+      expect {
+        valid_container.validate!
+      }.to_not raise_error(Vagrant::LXC::Driver::ContainerNotFound)
+    end
+
+    it 'does not raise a ContainerNotFound error if nil is provider as name' do
+      expect {
+        new_container.validate!
+      }.to_not raise_error(Vagrant::LXC::Driver::ContainerNotFound)
+    end
+  end
+
+  describe 'creation' do
+    let(:name)           { 'container-name' }
+    let(:template_name)  { 'auto-assigned-template-id' }
+    let(:template_path)  { '/path/to/lxc-template-from-box' }
+    let(:template_opts)  { {'--some' => 'random-option'} }
+    let(:rootfs_tarball) { '/path/to/cache/rootfs.tar.gz' }
+    let(:cli)            { fire_double('Vagrant::LXC::Driver::CLI', :create => true, :name= => true) }
+
+    subject { described_class.new(nil, cli) }
+
+    before do
+      subject.stub(:import_template).and_yield(template_name)
+      subject.create name, template_path, template_opts
+    end
+
+    it 'sets the cli object container name' do
+      cli.should have_received(:name=).with(name)
+    end
+
+    it 'creates container with the right arguments' do
+      cli.should have_received(:create).with(
+        template_name,
+        template_opts
+      )
+    end
+  end
+
+  describe 'destruction' do
+    let(:cli) { fire_double('Vagrant::LXC::Driver::CLI', destroy: true) }
+
+    subject { described_class.new('name', cli) }
+
+    before { subject.destroy }
+
+    it 'delegates to cli object' do
+      cli.should have_received(:destroy)
+    end
+  end
+
+  describe 'start' do
+    let(:customizations)         { [['a', '1'], ['b', '2']] }
+    let(:internal_customization) { ['internal', 'customization'] }
+    let(:cli)                    { fire_double('Vagrant::LXC::Driver::CLI', start: true) }
+
+    subject { described_class.new('name', cli) }
+
+    before do
+      cli.stub(:transition_to).and_yield(cli)
+      subject.customizations << internal_customization
+      subject.start(customizations)
+    end
+
+    it 'starts container with configured customizations' do
+      cli.should have_received(:start).with(customizations + [internal_customization], nil)
+    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
+    let(:cli) { fire_double('Vagrant::LXC::Driver::CLI', shutdown: true) }
+
+    subject { described_class.new('name', cli) }
+
+    before do
+      cli.stub(:transition_to).and_yield(cli)
+    end
+
+    it 'delegates to cli shutdown' do
+      cli.should_receive(:shutdown)
+      subject.halt
+    end
+
+    it 'expects a transition to running state to take place' do
+      cli.should_receive(:transition_to).with(:stopped)
+      subject.halt
+    end
+  end
+
+  describe 'state' do
+    let(:cli_state) { :something }
+    let(:cli)       { fire_double('Vagrant::LXC::Driver::CLI', state: cli_state) }
+
+    subject { described_class.new('name', 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)             { fire_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" }
+
+    subject { described_class.new('name') }
+
+    before do
+      subject.stub(rootfs_path: rootfs_path, system: true)
+      subject.share_folders(folders)
+    end
+
+    it "creates guest folder under container's rootfs" do
+      subject.should have_received(:system).with("sudo mkdir -p #{expected_guest_path}")
+    end
+
+    it 'adds a mount.entry to its local customizations' do
+      subject.customizations.should include [
+        'mount.entry',
+        "#{shared_folder[:hostpath]} #{expected_guest_path} none bind 0 0"
+      ]
+    end
+  end
+end

data/tasks/boxes.rake

@@ -10,9 +10,9 @@ namespace :boxes do
       sh 'mkdir -p boxes/output'
       sh 'cd boxes/quantal64 && sudo ./download-ubuntu'
       sh 'rm -f boxes/quantal64/rootfs.tar.gz'
-      sh 'cd boxes/quantal64 && sudo tar --numeric-owner -czf rootfs.tar.gz ./rootfs-amd64/*'
-      sh "cd boxes/quantal64 && sudo chown #{ENV['USER']}:#{ENV['USER']} rootfs.tar.gz && tar -czf ../output/lxc-quantal64.box ./* --exclude=rootfs-amd64 --exclude=download-ubuntu"
-      sh 'cd boxes/quantal64 && sudo rm -rf rootfs-amd64'
+      sh 'cd boxes/quantal64 && sudo tar --numeric-owner -czf rootfs.tar.gz ./rootfs/*'
+      sh 'cd boxes/quantal64 && sudo rm -rf rootfs'
+      sh "cd boxes/quantal64 && sudo chown #{ENV['USER']}:#{ENV['USER']} rootfs.tar.gz && tar -czf ../output/lxc-quantal64.box ./* --exclude=download-ubuntu"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -42,7 +42,6 @@ files:
 - example/puppet/modules/hello_world/manifests/init.pp
 - lib/vagrant-lxc.rb
 - lib/vagrant-lxc/action.rb
-- lib/vagrant-lxc/action/base_action.rb
 - lib/vagrant-lxc/action/boot.rb
 - lib/vagrant-lxc/action/check_created.rb
 - lib/vagrant-lxc/action/check_running.rb
@@ -56,19 +55,20 @@ files:
 - 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/network.rb
 - lib/vagrant-lxc/action/setup_package_files.rb
 - lib/vagrant-lxc/action/share_folders.rb
 - lib/vagrant-lxc/config.rb
-- lib/vagrant-lxc/container.rb
-- lib/vagrant-lxc/container/cli.rb
+- lib/vagrant-lxc/driver.rb
+- lib/vagrant-lxc/driver/builder.rb
+- lib/vagrant-lxc/driver/cli.rb
+- lib/vagrant-lxc/driver/fetch_ip_from_dnsmasq.rb
+- lib/vagrant-lxc/driver/fetch_ip_with_attach.rb
 - lib/vagrant-lxc/errors.rb
-- lib/vagrant-lxc/machine_state.rb
 - lib/vagrant-lxc/plugin.rb
 - lib/vagrant-lxc/provider.rb
 - lib/vagrant-lxc/version.rb
 - locales/en.yml
-- spec/fixtures/sample-ifconfig-output
+- spec/fixtures/sample-ip-addr-output
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
 - spec/unit/action/clear_forwarded_ports_spec.rb
@@ -76,9 +76,8 @@ files:
 - spec/unit/action/forward_ports_spec.rb
 - spec/unit/action/handle_box_metadata_spec.rb
 - spec/unit/action/setup_package_files_spec.rb
-- spec/unit/container/cli_spec.rb
-- spec/unit/container_spec.rb
-- spec/unit/machine_state_spec.rb
+- spec/unit/driver/cli_spec.rb
+- spec/unit/driver_spec.rb
 - spec/unit_helper.rb
 - tasks/boxes.rake
 - tasks/spec.rake
@@ -107,7 +106,7 @@ signing_key:
 specification_version: 4
 summary: Linux Containers provider for Vagrant
 test_files:
-- spec/fixtures/sample-ifconfig-output
+- spec/fixtures/sample-ip-addr-output
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
 - spec/unit/action/clear_forwarded_ports_spec.rb
@@ -115,7 +114,6 @@ test_files:
 - spec/unit/action/forward_ports_spec.rb
 - spec/unit/action/handle_box_metadata_spec.rb
 - spec/unit/action/setup_package_files_spec.rb
-- spec/unit/container/cli_spec.rb
-- spec/unit/container_spec.rb
-- spec/unit/machine_state_spec.rb
+- spec/unit/driver/cli_spec.rb
+- spec/unit/driver_spec.rb
 - spec/unit_helper.rb