veewee 0.1.0a → 0.1.2

data/Gemfile

@@ -2,9 +2,4 @@ source "http://rubygems.org"
 
 gem "veewee", :path => "."
 
-gem 'net-ssh'
-gem 'virtualbox'
-gem 'popen4'
-gem 'vagrant'
-gem 'thor'
-gem 'highline'
+#gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    veewee (0.1.0a)
+    veewee (0.1.2)
       highline (~> 1.6.1)
       net-ssh (~> 2.1.0)
       popen4 (~> 0.1.2)
+      progressbar
       thor (~> 0.14.6)
       vagrant (~> 0.7.0)
 
@@ -29,6 +30,7 @@ GEM
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
+    progressbar (0.9.0)
     rake (0.8.7)
     thor (0.14.6)
     vagrant (0.7.1)
@@ -48,10 +50,4 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  highline
-  net-ssh
-  popen4
-  thor
-  vagrant
   veewee!
-  virtualbox

data/{README → README.md}

@@ -1,54 +1,44 @@
-# Veewee is currently broken due to changes in Virtualbox 4.x
-# We will fix them soon and move veewee to a plugin for vagrant
-
-
-VeeWee: the tool to easily build vagrant base boxes
-===================================================
+**VeeWee:** the tool to easily build vagrant base boxes
 Vagrant is a great tool to test new things or changes in a virtual machine(Virtualbox) using either chef or puppet.
 The first step is to download an existing 'base box'. I believe this scares a lot of people as they don't know who or how this box was build. Therefore lots of people end up first building their own base box to use with vagrant.
 
 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:
-- Currently this is still a very much 'it works on my machine only' code
 - Have Virtualbox 4.x installed -> download it from http://download.virtualbox.org/virtualbox/
-- Have ruby and rubygems working
-- Have the rake gem installed -> gem install rake
-
-ALPHA CODE: -> you're on your own....
 
-### WILL UPDATE SOON ####
 
+ALPHA CODE: -> you're on your own....
 
-1)Installation: (from source)
-===========================
+## Installation: 
+__from source__
 $ git clone https://github.com/jedi4ever/veewee.git
 $ cd veewee
 $ gem install bundler
-$ bundle install 
-
-Installation: (as a gem)
-========================
-coming soon
-
-List all templates
-===================
-$ rake templates
-the following templates are available:
-use rake define['<boxname>','CentOS-4.8-i386']
-use rake define['<boxname>','CentOS-5.5-i386']
-use rake define['<boxname>','ubuntu-10.04.1-server-i386']
-use rake define['<boxname>','ubuntu-10.10-server-i386']
-
-3) Define a new box (ex. Ubuntu 10.10 server i386) - this is essentially making a copy based on the  templates provided above.
-$ rake define['myubuntubox','ubuntu-10.10-server-i386']
+$ bundle install
+
+__as a gem__
+$ gem install veewee 
+
+
+## List all templates
+$ vagrant basebox templates
+
+## Define a new box (ex. Ubuntu 10.10 server i386)
+
+this is essentially making a copy based on the  templates provided above.
+
+$ vagrant basebox define 'myubuntubox' 'ubuntu-10.10-server-i386'
 template successfully copied
 
--> This copies over the files in templates/ubuntu-10.10-server-i386 to definition/myubuntubox
+-> This copies over the templates/ubuntu-10.10-server-i386 to definition/myubuntubox
+
 $ ls definitions/myubuntubox
 definition.rb	postinstall.sh	postinstall2.sh	preseed.cfg
 
-4) Optionally modify the definition.rb , postinstall.sh or 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',:disk_size => '10240' ,
@@ -75,35 +65,40 @@ Veewee::Session.declare( {
   :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"
    }
 )
+</pre>
 
 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.
 
-5) Put your isofile inside the $VEEWEE/iso directory or if you don't run
-$ rake build['myubuntubox]
+## Put your isofile inside the $VEEWEE/iso directory or if you don't run
+$ 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
 
--> This will show you the iso to download
+## Build the new box:
+$ vagrant basebox build 'myubuntubox'
 
-6) Build the new box:
-$ rake 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
+- Mount the ISO File :iso_file
+- Boot up the machine and wait for :boot_time
+- Send the keystrokes in :boot_cmd_sequence
+- Startup a webserver on :kickstart_port to wait for a request for the :kickstart_file
+- Wait for ssh login to work with :ssh_user , :ssh_password
+- Sudo execute the :postinstall_files
 
--> This will create a machine + disk according to the definition.rb
--> Note: :os_type_id = The internal Name Virtualbox uses for that Distribution
--> Mount the ISO File :iso_file
--> Boot up the machine and wait for :boot_time
--> Send the keystrokes in :boot_cmd_sequence
--> Startup a webserver on :kickstart_port to wait for a request for the :kickstart_file
--> Wait for ssh login to work with :ssh_user , :ssh_password
--> Sudo execute the :postinstall_files
+## Export the vm to a .box file
+$ vagrant basebox export 'myubuntubox' 
 
-7) Export the box into the boxes directory
-$ rake export['myubuntubox']
+this is actually calling - vagrant package --base 'myubuntubox' --output 'boxes/myubuntubox.box'
 
-vagrant package --base 'myubuntubox' --output 'boxes/myubuntubox.box'
-vagrant box add 'myubuntubox' 'boxes/myubuntubox.box'
+this will result in a myubuntubox.box
 
--> This will show you the vagrant command to export and to add it your vagrant boxset
+## Add the box as one of your boxes
+$ vagrant box add 'myubuntubox' 'myubuntubox.box'
 
-8) Start vagrant init in another window (as we have set the Virtualbox env to tmp before)
+## Use it in vagrant
+Start vagrant init in another window (as we have set the Virtualbox env to tmp before)
 $ To import it into vagrant type:
 
 To use it:
@@ -111,12 +106,14 @@ vagrant init 'myubuntubox'
 vagrant up
 vagrant ssh
 
-9) If you have a setup working, share your 'definition' with me. That would be fun! 
+## If you have a setup working, share your 'definition' with me. That would be fun! 
 
 IDEAS:
+
 - Now you integrate this with your CI build to create a daily basebox
 
 FUTURE IDEAS:
+
 - use snapshots to fastforward initial boot, and every postinstall command
 - export to AMI too
 - provide for more failsafe execution, testing parameters

data/Rakefile

@@ -3,36 +3,8 @@ require 'bundler'
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
-#We set this in the ENV file
-#ENV['GEM_PATH']=File.join(File.dirname(__FILE__),"gems")
-#ENV['GEM_HOME']=File.join(File.dirname(__FILE__),"gems")
-
-def check_environment
-  begin 
-    require 'vagrant'
-  rescue LoadError
-    puts "you need to install dependencies:"
-    puts "gem install vagrant"
-    exit
-  end
-  
-  begin 
-    require 'net/ssh'
-    require 'virtualbox'
-    require 'webrick'
-    require 'popen4'
-  rescue LoadError
-    puts "hmm you had vagrant installed but are missing the net-ssh or virtualbox gem"
-    puts "gem install virtualbox net-ssh POpen4"
-    exit
-  end
-end
-
-#See if all gems and so are installed
-check_environment
-
 #Setup some base variables to use
-veewee_dir= File.dirname(__FILE__)
+veewee_dir= "."
 definition_dir= File.expand_path(File.join(veewee_dir, "definitions"))
 lib_dir= File.expand_path(File.join(veewee_dir, "lib"))
 box_dir= File.expand_path(File.join(veewee_dir, "boxes"))
@@ -41,8 +13,6 @@ vbox_dir=File.expand_path(File.join(veewee_dir, "tmp"))
 tmp_dir=File.expand_path(File.join(veewee_dir, "tmp"))
 iso_dir=File.expand_path(File.join(veewee_dir, "iso"))
 
-#needs to be moved to the config files to be allowed override
-ENV['VBOX_USER_HOME']=vbox_dir
 
 #Load Veewee::Session libraries
 Dir.glob(File.join(lib_dir, '**','*.rb')).each {|f| 

data/bin/veewee

@@ -30,6 +30,8 @@ Dir.glob(File.join(lib_dir, '**','*.rb')).each {|f|
 Veewee::Session.setenv({:veewee_dir => veewee_dir, :definition_dir => definition_dir,
    :template_dir => template_dir, :iso_dir => iso_dir, :box_dir => box_dir, :tmp_dir => tmp_dir})
 
+
+   
 class VeeweeCLI < Thor 
   
   desc "init [NAME] [TEMPLATE]", "initializes a box from a template" 
@@ -67,10 +69,11 @@ class VeeweeCLI < Thor
   
 end
 
+
+
 version=VirtualBox.version
-if (version.match(/^4.x/))
-	VeeweeCLI.start
+if (version.match(/^4./))
+   	VeeweeCLI.start
 else
-	puts "veewee only supports VirtualBox 4.x"
+   	puts "veewee only supports VirtualBox 4.x"
 end
-

data/lib/vagrant_init.rb

@@ -1 +1 @@
-require 'veewee'
+require 'veewee'

data/lib/veewee/command.rb

@@ -1,63 +1,66 @@
 require 'veewee/session'
 
+#Load Veewee::Session libraries
+lib_dir= File.expand_path(File.join(File.dirname(__FILE__),"..","..", "lib"))
+Dir.glob(File.join(lib_dir, '**','*.rb')).each {|f| require f  }
+
 #Setup some base variables to use
-veewee_dir= File.expand_path(File.join(File.dirname(__FILE__),"..",".."))
-definition_dir= File.expand_path(File.join(".", "definitions"))
-lib_dir= File.expand_path(File.join(veewee_dir, "lib"))
-box_dir= File.expand_path(File.join(veewee_dir, "boxes"))
-template_dir=File.expand_path(File.join(veewee_dir, "templates"))
+template_dir=File.expand_path(File.join(lib_dir,"..", "templates"))
 
-#vbox_dir=File.expand_path(File.join(veewee_dir, "tmp"))
+veewee_dir="."
+definition_dir= File.expand_path(File.join(veewee_dir, "definitions"))
 tmp_dir=File.expand_path(File.join(veewee_dir, "tmp"))
-
 iso_dir=File.expand_path(File.join(veewee_dir, "iso"))
-
-#needs to be moved to the config files to be allowed override
-#ENV['VBOX_USER_HOME']=vbox_dir
-
-#Load Veewee::Session libraries
-Dir.glob(File.join(lib_dir, '**','*.rb')).each {|f|
-  require f  }
+box_dir=File.expand_path(File.join(veewee_dir, "boxes"))
 
 #Initialize
 Veewee::Session.setenv({:veewee_dir => veewee_dir, :definition_dir => definition_dir,
    :template_dir => template_dir, :iso_dir => iso_dir, :box_dir => box_dir, :tmp_dir => tmp_dir})
 
+module Veewee
+class Command < Vagrant::Command::GroupBase
+  register "basebox","Commands to manage baseboxes"  
 
-module Vagrant
-  module Command
-    class BoxCommand < Vagrant::Command::GroupBase
-      # Do not register anymore, as this registration is already done in Vagrant core
-      # Since Ruby classes are 'open', we are just adding subcommands to the 'box' command
-
-      desc "templates", "List the currently available box templates"
-      def templates
-	    Veewee::Session.list_templates
-      end
-
-      desc "init BOXNAME TEMPLATE", "Define a new box starting from a template"
-      def init(boxname, template)
-	puts "Init a new box #{boxname}, starting from template #{template}"
-	Veewee::Session.define(boxname,template)
-      end
+  desc "templates", "List the currently available box templates"
+  def templates
+    Veewee::Session.list_templates
+  end
 
-      desc "build BOXNAME", "Build the box BOXNAME"
-      def build(boxname)
-        puts "Building box #{boxname}"
-	Veewee::Session.build(boxname)
-      end
+  desc "define BOXNAME TEMPLATE", "Define a new box starting from a template"
+  method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite the definition"
+  def define(boxname, template)    
+    Veewee::Session.define(boxname,template,options)
+  end
 
-      desc "ostypes", "List the available Operating System types"
-      def ostypes
-        puts "Operating System types:"
-	    Veewee::Session.list_ostypes
-      end
+  desc "build BOXNAME", "Build the box BOXNAME"
+  method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite the basebox"
+  def build(boxname)
+    Veewee::Session.build(boxname,options)
+  end
 
-      desc "clean", "Clean all unfinished builds"
-      def clean
-        puts "Cleaning all unfinished builds"
+  desc "ostypes", "List the available Operating System types"
+  def ostypes
+    Veewee::Session.list_ostypes
+  end
+  
+  desc "destroy BOXNAME", "Destroy the virtualmachine of a basebox"
+  def destroy(boxname)
+    puts Veewee::Session.destroy_vm(boxname)
+  end
+  
+  desc "list", "Lists all defined boxes"
+  def list
+  Veewee::Session.list_definitions
+  end
+  
+  desc "export [NAME]", "export the box" 
+  method_options :force => :boolean  
+  def export(boxname)
+      if (!boxname.nil?)
+        Veewee::Session.export_box(boxname)
       end
-
-    end
   end
+  
 end
+
+end

data/lib/veewee/config.rb

@@ -0,0 +1,5 @@
+module Veewee
+  class BaseBoxConfig < Vagrant::Config::Base
+    configures :basebox
+  end
+end

data/lib/veewee/scancode.rb

@@ -2,11 +2,16 @@ module Veewee
   class Scancode
   
     def self.send_sequence(vboxcmd,vname,sequence)
-
+            puts
+            counter=0
             sequence.each { |s|
+              counter=counter+1
+ 
               s.gsub!(/%IP%/,Veewee::Session.local_ip);
               s.gsub!(/%PORT%/,'7122');
               s.gsub!(/%NAME%/, vname);
+              puts "Typing:[#{counter}]: "+s
+
               keycodes=string_to_keycode(s)
       
               # VBox seems to have issues with sending the scancodes as one big
@@ -21,13 +26,15 @@ module Veewee
         	    sleep 1
     	    }
 
+          puts "Done typing."
+          puts
   
     end
 
     def self.send_keycode(vboxcmd,vname,keycode)
            command= "#{vboxcmd} controlvm '#{vname}' keyboardputscancode #{keycode}"
            #puts "#{command}"
-                  IO.popen("#{command}") { |f| print '.' }
+                  IO.popen("#{command}") { |f| print '' }
     end
 
     def self.string_to_keycode(thestring)

data/lib/veewee/session.rb

@@ -2,6 +2,10 @@ require 'digest/md5'
 require 'socket'
 require 'net/scp'
 require 'pp'
+require 'open-uri'
+require 'progressbar'
+require 'highline/import'
+require 'tempfile'
 
 
 module Veewee
@@ -41,25 +45,43 @@ module Veewee
  
     end
     
-    def self.define(boxname,template_name)
+    def self.define(boxname,template_name,options = {})
       #Check if template_name exists
-      #puts @veewee_dir
+      
+      options = {  "force" => false, "format" => "vagrant" }.merge(options)
+      
       if File.directory?(File.join(@template_dir,template_name))
       else
-        puts "this template can not be found, use vagrant box templates to list all templates"
+        puts "This template can not be found, use vagrant basebox templates to list all templates"
+        exit
       end
       if !File.exists?(@definition_dir)
         FileUtils.mkdir(@definition_dir)
       end
+      
       if File.directory?(File.join(@definition_dir,boxname))
-        puts "this definition already exists"
+        if !options["force"]
+          puts "The definition for #{boxname} already exists. Use --force to overwrite"
+          exit
+        end
       else
         FileUtils.mkdir(File.join(@definition_dir,boxname))
-        FileUtils.cp_r(File.join(@template_dir,template_name,'.'),File.join(@definition_dir,boxname))
-        puts "template succesfully copied"
       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 "You can now edit the definition files stored in definitions/#{boxname}"
+      puts "or build the box with:"
+      if (options["format"]=='vagrant') 
+         puts "vagrant basebox build '#{boxname}'"
+       end
+       if (options["format"]=='veewee')
+         puts "veewee  build '#{boxname}'"
+       end
+      
     end
 
+
+
   
     def self.definition_exists?(boxname)
       if File.directory?(File.join(@definition_dir,boxname))
@@ -85,15 +107,20 @@ module Veewee
       end
     end
 
-    def self.list_templates
-      puts "the following templates are available:"
+    def self.list_templates( options = { :format => 'vagrant'})
+      puts "The following templates are available:"
       subdirs=Dir.glob("#{@template_dir}/*")
       subdirs.each do |sub|
         if File.directory?("#{sub}")
           definition=Dir.glob("#{sub}/definition.rb")
           if definition.length!=0
             name=sub.sub(/#{@template_dir}\//,'')
-            puts "vagrant box init '<boxname>' '#{name}'"
+            if (options[:format]=='vagrant') 
+              puts "vagrant basebox define '<boxname>' '#{name}'"
+            end
+            if (options[:format]=='veewee')
+              puts "veewee define '<boxname>' '#{name}'"
+            end
           end
         end
       end
@@ -111,9 +138,10 @@ module Veewee
         puts "Not yet implemented"
     end
 
-    def self.verify_iso(filename)
+    def self.verify_iso(filename,autodownload = false)
       if File.exists?(File.join(@iso_dir,filename))
-        puts "isofile #{filename} is available"
+        puts 
+        puts "Verifying the isofile #{filename} is ok."
       else
         full_path=File.join(@iso_dir,filename)
         path1=Pathname.new(full_path)
@@ -121,15 +149,23 @@ module Veewee
         rel_path=path1.relative_path_from(path2).to_s
         
         puts
-        puts "Isofile is not found. The definition suggested the following URL to download:"
-        puts "-url: #{@definition[:iso_src]}"
-        puts "-md5: #{@definition[:iso_md5]}"
+        puts "The isofile is not found. The definition provided the following information:"
+        puts "- Download url: #{@definition[:iso_src]}"
+        puts "- Md5 Checksum: #{@definition[:iso_md5]}"
         puts ""
-        puts "type:"
-        puts "curl -C - -L '#{@definition[:iso_src]}' -o '#{rel_path}'"
-        puts "md5 '#{rel_path}' "
-        puts 
-        exit
+        
+        question=ask("Download? (Yes/No)") {|q| q.default="No"}
+        if question.downcase == "yes"
+          download_progress(@definition[:iso_src],full_path)
+        else
+          puts "You have choosen for manual download: "
+          puts "curl -C - -L '#{@definition[:iso_src]}' -o '#{rel_path}'"
+          puts "md5 '#{rel_path}' "
+          puts 
+          exit
+        end
+        
+  
       end
   
     end
@@ -145,7 +181,10 @@ module Veewee
         puts "Not yet implemented"
     end
 
-    def self.build(boxname)
+    def self.build(boxname,options)
+      
+        options = {  "force" => false, "format" => "vagrant" }.merge(options)
+      
         #Now we have to load the definition (reads definition.rb)
         load_definition(boxname)
 
@@ -160,9 +199,13 @@ module Veewee
         
         verify_iso(@definition[:iso_file])
         
+        if (options["force"]==false)
+        else    
+          puts "Forcing build by destroying #{boxname} machine"
+          destroy_vm(boxname)
+        end
+        
         checksums=calculate_checksums(@definition,boxname)
-
-   
         
         transaction(boxname,"0-initial-#{checksums[0]}",checksums) do
         
@@ -187,11 +230,12 @@ module Veewee
 
             
             #waiting for it to boot
+            puts "Waiting for the machine to boot"
             sleep @definition[:boot_wait].to_i
         
-            puts "sending keys"
             Veewee::Scancode.send_sequence("#{@vboxcmd}","#{boxname}",@definition[:boot_cmd_sequence])
         
+            puts "Starting a webserver on port #{@definition[:kickstart_port]}"
             #:kickstart_port => "7122", :kickstart_ip => self.local_ip, :kickstart_timeout => 1000,:kickstart_file => "preseed.cfg",
             Veewee::Web.wait_for_request(@definition[:kickstart_file],{:port => @definition[:kickstart_port],
                                       :host => @definition[:kickstart_ip], :timeout => @definition[:kickstart_timeout],
@@ -199,15 +243,16 @@ module Veewee
                                       
             Veewee::Ssh.when_ssh_login_works("localhost",ssh_options) do
               #Transfer version of Virtualbox to $HOME/.vbox_version            
-              versionfile=File.join(@tmp_dir,".vbox_version")    
-              File.open(versionfile, 'w') {|f| f.write("#{VirtualBox::Global.global.lib.virtualbox.version}") }
-              Veewee::Ssh.transfer_file("localhost",versionfile,ssh_options)
+              versionfile=Tempfile.open("vbox.version")
+              versionfile.puts "#{VirtualBox::Global.global.lib.virtualbox.version}"
+              versionfile.rewind
+              Veewee::Ssh.transfer_file("localhost",versionfile.path,".vbox_version", ssh_options)
+              versionfile.close
+              versionfile.delete
             end
         end #initial Transaction
  
-        
-                    
-              
+                 
                counter=1
                @definition[:postinstall_files].each do |postinstall_file|
      
@@ -270,7 +315,58 @@ module Veewee
       vm.save  
     end
     
-    def self.create_vm(boxname)
+    def self.destroy_vm(boxname)
+      
+      load_definition(boxname)
+            
+      #:destroy_medium => :delete,  will delete machine + all media attachments
+      #vm.destroy(:destroy_medium => :delete)
+      ##vm.destroy(:destroy_image => true)
+      
+      #VBoxManage unregistervm "test-machine" --delete
+      #because the destroy does remove the .vbox file on 4.0.x
+      #PDB
+      #vm.destroy()
+      
+      
+      
+      vm=VirtualBox::VM.find(boxname)
+
+      if (!vm.nil? && !(vm.powered_off?))
+          puts "Shutting down vm #{boxname}"
+          #We force it here, maybe vm.shutdown is cleaner
+          vm.stop
+      end     
+      sleep 3
+      
+      command="#{@vboxcmd} unregistervm  '#{boxname}' --delete"    
+
+      puts "Deleting vm #{boxname}"
+      
+      #Exec and system stop the execution here
+      Veewee::Shell.execute("#{command}")
+      sleep 1
+      
+      #if the disk was not attached when the machine was destroyed we also need to delete the disk
+      location=boxname+"."+@definition[:disk_format].downcase
+      found=false       
+      VirtualBox::HardDrive.all.each do |d|
+        if !d.location.match(/#{location}/).nil?
+
+          command="#{@vboxcmd} closemedium disk '#{d.location}' --delete"
+          puts "Deleting disk #{d.location}"
+          Veewee::Shell.execute("#{command}")          
+          #v.3
+          #d.destroy(true)
+          break
+        end
+      end     
+      
+      
+      
+    end
+    
+    def self.create_vm(boxname,force=false)
 
       #Verifying the os.id with the :os_type_id specified
       matchfound=false
@@ -293,8 +389,8 @@ module Veewee
           vm.stop
       end     
 
-      if !vm.nil?
-        puts "box already exists"
+      if !vm.nil? 
+        puts "Box already exists"
         #vm.stop
         #vm.destroy
       else
@@ -302,11 +398,9 @@ module Veewee
         #Box does not exist, we can start to create it
 
         command="#{@vboxcmd} createvm --name '#{boxname}' --ostype '#{@definition[:os_type_id]}' --register"    
-      	puts command
 
         #Exec and system stop the execution here
         Veewee::Shell.execute("#{command}")
-        sleep 3
         
       end
 
@@ -322,7 +416,8 @@ module Veewee
       vm.os_type_id=@definition[:os_type_id]
       vm.cpu_count=@definition[:cpu_count].to_i
       vm.name=boxname
-      
+
+      puts "Creating vm #{vm.name} : #{vm.memory_size}M - #{vm.cpu_count} CPU - #{vm.os_type_id}"
       #setting bootorder 
       vm.boot_order[0]=:hard_disk
       vm.boot_order[1]=:dvd
@@ -348,7 +443,7 @@ module Veewee
       end   
 
       if !found
-        puts "creating new harddrive"
+        puts "Creating new harddrive of size #{@definition[:disk_size].to_i} "
         
         #newdisk=VirtualBox::HardDrive.new
         #newdisk.format=@definition[:disk_format]
@@ -364,8 +459,7 @@ module Veewee
         place=results.gets.chop
         results.close
          
-        puts "#{command}" 
-        command ="#{@vboxcmd} createhd --filename '#{place}/#{boxname}/#{boxname}.#{@definition[:disk_format]}' --size '#{@definition[:disk_size].to_i}' --format #{@definition[:disk_format]}"
+        command ="#{@vboxcmd} createhd --filename '#{place}/#{boxname}/#{boxname}.#{@definition[:disk_format]}' --size '#{@definition[:disk_size].to_i}' --format #{@definition[:disk_format]} > /dev/null"
         Veewee::Shell.execute("#{command}")
                    
       end
@@ -394,20 +488,17 @@ module Veewee
       results.close
 
       location="#{place}/#{boxname}/"+location
-      
-      puts "location=#{location}"
-
+      puts "Attaching disk: #{location}"
       
       #command => "${vboxcmd} storageattach '${vname}' --storagectl 'SATA Controller' --port 0 --device 0 --type hdd --medium '${vname}.vdi'",
       command ="#{@vboxcmd} storageattach '#{boxname}' --storagectl 'SATA Controller' --port 0 --device 0 --type hdd --medium '#{location}'"
-      puts "#{command}"
       Veewee::Shell.execute("#{command}")
 
     end
     
     def self.mount_isofile(boxname,isofile)
       full_iso_file=File.join(@iso_dir,isofile)
-      puts "#{full_iso_file}"
+      puts "Mounting cdrom: #{full_iso_file}"
       #command => "${vboxcmd} storageattach '${vname}' --storagectl 'IDE Controller' --type dvddrive --port 1 --device 0 --medium '${isodst}' ";
       command ="#{@vboxcmd} storageattach '#{boxname}' --storagectl 'IDE Controller' --type dvddrive --port 1 --device 0 --medium '#{full_iso_file}'"
      Veewee::Shell.execute("#{command}")
@@ -443,10 +534,7 @@ module Veewee
       puts "Available os types:"
       VirtualBox::Global.global.lib.virtualbox.guest_os_types.collect { |os|
         puts "#{os.id}: #{os.description}"
-      }
-      
-      puts 
-      
+      }      
     end
     
     
@@ -477,11 +565,28 @@ module Veewee
           end
         end
 
-        pp checksums
         return checksums
 
       end
 
+      def self.download_progress(url,localfile)
+        pbar = nil
+        URI.parse(url).open(
+            :content_length_proc => lambda {|t|
+              if t && 0 < t
+                pbar = ProgressBar.new("Fetching file", t)
+                pbar.file_transfer_mode
+              end
+            },
+            :progress_proc => lambda {|s|
+              pbar.set s if pbar
+            }) { |src|
+              open("#{localfile}","wb") { |dst|
+                dst.write(src.read)
+              }
+            }
+         
+      end
     
       def self.transaction(boxname,step_name,checksums,&block)
 
@@ -504,8 +609,6 @@ module Veewee
           end 
         end
 
-        pp snapnames
-        
         #find the last snapshot matching the state
         counter=[snapnames.length, checksums.length].min-1
         last_good_state=counter
@@ -517,14 +620,14 @@ module Veewee
               break
             end  
         end
-        puts "Last good state: #{last_good_state}"
+        #puts "Last good state: #{last_good_state}"
 
         if (current_step_nr < last_good_state)
-            puts "fast forwarding #{step_name}"
+            #puts "fast forwarding #{step_name}"
             return
         end
 
-        puts "Current step: #{current_step_nr}"
+        #puts "Current step: #{current_step_nr}"
         if (current_step_nr == last_good_state)
             if vm.running?
               vm.stop
@@ -534,14 +637,14 @@ module Veewee
             #puts "remove old snapshots"
 
             for s in (last_good_state+1)..(snapnames.length-1)
-              puts "removing snapname #{snapnames[s]}"
+              puts "Removing step [s] snapshot as it is no more valid"
               snapshot=vm.find_snapshot(snapnames[s])
               snapshot.destroy
               #puts snapshot
             end
 
             vm.reload
-            puts "action load #{step_name}"
+            puts "Loading step #{current_step_nr} snapshots as it has not changed"
             sleep 2
             goodsnap=vm.find_snapshot(snapnames[last_good_state])
             goodsnap.restore
@@ -551,7 +654,7 @@ module Veewee
 
         end
 
-        puts "last good state #{last_good_state}"
+        #puts "last good state #{last_good_state}"
 
         
         if (current_step_nr > last_good_state)
@@ -562,66 +665,41 @@ module Veewee
  
             if !vm.nil?
               if vm.running?
-                puts "stopping machine"
+                puts "Stopping machine"
                 vm.stop
                 while vm.running?
                   sleep 1
                 end
               end
               
-              #detaching cdroms
-              vm.medium_attachments.each do |m|
-                if m.type==:dvd
-                  puts "detaching dvd"
-                  m.detach
-                end
-              end
+              #detaching cdroms (used to work in 3.x)
+#              vm.medium_attachments.each do |m|
+#                if m.type==:dvd
+#                  #puts "Detaching dvd"
+#                  m.detach
+#                end
+#              end
               
               vm.reload
-              puts "destroying machine+disks"
-              #:destroy_medium => :delete,  will delete machine + all media attachments
-              #vm.destroy(:destroy_medium => :delete)
-              ##vm.destroy(:destroy_image => true)
-              
-              #VBoxManage unregistervm "test-machine" --delete
-              #because the destroy does remove the .vbox file on 4.0.x
-              #PDB
-              #vm.destroy()
-              
-              command="#{@vboxcmd} unregistervm  '#{boxname}' --delete"    
-            	puts command
-
-              #Exec and system stop the execution here
-              Veewee::Shell.execute("#{command}")
-              
-              #if the disk was not attached when the machine was destroyed we also need to delete the disk
-              location=boxname+"."+@definition[:disk_format].downcase
-              found=false       
-              VirtualBox::HardDrive.all.each do |d|
-                if !d.location.match(/#{location}/).nil?
-                  d.destroy(true)
-                  break
-                end
-              end     
+              puts "We found no good state so we are destroying the previous machine+disks"
+              destroy_vm(boxname)
             end
               
           end
 
-          puts "(re-)executing step #{step_name}"
+          #puts "(re-)executing step #{step_name}"
           
          
           yield
-          puts "seeking #{boxname}"
+ 
           #Need to look it up again because if it was an initial load
           vm=VirtualBox::VM.find(boxname) 
-          puts "saving state"
+          puts "Step [#{current_step_nr}] was succesfull - saving state"
           vm.save_state
-          puts "waiting for 2 secs"
           sleep 2 #waiting for it to be ok
-          puts "about to snapshot #{vm}"
+          #puts "about to snapshot #{vm}"
           #take snapshot after succesful execution
           vm.take_snapshot(step_name,"snapshot taken by veewee")
-          puts "wait 2 secs before starting"
           sleep 2 #waiting for it to be started again
           vm.start
         end   

data/lib/veewee/shell.rb

@@ -15,7 +15,9 @@ module Veewee
             begin
               PTY.spawn( command ) do |r, w, pid|
                 begin
-                  r.each { |line| print line;}      
+                  r.each { }      
+                  #r.each { |line| print line;}      
+
                rescue Errno::EIO        
                end      
              end  

data/lib/veewee/ssh.rb

@@ -5,10 +5,11 @@ module Veewee
 
       defaults={ :port => '22', :timeout => 200 , :user => 'vagrant', :password => 'vagrant'}
 
-      puts "checking if login works ssh => #{options[:port]}"
-
       options=defaults.merge(options)
 
+      puts
+      puts "Trying ssh login with user #{options[:user]} to sshd on port => #{options[:port]}"
+
       begin
         Timeout::timeout(options[:timeout]) do
           connected=false
@@ -33,11 +34,13 @@ module Veewee
     end
 
 
-    def self.transfer_file(host,filename,options)
+    def self.transfer_file(host,filename,destination = '.' , options)
       Net::SSH.start( host,options[:user],options ) do |ssh|
-        puts "Transferring #{filename} "
-        ssh.scp.upload!( filename, '.' ) do |ch, name, sent, total|
-          print "\r#{filename}: #{(sent.to_f * 100 / total.to_f).to_i}%"
+        puts "Transferring #{filename} to #{destination} "
+        ssh.scp.upload!( filename, destination ) do |ch, name, sent, total|
+       #   print "\r#{destination}: #{(sent.to_f * 100 / total.to_f).to_i}%"
+          print "."
+
         end
       end 
       puts

data/lib/veewee/version.rb

@@ -1,3 +1,3 @@
 module Veewee
-  VERSION = "0.1.0a"
+  VERSION = "0.1.2"
 end

data/lib/veewee/web.rb

@@ -14,7 +14,7 @@ module Veewee
              def do_GET(request,response)
                      response['Content-Type']='text/plain'
                      response.status = 200
-                     
+                     puts "Serving file #{@localfile}"                     
                      displayfile=File.open(@localfile,'r')
                      content=displayfile.read()
                      response.body=content
@@ -26,12 +26,19 @@ module Veewee
 
     def self.wait_for_request(filename,options={:timeout => 10, :web_dir => "", :port => 7125})  
       
+      webrick_logger=WEBrick::Log.new("/dev/null", WEBrick::Log::INFO)
+      
       web_dir=options[:web_dir]
       filename=filename
-      s= HTTPServer.new(:Port => options[:port])
+      s= HTTPServer.new(
+        :Port => options[:port],
+        :Logger => webrick_logger,
+        :AccessLog => webrick_logger
+      )
       s.mount("/#{filename}", FileServlet,File.join(web_dir,filename))
       trap("INT"){
           s.shutdown
+          puts "Stopping webserver"
           exit
         }
       s.start

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

@@ -36,7 +36,7 @@ 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-x86.run
+sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
 
 rm VBoxGuestAdditions_$VBOX_VERSION.iso

data/veewee.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   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_development_dependency "bundler", ">= 1.0.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: veewee
 version: !ruby/object:Gem::Version 
-  prerelease: 5
-  version: 0.1.0a
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - Patrick Debois
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 +01:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,28 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: progressbar
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: Expand the 'vagrant box' command to support the creation of base boxes from scratch
 email: 
 - patrick.debois@jedi.be
@@ -84,15 +106,14 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
-- README
+- README.md
 - Rakefile
-- TODO
 - bin/veewee
-- gems/.gitignore
 - iso/.gitignore
 - lib/vagrant_init.rb
 - lib/veewee.rb
 - lib/veewee/command.rb
+- lib/veewee/config.rb
 - lib/veewee/export.rb
 - lib/veewee/scancode.rb
 - lib/veewee/session.rb
@@ -125,7 +146,6 @@ files:
 - templates/ubuntu-10.10-server-i386/postinstall.sh
 - templates/ubuntu-10.10-server-i386/postinstall2.sh
 - templates/ubuntu-10.10-server-i386/preseed.cfg
-- tmp/.gitignore
 - trials/docu-vbox.txt
 - trials/f.rb
 - trials/t.rb
@@ -144,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1588562477501260201
+      hash: 1560906446498783228
       segments: 
       - 0
       version: "0"

data/TODO

@@ -1 +0,0 @@
-Maybe use Bittorrent to download iso - http://rubytorrent.rubyforge.org/

data/gems/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

data/tmp/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore