veewee 0.1.16 → 0.1.17

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    veewee (0.1.16)
+    veewee (0.1.17)
       cucumber (= 0.8.5)
       highline (~> 1.6.1)
       net-ssh (~> 2.1.0)
       popen4 (~> 0.1.2)
       progressbar
+      rspec (~> 2.5.0)
       thor (~> 0.14.6)
       vagrant (~> 0.7.0)
 
@@ -37,17 +38,25 @@ GEM
     mario (0.0.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.1.2)
+    net-ssh (2.1.4)
     open4 (1.0.1)
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
     progressbar (0.9.0)
     rake (0.8.7)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     trollop (1.16.2)
-    vagrant (0.7.2)
+    vagrant (0.7.3)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)

data/lib/veewee/session.rb

@@ -30,7 +30,7 @@ module Veewee
     def self.declare(options)
       defaults={
         :cpu_count => '1', :memory_size=> '256', 
-        :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+        :disk_size => '10240', :disk_format => 'VDI', :hostiocache => 'off' ,
         :os_type_id => 'Ubuntu',
         :iso_file => "ubuntu-10.10-server-i386.iso", :iso_src => "", :iso_md5 => "", :iso_download_timeout => 1000,
         :boot_wait => "10", :boot_cmd_sequence => [ "boot"],
@@ -296,7 +296,7 @@ module Veewee
             Veewee::Ssh.when_ssh_login_works("localhost",ssh_options) do
               #Transfer version of Virtualbox to $HOME/.vbox_version            
               versionfile=Tempfile.open("vbox.version")
-              versionfile.puts "#{VirtualBox::Global.global.lib.virtualbox.version}"
+              versionfile.puts "#{VirtualBox::Global.global.lib.virtualbox.version.split('_')[0]}"
               versionfile.rewind
               begin
                 Veewee::Ssh.transfer_file("localhost",versionfile.path,".vbox_version", ssh_options)
@@ -573,7 +573,7 @@ module Veewee
     
     def self.add_sata_controller(boxname)
       #unless => "${vboxcmd} showvminfo '${vname}' | grep 'SATA Controller' ";
-      command ="#{@vboxcmd} storagectl '#{boxname}' --name 'SATA Controller' --add sata"
+      command ="#{@vboxcmd} storagectl '#{boxname}' --name 'SATA Controller' --add sata --hostiocache #{@definition[:hostiocache]}"
       Veewee::Shell.execute("#{command}")
     end
     

data/lib/veewee/ssh.rb

@@ -110,7 +110,7 @@ module Veewee
               ch.on_data do |c, data|
                 @stdout+=data
 
-                  puts data
+                  print data
 
               end
 
@@ -118,7 +118,7 @@ module Veewee
               ch.on_extended_data do |c, type, data|
                 @stderr+=data
 
-                  puts data
+                  print data
 
               end
 

data/lib/veewee/version.rb

@@ -1,3 +1,3 @@
 module Veewee
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

data/templates/Archlinux-latest/definition.rb

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '256', 
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'Linux',
   :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?r=http%3A%2F%2Fwww.sysresccd.org%2FDownload&ts=1297107227&use_mirror=ignum",

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

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '384', 
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'RedHat',
   :iso_file => "CentOS-4.8-i386-bin-DVD.iso", :iso_src => "", :iso_md5 => "", :iso_download_timeout => 1000,
   :boot_wait => "10",:boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],

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

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
 :cpu_count => '1', :memory_size=> '384', 
-:disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+:disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
 :os_type_id => 'RedHat',
 :iso_file => "CentOS-5.5-i386-netinstall.iso", 
 :iso_src => "http://mirror.bytemark.co.uk/centos/5.5/isos/i386/CentOS-5.5-i386-netinstall.iso", 

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

@@ -1,6 +1,6 @@
        Veewee::Session.declare( {
         :cpu_count => '1', :memory_size=> '384', 
-        :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+        :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
         :os_type_id => 'RedHat',
         :iso_file => "CentOS-5.5-i386-bin-DVD.iso", :iso_src => "", :iso_md5 => "75c92246479df172de41b14c9b966344", :iso_download_timeout => 1000,
         :boot_wait => "10",:boot_cmd_sequence => [ 

data/templates/Debian-6.0-amd64-netboot/definition.rb

@@ -1,9 +1,7 @@
 Veewee::Session.declare( {
   :cpu_count => '1',
   :memory_size=> '256',
-  :disk_size => '10140',
-  :disk_format => 'VDI',
-  :disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-6.0.0-amd64-netinst.iso",
   :iso_src => "http://ftp.acc.umu.se/debian-cd/current/amd64/iso-cd/debian-6.0.0-amd64-netinst.iso",

data/templates/Debian-6.0-i386-netboot/definition.rb

@@ -0,0 +1,42 @@
+#Thanks to Fletcher Nichol - https://github.com/fnichol
+
+Veewee::Session.declare( {
+  :cpu_count => '1',
+  :memory_size=> '256',
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
+  :os_type_id => 'Debian',
+  :iso_file => "debian-6.0.0-i386-netinst.iso",
+  :iso_src => "http://ftp.acc.umu.se/debian-cd/current/i386/iso-cd/debian-6.0.0-i386-netinst.iso",
+  :iso_md5 => "2840eea06e9cdd2e125f32cefa25fa1d",
+  :iso_download_timeout => "1000",
+  :boot_wait => "10",:boot_cmd_sequence => [
+     '<Esc>',
+     'install ',
+     'preseed/url=http://%IP%:%PORT%/preseed.cfg ',
+     'debian-installer=en_US ',
+     'auto ',
+     'locale=en_US ',
+     'kbd-chooser/method=us ',
+     'netcfg/get_hostname=%NAME% ',
+     'netcfg/get_domain=vagrantup.com ',
+     'fb=false ',
+     'debconf/frontend=noninteractive ',
+     'console-setup/ask_detect=false ',
+     'console-keymaps-at/keymap=us ',
+     '<Enter>'
+  ],
+  :kickstart_port => "7122",
+  :kickstart_timeout => "10000",
+  :kickstart_file => "preseed.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 => "halt -p",
+  :postinstall_files => [ "postinstall.sh" ],
+  :postinstall_timeout => "10000"
+ }
+)

data/templates/Debian-6.0-i386-netboot/postinstall.sh

@@ -0,0 +1,61 @@
+#http://adrianbravo.tumblr.com/post/644860401
+
+# Update the box
+apt-get -y update
+apt-get -y install linux-headers-$(uname -r) build-essential 
+apt-get -y install zlib1g-dev libssl-dev libreadline5-dev
+apt-get -y install curl unzip
+apt-get clean
+
+# Set up sudo
+cp /etc/sudoers /etc/sudoers.orig
+sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers
+
+# Install Ruby from packages
+apt-get -y install ruby ruby-dev libopenssl-ruby1.8 irb ri rdoc
+
+# Install Rubygems from source
+rg_ver=1.6.2
+curl -o /tmp/rubygems-${rg_ver}.zip \
+  "http://production.cf.rubygems.org/rubygems/rubygems-${rg_ver}.zip"
+(cd /tmp && unzip rubygems-${rg_ver}.zip && \
+  cd rubygems-${rg_ver} && ruby setup.rb --no-format-executable)
+rm -rf /tmp/rubygems-${rg_ver} /tmp/rubygems-${rg_ver}.zip
+
+# Install Chef & Puppet
+gem install chef --no-ri --no-rdoc
+gem install puppet --no-ri --no-rdoc
+
+# Install vagrant keys
+mkdir -p /home/vagrant/.ssh
+chmod 700 /home/vagrant/.ssh
+cd /home/vagrant/.ssh
+curl -o /home/vagrant/.ssh/authorized_keys \
+  'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub'
+chmod 0600 /home/vagrant/.ssh/authorized_keys
+chown -R vagrant:vagrant /home/vagrant/.ssh
+
+# Tweak sshd to prevent DNS resolution (speed up logins)
+echo 'UseDNS no' >> /etc/ssh/sshd_config
+
+# Customize the message of the day
+echo 'Welcome to your Vagrant-built virtual machine.' > /var/run/motd
+
+# The netboot installs the VirtualBox support (old) so we have to remove it
+apt-get -y remove virtualbox-ose-guest-dkms
+apt-get -y remove virtualbox-ose-guest-utils
+
+# Install the VirtualBox guest additions
+VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
+curl -Lo /tmp/VBoxGuestAdditions_$VBOX_VERSION.iso \
+  "http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso"
+mount -o loop /tmp/VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+yes|sh /mnt/VBoxLinuxAdditions.run
+umount /mnt
+
+# Clean up
+apt-get -y remove linux-headers-$(uname -r) build-essential
+apt-get -y autoremove
+
+rm /tmp/VBoxGuestAdditions_$VBOX_VERSION.iso 
+exit

data/templates/Debian-6.0-i386-netboot/preseed.cfg

@@ -0,0 +1,312 @@
+#### Contents of the preconfiguration file (for squeeze)
+### Localization
+# Locale sets language and country.
+d-i debian-installer/locale string en_US
+
+# Keyboard selection.
+#d-i console-tools/archs select at
+d-i console-keymaps-at/keymap select us
+# Example for a different keyboard architecture
+#d-i console-keymaps-usb/keymap select mac-usb-us
+
+### Network configuration
+# netcfg will choose an interface that has link if possible. This makes it
+# skip displaying a list if there is more than one interface.
+d-i netcfg/choose_interface select auto
+
+# To pick a particular interface instead:
+#d-i netcfg/choose_interface select eth1
+
+# If you have a slow dhcp server and the installer times out waiting for
+# it, this might be useful.
+#d-i netcfg/dhcp_timeout string 60
+
+# If you prefer to configure the network manually, uncomment this line and
+# the static network configuration below.
+#d-i netcfg/disable_dhcp boolean true
+
+# If you want the preconfiguration file to work on systems both with and
+# without a dhcp server, uncomment these lines and the static network
+# configuration below.
+#d-i netcfg/dhcp_failed note
+#d-i netcfg/dhcp_options select Configure network manually
+
+# Static network configuration.
+#d-i netcfg/get_nameservers string 192.168.1.1
+#d-i netcfg/get_ipaddress string 192.168.1.42
+#d-i netcfg/get_netmask string 255.255.255.0
+#d-i netcfg/get_gateway string 192.168.1.1
+#d-i netcfg/confirm_static boolean true
+
+# Any hostname and domain names assigned from dhcp take precedence over
+# values set here. However, setting the values still prevents the questions
+# from being shown, even if values come from dhcp.
+#d-i netcfg/get_hostname string vagrant
+d-i netcfg/get_domain string vagrantup.com
+
+# Disable that annoying WEP key dialog.
+d-i netcfg/wireless_wep string
+# The wacky dhcp hostname that some ISPs use as a password of sorts.
+#d-i netcfg/dhcp_hostname string radish
+
+# If non-free firmware is needed for the network or other hardware, you can
+# configure the installer to always try to load it, without prompting. Or
+# change to false to disable asking.
+#d-i hw-detect/load_firmware boolean true
+
+### Network console
+# Use the following settings if you wish to make use of the network-console
+# component for remote installation over SSH. This only makes sense if you
+# intend to perform the remainder of the installation manually.
+#d-i anna/choose_modules string network-console
+#d-i network-console/password password r00tme
+#d-i network-console/password-again password r00tme
+
+### Mirror settings
+# If you select ftp, the mirror/country string does not need to be set.
+#d-i mirror/protocol string ftp
+d-i mirror/country string manual
+d-i mirror/http/hostname string http.us.debian.org
+d-i mirror/http/directory string /debian
+d-i mirror/http/proxy string
+
+# Suite to install.
+#d-i mirror/suite string testing
+# Suite to use for loading installer components (optional).
+#d-i mirror/udeb/suite string testing
+
+### Clock and time zone setup
+# Controls whether or not the hardware clock is set to UTC.
+d-i clock-setup/utc boolean true
+
+# You may set this to any valid setting for $TZ; see the contents of
+# /usr/share/zoneinfo/ for valid values.
+d-i time/zone string UTC
+
+# Controls whether to use NTP to set the clock during the install
+d-i clock-setup/ntp boolean true
+# NTP server to use. The default is almost always fine here.
+#d-i clock-setup/ntp-server string ntp.example.com
+
+### Partitioning
+# If the system has free space you can choose to only partition that space.
+#d-i partman-auto/init_automatically_partition select biggest_free
+
+# Alternatively, you can specify a disk to partition. The device name must
+# be given in traditional non-devfs format.
+# Note: A disk must be specified, unless the system has only one disk.
+# For example, to use the first SCSI/SATA hard disk:
+d-i partman-auto/disk string /dev/sda
+# In addition, you'll need to specify the method to use.
+# The presently available methods are: "regular", "lvm" and "crypto"
+d-i partman-auto/method string lvm
+
+# If one of the disks that are going to be automatically partitioned
+# contains an old LVM configuration, the user will normally receive a
+# warning. This can be preseeded away...
+d-i partman-lvm/device_remove_lvm boolean true
+# The same applies to pre-existing software RAID array:
+d-i partman-md/device_remove_md boolean true
+
+# And the same goes for the confirmation to write the lvm partitions.
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
+
+
+d-i partman/choose_partition select finish
+d-i partman-auto-lvm/guided_size string max
+
+# You can choose one of the three predefined partitioning recipes:
+# - atomic: all files in one partition
+# - home:   separate /home partition
+# - multi:  separate /home, /usr, /var, and /tmp partitions
+d-i partman-auto/choose_recipe select atomic
+d-i partman/default_filesystem string ext3
+
+# Or provide a recipe of your own...
+# The recipe format is documented in the file devel/partman-auto-recipe.txt.
+# If you have a way to get a recipe file into the d-i environment, you can
+# just point at it.
+#d-i partman-auto/expert_recipe_file string /hd-media/recipe
+
+# If not, you can put an entire recipe into the preconfiguration file in one
+# (logical) line. This example creates a small /boot partition, suitable
+# swap, and uses the rest of the space for the root partition:
+#d-i partman-auto/expert_recipe string                         \
+#      boot-root ::                                            \
+#              40 50 100 ext3                                  \
+#                      $primary{ } $bootable{ }                \
+#                      method{ format } format{ }              \
+#                      use_filesystem{ } filesystem{ ext3 }    \
+#                      mountpoint{ /boot }                     \
+#              .                                               \
+#              500 10000 1000000000 ext3                       \
+#                      method{ format } format{ }              \
+#                      use_filesystem{ } filesystem{ ext3 }    \
+#                      mountpoint{ / }                         \
+#              .                                               \
+#              64 512 300% linux-swap                          \
+#                      method{ swap } format{ }                \
+#              .
+
+#The preseed line that "selects finish" needs to be in a certain order in your preseed, the example-preseed does not follow this.
+#http://ubuntuforums.org/archive/index.php/t-1504045.html
+
+# This makes partman automatically partition without confirmation, provided
+# that you told it what to do using one of the methods above.
+d-i partman/confirm_write_new_label boolean true
+d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
+
+
+### Base system installation
+# Select the initramfs generator used to generate the initrd for 2.6 kernels.
+#d-i base-installer/kernel/linux/initramfs-generators string yaird
+
+# The kernel image (meta) package to be installed; "none" can be used if no
+# kernel is to be installed.
+#d-i base-installer/kernel/image string linux-image-2.6-486
+
+### Account setup
+# Skip creation of a root account (normal user account will be able to
+# use sudo).
+d-i passwd/root-login boolean false
+# Alternatively, to skip creation of a normal user account.
+#d-i passwd/make-user boolean false
+
+# Root password, either in clear text
+d-i passwd/root-password password vagrant
+d-i passwd/root-password-again password vagrant
+# or encrypted using an MD5 hash.
+#d-i passwd/root-password-crypted password [MD5 hash]
+
+# To create a normal user account.
+d-i passwd/user-fullname string Vagrant User
+d-i passwd/username string vagrant
+# Normal user's password, either in clear text
+d-i passwd/user-password password vagrant
+d-i passwd/user-password-again password vagrant
+# or encrypted using an MD5 hash.
+#d-i passwd/user-password-crypted password [MD5 hash]
+# Create the first user with the specified UID instead of the default.
+#d-i passwd/user-uid string 1010
+d-i user-setup/encrypt-home boolean false
+d-i user-setup/allow-password-weak boolean true
+
+# The user account will be added to some standard initial groups. To
+# override that, use this.
+d-i passwd/user-default-groups string audio cdrom video admin
+
+### Apt setup
+# You can choose to install non-free and contrib software.
+#d-i apt-setup/non-free boolean true
+#d-i apt-setup/contrib boolean true
+# Uncomment this if you don't want to use a network mirror.
+#d-i apt-setup/use_mirror boolean false
+# Select which update services to use; define the mirrors to be used.
+# Values shown below are the normal defaults.
+#d-i apt-setup/services-select multiselect security, volatile
+#d-i apt-setup/security_host string security.debian.org
+#d-i apt-setup/volatile_host string volatile.debian.org
+
+
+# By default the installer requires that repositories be authenticated
+# using a known gpg key. This setting can be used to disable that
+# authentication. Warning: Insecure, not recommended.
+#d-i debian-installer/allow_unauthenticated string true
+
+### Package selection
+tasksel tasksel/first multiselect standard
+# If the desktop task is selected, install the kde and xfce desktops
+# instead of the default gnome desktop.
+#tasksel tasksel/desktop multiselect kde, xfce
+
+# Individual additional packages to install
+d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2 
+
+# Whether to upgrade packages after debootstrap.
+# Allowed values: none, safe-upgrade, full-upgrade
+d-i pkgsel/upgrade select none
+
+# Some versions of the installer can report back on what software you have
+# installed, and what software you use. The default is not to report back,
+# but sending reports helps the project determine what software is most
+# popular and include it on CDs.
+popularity-contest popularity-contest/participate boolean false
+
+### Boot loader installation
+# Grub is the default boot loader (for x86). If you want lilo installed
+# instead, uncomment this:
+#d-i grub-installer/skip boolean true
+# To also skip installing lilo, and install no bootloader, uncomment this
+# too:
+#d-i lilo-installer/skip boolean true
+
+# This is fairly safe to set, it makes grub install automatically to the MBR
+# if no other operating system is detected on the machine.
+d-i grub-installer/only_debian boolean true
+
+# This one makes grub-installer install to the MBR if it also finds some other
+# OS, which is less safe as it might not be able to boot that other OS.
+d-i grub-installer/with_other_os boolean true
+
+# Alternatively, if you want to install to a location other than the mbr,
+# uncomment and edit these lines:
+#d-i grub-installer/only_debian boolean false
+#d-i grub-installer/with_other_os boolean false
+#d-i grub-installer/bootdev  string (hd0,0)
+# To install grub to multiple disks:
+#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)
+
+# Optional password for grub, either in clear text
+#d-i grub-installer/password password r00tme
+#d-i grub-installer/password-again password r00tme
+# or encrypted using an MD5 hash, see grub-md5-crypt(8).
+#d-i grub-installer/password-crypted password [MD5 hash]
+
+### Finishing up the installation
+# During installations from serial console, the regular virtual consoles
+# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next
+# line to prevent this.
+#d-i finish-install/keep-consoles boolean true
+
+# Avoid that last message about the install being complete.
+d-i finish-install/reboot_in_progress note
+
+# This will prevent the installer from ejecting the CD during the reboot,
+# which is useful in some situations.
+#d-i cdrom-detect/eject boolean false
+
+# This is how to make the installer shutdown when finished, but not
+# reboot into the installed system.
+#d-i debian-installer/exit/halt boolean true
+# This will power off the machine instead of just halting it.
+#d-i debian-installer/exit/poweroff boolean true
+
+### Preseeding other packages
+# Depending on what software you choose to install, or if things go wrong
+# during the installation process, it's possible that other questions may
+# be asked. You can preseed those too, of course. To get a list of every
+# possible question that could be asked during an install, do an
+# installation, and then run these commands:
+#   debconf-get-selections --installer > file
+#   debconf-get-selections >> file
+
+
+#### Advanced options
+### Running custom commands during the installation
+# d-i preseeding is inherently not secure. Nothing in the installer checks
+# for attempts at buffer overflows or other exploits of the values of a
+# preconfiguration file like this one. Only use preconfiguration files from
+# trusted locations! To drive that home, and because it's generally useful,
+# here's a way to run any shell command you'd like inside the installer,
+# automatically.
+
+# This first command is run as early as possible, just after
+# preseeding is read.
+#d-i preseed/early_command string anna-install some-udeb
+
+# This command is run just before the install finishes, but when there is
+# still a usable /target directory. You can chroot to /target and use it
+# directly, or use the apt-install and in-target commands to easily install
+# packages and run commands in the target system.

data/templates/Sysrescuecd-2.0.0-experimental/definition.rb

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '256', 
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'Linux',
   :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",

data/templates/freebsd-8.2-experimental/definition.rb

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '256', 
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'FreeBSD_64',
   :iso_file => "mfsbsd-8.2-amd64.iso",
   :iso_src => "http://mfsbsd.vx.sk/iso/mfsbsd-8.2-amd64.iso",

data/templates/freebsd-8.2-pcbsd-i386-netboot/definition.rb

@@ -0,0 +1,34 @@
+# Many thanks to @draco2002
+# http://dracosplace.com/veewee_and_freebsd
+
+#  :iso_src => "ftp://mirrors.isc.org/pub/pcbsd/8.2/i386/PCBSD8.2-x86-bootonly.iso",
+#  :iso_file => "PCBSD8.2-x86-bootonly.iso",
+
+#Based on https://gist.github.com/911058
+
+Veewee::Session.declare( {
+  :cpu_count => '1', :memory_size=> '768',
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
+  :os_type_id => 'FreeBSD',
+  :iso_file => "PCBSD8.2-x86-bootonly.iso",
+  :iso_src => "http://mirrors.isc.org/pub/pcbsd/8.2/i386/PCBSD8.2-x86-bootonly.iso",
+  :iso_md5 => "548646b9d1042a162f769bc280149417",
+  :iso_download_timeout => "1000",
+  :boot_wait => "70",:boot_cmd_sequence => [
+        '<KillX>',
+        '<Enter>',
+        'dhclient em0<Enter>',
+        'sleep 15;echo "Lets Get the File";fetch "http://%IP%:%PORT%/pcinstall.fbg.cfg";sleep 2;',        
+        'echo \'echo sshd_enable=\"YES\" >> $FSMNT/etc/rc.conf\' > /root/activate-ssh.sh ; cat /root/activate-ssh.sh<Enter>',
+        'chmod +x /root/activate-ssh.sh<Enter>',
+        'echo "Hope i got the file";/usr/PCBSD/pc-sysinstall/pc-sysinstall -c /root/pcinstall.fbg.cfg<Enter>',
+        'reboot<Enter>'
+    ],
+  :kickstart_port => "7122", :kickstart_timeout => "10000",:kickstart_file => "pcinstall.fbg.cfg",
+  :ssh_login_timeout => "10000",:ssh_user => "vagrant", :ssh_password => "vagrant",:ssh_key => "",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
+  :sudo_cmd => "cat '%f'|su -",
+  :shutdown_cmd => "shutdown -p now",
+  :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"
+   }
+)

data/templates/freebsd-8.2-pcbsd-i386-netboot/pcinstall.fbg.cfg

@@ -0,0 +1,58 @@
+installInteractive=no
+installMode=fresh
+installType=FreeBSD
+packageType=tar
+hostname=freebsd
+#installMedium=dvd
+ftpPath=ftp://ftp.pcbsd.org/pub/mirror/8.2/i386/netinstall/
+installMedium=ftp
+netSaveDev=AUTO-DHCP
+
+# Timezone
+timeZone=America/New_York
+enableNTP=yes
+
+# Keyboard Layout Options
+localizeKeyModel=pc104
+localizeKeyLayout=us U.S.
+
+# Disk Setup for ada0
+disk0=ada0
+partition=ALL
+bootManager=none
+partscheme=MBR
+commitDiskPart
+
+# Setup the disk label
+# All sizes are expressed in MB
+disk0-part=UFS+S 1024 /
+disk0-part=SWAP 1534 none
+disk0-part=UFS+S 2048 /var
+disk0-part=UFS+S 5529 /usr
+commitDiskLabel
+
+# List our components to install
+# Src is only needed for the virtualbox extensions
+# installComponents=ports,src
+installComponents=ports
+
+# Set the root pass
+rootPass=vagrant
+
+userName=vagrant
+userComment=vagrant user
+userPass=vagrant
+userShell=/bin/csh
+userHome=/home/vagrant
+# Wheel group makes user sudo able
+userGroups=wheel,operator
+commitUser
+
+runExtCommand=/root/activate-ssh.sh
+
+# We temporary disable password checks , we promise to make up for it later
+runCommand=sed -i -e 's@auth.*include.*system@@' /etc/pam.d/su
+
+# making the clock run correctly 
+# http://forums.virtualbox.org/viewtopic.php?f=11&t=12210&start=0
+# runCommand=echo 'kern.hz=100' > /boot/loader.conf

data/templates/{freebsd-8.2-i386-pcbsdinstaller → freebsd-8.2-pcbsd-i386}/definition.rb

@@ -6,7 +6,7 @@
 
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '768',
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'FreeBSD',
   :iso_file => "PCBSD8.2-x86-DVD.iso",
   :iso_src => "ftp://mirrors.isc.org/pub/pcbsd/8.2/i386/PCBSD8.2-x86-DVD.iso",

data/templates/{freebsd-8.2-i386-pcbsdinstaller → freebsd-8.2-pcbsd-i386}/pcinstall.fbg.cfg

@@ -27,7 +27,7 @@ commitDiskPart
 disk0-part=UFS+S 1024 /
 disk0-part=SWAP 1534 none
 disk0-part=UFS+S 2048 /var
-disk0-part=UFS+S 5629 /usr
+disk0-part=UFS+S 5529 /usr
 commitDiskLabel
 
 # List our components to install
@@ -54,4 +54,4 @@ runCommand=sed -i -e 's@auth.*include.*system@@' /etc/pam.d/su
 
 # making the clock run correctly 
 # http://forums.virtualbox.org/viewtopic.php?f=11&t=12210&start=0
-runCommand=echo 'kern.hz=100' > /boot/loader.conf
+# runCommand=echo 'kern.hz=100' > /boot/loader.conf

data/templates/freebsd-8.2-pcbsd-i386/postinstall.sh

@@ -0,0 +1,91 @@
+# Get the latest portstree (needed for virtualbox to be on 4.x)
+portsnap fetch update
+
+#First install sudo
+cd /usr/ports/security/sudo
+make install -DBATCH
+
+#We prefer bash to be there
+cd /usr/ports/shells/bash
+make install -DBATCH
+
+
+#Off to rubygems to get first ruby running
+cd /usr/ports/devel/ruby-gems
+make install -DBATCH
+
+#Gem chef - does install chef 9.12 (latest in ports?)
+cd /usr/ports/sysutils/rubygem-chef
+make install -DBATCH
+
+#Installing chef & Puppet
+/usr/local/bin/gem update chef --no-ri --no-rdoc
+/usr/local/bin/gem install puppet --no-ri --no-rdoc
+
+#Get wget
+cd /usr/ports/ftp/wget
+make install -DBATCH
+
+#Installing vagrant keys
+mkdir /home/vagrant/.ssh
+chmod 700 /home/vagrant/.ssh
+cd /home/vagrant/.ssh
+/usr/local/bin/wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+
+# Cleaning portstree to save space
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html
+cd /usr/ports/ports-mgmt/portupgrade
+make install -DBATCH clean
+
+/usr/local/sbin/portsclean -C
+
+# As sharedfolders are not in defaults ports tree
+# We will use vagrant via NFS
+# Enable NFS
+echo 'rpcbind_enable="YES"' >> /etc/rc.conf
+echo 'nfs_server_enable="YES"' >> /etc/rc.conf
+echo 'mountd_flags="-r"' >> /etc/rc.conf
+
+# Enable passwordless sudo 
+echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /usr/local/etc/sudoers
+# Restore correct su permissions
+# I'll leave that up to the reader :)
+
+echo "=============================================================================="
+echo "NOTE: FreeBSD - Vagrant"
+echo "When using this basebox you need to do some special stuff in your Vagrantfile"
+echo "1) Include the correct system"
+echo "		require 'vagrant/systems/freebsd' "
+echo "2) Add after your config.vm.box = ..."
+echo "		  config.vm.system = :freebsd"
+echo "3) Enable HostOnly network"
+echo "	 config.vm.network ...."
+echo "4) Use nfs instead of shared folders"
+echo "		:nfs => true"
+echo "============================================================================="
+
+
+
+exit
+
+# The iso from virtualbox will only install windows/solaris or linux, no BSD
+# Research is on it's way to have 4.x in the main portstree
+# http://www.listware.net/201102/freebsd-ports/65201-call-for-testers-virtualbox-404.html
+# Virtualbox additions - http://wiki.freebsd.org/VirtualBox
+# Currently this will only work for 4.0.4 
+cd /tmp
+wget http://home.bluelife.at/ports/virtualbox-cft-20110218.tar.gz
+cd /usr/ports
+tar -xzvf /tmp/virtualbox-cft-20110218.tar.gz
+
+# This requires libtool >= 2.4
+cd /usr/ports/devel/libtool
+make clean
+make install -DBATCH
+
+cd /usr/ports/emulators/virtualbox-ose-additions
+make install -DBATCH
+
+echo 'vboxguest_enable="YES"' >> /etc/rc.conf
+echo 'vboxservice_enable="YES"' >> /etc/rc.conf

data/templates/ubuntu-10.04.1-server-amd64/definition.rb

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '384', 
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'Ubuntu_64',
   :iso_file => "ubuntu-10.04.1-server-amd64.iso",
   :iso_src => "http://releases.ubuntu.com/10.04.1/ubuntu-10.04.1-server-amd64.iso",

data/templates/ubuntu-10.04.1-server-i386/definition.rb

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '384', 
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'Ubuntu',
   :iso_file => "ubuntu-10.04.1-server-i386.iso",
   :iso_src => "http://releases.ubuntu.com/10.04.1/ubuntu-10.04.1-server-i386.iso",

data/templates/ubuntu-10.10-server-amd64-netboot/definition.rb

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '256', 
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'Ubuntu_64',
   :iso_file => "ubuntu-10.10-server-amd64-netboot.iso", 
   :iso_src => "http://archive.ubuntu.com/ubuntu/dists/maverick/main/installer-amd64/current/images/netboot/mini.iso",

data/templates/ubuntu-10.10-server-amd64/definition.rb

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '384', 
-  :disk_size => '10140', :disk_format => 'VDI',
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'Ubuntu_64',
   :iso_file => "ubuntu-10.10-server-amd64.iso", 
   :iso_src => "http://releases.ubuntu.com/maverick/ubuntu-10.10-server-amd64.iso",

data/templates/ubuntu-10.10-server-i386-netboot/definition.rb

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '384', 
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'Ubuntu',
   :iso_file => "ubuntu-10.10-server-i386-netboot.iso", 
   :iso_src => "http://archive.ubuntu.com/ubuntu/dists/maverick/main/installer-i386/current/images/netboot/mini.iso",

data/templates/ubuntu-10.10-server-i386/definition.rb

@@ -1,6 +1,6 @@
 Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '384', 
-  :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
+  :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',
   :os_type_id => 'Ubuntu',
   :iso_file => "ubuntu-10.10-server-i386.iso", 
   :iso_src => "http://releases.ubuntu.com/maverick/ubuntu-10.10-server-i386.iso",

data/veewee.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "highline", "~> 1.6.1"
   s.add_dependency "progressbar"
   s.add_dependency "cucumber", "0.8.5"
-  #s.add_dependency "rspec"
+  s.add_dependency "rspec", "~> 2.5.0"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: veewee
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 1
-  - 16
-  version: 0.1.16
+  - 17
+  version: 0.1.17
 platform: ruby
 authors: 
 - Patrick Debois
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +01:00
+date: 2011-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,22 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  type: :runtime
+  requirement: *id008
+  name: rspec
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,7 +158,7 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  requirement: *id008
+  requirement: *id009
   name: bundler
   prerelease: false
 description: Expand the 'vagrant box' command to support the creation of base boxes from scratch
@@ -191,13 +207,19 @@ files:
 - templates/Debian-6.0-amd64-netboot/definition.rb
 - templates/Debian-6.0-amd64-netboot/postinstall.sh
 - templates/Debian-6.0-amd64-netboot/preseed.cfg
+- templates/Debian-6.0-i386-netboot/definition.rb
+- templates/Debian-6.0-i386-netboot/postinstall.sh
+- templates/Debian-6.0-i386-netboot/preseed.cfg
 - templates/Sysrescuecd-2.0.0-experimental/autorun0
 - templates/Sysrescuecd-2.0.0-experimental/definition.rb
 - templates/freebsd-8.2-experimental/definition.rb
 - templates/freebsd-8.2-experimental/postinstall.sh
-- templates/freebsd-8.2-i386-pcbsdinstaller/definition.rb
-- templates/freebsd-8.2-i386-pcbsdinstaller/pcinstall.fbg.cfg
-- templates/freebsd-8.2-i386-pcbsdinstaller/postinstall.sh
+- templates/freebsd-8.2-pcbsd-i386-netboot/definition.rb
+- templates/freebsd-8.2-pcbsd-i386-netboot/pcinstall.fbg.cfg
+- templates/freebsd-8.2-pcbsd-i386-netboot/postinstall.sh
+- templates/freebsd-8.2-pcbsd-i386/definition.rb
+- templates/freebsd-8.2-pcbsd-i386/pcinstall.fbg.cfg
+- templates/freebsd-8.2-pcbsd-i386/postinstall.sh
 - templates/ubuntu-10.04.1-server-amd64/definition.rb
 - templates/ubuntu-10.04.1-server-amd64/postinstall.sh
 - templates/ubuntu-10.04.1-server-amd64/preseed.cfg