vagrant-lxc 0.3.3 → 0.3.4

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/spec/Vagrantfile

@@ -1,33 +1,24 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-def local_apt_cache(box_name)
-  cache_dir = File.join(File.expand_path(Vagrant::Environment::DEFAULT_HOME),
-                        'cache',
-                        'apt',
-                        box_name)
-  partial_dir = File.join(cache_dir, 'partial')
-  FileUtils.mkdir_p(partial_dir) unless File.exists? partial_dir
-  cache_dir
-end
-
 Vagrant.require_plugin 'vagrant-lxc'
+Vagrant.require_plugin 'vagrant-cachier'
 
-Vagrant.configure("2") do |config|
-  config.vm.box      = "quantal64"
-  config.vm.hostname = 'lxc-test-box'
+ENV['BOX_NAME'] ||= 'quantal64'
 
-  config.vm.box_url = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-10.box'
-  # Uncomment to test boxes built locally:
-  # config.vm.box_url = '../boxes/output/lxc-quantal64.box'
+Vagrant.configure("2") do |config|
+  config.vm.box = ENV['BOX_NAME']
+  # FIXME: Find out why this does not work for debian boxes
+  unless %w( squeeze64 wheezy64 sid64 ).include? config.vm.box
+    config.vm.hostname = 'lxc-test-box'
+  end
 
-  cache_dir = local_apt_cache(config.vm.box)
-  config.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
+  config.cache.enable :apt
 
   config.vm.provision :shell,
     inline: 'mkdir -p /vagrant/tmp && echo -n "Provisioned" > /vagrant/tmp/provisioning'
 
   config.vm.network :forwarded_port, guest: 80, host: 8080
   config.vm.provision :shell,
-    inline: 'sudo apt-get install nginx -y && sudo service nginx start'
+    inline: 'sudo apt-get install apache2 -y'
 end

data/spec/acceptance/sanity_check_spec.rb

@@ -20,7 +20,10 @@ describe 'Sanity check' do
     end
 
     it "is able to be SSH'ed" do
-      expect(vagrant_ssh('hostname')).to eq 'lxc-test-box'
+      expected = 'lxc-test-box'
+      # HACK:
+      expected = ENV['BOX_NAME'].gsub(/64$/, '') if %w( squeeze64 wheezy64 sid64 ).include? ENV['BOX_NAME']
+      expect(vagrant_ssh('hostname')).to eq expected
     end
 
     it 'mounts shared folders with the right permissions' do
@@ -36,7 +39,7 @@ describe 'Sanity check' do
 
     it 'forwards configured ports' do
       output = `curl -s localhost:8080`.strip.chomp
-      expect(output).to include 'Welcome to nginx!'
+      expect(output).to include 'It works!'
     end
   end
 
@@ -44,6 +47,7 @@ describe 'Sanity check' do
     before(:all) do
       destroy_container
       vagrant_up
+      vagrant_ssh 'touch /tmp/{some,files}'
       vagrant_halt
     end
 
@@ -61,6 +65,11 @@ describe 'Sanity check' do
       processes = `pgrep redir`
       expect($?.exitstatus).to_not eq 0
     end
+
+    it 'removes files under `/tmp`' do
+      container_tmp = Pathname("/var/lib/lxc/#{vagrant_container_name}/rootfs/tmp")
+      expect(container_tmp.entries).to have(2).items # basically '.' and '..'
+    end
   end
 
   context '`vagrant destroy`' do

data/spec/acceptance/support/test_ui.rb

@@ -3,7 +3,7 @@ class TestUI < Vagrant::UI::Interface
 
   METHODS = [:clear_line, :report_progress, :warn, :error, :info, :success]
 
-  def initialize(resource = nil)
+  def initialize
     super
     @messages = METHODS.each_with_object({}) { |m, h| h[m] = [] }
   end

data/spec/unit/driver/cli_spec.rb

@@ -157,9 +157,11 @@ describe Vagrant::LXC::Driver::CLI do
     let(:name) { 'a-running-container' }
     subject    { described_class.new(name) }
 
-    before { subject.stub(:run) }
+    before do
+      subject.stub(run: true, sleep: true, state: :stopped)
+    end
 
-    it 'yields cli object' do
+    it 'yields a cli object' do
       subject.stub(:shutdown)
       subject.transition_to(:stopped) { |c| c.shutdown }
       subject.should have_received(:shutdown)
@@ -171,9 +173,6 @@ describe Vagrant::LXC::Driver::CLI do
       }.to raise_error(described_class::TransitionBlockNotProvided)
     end
 
-    it 'waits for the expected container state using lxc-wait' do
-      subject.transition_to(:running) { }
-      subject.should have_received(:run).with(:wait, '--name', name, '--state', 'RUNNING')
-    end
+    pending 'waits for the expected container state'
   end
 end

data/spec/unit/driver_spec.rb

@@ -2,6 +2,7 @@ require 'unit_helper'
 
 require 'vagrant'
 require 'vagrant-lxc/driver'
+require 'vagrant-lxc/driver/cli'
 
 describe Vagrant::LXC::Driver do
   describe 'container name validation' do
@@ -101,12 +102,19 @@ describe Vagrant::LXC::Driver do
 
     it 'delegates to cli shutdown' do
       cli.should_receive(:shutdown)
-      subject.halt
+      subject.forced_halt
     end
 
     it 'expects a transition to running state to take place' do
       cli.should_receive(:transition_to).with(:stopped)
-      subject.halt
+      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)
+      subject.forced_halt
     end
   end
 

data/tasks/boxes.rake

@@ -1,79 +1,179 @@
+require 'pathname'
 require 'rake/tasklib'
 
-class BuildUbuntuBoxTask < ::Rake::TaskLib
+class BuildGenericBoxTask < ::Rake::TaskLib
   include ::Rake::DSL
 
   attr_reader :name
 
-  def initialize(name, release, arch, opts = {})
-    @name           = name
-    @release        = release.to_s
-    @arch           = arch.to_s
-    @install_chef   = opts.fetch(:chef, true)
-    @install_puppet = opts.fetch(:puppet, true)
-    @file           = opts[:file] || default_box_file
-
-    desc "Build an Ubuntu #{release} #{arch} box" unless ::Rake.application.last_comment
+  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
-        run_task
+        build
       end
     end
   end
 
-  def run_task
-    if File.exists?("./boxes/output/#{@file}")
-      puts 'Box has been built already!'
-      exit 1
+  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 Dir.exists?('boxes/temp')
-      puts "There is a partially built box under #{File.expand_path('./boxes/temp')}, please remove it before building a new box"
+    if script.readable?
+      sh "sudo #{script} #{args.join(' ')}"
+    else
+      STDERR.puts "cannot execute #{install_path} (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
-      sh "sudo ../ubuntu/download #{@arch} #{@release}"
-      sh "sudo ../ubuntu/install-puppet" if @install_puppet
-      sh "sudo ../ubuntu/install-chef" if @install_chef
-      sh 'sudo rm -f rootfs.tar.gz'
-      sh 'sudo tar --numeric-owner -czf rootfs.tar.gz ./rootfs/*'
+      download
+      install_cfg_engines
+      prepare_package_contents pwd
       sh 'sudo rm -rf rootfs'
-      sh "sudo chown #{ENV['USER']}:#{ENV['USER']} rootfs.tar.gz"
-      sh "cp ../ubuntu/lxc-template ."
-      metadata = File.read('../ubuntu/metadata.json.template')
-      metadata.gsub!('ARCH', @arch)
-      metadata.gsub!('RELEASE', @release)
-      File.open('metadata.json', 'w') { |f| f.print metadata }
       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 default_box_file
-    require 'time'
-    "lxc-#{@release}-#{@arch}-#{Date.today}.box"
+  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']}:#{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 }
+  end
+end
+
+class BuildDebianBoxTask < BuildGenericBoxTask
+  def initialize(name, release, arch, opts = {})
+    super(name, 'debian', release, arch, opts)
+  end
+end
+
+class BuildUbuntuBoxTask < BuildGenericBoxTask
+  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 :ubuntu do
     namespace :build do
-      chef   = ENV['CHEF'] != '0'
-      puppet = ENV['PUPPET'] != '0'
 
       desc 'Build an Ubuntu Precise 64 bits box'
-      BuildUbuntuBoxTask.new(:precise64, :precise, 'amd64', chef: chef, puppet: puppet)
+      BuildUbuntuBoxTask.
+        new(:precise64,
+            :precise, 'amd64', chef: chef, puppet: puppet, babushka: babushka)
 
       desc 'Build an Ubuntu Quantal 64 bits box'
-      BuildUbuntuBoxTask.new(:quantal64, :quantal, 'amd64', chef: chef, puppet: puppet)
+      BuildUbuntuBoxTask.
+        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'
-      BuildUbuntuBoxTask.new(:raring64, :raring, 'amd64', chef: false, puppet: puppet)
+      BuildUbuntuBoxTask.
+        new(:raring64,
+            :raring, 'amd64', chef: false, 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.
+        new(:squeeze64,
+            :squeeze, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+
+      desc 'Build an Debian Wheezy 64 bits box'
+      BuildDebianBoxTask.
+        new(:wheezy64,
+            :wheezy, 'amd64', chef: false, puppet: puppet, babushka: babushka)
+
+      desc 'Build an Debian Sid/unstable 64 bits box'
+      BuildDebianBoxTask.
+        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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -28,14 +28,22 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- boxes/common/cleanup
+- boxes/common/install-babushka
+- boxes/common/install-chef
+- boxes/common/install-puppet
+- boxes/debian/download
+- boxes/debian/lxc-template
+- boxes/debian/metadata.json.template
 - boxes/ubuntu/download
-- boxes/ubuntu/install-chef
-- boxes/ubuntu/install-puppet
 - boxes/ubuntu/lxc-template
 - boxes/ubuntu/metadata.json.template
 - development/Vagrantfile
 - development/lxc-configs/lxc-dev-box
+- development/lxc-configs/sid
+- development/lxc-configs/squeeze
 - development/lxc-configs/vbox
+- development/lxc-configs/wheezy
 - development/shell-provisioning/upgrade-kernel
 - development/site.pp
 - example/Vagrantfile
@@ -59,6 +67,7 @@ files:
 - 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/remove_temporary_files.rb
 - lib/vagrant-lxc/action/setup_package_files.rb
 - lib/vagrant-lxc/action/share_folders.rb
 - lib/vagrant-lxc/config.rb