vagrant-lxc 0.3.4 → 0.4.0

data/spec/unit/driver_spec.rb

@@ -9,24 +9,24 @@ describe Vagrant::LXC::Driver 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']) }
+    let(:cli)               { instance_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)
+      }.to raise_error
     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)
+      }.not_to raise_error
     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)
+      }.not_to raise_error
     end
   end
 
@@ -35,14 +35,15 @@ describe Vagrant::LXC::Driver do
     let(:template_name)  { 'auto-assigned-template-id' }
     let(:template_path)  { '/path/to/lxc-template-from-box' }
     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)            { fire_double('Vagrant::LXC::Driver::CLI', :create => true, :name= => true) }
+    let(:cli)            { instance_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
+      subject.create name, template_path, config_file, template_opts
     end
 
     it 'sets the cli object container name' do
@@ -52,13 +53,14 @@ describe Vagrant::LXC::Driver do
     it 'creates container with the right arguments' do
       cli.should have_received(:create).with(
         template_name,
+        config_file,
         template_opts
       )
     end
   end
 
   describe 'destruction' do
-    let(:cli) { fire_double('Vagrant::LXC::Driver::CLI', destroy: true) }
+    let(:cli) { instance_double('Vagrant::LXC::Driver::CLI', destroy: true) }
 
     subject { described_class.new('name', cli) }
 
@@ -72,7 +74,7 @@ describe Vagrant::LXC::Driver do
   describe 'start' do
     let(:customizations)         { [['a', '1'], ['b', '2']] }
     let(:internal_customization) { ['internal', 'customization'] }
-    let(:cli)                    { fire_double('Vagrant::LXC::Driver::CLI', start: true) }
+    let(:cli)                    { instance_double('Vagrant::LXC::Driver::CLI', start: true) }
 
     subject { described_class.new('name', cli) }
 
@@ -92,7 +94,7 @@ describe Vagrant::LXC::Driver do
   end
 
   describe 'halt' do
-    let(:cli) { fire_double('Vagrant::LXC::Driver::CLI', shutdown: true) }
+    let(:cli) { instance_double('Vagrant::LXC::Driver::CLI', shutdown: true) }
 
     subject { described_class.new('name', cli) }
 
@@ -120,7 +122,7 @@ describe Vagrant::LXC::Driver do
 
   describe 'state' do
     let(:cli_state) { :something }
-    let(:cli)       { fire_double('Vagrant::LXC::Driver::CLI', state: cli_state) }
+    let(:cli)       { instance_double('Vagrant::LXC::Driver::CLI', state: cli_state) }
 
     subject { described_class.new('name', cli) }
 
@@ -133,7 +135,7 @@ describe Vagrant::LXC::Driver 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) }
+    let(:cli)             { instance_double('Vagrant::LXC::Driver::CLI', :attach => ifconfig_output) }
 
     subject { described_class.new('name', cli) }
 

data/tasks/boxes.rake

@@ -1,50 +1,11 @@
 require 'pathname'
 require 'rake/tasklib'
+load 'tasks/boxes.v2.rake'
 
-class BuildGenericBoxTask < ::Rake::TaskLib
-  include ::Rake::DSL
-
-  attr_reader :name
-
-  def initialize(name, distrib, release, arch, opts = {})
-    @name             = name
-    @distrib          = distrib
-    @release          = release.to_s
-    @arch             = arch.to_s
-    @install_chef     = opts.fetch(:chef, true)
-    @install_puppet   = opts.fetch(:puppet, true)
-    @install_babushka = opts.fetch(:babushka, true)
-    @file             = opts[:file] || default_box_file
-    @scripts_path     = Pathname(Dir.pwd).join('boxes')
-
-    desc "Build an #{distrib.upcase} #{release} #{arch} box" unless
-      ::Rake.application.last_comment
-    task name do
-      RakeFileUtils.send(:verbose, true) do
-        build
-      end
-    end
-  end
-
-  def default_box_file
-    require 'time'
-    "lxc-#{@release}-#{@arch}-#{Date.today}.box"
-  end
-
-  def run(script_name, *args)
-    unless (script = @scripts_path.join(@distrib, script_name)).readable?
-      script = @scripts_path.join('common', script_name)
-    end
-
-    if script.readable?
-      sh "sudo #{script} #{args.join(' ')}"
-    else
-      STDERR.puts "cannot execute #{install_path} (not found?)"
-      exit 1
-    end
-  end
-
+class BuildGenericBoxTaskV3 < BuildGenericBoxTaskV2
   def build
+    require 'vagrant'
+
     check_if_box_has_been_built!
 
     FileUtils.mkdir_p 'boxes/temp' unless File.exist? 'base/temp'
@@ -55,6 +16,7 @@ class BuildGenericBoxTask < ::Rake::TaskLib
     Dir.chdir 'boxes/temp' do
       download
       install_cfg_engines
+      finalize
       prepare_package_contents pwd
       sh 'sudo rm -rf rootfs'
       sh "tar -czf tmp-package.box ./*"
@@ -65,64 +27,34 @@ class BuildGenericBoxTask < ::Rake::TaskLib
     sh "rm -rf boxes/temp"
   end
 
-  def check_if_box_has_been_built!
-    return unless File.exists?("./boxes/output/#{@file}")
-
-    puts 'Box has been built already!'
-    exit 1
-  end
-
-  def check_for_partially_built_box!
-    return unless Dir.entries('boxes/temp').size > 2
-
-    puts 'There is a partially built box under ' +
-      File.expand_path('./boxes/temp') +
-      ', please remove it before building a new box'
-    exit 1
-  end
-
-  def download
-    run 'download', @arch, @release
-  end
-
-  def install_cfg_engines
-    [ :puppet, :chef, :babushka ].each do |cfg_engine|
-      next unless instance_variable_get :"@install_#{cfg_engine}"
-      script_name = "install-#{cfg_engine}"
-      run script_name
-    end
+  def finalize
+    auth_key = Vagrant.source_root.join('keys', 'vagrant.pub').expand_path.to_s
+    run 'finalize', @arch, @release, auth_key
   end
 
   def prepare_package_contents(pwd)
     run 'cleanup'
     sh 'sudo rm -f rootfs.tar.gz'
     sh 'sudo tar --numeric-owner -czf rootfs.tar.gz ./rootfs/*'
-    sh "sudo chown #{ENV['USER']}:#{ENV['USER']} rootfs.tar.gz"
-    sh "cp #{pwd}/boxes/#{@distrib}/lxc-template ."
-    compile_metadata(pwd)
-  end
-
-  def compile_metadata(pwd)
-    metadata = File.read("#{pwd}/boxes/#{@distrib}/metadata.json.template")
-    metadata.gsub!('ARCH', @arch)
-    metadata.gsub!('RELEASE', @release)
-    File.open('metadata.json', 'w') { |f| f.print metadata }
+    sh "sudo chown #{ENV['USER']}:#{`id -gn`.strip} rootfs.tar.gz"
+    sh "cp #{pwd}/boxes/common/lxc-template ."
+    sh "cp #{pwd}/boxes/common/lxc.conf ."
+    sh "cp #{pwd}/boxes/common/metadata.json ."
   end
 end
 
-class BuildDebianBoxTask < BuildGenericBoxTask
+class BuildDebianBoxTaskV3 < BuildGenericBoxTaskV3
   def initialize(name, release, arch, opts = {})
     super(name, 'debian', release, arch, opts)
   end
 end
 
-class BuildUbuntuBoxTask < BuildGenericBoxTask
+class BuildUbuntuBoxTaskV3 < BuildGenericBoxTaskV3
   def initialize(name, release, arch, opts = {})
     super(name, 'ubuntu', release, arch, opts)
   end
 end
 
-chef     = ENV['CHEF']     == '1'
 puppet   = ENV['PUPPET']   == '1'
 babushka = ENV['BABUSHKA'] == '1'
 
@@ -131,43 +63,41 @@ namespace :boxes do
     namespace :build do
 
       desc 'Build an Ubuntu Precise 64 bits box'
-      BuildUbuntuBoxTask.
+      BuildUbuntuBoxTaskV3.
         new(:precise64,
-            :precise, 'amd64', chef: chef, puppet: puppet, babushka: babushka)
+            :precise, 'amd64', puppet: puppet, babushka: babushka)
 
       desc 'Build an Ubuntu Quantal 64 bits box'
-      BuildUbuntuBoxTask.
+      BuildUbuntuBoxTaskV3.
         new(:quantal64,
-            :quantal, 'amd64', chef: chef, puppet: puppet, babushka: babushka)
+            :quantal, 'amd64', puppet: puppet, babushka: babushka)
 
-      # FIXME: Find out how to install chef on raring
       desc 'Build an Ubuntu Raring 64 bits box'
-      BuildUbuntuBoxTask.
+      BuildUbuntuBoxTaskV3.
         new(:raring64,
-            :raring, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+            :raring, 'amd64', puppet: puppet, babushka: babushka)
 
       desc 'Build all Ubuntu boxes'
       task :all => %w( precise64 quantal64 raring64 )
     end
   end
 
-  # FIXME: Find out how to install chef on debian boxes
   namespace :debian do
     namespace :build do
       desc 'Build an Debian Squeeze 64 bits box'
-      BuildDebianBoxTask.
+      BuildDebianBoxTaskV3.
         new(:squeeze64,
-            :squeeze, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+            :squeeze, 'amd64', puppet: puppet, babushka: babushka)
 
       desc 'Build an Debian Wheezy 64 bits box'
-      BuildDebianBoxTask.
+      BuildDebianBoxTaskV3.
         new(:wheezy64,
-            :wheezy, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+            :wheezy, 'amd64', puppet: puppet, babushka: babushka)
 
       desc 'Build an Debian Sid/unstable 64 bits box'
-      BuildDebianBoxTask.
+      BuildDebianBoxTaskV3.
         new(:sid64,
-            :sid, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+            :sid, 'amd64', puppet: puppet, babushka: babushka)
 
       desc 'Build all Debian boxes'
       task :all => %w( squeeze64 wheezy64 sid64 )

data/tasks/boxes.v2.rake

@@ -0,0 +1,181 @@
+require 'pathname'
+require 'rake/tasklib'
+
+class BuildGenericBoxTaskV2 < ::Rake::TaskLib
+  include ::Rake::DSL
+
+  attr_reader :name
+
+  def initialize(name, distrib, release, arch, opts = {})
+    @name             = name
+    @distrib          = distrib
+    @release          = release.to_s
+    @arch             = arch.to_s
+    @install_chef     = opts.fetch(:chef, false)
+    @install_puppet   = opts.fetch(:puppet, true)
+    @install_babushka = opts.fetch(:babushka, true)
+    @file             = opts[:file] || default_box_file
+    @scripts_path     = Pathname(Dir.pwd).join('boxes')
+
+    desc "Build an #{distrib.upcase} #{release} #{arch} box" unless
+      ::Rake.application.last_comment
+    task name do
+      RakeFileUtils.send(:verbose, true) do
+        build
+      end
+    end
+  end
+
+  def default_box_file
+    require 'time'
+    "lxc-#{@release}-#{@arch}-#{Date.today}.box"
+  end
+
+  def run(script_name, *args)
+    unless (script = @scripts_path.join(@distrib, script_name)).readable?
+      script = @scripts_path.join('common', script_name)
+    end
+
+    if script.readable?
+      sh "sudo #{script} #{args.join(' ')}"
+    else
+      STDERR.puts "cannot execute #{script_name} (not found?)"
+      exit 1
+    end
+  end
+
+  def build
+    check_if_box_has_been_built!
+
+    FileUtils.mkdir_p 'boxes/temp' unless File.exist? 'base/temp'
+    check_for_partially_built_box!
+
+    pwd = Dir.pwd
+    sh 'mkdir -p boxes/temp/'
+    Dir.chdir 'boxes/temp' do
+      download
+      install_cfg_engines
+      prepare_package_contents pwd
+      sh 'sudo rm -rf rootfs'
+      sh "tar -czf tmp-package.box ./*"
+    end
+
+    sh 'mkdir -p boxes/output'
+    sh "cp boxes/temp/tmp-package.box boxes/output/#{@file}"
+    sh "rm -rf boxes/temp"
+  end
+
+  def check_if_box_has_been_built!
+    return unless File.exists?("./boxes/output/#{@file}")
+
+    puts 'Box has been built already!'
+    exit 1
+  end
+
+  def check_for_partially_built_box!
+    return unless Dir.entries('boxes/temp').size > 2
+
+    puts 'There is a partially built box under ' +
+      File.expand_path('./boxes/temp') +
+      ', please remove it before building a new box'
+    exit 1
+  end
+
+  def download
+    run 'download', @arch, @release
+  end
+
+  def install_cfg_engines
+    [ :puppet, :chef, :babushka ].each do |cfg_engine|
+      next unless instance_variable_get :"@install_#{cfg_engine}"
+      script_name = "install-#{cfg_engine}"
+      run script_name
+    end
+  end
+
+  def prepare_package_contents(pwd)
+    run 'cleanup'
+    sh 'sudo rm -f rootfs.tar.gz'
+    sh 'sudo tar --numeric-owner -czf rootfs.tar.gz ./rootfs/*'
+    sh "sudo chown #{ENV['USER']}:#{`id -gn`.strip} rootfs.tar.gz"
+    sh "cp #{pwd}/boxes/#{@distrib}/lxc-template ."
+    compile_metadata(pwd)
+  end
+
+  def compile_metadata(pwd)
+    metadata = File.read("#{pwd}/boxes/#{@distrib}/metadata.json.template")
+    metadata.gsub!('ARCH', @arch)
+    metadata.gsub!('RELEASE', @release)
+    File.open('metadata.json', 'w') { |f| f.print metadata }
+  end
+end
+
+class BuildDebianBoxTaskV2 < BuildGenericBoxTaskV2
+  def initialize(name, release, arch, opts = {})
+    super(name, 'debian', release, arch, opts)
+  end
+end
+
+class BuildUbuntuBoxTaskV2 < BuildGenericBoxTaskV2
+  def initialize(name, release, arch, opts = {})
+    super(name, 'ubuntu', release, arch, opts)
+  end
+end
+
+chef     = ENV['CHEF']     == '1'
+puppet   = ENV['PUPPET']   == '1'
+babushka = ENV['BABUSHKA'] == '1'
+
+namespace :boxes do
+  namespace :v2 do
+    namespace :ubuntu do
+      namespace :build do
+
+        desc 'Build an Ubuntu Precise 64 bits box'
+        BuildUbuntuBoxTaskV2.
+          new(:precise64,
+              :precise, 'amd64', chef: chef, puppet: puppet, babushka: babushka)
+
+        desc 'Build an Ubuntu Quantal 64 bits box'
+        BuildUbuntuBoxTaskV2.
+          new(:quantal64,
+              :quantal, 'amd64', chef: chef, puppet: puppet, babushka: babushka)
+
+        # 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)
+
+        desc 'Build all Ubuntu boxes'
+        task :all => %w( precise64 quantal64 raring64 )
+      end
+    end
+
+    # FIXME: Find out how to install chef on debian boxes
+    namespace :debian do
+      namespace :build do
+        desc 'Build an Debian Squeeze 64 bits box'
+        BuildDebianBoxTaskV2.
+          new(:squeeze64,
+              :squeeze, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+
+        desc 'Build an Debian Wheezy 64 bits box'
+        BuildDebianBoxTaskV2.
+          new(:wheezy64,
+              :wheezy, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+
+        desc 'Build an Debian Sid/unstable 64 bits box'
+        BuildDebianBoxTaskV2.
+          new(:sid64,
+              :sid, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+
+        desc 'Build all Debian boxes'
+        task :all => %w( squeeze64 wheezy64 sid64 )
+      end
+    end
+
+    desc 'Build all base boxes for release'
+    task :build_all => %w( ubuntu:build:all debian:build:all )
+  end
+end