veewee 0.1.26 → 0.1.27

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    veewee (0.1.26)
+    veewee (0.1.27)
       cucumber (= 0.8.5)
       highline (~> 1.6.1)
       net-ssh (~> 2.1.0)

data/README.md

@@ -5,114 +5,126 @@ The first step is to download an existing 'base box'. I believe this scares a lo
 Veewee tries to automate this and to share the knowledge and sources you need to create a basebox. Instead of creating custom ISO's from your favorite distribution, it leverages the 'keyboardputscancode' command of Virtualbox so send the actual 'boot prompt' keysequence to boot an existing iso.
 
 Before we can actually build the boxes, we need to take care of the minimal things to install:
+
 - Have Virtualbox 4.x installed -> download it from http://download.virtualbox.org/virtualbox/
 
 
 People have reported good experiences, why don't you give it a try?
 
-## Installation: 
+## Installation:
 __as a gem__
-<pre>
-$ gem install veewee 
-</pre>
+
+    $ gem install veewee
 
 __from source__
-<pre>
-$ git clone https://github.com/jedi4ever/veewee.git
-$ cd veewee
-$ gem install bundler
-$ bundle install
+
+    $ git clone https://github.com/jedi4ever/veewee.git
+    $ cd veewee
+    $ gem install bundler
+    $ bundle install
 
 If you don't use rvm, be sure to execute vagrant through bundle exec
-$ alias vagrant="bundle exec vagrant"
-</pre>
+
+    $ alias vagrant="bundle exec vagrant"
 
 
 ## List all templates
-<pre>
-$ vagrant basebox templates
-The following templates are available:
-The following templates are available:
-vagrant basebox define '<boxname>' 'Archlinux-latest'
-vagrant basebox define '<boxname>' 'CentOS-4.8-i386'
-vagrant basebox define '<boxname>' 'CentOS-5.5-i386'
-vagrant basebox define '<boxname>' 'CentOS-5.5-i386-netboot'
-vagrant basebox define '<boxname>' 'Debian-6.0-amd64-netboot'
-vagrant basebox define '<boxname>' 'Debian-6.0-i386-netboot'
-vagrant basebox define '<boxname>' 'Fedora-14-amd64'
-vagrant basebox define '<boxname>' 'Fedora-14-amd64-netboot'
-vagrant basebox define '<boxname>' 'Fedora-14-i386'
-vagrant basebox define '<boxname>' 'Fedora-14-i386-netboot'
-vagrant basebox define '<boxname>' 'freebsd-8.2-experimental'
-vagrant basebox define '<boxname>' 'freebsd-8.2-pcbsd-i386'
-vagrant basebox define '<boxname>' 'freebsd-8.2-pcbsd-i386-netboot'
-vagrant basebox define '<boxname>' 'solaris-11-express-i386'
-vagrant basebox define '<boxname>' 'Sysrescuecd-2.0.0-experimental'
-vagrant basebox define '<boxname>' 'ubuntu-10.04.2-server-amd64'
-vagrant basebox define '<boxname>' 'ubuntu-10.04.2-server-i386'
-vagrant basebox define '<boxname>' 'ubuntu-10.10-server-amd64'
-vagrant basebox define '<boxname>' 'ubuntu-10.10-server-amd64-netboot'
-vagrant basebox define '<boxname>' 'ubuntu-10.10-server-i386'
-vagrant basebox define '<boxname>' 'ubuntu-10.10-server-i386-netboot'
-
-
-</pre>
-## Define a new box 
+
+    $ vagrant basebox templates
+    The following templates are available:
+    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-i386-netboot'
+    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-amd64-netboot'
+    vagrant basebox define '<boxname>' 'solaris-11-express-i386'
+    vagrant basebox define '<boxname>' 'freebsd-8.2-pcbsd-i386-netboot'
+    vagrant basebox define '<boxname>' 'Fedora-14-amd64-netboot'
+    vagrant basebox define '<boxname>' 'ubuntu-11.04-server-amd64'
+    vagrant basebox define '<boxname>' 'freebsd-8.2-experimental'
+    vagrant basebox define '<boxname>' 'archlinux-i686'
+    vagrant basebox define '<boxname>' 'CentOS-5.6-i386-netboot'
+    vagrant basebox define '<boxname>' 'openindiana-148-ai-x86'
+    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-i386'
+    vagrant basebox define '<boxname>' 'ubuntu-10.04.2-server-i386'
+    vagrant basebox define '<boxname>' 'ubuntu-10.04.2-amd64-netboot'
+    vagrant basebox define '<boxname>' 'Sysrescuecd-2.0.0-experimental'
+    vagrant basebox define '<boxname>' 'Debian-6.0.1a-amd64-netboot'
+    vagrant basebox define '<boxname>' 'freebsd-8.2-pcbsd-i386'
+    vagrant basebox define '<boxname>' 'Fedora-14-i386'
+    vagrant basebox define '<boxname>' 'Fedora-14-amd64'
+    vagrant basebox define '<boxname>' 'ubuntu-10.04.2-server-i386-netboot'
+    vagrant basebox define '<boxname>' 'opensuse-11.4-i386-experimental'
+    vagrant basebox define '<boxname>' 'CentOS-4.8-i386'
+    vagrant basebox define '<boxname>' 'ubuntu-10.04.2-server-amd64'
+    vagrant basebox define '<boxname>' 'ubuntu-8.04.4-server-amd64'
+    vagrant basebox define '<boxname>' 'gentoo-latest-i386-experimental'
+    vagrant basebox define '<boxname>' 'ubuntu-8.04.4-server-i386'
+    vagrant basebox define '<boxname>' 'windows-2008R2-amd64'
+    vagrant basebox define '<boxname>' 'Fedora-14-i386-netboot'
+    vagrant basebox define '<boxname>' 'archlinux-64-experimental'
+    vagrant basebox define '<boxname>' 'Debian-6.0.1a-i386-netboot'
+    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-amd64'
+    vagrant basebox define '<boxname>' 'archlinux-64-aif-experimental'
+    vagrant basebox define '<boxname>' 'ubuntu-11.04-server-i386'
+    vagrant basebox define '<boxname>' 'CentOS-5.6-i386'
+
+
+## Define a new box
 Let's define a  Ubuntu 10.10 server i386 basebox called myunbuntubox
 this is essentially making a copy based on the  templates provided above.
-<pre>$ vagrant basebox define 'myubuntubox' 'ubuntu-10.10-server-i386'</pre>
-template successfully copied
+
+    $ vagrant basebox define 'myubuntubox' 'ubuntu-10.10-server-i386'
+    The basebox 'myubuntubox' has been succesfully created from the template ''ubuntu-10.10-server-i386'
+    You can now edit the definition files stored in definitions/myubuntubox
+    or build the box with:
+    vagrant basebox build 'myubuntubox'
 
 -> This copies over the templates/ubuntu-10.10-server-i386 to definition/myubuntubox
 
-<pre>$ ls definitions/myubuntubox
-definition.rb	postinstall.sh	postinstall2.sh	preseed.cfg
-</pre>
+    $ ls definitions/myubuntubox
+    definition.rb	postinstall.sh	postinstall2.sh	preseed.cfg
 
 ## Optionally modify the definition.rb , postinstall.sh or preseed.cfg
 
-<pre>
-Veewee::Session.declare( {
-  :cpu_count => '1', :memory_size=> '256', 
-  :disk_size => '10140', :disk_format => 'VDI',
-  :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",
-  :iso_md5 => "ce1cee108de737d7492e37069eed538e",
-  :iso_download_timeout => "1000",
-  :boot_wait => "10",
-  :boot_cmd_sequence => [ 
-      '<Esc><Esc><Enter>',
-      '/install/vmlinuz noapic preseed/url=http://%IP%:%PORT%/preseed.cfg ',
-      'debian-installer=en_US auto locale=en_US kbd-chooser/method=us ',
-      'hostname=%NAME% ',
-      'fb=false debconf/frontend=noninteractive ',
-      'console-setup/ask_detect=false console-setup/modelcode=pc105 console-setup/layoutcode=us ',
-      'initrd=/install/initrd.gz -- <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 => "2222", :ssh_guest_port => "22",
-  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
-  :shutdown_cmd => "shutdown -H",
-  :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"
-   }
-)
-</pre>
+    Veewee::Session.declare( {
+    :cpu_count => '1', :memory_size=> '256', 
+    :disk_size => '10140', :disk_format => 'VDI',
+    :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",
+    :iso_md5 => "ce1cee108de737d7492e37069eed538e",
+    :iso_download_timeout => "1000",
+    :boot_wait => "10",
+    :boot_cmd_sequence => [ 
+        '<Esc><Esc><Enter>',
+        '/install/vmlinuz noapic preseed/url=http://%IP%:%PORT%/preseed.cfg ',
+        'debian-installer=en_US auto locale=en_US kbd-chooser/method=us ',
+        'hostname=%NAME% ',
+        'fb=false debconf/frontend=noninteractive ',
+        'console-setup/ask_detect=false console-setup/modelcode=pc105 console-setup/layoutcode=us ',
+        'initrd=/install/initrd.gz -- <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 => "2222", :ssh_guest_port => "22",
+    :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
+    :shutdown_cmd => "shutdown -H",
+    :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"
+     }
+    )
 
 If you need to change values in the templates, be sure to run the rake undefine, the rake define again to copy the changes across.
 
 ## Getting the cdrom file in place
 Put your isofile inside the 'currentdir'/iso directory or if you don't run
-<pre>$ vagrant basebox build 'myubuntubox'</pre>
+
+    $ vagrant basebox build 'myubuntubox'
 
 - the build assumes your iso files are in 'currentdir'/iso
 - if it can not find it will suggest to download the iso for you
 - use '--force' to overwrite an existing install
 
 ## Build the new box:
-<pre>
-$ vagrant basebox build 'myubuntubox'</pre>
+
+    $ vagrant basebox build 'myubuntubox'
 
 - This will create a machine + disk according to the definition.rb
 - Note: :os_type_id = The internal Name Virtualbox uses for that Distribution
@@ -124,12 +136,14 @@ $ vagrant basebox build 'myubuntubox'</pre>
 - Sudo execute the :postinstall_files
 
 ## Validate the vm 
-<pre>$ vagrant basebox validate 'myubuntubox' </pre>
+
+    $ vagrant basebox validate 'myubuntubox'
 
 this will run some cucumber test against the box to see if it has the necessary bits and pieces for vagrant to work
 
 ## Export the vm to a .box file
-<pre>$ vagrant basebox export 'myubuntubox' </pre>
+
+    $ vagrant basebox export 'myubuntubox'
 
 this is actually calling - vagrant package --base 'myubuntubox' --output 'boxes/myubuntubox.box'
 
@@ -138,38 +152,32 @@ this will result in a myubuntubox.box
 ## Add the box as one of your boxes
 To import it into vagrant type:
 
-<pre>$ vagrant box add 'myubuntubox' 'myubuntubox.box'
-</pre>
+    $ vagrant box add 'myubuntubox' 'myubuntubox.box'
+
 ## Use it in vagrant
 
 To use it:
-<pre>
-$ vagrant init 'myubuntubox'
-$ vagrant up
-$ vagrant ssh
-</pre>
+
+    $ vagrant init 'myubuntubox'
+    $ vagrant up
+    $ vagrant ssh
 
 ## How to add a new OS/installation (needs some love)
 
-- I suggest the easiest way is to get an account on github
-- fork of the veewee repository
+I suggest the easiest way is to get an account on github and fork of the veewee repository
 
-<pre>
-$ git clone https://github.com/*your account*/veewee.git
-$ cd veewee
-$ gem install bundler
-$ bundle install
-</pre>
+    $ git clone https://github.com/*your account*/veewee.git
+    $ cd veewee
+    $ gem install bundler
+    $ bundle install
 
 If you don't use rvm, be sure to execute vagrant through bundle exec
-<pre>
-$ alias vagrant="bundle exec vagrant"
-</pre>
+
+    $ alias vagrant="bundle exec vagrant"
 
 Start of an existing one
-<pre>
-$ vagrant basebox define 'mynewos' 'ubuntu...'
-</pre>
+
+    $ vagrant basebox define 'mynewos' 'ubuntu...'
 
 - Do changes in the currentdir/definitions/mynewos
 - When it builds ok, move the definition/mynewos to a sensible directory under templates

data/lib/veewee/command.rb

@@ -70,9 +70,10 @@ class Command < Vagrant::Command::GroupBase
   end
   
   desc "validate [NAME]", "Validates a box against vagrant compliancy rules"
+  method_option :user,:default => "vagrant", :aliases => "-u", :desc => "user to login with"
   def validate(boxname)
       if (!boxname.nil?)
-        Veewee::Session.validate_box(boxname)
+        Veewee::Session.validate_box(boxname,options)
       end
   end
   

data/lib/veewee/scancode.rb

@@ -93,10 +93,27 @@ module Veewee
           special['<KillX>'] = '1d 38 0e';
           special['<Wait>'] = 'wait';
 
-          #special['<Up>'] = '01';
-          #special['<Down>'] = '01';
-          #special['<PageUp>'] = '01';
-          #special['<PageDown>'] = '01';
+          special['<Up>'] = '48 c8';
+          special['<Down>'] = '50 d0';
+          special['<PageUp>'] = '49 c9';
+          special['<PageDown>'] = '51 d1';
+          special['<End>'] = '4f cf';
+          special['<Insert>'] = '52 d2';
+          special['<Delete>'] = '53 d3';
+          special['<Left>'] = '4b cb';
+          special['<Right>'] = '4d cd';
+          special['<Home>'] = '47 c7';
+
+	  special['<F1>'] = '3b';
+	  special['<F2>'] = '3c';
+	  special['<F3>'] = '3d';
+	  special['<F4>'] = '3e';
+	  special['<F5>'] = '3f';
+	  special['<F6>'] = '40';
+	  special['<F7>'] = '41';
+	  special['<F8>'] = '42';
+	  special['<F9>'] = '43';
+	  special['<F10>'] = '44';
 
           keycodes=''
           thestring.gsub!(/ /,"<Spacebar>")

data/lib/veewee/session.rb

@@ -696,13 +696,13 @@ module Veewee
       Socket.do_not_reverse_lookup = orig
     end
     
-    def self.validate_box(boxname)
+    def self.validate_box(boxname,options)
       require 'cucumber'
 
       require 'cucumber/rspec/disable_option_parser'
       require 'cucumber/cli/main'
 
-
+      ENV['veewee_user']=options[:user]
       feature_path=File.join(File.dirname(__FILE__),"..","..","validation","vagrant.feature")
 
       features=Array.new

data/lib/veewee/version.rb

@@ -1,3 +1,3 @@
 module Veewee
-  VERSION = "0.1.26"
+  VERSION = "0.1.27"
 end

data/templates/CentOS-5.6-x86_64-netboot/definition.rb

@@ -0,0 +1,16 @@
+Veewee::Session.declare({
+  :cpu_count => '1', :memory_size=> '384',
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
+  :os_type_id => 'RedHat_64',
+  :iso_file => "CentOS-5.6-x86_64-netinstall.iso",
+  :iso_src => "http://mirror.ukhost4u.com/centos/5.6/isos/x86_64/CentOS-5.6-x86_64-netinstall.iso",
+  :iso_md5 => "02cf3a5e32aaa5eed27af775ad292beb",
+  :iso_download_timeout => 1000,
+  :boot_wait => "10", :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
+  :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
+  :ssh_login_timeout => "100", :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 => [ "postinstall.sh"], :postinstall_timeout => 10000
+})

data/templates/CentOS-5.6-x86_64-netboot/ks.cfg

@@ -0,0 +1,45 @@
+# Kickstart file automatically generated by anaconda.
+
+install
+url --url=http://mirror.bytemark.co.uk/centos/5.6/os/x86_64
+lang en_US.UTF-8
+langsupport --default=en_US.UTF-8 en_US.UTF-8
+keyboard us
+xconfig --card "VMWare" --videoram 16384 --hsync 31.5-37.9 --vsync 50-70 --resolution 800x600 --depth 16
+network --device eth0 --bootproto dhcp
+rootpw --iscrypted $1$vSG8FjAu$ekQ0grf16hS4G93HTPcco/
+firewall --enabled --trust eth0 --ssh
+selinux --enforcing
+authconfig --enableshadow --enablemd5
+timezone Europe/London
+bootloader --location=mbr
+# The following is the partition information you requested
+# Note that any partitions you deleted are not expressed
+# here so unless you clear all partitions first, this is
+# not guaranteed to work
+clearpart --all --drives=sda --initlabel
+part /boot --fstype ext3 --size=100 --ondisk=sda
+part pv.2 --size=0 --grow --ondisk=sda
+volgroup VolGroup00 --pesize=32768 pv.2
+logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=528 --grow --maxsize=1056
+logvol / --fstype ext3 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+reboot
+
+%packages
+#@ admin-tools
+#@ text-internet
+#@ dialup
+#@ smb-server
+#@ web-server
+#@ printing
+#@ server-cfg
+@ core
+grub
+e2fsprogs
+lvm2
+
+%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

data/templates/CentOS-5.6-x86_64-netboot/postinstall.sh

@@ -0,0 +1,58 @@
+#http://chrisadams.me.uk/2010/05/10/setting-up-a-centos-base-box-for-development-and-testing-with-vagrant/
+
+fail()
+{
+  echo "FATAL: $*"
+  exit 1
+}
+
+#kernel source is needed for vbox additions
+yum -y install gcc bzip2 make kernel-devel-`uname -r`
+#yum -y update
+#yum -y upgrade
+
+yum -y install gcc-c++ zlib-devel openssl-devel readline-devel sqlite3-devel
+yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y clean all
+
+#Installing ruby
+cd /tmp
+wget http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.2-p180.tar.gz || fail "Could not download Ruby source"
+tar xzvf ruby-1.9.2-p180.tar.gz 
+cd ruby-1.9.2-p180
+./configure
+make && make install
+cd /tmp
+rm -rf /tmp/ruby-1.9.2-p180
+rm /tmp/ruby-1.9.2-p180.tar.gz
+ln -s /usr/local/bin/ruby /usr/bin/ruby # Create a sym link for the same path
+ln -s /usr/local/bin/gem /usr/bin/gem # Create a sym link for the same path
+
+#Installing chef & Puppet
+echo "Installing chef and puppet"
+/usr/local/bin/gem install chef --no-ri --no-rdoc || fail "Could not install chef"
+/usr/local/bin/gem install puppet --no-ri --no-rdoc || fail "Could not install puppet"
+
+#Installing vagrant keys
+mkdir /home/vagrant/.ssh
+chmod 700 /home/vagrant/.ssh
+cd /home/vagrant/.ssh
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+
+#Installing the virtualbox guest additions
+VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
+cd /tmp
+wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
+mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+sh /mnt/VBoxLinuxAdditions.run
+umount /mnt
+
+rm VBoxGuestAdditions_$VBOX_VERSION.iso
+
+
+sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
+
+#poweroff -h
+
+exit