veewee 0.3.0.alpha8 → 0.3.0.alpha9

data/lib/veewee/provider/core/helper/tcp.rb

@@ -39,7 +39,7 @@ module Veewee
 
             if guessed_port.nil?
               ui.error "No free port available: tried #{min_port}..#{max_port}"
-              exit -1
+              raise Veewee::Error, "No free port available: tried #{min_port}..#{max_port}"
             else
               ui.info "Found port #{guessed_port} available"
             end
@@ -52,9 +52,11 @@ module Veewee
             defaults={ :port => 22, :timeout => 2 , :pollrate => 5}
 
             options=defaults.merge(options)
+            timeout=options[:timeout]
+            timeout=ENV['VEEWEE_TIMEOUT'].to_i unless ENV['VEEWEE_TIMEOUT'].nil?
 
             begin
-              Timeout::timeout(options[:timeout]) do
+              Timeout::timeout(timeout) do
                 connected=false
                 while !connected do
                   begin
@@ -69,7 +71,7 @@ module Veewee
                 end
               end
             rescue Timeout::Error
-              raise 'timeout connecting to port'
+              raise "Timeout connecting to TCP port {options[:port]} exceeded #{timeout} secs."
             end
 
             return false

data/lib/veewee/provider/kvm/box/destroy.rb

@@ -6,7 +6,7 @@ module Veewee
         def destroy(options={})
           if @connection.servers.all(:name => name).nil?
             env.ui.error "Error:: You tried to destroy a non-existing box '#{name}'"
-            exit -1
+            raise Veewee::Error,"Error:: You tried to destroy a non-existing box '#{name}'"
           end
 
           self.poweroff if running?

data/lib/veewee/provider/parallels/box/destroy.rb

@@ -5,8 +5,7 @@ module Veewee
 
         def destroy(options={})
           unless self.exists?
-            ui.error "Error:: You tried to destroy a non-existing box '#{name}'"
-            exit -1
+            raise Veewee::Error, "Error:: You tried to destroy a non-existing box '#{name}'"
           end
 
           if self.running?

data/lib/veewee/provider/virtualbox/box.rb

@@ -5,6 +5,7 @@ require 'veewee/provider/virtualbox/box/create'
 require 'veewee/provider/virtualbox/box/halt'
 require 'veewee/provider/virtualbox/box/poweroff'
 require 'veewee/provider/virtualbox/box/destroy'
+require 'veewee/provider/virtualbox/box/screenshot'
 require 'veewee/provider/virtualbox/box/ssh'
 require 'veewee/provider/virtualbox/box/validate_vagrant'
 require 'veewee/provider/virtualbox/box/export_vagrant'

data/lib/veewee/provider/virtualbox/box/build.rb

@@ -7,7 +7,7 @@ module Veewee
           download_vbox_guest_additions_iso(options)
 
           unless definition.floppy_files.nil?
-            unless self.shell_exec("java").status == 0
+            unless self.shell_exec("java -version").status == 0
               raise Veewee::Error,"This box contains floppyfiles, to create it you require to have java installed or have it in your path"
             end
           end

data/lib/veewee/provider/virtualbox/box/destroy.rb

@@ -6,8 +6,7 @@ module Veewee
         def destroy(option={})
 
           unless self.exists?
-            ui.error "Error:: You tried to destroy a non-existing box '#{name}'"
-            exit -1
+            raise Veewee::Error, "Error:: You tried to destroy a non-existing box '#{name}'"
           end
 
           # If it has a save state,remove that first
@@ -53,7 +52,6 @@ module Veewee
                 ui.info "We tried to delete the disk file via virtualbox '#{location} but failed"
                 ui.info "Removing it manually"
                 FileUtils.rm(location)
-                exit -1
               end
               break
             end

data/lib/veewee/provider/virtualbox/box/export_vagrant.rb

@@ -54,12 +54,13 @@ module Veewee
           box_path=path1.relative_path_from(path2).to_s
 
           if File.exists?("#{box_path}")
-            ui.info "box #{name}.box already exists"
-            exit
+            raise Veewee::Error, "box #{name}.box already exists"
           end
 
           ui.info "Executing vagrant voodoo:"
           export_command="vagrant package --base '#{name}' --output '#{box_path}'"
+          export_command += " --include #{options["include"].join(',')}" unless options["include"].empty?
+          export_command += " --vagrantfile #{options["vagrantfile"].join(' ')}" unless options["vagrantfile"].empty?
           ui.info "#{export_command}"
           shell_exec("#{export_command}") #hmm, needs to get the gem_home set?
           ui.info ""

data/lib/veewee/provider/virtualbox/box/helper/console_type.rb

@@ -48,11 +48,11 @@ module Veewee
           env.logger.info "#{command}"
           sshresult=shell_exec("#{command}",{:mute => true})
           unless sshresult.stdout.index("E_ACCESSDENIED").nil?
-            ui.error "There was an error typing the commands on the console"
-            ui.error "Probably the VM did not get started."
-            ui.error ""
-            ui.error "#{sshresult.stdout}"
-            exit -1
+            error= "There was an error typing the commands on the console"
+            error+="Probably the VM did not get started."
+            error+= ""
+            error+= "#{sshresult.stdout}"
+            raise Veewee::Error, error
           end
         end
 

data/lib/veewee/provider/virtualbox/box/helper/natinterface.rb

@@ -4,7 +4,7 @@ module Veewee
       module BoxCommand
 
         def natinterface
-          command="#{@vboxcmd} showvminfo --details --machinereadable '#{self.name}'"
+          command="#{@vboxcmd} showvminfo --details --machinereadable \"#{self.name}\""
           shell_results=shell_exec("#{command}")
 
           nic_id=shell_results.stdout.split(/\n/).grep(/^nic/).grep(/nat/)[0].split('=')[0][-1,1]

data/lib/veewee/provider/virtualbox/box/screenshot.rb

@@ -0,0 +1,24 @@
+module Veewee
+  module Provider
+    module Virtualbox
+      module BoxCommand
+
+        def screenshot(filename,options={})
+          raise Veewee::Error, "The VM needs to exist before we can take a screenshot" unless self.exists?
+          raise Veewee::Error, "The VM needs to be running before we can test a screenshot" unless self.running?
+          # If the vm is not powered off, take a screenshot
+          if (self.exists? && self.running?)
+            ui.info "Saving screenshot of vm #{name} in #{filename}"
+
+            command="#{@vboxcmd} controlvm \"#{name}\" screenshotpng \"#{filename}\""
+            shell_exec("#{command}")
+            unless File.exists?(filename)
+              raise Veewee::Error,"Saving Screenshot #{filename} failed"
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/veewee/provider/virtualbox/box/up.rb

@@ -6,8 +6,7 @@ module Veewee
         def up(options={})
 
           unless self.exists?
-            ui.error "Error:: You tried to up a non-existing box '#{name}'"
-            exit -1
+            raise Veewee::Error, "Error:: You tried to up a non-existing box '#{name}'"
           end
 
           gui_enabled=options['nogui']==true ? false : true
@@ -30,7 +29,7 @@ module Veewee
             self.add_ssh_nat_mapping
           end
 
-          self.suppress_messages    
+          self.suppress_messages
 
           # Once assembled we start the machine
           env.logger.info "Started the VM with GUI Enabled? #{gui_enabled}"

data/lib/veewee/provider/vmfusion/box/destroy.rb

@@ -5,8 +5,7 @@ module Veewee
 
         def destroy(options={})
           unless raw.exists?
-            env.ui.error "Error:: You tried to destroy a non-existing box '#{name}'"
-            exit -1
+            raise Veewee::Error, "Error:: You tried to destroy a non-existing box '#{name}'"
           end
 
           raw.halt if raw.state=="running"

data/lib/veewee/provider/vmfusion/box/helper/vnc.rb

@@ -29,7 +29,7 @@ module Veewee
 
           if guessed_port.nil?
             env.ui.info "No free VNC port available: tried #{min_port}..#{max_port}"
-            exit -1
+            raise Veewee::Error, "No free VNC port available: tried #{min_port}..#{max_port}"
           else
             env.ui.info "Found VNC port #{guessed_port} available"
           end

data/lib/veewee/templates.rb

@@ -46,7 +46,7 @@ module Veewee
         env.logger.debug("[Template] no templates found") 
       end
 
-      templates.each(&block)
+      Hash[templates.sort].each(&block)
     end
 
     private

data/lib/veewee/version.rb

@@ -4,5 +4,5 @@ end
 
 # Only set the version constant if it wasn't set before
 unless defined?(Veewee::VERSION)
-  ::Veewee::VERSION="0.3.0.alpha8"
+  ::Veewee::VERSION="0.3.0.alpha9"
 end

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

@@ -3,7 +3,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI',:hostiocache => 'off',:ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat',
   :iso_file => "CentOS-4.8-i386-bin-DVD.iso", :iso_src => "", :iso_md5 => "", :iso_download_timeout => 1000,
-  :iso_download_instructions => "This iso is no more available, for instructions see http://isoredirect.centos.org/centos/4/isos/i386/",
+  :iso_download_instructions => "This iso is no more available, for instructions see http://vault.centos.org/4.8/isos/i386/",
   :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 => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",

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

@@ -8,7 +8,7 @@ Veewee::Session.declare({
   :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_login_timeout => "600", :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",

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

@@ -8,7 +8,7 @@ Veewee::Session.declare({
   :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_login_timeout => "600", :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",

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

@@ -8,7 +8,7 @@ Veewee::Session.declare({
   :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_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",

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

@@ -37,6 +37,8 @@ reboot
 grub
 e2fsprogs
 lvm2
+kernel-devel
+kernel-headers
 
 %post
 /usr/sbin/groupadd vagrant

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

@@ -8,7 +8,7 @@ Veewee::Session.declare({
   :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_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",

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

@@ -1,7 +1,7 @@
 # Kickstart file automatically generated by anaconda.
 
 install
-url --url=http://mirror.atlanticmetro.net/centos/5.7/os/x86_64
+url --url=http://vault.centos.org/5.7/os/x86_64
 lang en_US.UTF-8
 langsupport --default=en_US.UTF-8 en_US.UTF-8
 keyboard us
@@ -37,6 +37,8 @@ reboot
 grub
 e2fsprogs
 lvm2
+kernel-devel
+kernel-headers
 
 %post
 /usr/sbin/groupadd vagrant

data/templates/CentOS-5.8-i386-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',
+  :iso_file => "CentOS-5.8-i386-netinstall.iso",
+  :iso_src => "http://mirrors.arsc.edu/centos/5.8/isos/i386/CentOS-5.8-i386-netinstall.iso",
+  :iso_md5 => "3812865e426b55fde9a9931990e4a16c",
+  :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 => "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 => [ "postinstall.sh"], :postinstall_timeout => 10000
+})

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

@@ -0,0 +1,47 @@
+# Kickstart file automatically generated by anaconda.
+
+install
+url --url=http://mirrors.arsc.edu/centos/5.8/os/i386/
+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 America/New_York
+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
+kernel-devel
+kernel-headers
+
+%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.8-i386-netboot/postinstall.sh

@@ -0,0 +1,53 @@
+#http://chrisadams.me.uk/2010/05/10/setting-up-a-centos-base-box-for-development-and-testing-with-vagrant/
+#kernel source is needed for vbox additions
+
+date > /etc/vagrant_box_build_time
+
+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
+/usr/bin/gem install chef --no-ri --no-rdoc
+/usr/bin/gem install puppet --no-ri --no-rdoc
+
+#Installing vagrant keys
+mkdir /home/vagrant/.ssh
+chmod 700 /home/vagrant/.ssh
+cd /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/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
+sed -i "s/^\(.*env_keep = \"\)/\1PATH /" /etc/sudoers
+
+#poweroff -h
+
+exit

data/templates/CentOS-5.8-i386/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',
+  :iso_file => "CentOS-5.8-i386-bin-DVD-1of2.iso",
+  :iso_src => "http://mirrors.arsc.edu/centos/5.8/isos/i386/CentOS-5.8-i386-bin-DVD-1of2.iso",
+  :iso_md5 => "0fdd45c43b5d8fb9e05f4255c5855f9c",
+  :iso_download_timeout => 10000,
+  :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 => "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 => [ "postinstall.sh"], :postinstall_timeout => 10000
+})

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

@@ -0,0 +1,47 @@
+# Kickstart file automatically generated by anaconda.
+
+install
+cdrom
+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 America/New_York
+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
+kernel-devel
+kernel-headers
+
+%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