veewee 0.3.7 → 0.3.9

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

@@ -48,7 +48,7 @@ module Veewee
 
       def string_to_vnccode(thestring)
 
-        # http://code.google.com/p/ruby-vnc/source/browse/trunk/data/keys.yaml
+	# https://github.com/aquasync/ruby-vnc/blob/master/data/keys.yaml
 
         special=Hash.new
         # Specific veewee

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

@@ -7,6 +7,14 @@ module Veewee
         def wincp(localfile,remotefile,options={})
           raise Veewee::Error,"Box is not running" unless self.running?
 
+          if self.exec("cmd.exe /C dir #{wget_vbs_file} > NUL",{:exitcode=>"*"}).status != 0
+            env.ui.warn "Creating wget.vbs"
+            create_wget_vbs_command do |command_chunk, chunk_num|
+              self.exec("cmd.exe /C echo \"Rendering '#{wget_vbs_file}' chunk #{chunk_num}\" && #{command_chunk}")
+            end
+          end
+
+          
           # Calculate an available kickstart port which we will use for wincp
           definition.kickstart_port = "7000" if definition.kickstart_port.nil?
           guessed_port=guess_free_port(definition.kickstart_port.to_i,7199).to_s
@@ -15,14 +23,6 @@ module Veewee
             definition.kickstart_port=guessed_port.to_s
           end
 
-          if self.exec("cmd.exe /C dir #{wget_vbs_file} > %TEMP%\\null",{:exitcode=>"*"}).status != 0
-            env.ui.warn "Creating wget.vbs"
-            create_wget_vbs_command do |command_chunk, chunk_num|
-              self.exec("cmd.exe /C echo \"Rendering '#{wget_vbs_file}' chunk #{chunk_num}\" && #{command_chunk}")
-            end
-          end
-
-          
           env.ui.warn "Spinning up a wait_for_http_request on http://#{host_ip_as_seen_by_guest}:#{definition.kickstart_port}#{localfile}"
           webthread=allow_for_http_request(localfile,{
               :port => definition.kickstart_port,

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

@@ -8,6 +8,7 @@ module Veewee
           require 'progressbar'
           require 'highline/import'
           require 'digest/md5'
+          require 'digest/sha1'
 
           def download_iso(url,filename)
             if !File.exists?(env.config.veewee.iso_dir)
@@ -27,7 +28,8 @@ module Veewee
 
           def download_progress(url,localfile)
             pbar = nil
-            URI.parse(url).open(
+            uri = URI.parse(url)
+            uri.open(
               :content_length_proc => lambda {|t|
               if t && 0 < t
                 pbar = ProgressBar.new("Fetching file", t)
@@ -36,7 +38,10 @@ module Veewee
             },
               :progress_proc => lambda {|s|
               pbar.set s if pbar
-            }) { |src|
+            },
+              #consider proxy env vars only if host is not excluded
+              :proxy => !no_proxy?(uri.host)
+            ) { |src|
               # We assume large 10K files, so this is tempfile object
               env.logger.info "#{src.class}"
                 ui.info "Moving #{src.path} to #{localfile}"
@@ -50,9 +55,26 @@ module Veewee
             }
           end
 
+          #return true if host is excluded from proxy via no_proxy env var, false otherwise
+          def no_proxy? host
+            @no_proxy ||= (ENV['NO_PROXY'] || ENV['no_proxy'] || 'localhost, 127.0.0.1').split(/\s*,\s*/)
+            @no_proxy.each do |host_addr|
+              return true if host.match(Regexp.quote(host_addr)+'$')
+            end
+            return false
+          end
+
           # Compute hash code
-          def hashsum(filename)
-            checksum=Digest::MD5.new
+          def hashsum(filename,type)
+            case type
+            when :md5
+              checksum=Digest::MD5.new
+            when :sha1
+              checksum=Digest::SHA1.new
+            else
+              raise Veewee::Error, "Unknown checksum type #{type}"
+            end
+
             buflen=1024
             open(filename, "rb") do |io|
               counter = 0
@@ -65,15 +87,16 @@ module Veewee
             return checksum.hexdigest
           end
 
-          def verify_md5sum(full_path)
+          def verify_sum(full_path,type)
             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)"
+            required_sum = self.instance_variable_get('@iso_'+type.to_s)
+            ui.info "Verifying #{type} checksum : #{self.required_sum}"
+            file_sum = hashsum(full_path,type)
+
+            unless file_sum == required_sum
+              ui.error "The #{type} checksum for file #{filename } do not match: "
+              ui.error "- #{file_sum} (current) vs #{required_sum} (specified)"
+              raise Veewee::Error, "The #{type} checksum for file #{filename } do not match: \n"+ "- #{file_sum} (current) vs #{required_sum} (specified)"
             end
           end
 
@@ -95,7 +118,8 @@ module Veewee
               unless "#{self.iso_src}"==""
                 ui.info "- Download url: #{self.iso_src}"
               end
-              ui.info "- Md5 Checksum: #{self.iso_md5}"
+              ui.info "- Md5 Checksum: #{self.iso_md5}" if self.iso_md5
+              ui.info "- Sha1 Checksum: #{self.iso_sha1}" if self.iso_sha1
               ui.info "#{self.iso_download_instructions}"
               ui.info ""
 
@@ -125,7 +149,8 @@ module Veewee
                 else
                   ui.info "You have selected manual download: "
                   ui.info "curl -C - -L '#{self.iso_src}' -o '#{rel_path}'"
-                  ui.info "md5 '#{rel_path}' "
+                  ui.info "md5 '#{rel_path}' " if self.iso_md5
+                  ui.info "shasum '#{rel_path}' " if self.iso_sha1
                   ui.info ""
                   exit
                 end
@@ -138,7 +163,8 @@ module Veewee
 
             end
 
-            verify_md5sum(full_path) if options["md5check"] && !self.iso_md5.nil?
+            verify_sum(full_path,:md5) if options["checksum"] && !self.iso_md5.nil?
+            verify_sum(full_path,:sha1) if options["checksum"] && !self.iso_sha1.nil?
 
           end
         end #Module

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

@@ -4,80 +4,83 @@ module Veewee
       module Helper
         class Scancode
 
-          def self.string_to_keycode(thestring)
+          #http://www.win.tue.nl/~aeb/linux/kbd/scancodes-1.html
 
-            #http://www.win.tue.nl/~aeb/linux/kbd/scancodes-1.html
+          # keycode hash, seeded with 'Tab' - which is special as it's longer than 1 char
+          @@keys = { 'Tab' => '0f 8f' }
 
-            # keycode hash, seeded with 'Tab' - which is special as it's longer than 1 char
-            k = { 'Tab' => '0f 8f' }
-            
-            # add keycodes
+          # add keycodes
 
-            # "pure" keys (no modifier keys)
-            lower_keys = {
+          # "pure" keys (no modifier keys)
+          {
               '1234567890-='  => 0x02,
               'qwertyuiop[]'  => 0x10,
               'asdfghjkl;\'`' => 0x1e,
               '\\zxcvbnm,./'  => 0x2b
-            }.each do |keys, offset|
-              keys.split('').each_with_index do |key, idx|
-                k[key] = sprintf('%02x %02x', idx + offset, idx + offset + 0x80)
-              end
+          }.each do |keys, offset|
+            keys.split('').each_with_index do |key, idx|
+              @@keys[key] = sprintf('%02x %02x', idx + offset, idx + offset + 0x80)
             end
+          end
 
-            # upcase keys (with shift)
-            {
+          # upcase keys (with shift)
+          {
               '!@#$%^&*()_+'  => 0x02,
               'QWERTYUIOP{}'  => 0x10,
               'ASDFGHJKL:"~'  => 0x1e,
               '|ZXCVBNM<>?'   => 0x2b
-            }.each do |keys, offset|
-              keys.split('').each_with_index do |key, idx|
-                k[key] = sprintf('2a %02x aa %02x', idx + offset, idx + offset + 0x80)
-              end
+          }.each do |keys, offset|
+            keys.split('').each_with_index do |key, idx|
+              @@keys[key] = sprintf('2a %02x aa %02x', idx + offset, idx + offset + 0x80)
             end
-            
-            special=Hash.new;
-            special['<Enter>'] = '1c 9c';
-            special['<Backspace>'] = '0e 8e';
-            special['<Spacebar>'] = '39 b9';
-            special['<Return>'] = '1c 9c'
-            special['<Esc>'] = '01 81';
-            special['<Tab>'] = '0f 8f';
-            special['<KillX>'] = '1d 38 0e b8';
-            special['<Wait>'] = 'wait';
+          end
+
+          @@special_keys=Hash.new;
+          @@special_keys['<Enter>'] = '1c 9c';
+          @@special_keys['<Backspace>'] = '0e 8e';
+          @@special_keys['<Spacebar>'] = '39 b9';
+          @@special_keys['<Return>'] = '1c 9c'
+          @@special_keys['<Esc>'] = '01 81';
+          @@special_keys['<Tab>'] = '0f 8f';
+          @@special_keys['<KillX>'] = '1d 38 0e b8';
+          @@special_keys['<Wait>'] = 'wait';
 
-            special['<Up>'] = '48 c8';
-            special['<Down>'] = '50 d0';
-            special['<PageUp>'] = '49 c9';
-            special['<PageDown>'] = '51 d1';
-            special['<End>'] = '4f cf';
-            special['<Insert>'] = '52 d2';
-            special['<Delete>'] = '53 d3';
-            special['<Left>'] = '4b cb';
-            special['<Right>'] = '4d cd';
-            special['<Home>'] = '47 c7';
+          @@special_keys['<Up>'] = '48 c8';
+          @@special_keys['<Down>'] = '50 d0';
+          @@special_keys['<PageUp>'] = '49 c9';
+          @@special_keys['<PageDown>'] = '51 d1';
+          @@special_keys['<End>'] = '4f cf';
+          @@special_keys['<Insert>'] = '52 d2';
+          @@special_keys['<Delete>'] = '53 d3';
+          @@special_keys['<Left>'] = '4b cb';
+          @@special_keys['<Right>'] = '4d cd';
+          @@special_keys['<Home>'] = '47 c7';
 
-            # F1 .. F10
-            (1..10).each { |num| special["<F#{num}>"] = sprintf('%02x', num + 0x3a) }
+          # F1 .. F10
+          (1..10).each { |num| @@special_keys["<F#{num}>"] = sprintf('%02x', num + 0x3a) }
 
+          # VT1 - VT12 (Switch to Virtual Terminal #. e.g Alt+F1)
+          (1..12).each { |num| @@special_keys["<VT#{num}>"] = sprintf('38 %02x b8 %02x', num + 0x3a, num + 0xba) }
+
+          # the us keymap is used
+          def self.string_to_keycode(thestring)
             keycodes=''
             thestring.gsub!(/ /,"<Spacebar>")
 
             until thestring.length == 0
               nospecial=true;
-              special.keys.each { |key|
+              @@special_keys.keys.each { |key|
                 if thestring.start_with?(key)
                   #take thestring
                   #check if it starts with a special key + pop special string
-                  keycodes=keycodes+special[key]+' ';
+                  keycodes=keycodes+@@special_keys[key]+' ';
                   thestring=thestring.slice(key.length,thestring.length-key.length)
                   nospecial=false;
                   break;
                 end
               }
               if nospecial
-                code=k[thestring.slice(0,1)]
+                code=@@keys[thestring.slice(0,1)]
                 if !code.nil?
                   keycodes=keycodes+code+' '
                 else

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

@@ -20,7 +20,7 @@ module Veewee
           # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/185404
           # This should work on windows too now
           # This will result in a ShellResult structure with stdout, stderr and status
-          def shell_exec(command,options = {:mute => true,:status => 0})
+          def shell_exec(command,options = {:mute => true,:status => 0,:stderr => "&1"})
             defaults={:mute => true, :status => 0}
             options=defaults.merge(options)
             result=ShellResult.new("","",-1)
@@ -29,7 +29,8 @@ module Veewee
             env.logger.debug "Output:"
             env.logger.debug "-------"
             escaped_command=command
-            IO.popen("#{escaped_command}"+ " 2>&1") { |p|
+            stderr_redirect = options[:stderr]? options[:stderr] : "&1"
+            IO.popen("#{escaped_command}"+ " 2>#{stderr_redirect}") { |p|
               p.each_line{ |l|
                 result.stdout+=l
                 ui.info(l,{:new_line => false})  unless options[:mute]

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

@@ -3,7 +3,7 @@ module Veewee
     module Core
       module Helper
 
-        class SshResult
+        class SshResult < RuntimeError
           attr_accessor :stdout
           attr_accessor :stderr
           attr_accessor :status
@@ -25,28 +25,36 @@ 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?
 
+            unless options[:mute]
             ui.info  "Waiting for ssh login on #{ip} with user #{options[:user]} to sshd on port => #{options[:port]} to work, timeout=#{timeout} sec"
+            end
+
+            run_hook(:before_ssh)
 
             begin
               Timeout::timeout(timeout) do
                 connected=false
                 while !connected do
                   begin
-                    env.ui.info ".",{:new_line => false , :prefix => false}
+                    env.ui.info ".",{:new_line => false , :prefix => false} unless options[:mute]
                     Net::SSH.start(ip, options[:user], { :port => options[:port] , :password => options[:password], :paranoid => false , :timeout => timeout }) do |ssh|
 
-                      ui.info "\n", {:prefix => false}
+                      ui.info "\n", {:prefix => false} unless options[:mute]
                       block.call(ip);
                       return true
                     end
-                  rescue Net::SSH::Disconnect,Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ENETUNREACH,Errno::ETIMEDOUT, Errno::ENETUNREACH
+                  rescue Net::SSH::Disconnect, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ENETUNREACH, Errno::ETIMEDOUT
                     sleep 5
                   end
                 end
               end
+            rescue IOError
+              ui.info "Received a disconnect; moving on"
+              sleep 5
             rescue Timeout::Error
               raise Veewee::Error, "Ssh timeout #{timeout} sec has been reached."
             end
@@ -80,7 +88,9 @@ module Veewee
             stderr=""
             status=-99999
 
-            ui.info "Executing command: #{command}"
+            unless options[:mute]
+              ui.info "Executing command: #{command}"
+            end
 
             Net::SSH.start(host, options[:user], { :port => options[:port], :password => options[:password], :paranoid => false }) do |ssh|
 
@@ -101,15 +111,16 @@ module Veewee
                   ch.on_data do |c, data|
                     stdout+=data
 
-                    ui.info data
+                    ui.info(data, :new_line => false) unless options[:mute]
 
                   end
 
                   # "on_extended_data" is called when the process writes something to stderr
+                  # NOTE: When requesting a pty (ch.request_pty), everything goes to stdout
                   ch.on_extended_data do |c, type, data|
                     stderr+=data
 
-                    ui.info data
+                    ui.info(data, :new_line => false) unless options[:mute]
 
                   end
 
@@ -119,14 +130,14 @@ module Veewee
                     exit_code = data.read_long
                     status=exit_code
                     if exit_code > 0
-                      ui.info "ERROR: exit code #{exit_code}"
+                      ui.info "ERROR: exit code #{exit_code}" unless options[:mute]
                     else
                       #ui.info "Successfully executed"
                     end
                   end
 
                   channel.on_request("exit-signal") do |ch, data|
-                    ui.info "SIGNAL: #{data.read_long}"
+                    ui.info "SIGNAL: #{data.read_long}" unless options[:mute]
                   end
 
                   ch.on_close {
@@ -143,7 +154,7 @@ module Veewee
               if (options[:exitcode]=="*")
                 #its a test so we don't need to worry
               else
-                raise "Exitcode was not what we expected"
+                raise Veewee::Provider::Core::Helper::SshResult.new(stdout,stderr,status), "Exitcode was not what we expected"
               end
 
             end

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

@@ -13,6 +13,7 @@ module Veewee
                 begin
                   s = TCPSocket.new(ip, port)
                   s.close
+                  env.logger.debug("TCP port #{ip}:#{port} is used.")
                   return true
                 rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH,Errno::ENETDOWN
                   return false
@@ -26,11 +27,11 @@ module Veewee
 
           # This tries to guess a local free tcp port 
           def guess_free_port(min_port,max_port)
-            ui.info "Received port hint - #{min_port}"
+            ui.info "Finding unused TCP port in range: #{min_port} - #{max_port}"
 
             guessed_port=nil
 
-            for port in (min_port..max_port)
+            (min_port..max_port).each do |port|
               unless is_tcp_port_open?(get_local_ip, port)
                 guessed_port=port
                 break
@@ -38,15 +39,27 @@ module Veewee
             end
 
             if guessed_port.nil?
-              ui.error "No free port available: tried #{min_port}..#{max_port}"
-              raise Veewee::Error, "No free port available: tried #{min_port}..#{max_port}"
-            else
-              ui.info "Found port #{guessed_port} available"
+              message = "No free TCP port available in range: #{min_port} - #{max_port}"
+              ui.error message
+              raise Veewee::Error, message
             end
 
+            ui.info "Selected TCP port #{guessed_port}"
             return guessed_port
           end
 
+          def guess_free_ssh_port(min_port, max_port)
+            if definition.force_ssh_port
+              ui.warn "SSH port auto-configuration is disabled in the definition (force_ssh_port=true)."
+              if is_tcp_port_open?(get_local_ip, min_port)
+                ui.warn "TCP port #{min_port} is in use. You may execute the postinstall scripts on a different machine than intended!"
+              end
+              return min_port
+            else
+              return guess_free_port(min_port, max_port)
+            end
+          end
+
           def execute_when_tcp_available(ip="127.0.0.1", options = { } , &block)
 
             defaults={ :port => 22, :timeout => 2 , :pollrate => 5}