vagrant-lxc 0.8.0 → 1.0.0.alpha.1

data/spec/unit/action/setup_package_files_spec.rb

@@ -5,16 +5,16 @@ require 'vagrant-lxc/action/setup_package_files'
 describe Vagrant::LXC::Action::SetupPackageFiles do
   let(:app)         { double(:app, call: true) }
   let(:env)         { {machine: machine, tmp_path: tmp_path, ui: double(info: true), 'package.rootfs' => rootfs_path} }
-  let(:machine)     { instance_double('Vagrant::Machine', box: box) }
+  let(:machine)     { double(Vagrant::Machine, box: box) }
   let!(:tmp_path)   { Pathname.new(Dir.mktmpdir) }
-  let(:box)         { instance_double('Vagrant::Box', directory: tmp_path.join('box')) }
+  let(:box)         { double(Vagrant::Box, directory: tmp_path.join('box')) }
   let(:rootfs_path) { tmp_path.join('rootfs-amd64.tar.gz') }
 
   subject { described_class.new(app, env) }
 
   before do
     box.directory.mkdir
-    files = %w( lxc-template metadata.json lxc.conf ).map { |f| box.directory.join(f) }
+    files = %w( lxc-template metadata.json lxc.conf lxc-config ).map { |f| box.directory.join(f) }
     (files + [rootfs_path]).each do |file|
       file.open('w') { |f| f.puts file.to_s }
     end
@@ -30,20 +30,34 @@ describe Vagrant::LXC::Action::SetupPackageFiles do
     before { subject.call(env) }
 
     it 'copies box lxc-template to package directory' do
-      env['package.directory'].join('lxc-template').should be_file
+      expect(env['package.directory'].join('lxc-template')).to be_file
     end
 
     it 'copies metadata.json to package directory' do
-      env['package.directory'].join('metadata.json').should be_file
+      expect(env['package.directory'].join('metadata.json')).to be_file
     end
 
     it 'copies box lxc.conf to package directory' do
-      env['package.directory'].join('lxc-template').should be_file
+      expect(env['package.directory'].join('lxc-template')).to be_file
+    end
+
+    it 'copies box lxc-config to package directory' do
+      expect(env['package.directory'].join('lxc-config')).to be_file
     end
 
     it 'moves the compressed rootfs to package directory' do
-      env['package.directory'].join(rootfs_path.basename).should be_file
-      env['package.rootfs'].should_not be_file
+      expect(env['package.directory'].join(rootfs_path.basename)).to be_file
+      expect(env['package.rootfs']).not_to be_file
+    end
+  end
+
+  context 'when lxc-template file is not present' do
+    before do
+      box.directory.join('lxc-template').delete
+    end
+
+    it 'does not blow up' do
+      expect { subject.call(env) }.to_not raise_error
     end
   end
 
@@ -56,4 +70,14 @@ describe Vagrant::LXC::Action::SetupPackageFiles do
       expect { subject.call(env) }.to_not raise_error
     end
   end
+
+  context 'when lxc-config file is not present' do
+    before do
+      box.directory.join('lxc-config').delete
+    end
+
+    it 'does not blow up' do
+      expect { subject.call(env) }.to_not raise_error
+    end
+  end
 end

data/spec/unit/driver/cli_spec.rb

@@ -1,9 +1,10 @@
 require 'unit_helper'
 
+require 'vagrant-lxc/sudo_wrapper'
 require 'vagrant-lxc/driver/cli'
 
 describe Vagrant::LXC::Driver::CLI do
-  let(:sudo_wrapper) { instance_double('Vagrant::LXC::SudoWrapper', run: true) }
+  let(:sudo_wrapper) { double(Vagrant::LXC::SudoWrapper, run: true) }
 
   subject { described_class.new(sudo_wrapper) }
 
@@ -12,18 +13,18 @@ describe Vagrant::LXC::Driver::CLI do
     let(:result)     { @result }
 
     before do
-      subject.stub(:run).with(:ls).and_return(lxc_ls_out)
+      allow(subject).to receive(:run).with(:ls).and_return(lxc_ls_out)
       @result = subject.list
     end
 
     it 'grabs previously created containers from lxc-ls output' do
-      result.should be_an Enumerable
-      result.should include 'a-container'
-      result.should include 'dup-container'
+      expect(result).to be_an Enumerable
+      expect(result).to include 'a-container'
+      expect(result).to include 'dup-container'
     end
 
     it 'removes duplicates from lxc-ls output' do
-      result.uniq.should == result
+      expect(result.uniq).to eq(result)
     end
   end
 
@@ -31,11 +32,11 @@ describe Vagrant::LXC::Driver::CLI do
     let(:lxc_version_out) { "lxc version:  0.x.y-rc1\n" }
 
     before do
-      subject.stub(:run).with(:version).and_return(lxc_version_out)
+      allow(subject).to receive(:run).with(:version).and_return(lxc_version_out)
     end
 
     it 'parses the version from the output' do
-      subject.version.should == '0.x.y-rc1'
+      expect(subject.version).to eq('0.x.y-rc1')
     end
   end
 
@@ -48,12 +49,12 @@ describe Vagrant::LXC::Driver::CLI do
     subject { described_class.new(sudo_wrapper, name) }
 
     before do
-      subject.stub(:run) { |*args| @run_args = args }
+      allow(subject).to receive(: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(
+      expect(subject).to have_received(:run).with(
         :create,
         '--template', template,
         '--name',     name,
@@ -65,7 +66,7 @@ describe Vagrant::LXC::Driver::CLI do
     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' }
+      allow(subject).to receive(:run) { raise Vagrant::LXC::Errors::ExecuteError, stderr: 'alreAdy Exists' }
       expect {
         subject.create(template, config_file, template_args)
       }.to raise_error(Vagrant::LXC::Errors::ContainerAlreadyExists)
@@ -78,12 +79,12 @@ describe Vagrant::LXC::Driver::CLI do
     subject { described_class.new(sudo_wrapper, name) }
 
     before do
-      subject.stub(:run)
+      allow(subject).to receive(:run)
       subject.destroy
     end
 
     it 'issues a lxc-destroy with container name' do
-      subject.should have_received(:run).with(:destroy, '--name', name)
+      expect(subject).to have_received(:run).with(:destroy, '--name', name)
     end
   end
 
@@ -92,12 +93,12 @@ describe Vagrant::LXC::Driver::CLI do
     subject    { described_class.new(sudo_wrapper, name) }
 
     before do
-      subject.stub(:run)
+      allow(subject).to receive(:run)
     end
 
     it 'starts container on the background' do
       subject.start
-      subject.should have_received(:run).with(
+      expect(subject).to have_received(:run).with(
         :start,
         '-d',
         '--name',  name
@@ -111,16 +112,16 @@ describe Vagrant::LXC::Driver::CLI do
 
     before do
       subject.stub(system: true)
-      subject.stub(:run)
+      allow(subject).to receive(:run)
     end
 
     it 'issues a lxc-shutdown with provided container name' do
       subject.shutdown
-      subject.should have_received(:run).with(:shutdown, '--name', name)
+      expect(subject).to have_received(:run).with(:shutdown, '--name', name)
     end
 
     it 'raises a ShutdownNotSupported in case it is not supported' do
-      subject.stub(:system).with('which lxc-shutdown > /dev/null').and_return(false)
+      allow(subject).to receive(:system).with('which lxc-shutdown > /dev/null').and_return(false)
       expect { subject.shutdown }.to raise_error(described_class::ShutdownNotSupported)
     end
   end
@@ -130,21 +131,21 @@ describe Vagrant::LXC::Driver::CLI do
     subject    { described_class.new(sudo_wrapper, name) }
 
     before do
-      subject.stub(:run).and_return("state: STOPPED\npid: 2")
+      allow(subject).to receive(:run).and_return("state: STOPPED\npid: 2")
     end
 
     it 'calls lxc-info with the right arguments' do
       subject.state
-      subject.should have_received(:run).with(:info, '--name', name, retryable: true)
+      expect(subject).to have_received(:run).with(:info, '--name', name, retryable: true)
     end
 
     it 'maps the output of lxc-info status out to a symbol' do
-      subject.state.should == :stopped
+      expect(subject.state).to eq(:stopped)
     end
 
     it 'is not case sensitive' do
-      subject.stub(:run).and_return("StatE: STarTED\npid: 2")
-      subject.state.should == :started
+      allow(subject).to receive(:run).and_return("StatE: STarTED\npid: 2")
+      expect(subject.state).to eq(:started)
     end
   end
 
@@ -160,17 +161,17 @@ describe Vagrant::LXC::Driver::CLI do
 
     it 'calls lxc-attach with specified command' do
       subject.attach(*command)
-      subject.should have_received(:run).with(:attach, '--name', name, '--', *command)
+      expect(subject).to have_received(:run).with(:attach, '--name', name, '--', *command)
     end
 
     it 'supports a "namespaces" parameter' do
-      subject.stub(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => '--namespaces'})
+      allow(subject).to receive(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => '--namespaces'})
       subject.attach *(command + [{namespaces: ['network', 'mount']}])
-      subject.should have_received(:run).with(:attach, '--name', name, '--namespaces', 'NETWORK|MOUNT', '--', *command)
+      expect(subject).to have_received(:run).with(:attach, '--name', name, '--namespaces', 'NETWORK|MOUNT', '--', *command)
     end
 
     it 'raises a NamespacesNotSupported error if not supported' do
-      subject.stub(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => 'not supported'})
+      allow(subject).to receive(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => 'not supported'})
       expect {
         subject.attach *(command + [{namespaces: ['network', 'mount']}])
       }.to raise_error(Vagrant::LXC::Errors::NamespacesNotSupported)
@@ -186,9 +187,9 @@ describe Vagrant::LXC::Driver::CLI do
     end
 
     it 'yields a cli object' do
-      subject.stub(:shutdown)
+      allow(subject).to receive(:shutdown)
       subject.transition_to(:stopped) { |c| c.shutdown }
-      subject.should have_received(:shutdown)
+      expect(subject).to have_received(:shutdown)
     end
 
     it 'throws an exception if block is not provided' do
@@ -197,6 +198,6 @@ describe Vagrant::LXC::Driver::CLI do
       }.to raise_error(described_class::TransitionBlockNotProvided)
     end
 
-    pending 'waits for the expected container state'
+    skip 'waits for the expected container state'
   end
 end

data/spec/unit/driver_spec.rb

@@ -1,15 +1,15 @@
 require 'unit_helper'
 
-require 'vagrant'
 require 'vagrant-lxc/driver'
 require 'vagrant-lxc/driver/cli'
+require 'vagrant-lxc/sudo_wrapper'
 
 describe Vagrant::LXC::Driver do
   describe 'container name validation' do
     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']) }
+    let(:cli)               { double(Vagrant::LXC::Driver::CLI, list: ['valid']) }
 
     it 'raises a ContainerNotFound error if an unknown container name gets provided' do
       expect {
@@ -37,21 +37,21 @@ describe Vagrant::LXC::Driver do
     let(:template_opts)  { {'--some' => 'random-option'} }
     let(:config_file)    { '/path/to/lxc-config-from-box' }
     let(:rootfs_tarball) { '/path/to/cache/rootfs.tar.gz' }
-    let(:cli)            { instance_double('Vagrant::LXC::Driver::CLI', :create => true, :name= => true) }
+    let(:cli)            { double(Vagrant::LXC::Driver::CLI, :create => true, :name= => true) }
 
     subject { described_class.new(nil, nil, cli) }
 
     before do
-      subject.stub(:import_template).and_yield(template_name)
+      allow(subject).to receive(:import_template).and_yield(template_name)
       subject.create name, template_path, config_file, template_opts
     end
 
     it 'sets the cli object container name' do
-      cli.should have_received(:name=).with(name)
+      expect(cli).to have_received(:name=).with(name)
     end
 
     it 'creates container with the right arguments' do
-      cli.should have_received(:create).with(
+      expect(cli).to have_received(:create).with(
         template_name,
         config_file,
         template_opts
@@ -60,22 +60,22 @@ describe Vagrant::LXC::Driver do
   end
 
   describe 'destruction' do
-    let(:cli) { instance_double('Vagrant::LXC::Driver::CLI', destroy: true) }
+    let(:cli) { double(Vagrant::LXC::Driver::CLI, destroy: true) }
 
     subject { described_class.new('name', nil, cli) }
 
     before { subject.destroy }
 
     it 'delegates to cli object' do
-      cli.should have_received(:destroy)
+      expect(cli).to have_received(:destroy)
     end
   end
 
   describe 'start' 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) }
+    let(:cli)                    { double(Vagrant::LXC::Driver::CLI, start: true) }
+    let(:sudo)                   { double(Vagrant::LXC::SudoWrapper, su_c: true) }
 
     subject { described_class.new('name', sudo, cli) }
 
@@ -89,61 +89,62 @@ describe Vagrant::LXC::Driver do
     it 'writes configurations to config file'
 
     it 'starts container with configured customizations' do
-      cli.should have_received(:start)
+      expect(cli).to have_received(:start)
     end
   end
 
   describe 'halt' do
-    let(:cli) { instance_double('Vagrant::LXC::Driver::CLI', shutdown: true) }
+    let(:cli) { double(Vagrant::LXC::Driver::CLI, shutdown: true) }
 
     subject { described_class.new('name', nil, cli) }
 
     before do
-      cli.stub(:transition_to).and_yield(cli)
+      allow(cli).to receive(:transition_to).and_yield(cli)
     end
 
     it 'delegates to cli shutdown' do
-      cli.should_receive(:shutdown)
+      expect(cli).to receive(:shutdown)
       subject.forced_halt
     end
 
     it 'expects a transition to running state to take place' do
-      cli.should_receive(:transition_to).with(:stopped)
+      expect(cli).to receive(:transition_to).with(:stopped)
       subject.forced_halt
     end
 
     it 'attempts to force the container to stop in case a shutdown doesnt work' do
-      cli.stub(:shutdown).and_raise(Vagrant::LXC::Driver::CLI::TargetStateNotReached.new :target, :source)
-      cli.should_receive(:transition_to).with(:stopped).twice
-      cli.should_receive(:stop)
+      allow(cli).to receive(:shutdown).and_raise(Vagrant::LXC::Driver::CLI::TargetStateNotReached.new :target, :source)
+      expect(cli).to receive(:transition_to).with(:stopped).twice
+      expect(cli).to receive(:stop)
       subject.forced_halt
     end
 
     it 'attempts to force the container to stop in case lxc-shutdown is not supported' do
-      cli.stub(:shutdown).and_raise(Vagrant::LXC::Driver::CLI::ShutdownNotSupported)
-      cli.should_receive(:transition_to).with(:stopped).twice
-      cli.should_receive(:stop)
+      allow(cli).to receive(:shutdown).and_raise(Vagrant::LXC::Driver::CLI::ShutdownNotSupported)
+      expect(cli).to receive(:transition_to).with(:stopped).twice
+      expect(cli).to receive(:stop)
       subject.forced_halt
     end
   end
 
   describe 'state' do
     let(:cli_state) { :something }
-    let(:cli)       { instance_double('Vagrant::LXC::Driver::CLI', state: cli_state) }
+    let(:cli)       { double(Vagrant::LXC::Driver::CLI, state: cli_state) }
 
     subject { described_class.new('name', nil, cli) }
 
     it 'delegates to cli' do
-      subject.state.should == cli_state
+      expect(subject.state).to eq(cli_state)
     end
   end
 
   describe 'folder sharing' do
     let(:shared_folder)       { {guestpath: '/vagrant', hostpath: '/path/to/host/dir'} }
-    let(:folders)             { [shared_folder] }
+    let(:ro_rw_folder)        { {guestpath: '/vagrant/ro_rw', hostpath: '/path/to/host/dir', mount_options: ['ro', 'rw']} }
+    let(:folders)             { [shared_folder, ro_rw_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) }
+    let(:sudo_wrapper)        { double(Vagrant::LXC::SudoWrapper, run: true) }
 
     subject { described_class.new('name', sudo_wrapper) }
 
@@ -153,14 +154,21 @@ describe Vagrant::LXC::Driver do
     end
 
     it "creates guest folder under container's rootfs" do
-      sudo_wrapper.should have_received(:run).with("mkdir", "-p", expected_guest_path)
+      expect(sudo_wrapper).to have_received(:run).with("mkdir", "-p", expected_guest_path)
     end
 
     it 'adds a mount.entry to its local customizations' do
-      subject.customizations.should include [
+      expect(subject.customizations).to include [
         'mount.entry',
         "#{shared_folder[:hostpath]} #{expected_guest_path} none bind 0 0"
       ]
     end
+
+    it 'supports additional mount options' do
+      expect(subject.customizations).to include [
+        'mount.entry',
+        "#{ro_rw_folder[:hostpath]} #{rootfs_path}/vagrant/ro_rw none ro,rw 0 0"
+      ]
+    end
   end
 end

data/spec/unit/support/unit_example_group.rb

@@ -2,23 +2,23 @@ module UnitExampleGroup
   def self.included(base)
     base.metadata[:type] = :unit
     base.before do
-      Object.any_instance.stub(:system) { |*args, &block|
+      allow_any_instance_of(Object).to receive(:system) { |instance, *args, &block|
         UnitExampleGroup.prevent_system_calls(*args, &block)
       }
-      Object.any_instance.stub(:`) { |*args, &block|
+      allow_any_instance_of(Object).to receive(:`) { |instance, *args, &block|
         UnitExampleGroup.prevent_system_calls(*args, &block)
       }
-      Object.any_instance.stub(:exec) { |*args, &block|
+      allow_any_instance_of(Object).to receive(:exec) { |instance, *args, &block|
         UnitExampleGroup.prevent_system_calls(*args, &block)
       }
-      Object.any_instance.stub(:fork) { |*args, &block|
+      allow_any_instance_of(Object).to receive(:fork) { |instance, *args, &block|
         UnitExampleGroup.prevent_system_calls(*args, &block)
       }
-      Object.any_instance.stub(:spawn) { |*args, &block|
+      allow_any_instance_of(Object).to receive(:spawn) { |instance, *args, &block|
         UnitExampleGroup.prevent_system_calls(*args, &block)
       }
       require 'vagrant/util/subprocess'
-      Vagrant::Util::Subprocess.stub(:execute) { |*args, &block|
+      allow(Vagrant::Util::Subprocess).to receive(:execute) { |*args, &block|
         UnitExampleGroup.prevent_system_calls(*args, &block)
       }
     end