veewee 0.3.0.alpha8 → 0.3.0.alpha9

data/Gemfile

@@ -1,3 +1,8 @@
+#if RUBY_VERSION =~ /1.9/
+    #Encoding.default_external = Encoding::UTF_8
+    #Encoding.default_internal = Encoding::UTF_8
+#end
+
 source "http://rubygems.org"
 
 #gem "veewee", :path => "."

data/Rakefile

@@ -25,7 +25,7 @@ Rake::TestTask.new do |t|
 end
 
 desc 'Verify ISO'
-task :iso, [:box_name] do |t,args|
+task :iso, [:template_name] do |t,args|
   require 'net/http'
   #if args.to_hash.size!=1
   #puts "needs one arguments: rake iso [\"yourname\"]"
@@ -63,3 +63,43 @@ task :iso, [:box_name] do |t,args|
     end
   end
 end
+
+desc 'Autobuilds all templates and runs validation.'
+task :autotest, [:pattern] do |t,args|
+
+  # We overrule all timeouts for tcp and ssh
+  #ENV['VEEWEE_TIMEOUT']='600'
+
+  ve=Veewee::Environment.new()
+  ve.templates.each do |name,template|
+
+    # If pattern was given, only take the ones that match the pattern
+    unless args[:pattern].nil?
+      next unless name.match(args[:pattern])
+    end
+
+    begin
+      ve.definitions.define("auto",name, { 'force' => true})
+      vd=ve.definitions["auto"]
+      box=ve.providers["virtualbox"].get_box("auto")
+      puts "AUTO: Building #{name}"
+      box.build({"auto" => true,"force" => true, 'nogui' => true })
+      puts "AUTO: Validating #{name}"
+      box.validate_vagrant
+      puts "AUTO: Success #{name}"
+      box.destroy
+    rescue Exception => ex
+      puts "AUTO: Template #{name} failed - #{ex}"
+      if box.running?
+        begin
+          screenshot="screenshot-auto-#{name}.png"
+          puts "AUTO: Taking snapshot #{screenshot}"
+          box.screenshot(screenshot)
+        rescue Veewee::Error => ex
+          puts "AUTO: Error taking screenshot"
+        end
+      end
+    end
+
+  end
+end

data/bin/veewee

@@ -18,5 +18,5 @@ begin
   ::Veewee::CLI.start(ARGV,:env => env)
 
 rescue Veewee::Error => e
-  puts "#{e}"
+  env.ui.error "#{e}"
 end

data/doc/kvm.md

@@ -1,2 +1,10 @@
-Coming Soon
+NOTE:Virtualbox doesn't like KVM to be enabled
 
+check with 
+
+    kvm_ok
+
+Remove modules:
+
+    rmmod kvm_intel
+    rmmod kvm

data/doc/vagrant.md

@@ -2,11 +2,11 @@
 Let's define a  Ubuntu 10.10 server i386 basebox called myunbuntubox
 this is essentially making a copy based on the  templates provided above.
 
-    $ veewee vbox basebox define 'myubuntubox' 'ubuntu-10.10-server-i386'
+    $ veewee vbox define 'myubuntubox' 'ubuntu-10.10-server-i386'
     The basebox 'myubuntubox' has been succesfully created from the template ''ubuntu-10.10-server-i386'
     You can now edit the definition files stored in definitions/myubuntubox
     or build the box with:
-    veewee vbox basebox build 'myubuntubox'
+    veewee vbox build 'myubuntubox'
 
 -> This copies over the templates/ubuntu-10.10-server-i386 to definition/myubuntubox
 
@@ -47,7 +47,7 @@ If you need to change values in the templates, be sure to run the rake undefine,
 ## Getting the cdrom file in place
 Put your isofile inside the 'currentdir'/iso directory or if you don't run
 
-    $ veewee vbox basebox build 'myubuntubox'
+    $ veewee vbox 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
@@ -55,7 +55,7 @@ Put your isofile inside the 'currentdir'/iso directory or if you don't run
 
 ## Build the new box:
 
-    $ veewee vbox basebox build 'myubuntubox'
+    $ veewee vbox 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
@@ -108,7 +108,7 @@ If you don't use rvm, be sure to execute vagrant through bundle exec
 
 Start of an existing one
 
-    $ veewee vbox basebox define 'mynewos' 'ubuntu...'
+    $ veewee vbox define 'mynewos' 'ubuntu...'
 
 - Do changes in the currentdir/definitions/mynewos
 - When it builds ok, move the definition/mynewos to a sensible directory under templates

data/lib/veewee/command/vagrant/basebox.rb

@@ -12,6 +12,7 @@ require 'veewee/command/vagrant/define'
 require 'veewee/command/vagrant/undefine'
 require 'veewee/command/vagrant/validate'
 require 'veewee/command/vagrant/export'
+require 'veewee/command/vagrant/screenshot'
 
 
 module Veewee
@@ -36,6 +37,7 @@ module Veewee
           @subcommands.register(:undefine)    { Veewee::Command::Vagrant::Undefine }
           @subcommands.register(:export)    { Veewee::Command::Vagrant::Export }
           @subcommands.register(:validate)    { Veewee::Command::Vagrant::Validate }
+          @subcommands.register(:screenshot)    { Veewee::Command::Vagrant::Screenshot }
 
         end
 

data/lib/veewee/command/vagrant/build.rb

@@ -40,6 +40,9 @@ module Veewee
               options['postinstall_list'] = e
             end
 
+            opts.on("--[no-]md5","force to check iso file md5 sum") do |v|
+              options['md5check'] = v
+            end
 
           end
 

data/lib/veewee/command/vagrant/export.rb

@@ -6,6 +6,8 @@ module Veewee
       class Export < ::Vagrant::Command::Base
         def execute
           options = {}
+          options['include'] = []
+          options['vagrantfile'] = []
 
           opts = OptionParser.new do |opts|
             opts.banner = "Exports basebox to the vagrant box format"
@@ -20,6 +22,14 @@ module Veewee
               options['force'] = f
             end
 
+            opts.on( "--vagrantfile [FILE]", "vagrantfile") do |f|
+              options['vagrantfile'] = f
+            end
+
+            opts.on("-i", "--include [FILE]", "include") do |f|
+                options['include'] << f
+            end
+
           end
 
           # Parse the options

data/lib/veewee/command/vagrant/screenshot.rb

@@ -0,0 +1,45 @@
+require 'optparse'
+
+module Veewee
+  module Command
+    module Vagrant
+      class Screenshot < ::Vagrant::Command::Base
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |opts|
+            opts.banner = "Grab a screenshot of a running basebox"
+            opts.separator ""
+            opts.separator "Usage: vagrant basebox screenshot <boxname> <pngfile>"
+
+            opts.on("-d", "--debug", "enable debugging") do |d|
+              options['debug'] = d
+            end
+
+            opts.on("-f", "--force", "force overwrite") do |f|
+              options['force'] = f
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+          raise ::Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 2
+
+          begin
+            venv=Veewee::Environment.new(options)
+            venv.ui=@env.ui
+            box_name=argv[0]
+            pngfilename=argv[1]
+            venv.providers["virtualbox"].get_box(box_name).screenshot(pngfilename)
+          rescue Veewee::Error => ex
+            venv.ui.error(ex,:prefix => false)
+            exit -1
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/veewee/command/virtualbox.rb

@@ -126,6 +126,19 @@ module Veewee
         end
       end
 
+      desc "screenshot [NAME] [PNGFILENAME]", "Takes a screenshot of the box"
+      def screenshot(box_name,pngfilename)
+        begin
+        venv=Veewee::Environment.new(options)
+        venv.ui = ::Veewee::UI::Shell.new(venv, shell)
+
+        venv.providers["virtualbox"].get_box(box_name).screenshot(pngfilename,options)
+        rescue Veewee::Error => ex
+          venv.ui.error(ex, :prefix => false)
+          exit -1
+        end
+      end
+
 
     end
 

data/lib/veewee/config.rb

@@ -48,11 +48,11 @@ module Veewee
         env.ui.error "Some method got an error in the configfile - Sorry"
         env.ui.error $!
         env.ui.error e.message
-        exit -1
+        raise Veewee::Error "Some method got an error in the configfile - Sorry"
       rescue Error => e
         env.ui.error "Error processing configfile - Sorry"
         env.ui.error e.message
-        exit -1
+        raise Veewee::Error "Error processing configfile - Sorry"
       end
       return self
     end

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

@@ -75,8 +75,11 @@ module Veewee
           end
 
           self.transfer_buildinfo(options)
-          self.handle_postinstall(options)
 
+          # Filtering post install files based upon --postinstall-include and --postinstall--exclude
+          definition.postinstall_files=filter_postinstall_files(options)
+
+          self.handle_postinstall(options)
 
           ui.success "The box #{name} was built succesfully!"
           ui.info "You can now login to the box with:"
@@ -158,8 +161,6 @@ module Veewee
         # It requires a definition to find all the necessary information
         def handle_kickstart(options)
 
-            # Filtering post install files based upon --postinstall-include and --postinstall--exclude
-          definition.postinstall_files=filter_postinstall_files(options)
           # Handling the kickstart by web
           kickstartfiles=definition.kickstart_file
 
@@ -191,32 +192,44 @@ module Veewee
         # This function handles all the post-install scripts
         # It requires a box(to login to) and a definition(listing the postinstall files)
         def handle_postinstall(options)
-          is_pre_postinstall_file = !definition.pre_postinstall_file.nil? && !definition.pre_postinstall_file.length != 0
-          transfered = false
+
+          # Transfer all postinstall files
           definition.postinstall_files.each do |postinstall_file|
             # Filenames of postinstall_files are relative to their definition
             filename=File.join(definition.path,postinstall_file)
-            unless File.basename(postinstall_file)=~/^_/
-              self.scp(filename,File.basename(filename))
-              self.exec("chmod +x \"#{File.basename(filename)}\"")
-              if is_pre_postinstall_file
+            self.scp(filename,File.basename(filename))
+            self.exec("chmod +x \"#{File.basename(filename)}\"")
+          end
+
+          # Prepare a pre_poinstall file if needed (not nil , or not empty)
+          unless definition.pre_postinstall_file.to_s.empty?
+            pre_filename=File.join(definition.path, definition.pre_postinstall_file)
+            self.scp(pre_filename,File.basename(pre_filename))
+            self.exec("chmod +x \"#{File.basename(pre_filename)}\"")
+            # Inject the call to the real script by executing the first argument (it will be the postinstall script file name to be executed)
+            self.exec("execute=\"\\n# We must execute the script passed as the first argument\\n\\$1\" && printf \"%b\\n\" \"$execute\" >> #{File.basename(pre_filename)}")
+          end
+
+          # Now iterate over the postinstall files
+          definition.postinstall_files.each do |postinstall_file|
+            # Filenames of postinstall_files are relative to their definition
+            filename=File.join(definition.path,postinstall_file)
+
+            unless File.basename(postinstall_file).start_with?("_")
+
+              unless definition.pre_postinstall_file.to_s.empty?
                 # Filename of pre_postinstall_file are relative to their definition
                 pre_filename=File.join(definition.path, definition.pre_postinstall_file)
                 # Upload the pre postinstall script if not already transfered
-                if !transfered
-                  self.scp(pre_filename,File.basename(pre_filename))
-                  transfered = true
-                  self.exec("chmod +x \"#{File.basename(pre_filename)}\"")
-                  # Inject the call to the real script by executing the first argument (it will be the postinstall script file name to be executed)
-                  self.exec("execute=\"\\n# We must execute the script passed as the first argument\\n\\$1\" && printf \"%b\\n\" \"$execute\" >> #{File.basename(pre_filename)}")
-                end
                 command = "./" + File.basename(pre_filename)
                 command = sudo(command) + " ./"+File.basename(filename)
               else
                 command = "./"+File.basename(filename)
                 command = sudo(command)
               end
+
               self.exec(command)
+
             else
               env.logger.info "Skipping postinstallfile #{postinstall_file}"
             end

data/lib/veewee/provider/core/box/exec.rb

@@ -18,13 +18,13 @@ module Veewee
                 result=self.ssh_execute(self.ip_address,command,new_options)
                 return result
               rescue RuntimeError => ex
-                ui.error("Error executing command #{command} : #{ex}",:prefix => false)
-                raise Veewee::SshError, ex
+                error= "Error executing command #{command} : #{ex}"
+                error+="\n"+ex
+                raise Veewee::SshError, error
               end
             end
           rescue Net::SSH::AuthenticationFailed => ex
-            ui.error("Authentication failure",:prefix => false)
-            raise Veewee::SshError, ex
+            raise Veewee::SshError, "Authentication failure\n"+ex
           end
 
         end

data/lib/veewee/provider/core/box/floppy.rb

@@ -20,7 +20,7 @@ module Veewee
               env.logger.info "Removing previous floppy file"
               FileUtils.rm(floppy_file)
             end
-            command="java -jar #{javacode_dir}/dir2floppy.jar '#{temp_dir}' '#{floppy_file}'"
+            command="java -jar #{javacode_dir}/dir2floppy.jar \"#{temp_dir}\" \"#{floppy_file}\""
             shell_exec("#{command}")
           end
         end

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

@@ -37,7 +37,7 @@ module Veewee
               :progress_proc => lambda {|s|
               pbar.set s if pbar
             }) { |src|
-              # We assume large 10K files, so this is tempfile object 
+              # We assume large 10K files, so this is tempfile object
               env.logger.info "#{src.class}"
                 ui.info "Moving #{src.path} to #{localfile}"
                 # Force the close of the src stream to release handle before moving
@@ -65,6 +65,17 @@ module Veewee
             return checksum.hexdigest
           end
 
+          def verify_md5sum(full_path)
+            filename = File.basename(full_path)
+            ui.info "Verifying md5 checksum : #{self.iso_md5}"
+            file_md5=hashsum(full_path)
+
+            unless file_md5==self.iso_md5
+              ui.error "The MD5 checksums for file #{filename } do not match: "
+              ui.error "- #{file_md5} (current) vs #{self.iso_md5} (specified)"
+              raise Veewee::Error, "The MD5 checksums for file #{filename } do not match: \n"+ "- #{file_md5} (current) vs #{self.iso_md5} (specified)"
+            end
+          end
 
           def verify_iso(options)
             filename=self.iso_file
@@ -123,19 +134,12 @@ module Veewee
                   raise Veewee::Error, "The provided iso #{full_path} is not readable"
                 end
 
-                ui.info "Verifying md5 checksum : #{self.iso_md5}"
-                file_md5=hashsum(full_path)
-
-                unless file_md5==self.iso_md5
-                  ui.error "The MD5 checksums for file #{filename } do not match: "
-                  ui.error "- #{file_md5} (current) vs #{self.iso_md5} (specified)"
-                  raise Veewee::Error, "The MD5 checksums for file #{filename } do not match: \n"+ "- #{file_md5} (current) vs #{self.iso_md5} (specified)"
-                end
-
               end
 
             end
 
+            verify_md5sum(full_path) if options["md5check"] && !self.iso_md5.nil?
+
           end
         end #Module
 

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

@@ -25,16 +25,18 @@ module Veewee
             defaults={ :port => '22', :timeout => 20000 }
 
             options=defaults.merge(options)
+            timeout = options[:timeout]
+            timeout=ENV['VEEWEE_TIMEOUT'].to_i unless ENV['VEEWEE_TIMEOUT'].nil?
 
-            ui.info  "Waiting for ssh login on #{ip} with user #{options[:user]} to sshd on port => #{options[:port]} to work, timeout=#{options[:timeout]} sec"
+            ui.info  "Waiting for ssh login on #{ip} with user #{options[:user]} to sshd on port => #{options[:port]} to work, timeout=#{timeout} sec"
 
             begin
-              Timeout::timeout(options[:timeout]) do
+              Timeout::timeout(timeout) do
                 connected=false
                 while !connected do
                   begin
                     env.ui.info ".",{:new_line => false , :prefix => false}
-                    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], { :port => options[:port] , :password => options[:password], :paranoid => false , :timeout => timeout }) do |ssh|
 
                       ui.info "\n", {:prefix => false}
                       block.call(ip);
@@ -46,8 +48,7 @@ module Veewee
                 end
               end
             rescue Timeout::Error
-              ui.error "Ssh timeout #{options[:timeout]} sec has been reached."
-              exit -1
+              raise Veewee::Error, "Ssh timeout #{timeout} sec has been reached."
             end
             ui.info ""
             return false