veewee 0.1.29 → 0.2.0

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

@@ -1,24 +1,57 @@
-Veewee::Session.declare({
-  :cpu_count => '1', :memory_size=> '384', 
-  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
-  :os_type_id => 'Ubuntu_64',
-  :iso_file => "ubuntu-10.04.2-server-amd64.iso",
-  :iso_src => "http://releases.ubuntu.com/10.04.2/ubuntu-10.04.2-server-amd64.iso",
-  :iso_md5 => "b446b36430a29f3dcf0c5eb797197cac",
-  :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 => "7222", :ssh_guest_port => "22",
-  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
-  :shutdown_cmd => "shutdown -P now",
-  :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => "10000"
+require 'digest/md5'
+CURRENT_DIR       = File.dirname(__FILE__)
+PRESEED_MD5       = "#{Digest::MD5.file("#{CURRENT_DIR}/preseed.cfg").hexdigest}"
+#ISO_MD5           = "#{Digest::MD5.file("#{CURRENT_DIR}/../../iso/ubuntu-10.04.2-server-amd64.iso").hexdigest}"
+
+Veewee::Session.declare( {
+  :boot_cmd_sequence    => [
+                           "<Esc><Esc><Enter>",
+                           "/install/vmlinuz ",
+                           "noapic ",
+                           "auto-install/enable",
+                           "console-setup/ask_detect=false ",
+                           "console-setup/modelcode=pc105 ",
+                           "console-setup/layoutcode=us ",
+                           "debconf/priority=critical ",
+                           "debconf/frontend=noninteractive ",
+                           "debian-installer=en_US ",
+                           "debian-installer/locale=en_US ",
+                           "debian-installer/framebuffer=false ",
+                           "initrd=/install/initrd.gz ",
+                           "kbd-chooser/method=us ",
+                           "netcfg/get_hostname=%NAME% ",
+                           "netcfg/dhcp_timeout=60 ",
+                           "netcfg/choose_interface=auto ",
+                           "preseed/interactive=false ",
+                           "preseed/url=http://%IP%:%PORT%/preseed.cfg ",
+                           "preseed/url/checksum=#{PRESEED_MD5} ",
+                           "DEBCONF_DEBUG=5 ",
+                           "-- <Enter>"
+                           ],
+  :boot_wait            => "10",
+  :cpu_count            => '1',
+  :disk_size            => '10140',
+  :disk_format          => 'VMDK',
+  :hostiocache          => 'on',
+  :iso_download_timeout => "60",
+  :iso_file             => "ubuntu-10.04.2-server-amd64.iso",
+  :iso_src              => "http://releases.ubuntu.com/10.04.2/ubuntu-10.04.2-server-amd64.iso",
+  :iso_md5              => "b446b36430a29f3dcf0c5eb797197cac",
+  :kickstart_file       => "preseed.cfg",
+  :kickstart_port       => "7122",
+  :kickstart_timeout    => "60",
+  :memory_size          => '384',
+  :os_type_id           => 'Ubuntu_64',
+  :postinstall_files    => [ "postinstall.sh" ],
+  :postinstall_timeout  => "10000",
+  :ssh_login_timeout    => "60",
+  :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         => "shutdown -h now",
+  :use_hw_virt_ext      => 'off',
+  :use_pae              => 'on'
 })

data/templates/ubuntu-10.04.2-server-amd64/postinstall.sh

@@ -1,5 +1,7 @@
 # postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
+date > /etc/vagrant_box_build_time
+
 # Apt-install various things necessary for Ruby, guest additions,
 # etc., and remove optional things to trim down the machine.
 apt-get -y update
@@ -21,7 +23,7 @@ apt-get -y install nfs-common
 # We must install the 1.8.x series since Puppet doesn't support
 # Ruby 1.9 yet.
 wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
-tar xvzf http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
 cd ruby-1.8.7-p334
 ./configure --prefix=/opt/ruby
 make
@@ -85,4 +87,4 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
 
 echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
 echo "pre-up sleep 2" >> /etc/network/interfaces
-exit
+exit

data/templates/ubuntu-10.04.2-server-i386-netboot/postinstall.sh

@@ -1,5 +1,7 @@
 # postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
+date > /etc/vagrant_box_build_time
+
 # Apt-install various things necessary for Ruby, guest additions,
 # etc., and remove optional things to trim down the machine.
 apt-get -y update
@@ -21,7 +23,7 @@ apt-get -y install nfs-common
 # We must install the 1.8.x series since Puppet doesn't support
 # Ruby 1.9 yet.
 wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
-tar xvzf http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
 cd ruby-1.8.7-p334
 ./configure --prefix=/opt/ruby
 make
@@ -85,4 +87,4 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
 
 echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
 echo "pre-up sleep 2" >> /etc/network/interfaces
-exit
+exit

data/templates/ubuntu-10.04.2-server-i386/postinstall.sh

@@ -1,5 +1,7 @@
 # postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
+date > /etc/vagrant_box_build_time
+
 # Apt-install various things necessary for Ruby, guest additions,
 # etc., and remove optional things to trim down the machine.
 apt-get -y update
@@ -21,7 +23,7 @@ apt-get -y install nfs-common
 # We must install the 1.8.x series since Puppet doesn't support
 # Ruby 1.9 yet.
 wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
-tar xvzf http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
 cd ruby-1.8.7-p334
 ./configure --prefix=/opt/ruby
 make

data/templates/ubuntu-10.10-server-amd64-netboot/postinstall.sh

@@ -1,5 +1,7 @@
 # postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
+date > /etc/vagrant_box_build_time
+
 # Apt-install various things necessary for Ruby, guest additions,
 # etc., and remove optional things to trim down the machine.
 apt-get -y update
@@ -21,7 +23,7 @@ apt-get -y install nfs-common
 # We must install the 1.8.x series since Puppet doesn't support
 # Ruby 1.9 yet.
 wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
-tar xvzf http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
 cd ruby-1.8.7-p334
 ./configure --prefix=/opt/ruby
 make
@@ -85,4 +87,4 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
 
 echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
 echo "pre-up sleep 2" >> /etc/network/interfaces
-exit
+exit

data/templates/ubuntu-10.10-server-amd64/postinstall.sh

@@ -1,5 +1,7 @@
 # postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
+date > /etc/vagrant_box_build_time
+
 # Apt-install various things necessary for Ruby, guest additions,
 # etc., and remove optional things to trim down the machine.
 apt-get -y update
@@ -21,7 +23,7 @@ apt-get -y install nfs-common
 # We must install the 1.8.x series since Puppet doesn't support
 # Ruby 1.9 yet.
 wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
-tar xvzf http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
 cd ruby-1.8.7-p334
 ./configure --prefix=/opt/ruby
 make

data/templates/ubuntu-10.10-server-i386-netboot/postinstall.sh

@@ -1,5 +1,7 @@
 # postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
+date > /etc/vagrant_box_build_time
+
 # Apt-install various things necessary for Ruby, guest additions,
 # etc., and remove optional things to trim down the machine.
 apt-get -y update
@@ -21,7 +23,7 @@ apt-get -y install nfs-common
 # We must install the 1.8.x series since Puppet doesn't support
 # Ruby 1.9 yet.
 wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
-tar xvzf http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
 cd ruby-1.8.7-p334
 ./configure --prefix=/opt/ruby
 make
@@ -85,4 +87,4 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
 
 echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
 echo "pre-up sleep 2" >> /etc/network/interfaces
-exit
+exit

data/templates/ubuntu-10.10-server-i386/postinstall.sh

@@ -1,5 +1,7 @@
 # postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
+date > /etc/vagrant_box_build_time
+
 # Apt-install various things necessary for Ruby, guest additions,
 # etc., and remove optional things to trim down the machine.
 apt-get -y update
@@ -21,7 +23,7 @@ apt-get -y install nfs-common
 # We must install the 1.8.x series since Puppet doesn't support
 # Ruby 1.9 yet.
 wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
-tar xvzf http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
 cd ruby-1.8.7-p334
 ./configure --prefix=/opt/ruby
 make
@@ -85,4 +87,4 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
 
 echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
 echo "pre-up sleep 2" >> /etc/network/interfaces
-exit
+exit

data/templates/ubuntu-11.04-server-amd64/postinstall.sh

@@ -1,5 +1,7 @@
 # postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
+date > /etc/vagrant_box_build_time
+
 # Apt-install various things necessary for Ruby, guest additions,
 # etc., and remove optional things to trim down the machine.
 apt-get -y update
@@ -21,7 +23,7 @@ apt-get -y install nfs-common
 # We must install the 1.8.x series since Puppet doesn't support
 # Ruby 1.9 yet.
 wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
-tar xvzf http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
 cd ruby-1.8.7-p334
 ./configure --prefix=/opt/ruby
 make
@@ -85,4 +87,4 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
 
 echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
 echo "pre-up sleep 2" >> /etc/network/interfaces
-exit
+exit

data/templates/ubuntu-11.04-server-i386/postinstall.sh

@@ -1,5 +1,7 @@
 # postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
+date > /etc/vagrant_box_build_time
+
 # Apt-install various things necessary for Ruby, guest additions,
 # etc., and remove optional things to trim down the machine.
 apt-get -y update
@@ -21,7 +23,7 @@ apt-get -y install nfs-common
 # We must install the 1.8.x series since Puppet doesn't support
 # Ruby 1.9 yet.
 wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
-tar xvzf http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
 cd ruby-1.8.7-p334
 ./configure --prefix=/opt/ruby
 make
@@ -85,4 +87,4 @@ rm /lib/udev/rules.d/75-persistent-net-generator.rules
 
 echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
 echo "pre-up sleep 2" >> /etc/network/interfaces
-exit
+exit

data/templates/ubuntu-8.04.4-server-amd64/postinstall.sh

@@ -1,5 +1,7 @@
 #http://adrianbravo.tumblr.com/post/644860401
 
+date > /etc/vagrant_box_build_time
+
 #Updating the box
 apt-get -y update
 apt-get -y install linux-headers-$(uname -r) build-essential

data/templates/ubuntu-8.04.4-server-i386/postinstall.sh

@@ -1,5 +1,7 @@
 p#http://adrianbravo.tumblr.com/post/644860401
 
+date > /etc/vagrant_box_build_time
+
 #Updating the box
 apt-get -y update
 apt-get -y install linux-headers-$(uname -r) build-essential
@@ -42,4 +44,4 @@ apt-get -y remove linux-headers-$(uname -r) build-essential
 apt-get -y autoremove
 
 rm VBoxGuestAdditions_$VBOX_VERSION.iso
-exit
+exit

data/validation/features/steps/ssh_steps.rb

@@ -33,7 +33,7 @@ Then /^I can ssh to the following hosts with these credentials:$/ do |table|
     end
     
     lambda {
-	    Net::SSH.start(session["hostname"], session["username"], :password => session["password"], 
+	    Net::SSH.start(session["hostname"], session["username"], :password => session["password"],
                                                                :auth_methods => session_auth_methods,
                                                                :keys => session_keys)
     }.should_not raise_error(Net::SSH::AuthenticationFailed)
@@ -70,13 +70,27 @@ When /^I ssh to "([^\"]*)" with the following credentials:$/ do |hostname, table
   
 
   lambda {
-    @connection = Net::SSH.start(hostname, session["username"], :password => session["password"], 
-                                                                :auth_methods => session_auth_methods,
-# This is the list of authorization methods to try. It defaults to “publickey”, “hostbased”, “password”, and “keyboard-interactive”. (These are also the only authorization methods that are supported.) If 
-#http://net-ssh.rubyforge.org/ssh/v1/chapter-2.html
-                                                                :port => session_port,
-                                                                :keys => session_keys)
-#                                                                :keys => session_keys,:verbose => :debug)
+         # This is the list of authorization methods to try. It defaults to “publickey”, “hostbased”, “password”, and “keyboard-interactive”. (These are also the only authorization methods that are supported.) If
+         # http://net-ssh.rubyforge.org/ssh/v1/chapter-2.html
+    key_auth_tried = false
+    ssh_options = {:password => session["password"], :auth_methods => session_auth_methods, :port => session_port, :keys => session_keys}
+    # ssh_options[:verbose] => :debug
+    begin
+      print "."
+      @connection = Net::SSH.start(session["hostname"], session["username"], ssh_options)
+    rescue Net::SSH::AuthenticationFailed
+      ssh_options[:keys] = Array.new([File.join(File.dirname(__FILE__),'./../../vagrant')])
+      ssh_options.delete(:password)
+      ssh_options[:auth_methods] = ['publickey']
+      if key_auth_tried
+         raise
+      else
+         key_auth_tried = true
+        retry
+      end
+    rescue Net::SSH::Disconnect, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ENETUNREACH
+      sleep 5
+    end
   }.should_not raise_error
 end
 

data/veewee.gemspec

@@ -14,13 +14,13 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "veewee"
 
-  s.add_dependency "vagrant", "~> 0.7.0"
+  s.add_dependency "vagrant", "~> 0.8.0"
   s.add_dependency "net-ssh", "~> 2.1.0"
   s.add_dependency "popen4", "~> 0.1.2"
   s.add_dependency "thor", "~> 0.14.6"
   s.add_dependency "highline", "~> 1.6.1"
   s.add_dependency "progressbar"
-  s.add_dependency "cucumber", "0.8.5"
+  s.add_dependency "cucumber", "~> 1.0.2"
   s.add_dependency "rspec", "~> 2.5.0"
   #s.add_dependency "simon", "~> 0.1.1"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: veewee
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 29
-  version: 0.1.29
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Patrick Debois
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-03 00:00:00 +02:00
+date: 2011-07-23 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 63
         segments: 
         - 0
-        - 7
+        - 8
         - 0
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   requirement: *id001
   name: vagrant
@@ -117,14 +117,14 @@ dependencies:
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 19
         segments: 
+        - 1
         - 0
-        - 8
-        - 5
-        version: 0.8.5
+        - 2
+        version: 1.0.2
   type: :runtime
   requirement: *id007
   name: cucumber
@@ -207,6 +207,18 @@ files:
 - templates/CentOS-5.6-x86_64-netboot/definition.rb
 - templates/CentOS-5.6-x86_64-netboot/ks.cfg
 - templates/CentOS-5.6-x86_64-netboot/postinstall.sh
+- templates/CentOS-6.0-i386-netboot/definition.rb
+- templates/CentOS-6.0-i386-netboot/ks.cfg
+- templates/CentOS-6.0-i386-netboot/postinstall.sh
+- templates/CentOS-6.0-i386/definition.rb
+- templates/CentOS-6.0-i386/ks.cfg
+- templates/CentOS-6.0-i386/postinstall.sh
+- templates/CentOS-6.0-x86_64-netboot/definition.rb
+- templates/CentOS-6.0-x86_64-netboot/ks.cfg
+- templates/CentOS-6.0-x86_64-netboot/postinstall.sh
+- templates/CentOS-6.0-x86_64/definition.rb
+- templates/CentOS-6.0-x86_64/ks.cfg
+- templates/CentOS-6.0-x86_64/postinstall.sh
 - templates/Debian-5.0.8-amd64-netboot/definition.rb
 - templates/Debian-5.0.8-amd64-netboot/postinstall.sh
 - templates/Debian-5.0.8-amd64-netboot/preseed.cfg
@@ -231,16 +243,20 @@ files:
 - templates/Fedora-14-i386/definition.rb
 - templates/Fedora-14-i386/ks.cfg
 - templates/Fedora-14-i386/postinstall.sh
+- templates/Fedora-15-i386-netboot/definition.rb
+- templates/Fedora-15-i386-netboot/ks.cfg
+- templates/Fedora-15-i386-netboot/postinstall.sh
+- templates/Fedora-15-i386/definition.rb
+- templates/Fedora-15-i386/ks.cfg
+- templates/Fedora-15-i386/postinstall.sh
 - templates/Sysrescuecd-2.0.0-experimental/autorun0
 - templates/Sysrescuecd-2.0.0-experimental/definition.rb
-- templates/archlinux-64-aif-experimental/definition.rb
-- templates/archlinux-64-aif-experimental/postinstall.sh
-- templates/archlinux-64-experimental/autorun0
-- templates/archlinux-64-experimental/definition.rb
-- templates/archlinux-64-experimental/postinstall.sh
-- templates/archlinux-i686/autorun0
-- templates/archlinux-i686/definition.rb
-- templates/archlinux-i686/postinstall.sh
+- templates/archlinux-i386/aif.cfg
+- templates/archlinux-i386/definition.rb
+- templates/archlinux-i386/postinstall.sh
+- templates/archlinux-x86_64/aif.cfg
+- templates/archlinux-x86_64/definition.rb
+- templates/archlinux-x86_64/postinstall.sh
 - templates/freebsd-8.2-experimental/definition.rb
 - templates/freebsd-8.2-experimental/postinstall.sh
 - templates/freebsd-8.2-pcbsd-i386-netboot/definition.rb
@@ -282,6 +298,9 @@ files:
 - templates/ubuntu-10.04.2-amd64-netboot/definition.rb
 - templates/ubuntu-10.04.2-amd64-netboot/postinstall.sh
 - templates/ubuntu-10.04.2-amd64-netboot/preseed.cfg
+- templates/ubuntu-10.04.2-server-amd64-alt/definition.rb
+- templates/ubuntu-10.04.2-server-amd64-alt/postinstall.sh
+- templates/ubuntu-10.04.2-server-amd64-alt/preseed.cfg
 - templates/ubuntu-10.04.2-server-amd64/definition.rb
 - templates/ubuntu-10.04.2-server-amd64/postinstall.sh
 - templates/ubuntu-10.04.2-server-amd64/preseed.cfg