veewee 0.1.29 → 0.2.0

data/Gemfile.lock

@@ -1,48 +1,44 @@
 PATH
   remote: .
   specs:
-    veewee (0.1.29)
-      cucumber (= 0.8.5)
+    veewee (0.2.0)
+      cucumber (~> 1.0.2)
       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)
+      vagrant (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     Platform (0.4.0)
-    abstract (1.0.0)
     archive-tar-minitar (0.5.2)
-    builder (2.1.2)
-    cucumber (0.8.5)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.1.4)
-      json_pure (~> 1.4.3)
-      term-ansicolor (~> 1.0.4)
+    builder (3.0.0)
+    cucumber (1.0.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    erubis (2.7.0)
     ffi (1.0.9)
-    gherkin (2.1.5)
-      trollop (~> 1.16.2)
+    gherkin (2.4.5)
+      json (>= 1.4.6)
     highline (1.6.2)
     i18n (0.5.0)
-    json (1.5.1)
-    json_pure (1.4.6)
-    mario (0.0.6)
+    json (1.5.3)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
-    open4 (1.0.1)
+    open4 (1.1.0)
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
-    progressbar (0.9.0)
+    progressbar (0.9.1)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -51,21 +47,19 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    term-ansicolor (1.0.5)
+    term-ansicolor (1.0.6)
     thor (0.14.6)
-    trollop (1.16.2)
-    vagrant (0.7.5)
+    vagrant (0.8.1)
       archive-tar-minitar (= 0.5.2)
-      erubis (~> 2.6.6)
+      erubis (~> 2.7.0)
       i18n (~> 0.5.0)
       json (~> 1.5.1)
-      mario (~> 0.0.6)
       net-scp (~> 1.0.4)
-      net-ssh (~> 2.1.0)
+      net-ssh (~> 2.1.4)
       thor (~> 0.14.6)
-      virtualbox (~> 0.8.3)
-    virtualbox (0.8.6)
-      ffi (~> 1.0)
+      virtualbox (~> 0.9.0)
+    virtualbox (0.9.0)
+      ffi (~> 1.0.9)
 
 PLATFORMS
   ruby

data/lib/veewee/session.rb

@@ -6,6 +6,9 @@ require 'open-uri'
 require 'progressbar'
 require 'highline/import'
 require 'tempfile'
+require 'virtualbox'
+require 'virtualbox/abstract_model'
+require 'virtualbox/ext/byte_normalizer'
 
 
 module Veewee
@@ -69,7 +72,7 @@ module Veewee
         FileUtils.mkdir(File.join(@definition_dir,boxname))
       end
       FileUtils.cp_r(File.join(@template_dir,template_name,'.'),File.join(@definition_dir,boxname))
-      puts "The basebox '#{boxname}' has been succesfully created from the template ''#{template_name}'"
+      puts "The basebox '#{boxname}' has been successfully created from the template ''#{template_name}'"
       puts "You can now edit the definition files stored in definitions/#{boxname}"
       puts "or build the box with:"
       if (options["format"]=='vagrant') 
@@ -346,7 +349,7 @@ module Veewee
                     begin
                       Veewee::Ssh.transfer_file("localhost",filename,File.basename(filename),ssh_options)
                     rescue RuntimeError
-                      puts "error transfering file, possible not enough permissions to write?"
+                      puts "error transferring file, possible not enough permissions to write?"
                       exit
                     end
                     command=@definition[:sudo_cmd]
@@ -362,11 +365,11 @@ module Veewee
                  
                end  
      
-          puts "#{boxname} was build succesfully. "
+          puts "#{boxname} was built successfully. "
           puts ""
           puts "Now you can: "
-          puts "- verify your box by running              : vagrant basebox validate #{boxname}"
-          puts "- export your vm to a .box fileby running : vagrant basebox export   #{boxname}"
+          puts "- verify your box by running               : vagrant basebox validate #{boxname}"
+          puts "- export your vm to a .box file by running : vagrant basebox export   #{boxname}"
         
     end
 
@@ -889,11 +892,11 @@ module Veewee
  
           #Need to look it up again because if it was an initial load
           vm=VirtualBox::VM.find(boxname) 
-          puts "Step [#{current_step_nr}] was succesfully - saving state"
+          puts "Step [#{current_step_nr}] was successfully - saving state"
           vm.save_state
           sleep 2 #waiting for it to be ok
           #puts "about to snapshot #{vm}"
-          #take snapshot after succesful execution
+          #take snapshot after successful execution
           vm.take_snapshot(step_name,"snapshot taken by veewee")
           sleep 2 #waiting for it to be started again
           vm.start

data/lib/veewee/ssh.rb

@@ -13,14 +13,26 @@ module Veewee
       begin
         Timeout::timeout(options[:timeout]) do
           connected=false
+          @key_auth_tried = false
+          ssh_options = { :port => options[:port] , :password => options[:password], :paranoid => false, :timeout => options[:timeout]  }
           while !connected do
             begin
               print "."
-              Net::SSH.start(ip, options[:user], { :port => options[:port] , :password => options[:password], :paranoid => false, :timeout => options[:timeout]  }) do |ssh|
+              Net::SSH.start(ip, options[:user], ssh_options) do |ssh|
                 block.call(ip);
                 puts ""
                 return true
               end
+            rescue Net::SSH::AuthenticationFailed
+              options[:keys] = File.join(File.dirname(__FILE__),'./../../validation/vagrant')
+              options.delete(:password)
+              ssh_options = options
+              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
@@ -89,64 +101,80 @@ module Veewee
 
       puts "Executing command: #{command}"
 
-      Net::SSH.start(host, options[:user], { :port => options[:port], :password => options[:password], :paranoid => false }) do |ssh|
+      @key_auth_tried = false
+      ssh_options = { :port => options[:port], :password => options[:password], :paranoid => false}
+      # ssh_options[:verbose] => :debug
+      begin
+        Net::SSH.start(host, options[:user], ssh_options) do |ssh|
 
-          # open a new channel and configure a minimal set of callbacks, then run
-          # the event loop until the channel finishes (closes)
-          channel = ssh.open_channel do |ch|
+            # open a new channel and configure a minimal set of callbacks, then run
+            # the event loop until the channel finishes (closes)
+            channel = ssh.open_channel do |ch|
 
-            #request pty for sudo stuff and so
-            ch.request_pty do |ch, success| 
-                raise "Error requesting pty" unless success 
-            end
-              
+              #request pty for sudo stuff and so
+              ch.request_pty do |ch, success|
+                  raise "Error requesting pty" unless success
+              end
 
-            ch.exec "#{command}" do |ch, success|
-              raise "could not execute command" unless success
 
+              ch.exec "#{command}" do |ch, success|
+                raise "could not execute command" unless success
 
-              
-              # "on_data" is called when the process writes something to stdout
-              ch.on_data do |c, data|
-                @stdout+=data
 
-                  print data
 
-              end
+                # "on_data" is called when the process writes something to stdout
+                ch.on_data do |c, data|
+                  @stdout+=data
+
+                    print data
 
-              # "on_extended_data" is called when the process writes something to stderr
-              ch.on_extended_data do |c, type, data|
-                @stderr+=data
+                end
 
-                  print data
+                # "on_extended_data" is called when the process writes something to stderr
+                ch.on_extended_data do |c, type, data|
+                  @stderr+=data
 
-              end
+                    print data
 
-              #exit code
-              #http://groups.google.com/group/comp.lang.ruby/browse_thread/thread/a806b0f5dae4e1e2
-              channel.on_request("exit-status") do |ch, data|
-                exit_code = data.read_long
-                @status=exit_code
-                if exit_code > 0
-                  puts "ERROR: exit code #{exit_code}"
-                else
-                  #puts "Successfully executed"
                 end
-              end
 
-              channel.on_request("exit-signal") do |ch, data|
-                puts "SIGNAL: #{data.read_long}"
-              end
+                #exit code
+                #http://groups.google.com/group/comp.lang.ruby/browse_thread/thread/a806b0f5dae4e1e2
+                channel.on_request("exit-status") do |ch, data|
+                  exit_code = data.read_long
+                  @status=exit_code
+                  if exit_code > 0
+                    puts "ERROR: exit code #{exit_code}"
+                  else
+                    #puts "Successfully executed"
+                  end
+                end
+
+                channel.on_request("exit-signal") do |ch, data|
+                  puts "SIGNAL: #{data.read_long}"
+                end
 
-              ch.on_close {
-                #puts "done!"
-              }
-              #status=ch.exec "echo $?"
+                ch.on_close {
+                  #puts "done!"
+                }
+                #status=ch.exec "echo $?"
+              end
             end
+            channel.wait
           end
-          channel.wait
+      rescue Net::SSH::AuthenticationFailed
+        ssh_options[:keys] = Array.new([File.join(File.dirname(__FILE__),'./../../validation/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 1
+      end
   
       if (@status.to_s != options[:exitcode] )
         if (options[:exitcode]=="*")

data/lib/veewee/version.rb

@@ -1,3 +1,3 @@
 module Veewee
-  VERSION = "0.1.29"
+  VERSION = "0.2.0"
 end

data/templates/CentOS-4.8-i386/postinstall.sh

@@ -1,6 +1,8 @@
 #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

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

@@ -1,6 +1,8 @@
 #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
@@ -47,4 +49,4 @@ sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 
 #poweroff -h
 
-exit
+exit

data/templates/CentOS-5.6-i386/postinstall.sh

@@ -1,6 +1,8 @@
 #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
@@ -45,4 +47,4 @@ sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 
 #poweroff -h
 
-exit
+exit

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

@@ -1,5 +1,7 @@
 #http://chrisadams.me.uk/2010/05/10/setting-up-a-centos-base-box-for-development-and-testing-with-vagrant/
 
+date > /etc/vagrant_box_build_time
+
 fail()
 {
   echo "FATAL: $*"

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

@@ -0,0 +1,16 @@
+Veewee::Session.declare({
+  :cpu_count => '1', :memory_size=> '392',
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
+  :os_type_id => 'RedHat',
+  :iso_file => "CentOS-6.0-i386-netinstall.iso",
+  :iso_src => "http://be.mirror.eurid.eu/centos/6.0/isos/i386/CentOS-6.0-i386-netinstall.iso",
+  :iso_md5 => "65731c29c49630dea6cde103d02ccffb",
+  :iso_download_timeout => 1000,
+  :boot_wait => "15", :boot_cmd_sequence => [ '<Tab> 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-6.0-i386-netboot/ks.cfg

@@ -0,0 +1,52 @@
+install
+url --url=http://be.mirror.eurid.eu/centos/6.0/os/i386/
+lang en_US.UTF-8
+keyboard us
+network --bootproto dhcp
+rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
+firewall --enabled --trust eth0 --ssh
+authconfig --enableshadow --enablemd5
+selinux --disabled
+timezone Europe/Brussels
+bootloader --location=mbr
+
+text
+skipx
+zerombr
+
+clearpart --all --initlabel
+autopart
+
+auth --useshadow --enablemd5
+firstboot --disabled
+reboot
+
+repo --name=epel --baseurl=http://download.fedora.redhat.com/pub/epel/6/i386/ --includepkgs='ruby-augeas,ruby-shadow'
+repo --name=puppetlabs --baseurl=http://stahnma.fedorapeople.org/puppetlabs/6/i386 --includepkgs='puppet,facter'
+
+%packages
+@ core
+ruby
+ruby-devel
+rubygems
+kernel-devel
+gcc
+gcc-c++
+bzip2
+make
+zlib-devel
+openssl-devel
+readline-devel
+sqlite-devel
+puppet
+facter
+
+-ipw2100-firmware
+-ipw2200-firmware
+-ivtv-firmware
+
+%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-6.0-i386-netboot/postinstall.sh

@@ -0,0 +1,30 @@
+#http://chrisadams.me.uk/2010/05/10/setting-up-a-centos-base-box-for-development-and-testing-with-vagrant/
+
+date > /etc/vagrant_box_build_time
+
+yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y clean all
+
+gem install --no-ri --no-rdoc chef
+
+# 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
+
+dd if=/dev/zero of=/tmp/clean || rm /tmp/clean
+
+exit