veewee 0.5.0.alpha1 → 0.5.0.alpha2

data/templates/Debian-7.7.0-amd64-netboot/vmfusion.sh

@@ -0,0 +1,7 @@
+cd /tmp
+mkdir -p /mnt/cdrom
+mount -o loop /home/vagrant/linux.iso /mnt/cdrom
+tar zxvf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
+/tmp/vmware-tools-distrib/vmware-install.pl -d
+rm /home/vagrant/linux.iso
+umount /mnt/cdrom

data/templates/{CentOS-5.10-i386 → Debian-7.7.0-amd64-netboot}/zerodisk.sh

@@ -1,4 +1,3 @@
 # Zero out the free space to save space in the final image:
-
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY

data/templates/kali-1.0.9a-amd64/base.sh

@@ -6,7 +6,7 @@ apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev libyaml-dev libya
 apt-get -y install curl unzip vim
 
 # Set up sudo
-echo 'vagrant ALL=NOPASSWD:ALL' > /etc/sudoers.d/vagrant
+echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant
 
 # Tweak sshd to prevent DNS resolution (speed up logins)
 echo 'UseDNS no' >> /etc/ssh/sshd_config

data/templates/ubuntu-12.04.2-server-amd64/base.sh

@@ -17,7 +17,7 @@ apt-get clean
 
 # Set up sudo
 ( cat <<'EOP'
-%vagrant ALL=NOPASSWD:ALL
+%vagrant ALL=(ALL) NOPASSWD: ALL
 EOP
 ) > /tmp/vagrant
 chmod 0440 /tmp/vagrant

data/templates/ubuntu-12.04.3-server-amd64-parallels/base.sh

@@ -10,7 +10,7 @@ apt-get clean
 
 # Set up sudo
 ( cat <<'EOP'
-%vagrant ALL=NOPASSWD:ALL
+%vagrant ALL=(ALL) NOPASSWD: ALL
 EOP
 ) > /tmp/vagrant
 chmod 0440 /tmp/vagrant

data/templates/ubuntu-12.04.3-server-amd64/base.sh

@@ -11,7 +11,7 @@ apt-get clean
 
 # Set up sudo
 ( cat <<'EOP'
-%vagrant ALL=NOPASSWD:ALL
+%vagrant ALL=(ALL) NOPASSWD: ALL
 EOP
 ) > /tmp/vagrant
 chmod 0440 /tmp/vagrant

data/test/build_realtest.rb

@@ -40,15 +40,15 @@ class TestVeeweeBuild < Test::Unit::TestCase
       assert_match(/bla/,result.stdout)
     }
   end
-  
+
   # Are there as many disks as in disk_count?
   def test_box_4_check_disk_count
-    assert_nothing_raised { 
+    assert_nothing_raised {
       result=@box.exec("lsblk -lo MODEL|grep -i harddisk|wc -l")
       assert_match(/#{@box.definition.disk_count}/,result.stdout)
     }
   end
-  
+
 
   # Try shutdown
   def test_box_5_shutdown

data/test/definitions/erb_definition/autorun0.erb

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "Testing one <%= definition.os_type_id %>"
+<% if definition.iso_file =~ /netboot/ %>
+echo netboot
+<% else %>
+echo DVD
+<% end %>

data/test/definitions/erb_definition/definition.rb

@@ -0,0 +1,24 @@
+Veewee::Definition.declare({
+  :cpu_count => '1', :memory_size=> '512',
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
+  :os_type_id => 'Linux26',
+  :iso_file => "systemrescuecd-x86-2.3.1.iso",
+  :iso_src => "http://downloads.sourceforge.net/project/systemrescuecd/sysresccd-x86/2.3.1/systemrescuecd-x86-2.3.1.iso",
+  :iso_md5 => "8813aa38506f6e6be1c02e871eb898ca",
+  #:iso_file => "systemrescuecd-x86-2.0.0.iso",
+  #:iso_src => "http://downloads.sourceforge.net/project/systemrescuecd/sysresccd-x86/2.0.0/systemrescuecd-x86-2.0.0.iso",
+  #:iso_md5 => "51012e0bb943cff6367e5cea3a61cdbe",
+  :iso_download_timeout => "1000",
+  :boot_wait => "10", :boot_cmd_sequence => [
+    '<Tab> raid=noautodetect setkmap=us dodhcp=eth0 fastboot dhcphostname=%NAME% rootpass=vagrant ar_source=http://%IP%:%PORT%/ autoruns=0 ar_nowait dns=127.0.0.1 nomodeset nodetect nodmraid nomadm edd=off quiet nosata nosound nosmp nohotplug acpi=off noresume load=eth1000 nonet noload=ipv6,floppy,md,raid10,raid456,raid1,raid0,multipath,linear,i2c_piix4,i2c_core,udev scandelay=0 nousb<Enter>'
+  ],
+  :kickstart_port => "7122", :kickstart_timeout => "10000",
+  :kickstart_file => "autorun0.erb",
+
+  :ssh_login_timeout => "10000", :ssh_user => "root", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
+  :sudo_cmd => "sh '%f'",
+  :shutdown_cmd => "shutdown -h -H now",
+  :postinstall_files => ["_disabled_postinstall.sh", "enabled_postinstall.sh" ],
+  :postinstall_timeout => "10000"
+})

data/test/veewee/provider/core/helper/web_test.rb

@@ -0,0 +1,30 @@
+`VBoxManage -v` rescue nil
+if $?.success?
+
+require 'test/unit'
+require 'veewee'
+
+class TestVeeweeBuild < Test::Unit::TestCase
+  def setup
+    @definition_dir = File.expand_path("../../../../../definitions", __FILE__)
+    @definition_name = "erb_definition"
+    ve = Veewee::Environment.new({ :definition_dir =>  @definition_dir })
+    @box = ve.providers["virtualbox"].get_box(@definition_name)
+  end
+
+  def test_box_1_build
+    assert_equal(
+      "\
+#!/bin/bash
+
+echo \"Testing one Linux26\"
+
+echo DVD
+
+",
+      @box.send(:read_content, File.join(@definition_dir, @definition_name, "autorun0.erb"))
+    )
+  end
+end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: veewee
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha1
+  version: 0.5.0.alpha2
 platform: ruby
 authors:
 - Patrick Debois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -503,46 +503,21 @@ files:
 - templates/CentOS-4.8-i386/definition.rb
 - templates/CentOS-4.8-i386/ks.cfg
 - templates/CentOS-4.8-i386/postinstall.sh
-- templates/CentOS-5.10-i386-netboot/base.sh
-- templates/CentOS-5.10-i386-netboot/chef.sh
-- templates/CentOS-5.10-i386-netboot/cleanup.sh
-- templates/CentOS-5.10-i386-netboot/definition.rb
-- templates/CentOS-5.10-i386-netboot/ks.cfg
-- templates/CentOS-5.10-i386-netboot/puppet.sh
-- templates/CentOS-5.10-i386-netboot/ruby.sh
-- templates/CentOS-5.10-i386-netboot/vagrant.sh
-- templates/CentOS-5.10-i386-netboot/virtualbox.sh
-- templates/CentOS-5.10-i386-netboot/zerodisk.sh
-- templates/CentOS-5.10-i386/base.sh
-- templates/CentOS-5.10-i386/chef.sh
-- templates/CentOS-5.10-i386/cleanup.sh
-- templates/CentOS-5.10-i386/definition.rb
-- templates/CentOS-5.10-i386/ks.cfg
-- templates/CentOS-5.10-i386/puppet.sh
-- templates/CentOS-5.10-i386/ruby.sh
-- templates/CentOS-5.10-i386/vagrant.sh
-- templates/CentOS-5.10-i386/virtualbox.sh
-- templates/CentOS-5.10-i386/zerodisk.sh
-- templates/CentOS-5.10-x86_64-netboot/base.sh
-- templates/CentOS-5.10-x86_64-netboot/chef.sh
-- templates/CentOS-5.10-x86_64-netboot/cleanup.sh
-- templates/CentOS-5.10-x86_64-netboot/definition.rb
-- templates/CentOS-5.10-x86_64-netboot/ks.cfg
-- templates/CentOS-5.10-x86_64-netboot/puppet.sh
-- templates/CentOS-5.10-x86_64-netboot/ruby.sh
-- templates/CentOS-5.10-x86_64-netboot/vagrant.sh
-- templates/CentOS-5.10-x86_64-netboot/virtualbox.sh
-- templates/CentOS-5.10-x86_64-netboot/zerodisk.sh
-- templates/CentOS-5.10-x86_64/base.sh
-- templates/CentOS-5.10-x86_64/chef.sh
-- templates/CentOS-5.10-x86_64/cleanup.sh
-- templates/CentOS-5.10-x86_64/definition.rb
-- templates/CentOS-5.10-x86_64/ks.cfg
-- templates/CentOS-5.10-x86_64/puppet.sh
-- templates/CentOS-5.10-x86_64/ruby.sh
-- templates/CentOS-5.10-x86_64/vagrant.sh
-- templates/CentOS-5.10-x86_64/virtualbox.sh
-- templates/CentOS-5.10-x86_64/zerodisk.sh
+- templates/CentOS-5.10/base.sh
+- templates/CentOS-5.10/centos_32_dvd.yml
+- templates/CentOS-5.10/centos_32_net.yml
+- templates/CentOS-5.10/centos_64_dvd.yml
+- templates/CentOS-5.10/centos_64_net.yml
+- templates/CentOS-5.10/chef.sh
+- templates/CentOS-5.10/cleanup.sh
+- templates/CentOS-5.10/definition.rb
+- templates/CentOS-5.10/definition.yml
+- templates/CentOS-5.10/ks.cfg
+- templates/CentOS-5.10/puppet.sh
+- templates/CentOS-5.10/ruby.sh
+- templates/CentOS-5.10/vagrant.sh
+- templates/CentOS-5.10/virtualbox.sh
+- templates/CentOS-5.10/zerodisk.sh
 - templates/CentOS-5.5-i386-netboot/definition.rb
 - templates/CentOS-5.5-i386-netboot/ks.cfg
 - templates/CentOS-5.5-i386-netboot/postinstall.sh
@@ -1238,6 +1213,17 @@ files:
 - templates/Debian-7.6.0-i386-netboot/virtualbox.sh
 - templates/Debian-7.6.0-i386-netboot/vmfusion.sh
 - templates/Debian-7.6.0-i386-netboot/zerodisk.sh
+- templates/Debian-7.7.0-amd64-netboot/base.sh
+- templates/Debian-7.7.0-amd64-netboot/chef.sh
+- templates/Debian-7.7.0-amd64-netboot/cleanup.sh
+- templates/Debian-7.7.0-amd64-netboot/definition.rb
+- templates/Debian-7.7.0-amd64-netboot/preseed.cfg
+- templates/Debian-7.7.0-amd64-netboot/puppet.sh
+- templates/Debian-7.7.0-amd64-netboot/ruby.sh
+- templates/Debian-7.7.0-amd64-netboot/vagrant.sh
+- templates/Debian-7.7.0-amd64-netboot/virtualbox.sh
+- templates/Debian-7.7.0-amd64-netboot/vmfusion.sh
+- templates/Debian-7.7.0-amd64-netboot/zerodisk.sh
 - templates/Fedora-14-amd64-netboot/definition.rb
 - templates/Fedora-14-amd64-netboot/ks.cfg
 - templates/Fedora-14-amd64-netboot/postinstall.sh
@@ -2356,11 +2342,14 @@ files:
 - templates/windows-8-preview-amd64/winrm.rb
 - test/build_realtest.rb
 - test/definition_test.rb
+- test/definitions/erb_definition/autorun0.erb
+- test/definitions/erb_definition/definition.rb
 - test/definitions/test_definition/_disabled_postinstall.sh
 - test/definitions/test_definition/autorun0
 - test/definitions/test_definition/definition.rb
 - test/definitions/test_definition/enabled_postinstall.sh
 - test/environment_test.rb
+- test/veewee/provider/core/helper/web_test.rb
 - test/veewee/provider/virtualbox/box/helper/guest_additions_test.rb
 - test/veewee/provider/virtualbox/box/helper/version.rb
 - validation/vagrant-private.key

data/templates/CentOS-5.10-i386-netboot/definition.rb

@@ -1,42 +0,0 @@
-Veewee::Session.declare({
-  :cpu_count => '1',
-  :memory_size=> '384',
-  :disk_size => '10140',
-  :disk_format => 'VDI',
-  :hostiocache => 'on',
-  :virtualbox => {
-    :vm_options => [
-      "pae" => "on",
-      "ioapic" => "on",
-    ],
-  },
-  :os_type_id => 'RedHat',
-  :iso_file => "CentOS-5.10-i386-netinstall.iso",
-  :iso_src => "http://mirrors.kernel.org/centos/5.10/isos/i386/CentOS-5.10-i386-netinstall.iso",
-  :iso_md5 => "8d19b12cb5f65a4b5c2bc61a98abf80c",
-  :iso_download_timeout => 1000,
-  :boot_wait => "10",
-  :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
-  :kickstart_port => "7122",
-  :kickstart_timeout => 300,
-  :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "10000",
-  :ssh_user => "vagrant",
-  :ssh_password => "vagrant",
-  :ssh_key => "",
-  :ssh_host_port => "7222",
-  :ssh_guest_port => "22",
-  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
-  :shutdown_cmd => "/sbin/halt -h -p",
-  :postinstall_files => [
-    "base.sh",
-    "ruby.sh",
-    "chef.sh",
-    "puppet.sh",
-    "vagrant.sh",
-    "virtualbox.sh",
-    "cleanup.sh",
-    "zerodisk.sh"
-  ],
-  :postinstall_timeout => 10000
-})

data/templates/CentOS-5.10-i386-netboot/ks.cfg

@@ -1,27 +0,0 @@
-install
-url --url=http://mirrors.kernel.org/centos/5.10/os/i386/
-lang en_US.UTF-8
-langsupport --default=en_US.UTF-8 en_US.UTF-8
-keyboard us
-text
-skipx
-zerombr
-network --device eth0 --bootproto dhcp
-rootpw vagrant
-firewall --enabled --trust eth0 --ssh
-selinux --disabled
-authconfig --enableshadow --enablemd5
-timezone America/New_York
-bootloader --location=mbr
-clearpart --all --initlabel
-autopart
-reboot
-
-%packages
-@ core
-%post
-/usr/sbin/groupadd vagrant
-/usr/sbin/useradd vagrant -g vagrant -G wheel
-echo "vagrant"|passwd --stdin vagrant
-echo "vagrant        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers
-%end

data/templates/CentOS-5.10-i386/base.sh

@@ -1,8 +0,0 @@
-# Base install
-
-sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
-sed -i "s/^\(.*env_keep = \"\)/\1PATH /" /etc/sudoers
-
-yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl wget dkms bzip2
-
-yum -y erase gtk2 libX11 hicolor-icon-theme freetype bitstream-vera-fonts

data/templates/CentOS-5.10-i386/chef.sh

@@ -1,3 +0,0 @@
-# Install Chef
-
-curl -L https://www.opscode.com/chef/install.sh | sudo bash

data/templates/CentOS-5.10-i386/cleanup.sh

@@ -1,11 +0,0 @@
-# Clean up
-
-yum -y clean all
-rm -rf /etc/yum.repos.d/puppetlabs.repo
-rm -rf VBoxGuestAdditions_*.iso
-
-# Remove mac address from network configuration
-sed -i /HWADDR/d /etc/sysconfig/network-scripts/ifcfg-eth0
-
-# Remove DHCP leases
-rm /var/lib/dhclient/*.leases

data/templates/CentOS-5.10-i386/definition.rb

@@ -1,42 +0,0 @@
-Veewee::Session.declare({
-  :cpu_count => '1',
-  :memory_size=> '384',
-  :disk_size => '10140',
-  :disk_format => 'VDI',
-  :hostiocache => 'on',
-  :virtualbox => {
-    :vm_options => [
-      "pae" => "on",
-      "ioapic" => "on",
-    ],
-  },
-  :os_type_id => 'RedHat',
-  :iso_file => "CentOS-5.10-i386-bin-DVD-1of2.iso",
-  :iso_src => "http://mirrors.kernel.org/centos/5.10/isos/i386/CentOS-5.10-i386-bin-DVD-1of2.iso",
-  :iso_md5 => "ec0acc2a4f6a813ea85bf1e36acb03f0",
-  :iso_download_timeout => 1000,
-  :boot_wait => "10",
-  :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
-  :kickstart_port => "7122",
-  :kickstart_timeout => 300,
-  :kickstart_file => "ks.cfg",
-  :ssh_login_timeout => "10000",
-  :ssh_user => "vagrant",
-  :ssh_password => "vagrant",
-  :ssh_key => "",
-  :ssh_host_port => "7222",
-  :ssh_guest_port => "22",
-  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
-  :shutdown_cmd => "/sbin/halt -h -p",
-  :postinstall_files => [
-    "base.sh",
-    "ruby.sh",
-    "chef.sh",
-    "puppet.sh",
-    "vagrant.sh",
-    "virtualbox.sh",
-    "cleanup.sh",
-    "zerodisk.sh"
-  ],
-  :postinstall_timeout => 10000
-})

data/templates/CentOS-5.10-i386/ks.cfg

@@ -1,27 +0,0 @@
-install
-cdrom
-lang en_US.UTF-8
-langsupport --default=en_US.UTF-8 en_US.UTF-8
-keyboard us
-text
-skipx
-zerombr
-network --device eth0 --bootproto dhcp
-rootpw vagrant
-firewall --enabled --trust eth0 --ssh
-selinux --disabled
-authconfig --enableshadow --enablemd5
-timezone America/New_York
-bootloader --location=mbr
-clearpart --all --initlabel
-autopart
-reboot
-
-%packages
-@ core
-%post
-/usr/sbin/groupadd vagrant
-/usr/sbin/useradd vagrant -g vagrant -G wheel
-echo "vagrant"|passwd --stdin vagrant
-echo "vagrant        ALL=(ALL)       NOPASSWD: ALL" >> /etc/sudoers
-%end

data/templates/CentOS-5.10-i386/puppet.sh

@@ -1,17 +0,0 @@
-# Install Puppet
-
-cat > /etc/yum.repos.d/puppetlabs.repo << EOM
-[puppetlabs-dependencies]
-name=puppetlabdsdependencies
-baseurl=http://yum.puppetlabs.com/el/5/dependencies/\$basearch
-enabled=1
-gpgcheck=0
-
-[puppetlabs]
-name=puppetlabs
-baseurl=http://yum.puppetlabs.com/el/5/products/\$basearch
-enabled=1
-gpgcheck=0
-EOM
-
-yum -y install puppet facter ruby-shadow

data/templates/CentOS-5.10-i386/ruby.sh

@@ -1,41 +0,0 @@
-# Install Ruby from sources
-
-# add epel repo for Ruby compile time dependencies
-cat > /etc/yum.repos.d/epel.repo << EOM
-[epel]
-name=epel
-baseurl=http://download.fedoraproject.org/pub/epel/5/\$basearch
-enabled=1
-gpgcheck=0
-includepkgs=libffi*
-EOM
-
-# Install required library packages
-yum install -y gdbm-devel libffi-devel ncurses-devel
-
-# Install LibYAML (prerequisite for Ruby)
-YAML_VERSION=0.1.4
-wget http://pyyaml.org/download/libyaml/yaml-$YAML_VERSION.tar.gz
-tar xzvf yaml-$YAML_VERSION.tar.gz
-cd yaml-$YAML_VERSION
-./configure --prefix=/opt
-make && make install
-cd ..
-rm -rf yaml-$YAML_VERSION
-rm -f yaml-$YAML_VERSION.tar.gz
-
-# Install Ruby
-RUBY_VERSION=1.9.3-p484
-wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-$RUBY_VERSION.tar.gz
-tar xvzf ruby-$RUBY_VERSION.tar.gz
-cd ruby-$RUBY_VERSION
-# Fix: BSD compatibility arguments not supported by the installed version of sed
-sed -i "s/sed -E/sed -e/" configure
-./configure --prefix=/opt/ruby --disable-install-doc --with-opt-dir=/opt
-make && make install
-cd ..
-rm -rf ruby-$RUBY_VERSION
-rm -f ruby-$RUBY_VERSION.tar.gz
-
-# remove epel repo
-rm -rf /etc/yum.repos.d/epel.repo