veewee 0.3.12 → 0.4.0

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

@@ -1,4 +1,5 @@
 require 'veewee/provider/core/helper/ssh'
+require 'shellwords'
 module Veewee
   module Provider
     module  Core
@@ -12,11 +13,8 @@ module Veewee
           host_ip=self.ip_address
 
           if (options[:interactive]==true)
-            # Command line options
-            extended_command="#{command}"
-
             unless host_ip.nil? || host_ip==""
-              ssh_command="ssh #{ssh_commandline_options(options)} #{host_ip} \"#{extended_command}\""
+              ssh_command="ssh #{ssh_commandline_options(options)} #{host_ip} #{Shellwords.escape command}"
 
               fg_exec(ssh_command,options)
 
@@ -42,8 +40,10 @@ module Veewee
             "-o IdentitiesOnly=yes",
             "-o VerifyHostKeyDNS=no"
           ]
-          if !(definition.ssh_key.nil? ||  definition.ssh_key.length!="")
-            command_options << "-i #{definition.ssh_key}"
+          if !(definition.ssh_key.nil? ||  definition.ssh_key.empty?)
+            # Filenames of SSH keys are relative to their definition
+            ssh_key = File.join(definition.path, definition.ssh_key)
+            command_options << "-i #{ssh_key}"
           end
           commandline_options="#{command_options.join(" ")} ".strip
 

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

@@ -1,4 +1,6 @@
+require 'to_slug'
 require 'veewee/provider/core/helper/winrm'
+
 module Veewee
   module Provider
     module  Core
@@ -10,11 +12,10 @@ module Veewee
           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}")
+              self.exec(%Q!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
@@ -23,18 +24,23 @@ module Veewee
             definition.kickstart_port=guessed_port.to_s
           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,
-              :host => definition.kickstart_ip,
-              :timeout => definition.kickstart_timeout,
-              :web_dir => '/'
-            })
+          urlpath = localfile.to_slug
+          urlpath = urlpath.start_with?('/') ? urlpath : '/' + urlpath
+          env.ui.warn "Spinning up an allow_for_http_request on http://#{host_ip_as_seen_by_guest}:#{definition.kickstart_port}#{localfile} at URL #{urlpath}"
+          allow_for_http_request(
+              localfile,
+              urlpath,
+              {
+                :port => definition.kickstart_port,
+                :host => definition.kickstart_ip,
+                :timeout => definition.kickstart_timeout,
+              }
+          )
           
           begin
             self.when_winrm_login_works(self.ip_address,winrm_options.merge(options)) do
               env.ui.info "Going to try and copy #{localfile} to #{remotefile.inspect}"
-              self.exec("cmd.exe /C cscript %TEMP%\\wget.vbs /url:http://#{host_ip_as_seen_by_guest}:#{definition.kickstart_port}#{localfile} /path:#{remotefile}")
+              self.exec("cmd.exe /C cscript %TEMP%\\wget.vbs /url:http://#{host_ip_as_seen_by_guest}:#{definition.kickstart_port}#{urlpath} /path:#{remotefile}")
               # while true do
               #   sleep 0.1 # used to debug
               # end
@@ -72,14 +78,14 @@ Set objXMLHTTP = CreateObject("MSXML2.ServerXMLHTTP")
 Set wshShell = CreateObject( "WScript.Shell" )
 Set objUserVariables = wshShell.Environment("USER")
 
-'http proxy is optional
-'attempt to read from HTTP_PROXY env var first
+rem http proxy is optional
+rem attempt to read from HTTP_PROXY env var first
 On Error Resume Next
 
 If NOT (objUserVariables("HTTP_PROXY") = "") Then
 objXMLHTTP.setProxy 2, objUserVariables("HTTP_PROXY")
 
-'fall back to named arg
+rem fall back to named arg
 ElseIf NOT (WScript.Arguments.Named("proxy") = "") Then
 objXMLHTTP.setProxy 2, WScript.Arguments.Named("proxy")
 End If

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

@@ -9,6 +9,7 @@ module Veewee
           require 'highline/import'
           require 'digest/md5'
           require 'digest/sha1'
+          require 'digest/sha2'
 
           def download_iso(url,filename)
             if !File.exists?(env.config.veewee.iso_dir)
@@ -71,6 +72,8 @@ module Veewee
               checksum=Digest::MD5.new
             when :sha1
               checksum=Digest::SHA1.new
+            when :sha256
+              checksum=Digest::SHA256.new
             else
               raise Veewee::Error, "Unknown checksum type #{type}"
             end
@@ -90,7 +93,7 @@ module Veewee
           def verify_sum(full_path,type)
             filename = File.basename(full_path)
             required_sum = self.instance_variable_get('@iso_'+type.to_s)
-            ui.info "Verifying #{type} checksum : #{self.required_sum}"
+            ui.info "Verifying #{type} checksum : #{required_sum}"
             file_sum = hashsum(full_path,type)
 
             unless file_sum == required_sum
@@ -108,11 +111,6 @@ module Veewee
               ui.info ""
               ui.info "The isofile #{filename} already exists."
             else
-
-              path1=Pathname.new(full_path)
-              path2=Pathname.new(Dir.pwd)
-              rel_path=path1.relative_path_from(path2).to_s
-
               ui.info ""
               ui.info "We did not find an isofile here : #{full_path}. \n\nThe definition provided the following download information:"
               unless "#{self.iso_src}"==""
@@ -120,6 +118,7 @@ module Veewee
               end
               ui.info "- Md5 Checksum: #{self.iso_md5}" if self.iso_md5
               ui.info "- Sha1 Checksum: #{self.iso_sha1}" if self.iso_sha1
+              ui.info "- Sha256 Checksum: #{self.iso_sha256}" if self.iso_sha256
               ui.info "#{self.iso_download_instructions}"
               ui.info ""
 
@@ -148,9 +147,10 @@ module Veewee
                   end
                 else
                   ui.info "You have selected manual download: "
-                  ui.info "curl -C - -L '#{self.iso_src}' -o '#{rel_path}'"
-                  ui.info "md5 '#{rel_path}' " if self.iso_md5
-                  ui.info "shasum '#{rel_path}' " if self.iso_sha1
+                  ui.info "curl -C - -L '#{self.iso_src}' -o '#{full_path}'"
+                  ui.info "md5 '#{full_path}' " if self.iso_md5
+                  ui.info "shasum '#{full_path}' " if self.iso_sha1
+                  ui.info "shasum -a 256 '#{rel_path}' " if self.iso_sha256
                   ui.info ""
                   exit
                 end
@@ -165,6 +165,7 @@ module Veewee
 
             verify_sum(full_path,:md5) if options["checksum"] && !self.iso_md5.nil?
             verify_sum(full_path,:sha1) if options["checksum"] && !self.iso_sha1.nil?
+            verify_sum(full_path,:sha256) if options["checksum"] && !self.iso_sha256.nil?
 
           end
         end #Module

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

@@ -17,6 +17,43 @@ module Veewee
 
         module Ssh
 
+          require 'socket'
+
+          # nonblocking ssh connection check
+          def tcp_test_ssh(hostname, port, timeout = 2)                        
+            
+            addr = Socket.getaddrinfo(hostname, nil)
+            sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
+
+            Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0).tap do |socket|
+              socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+              begin
+                socket.connect_nonblock(sockaddr)
+
+              rescue IO::WaitWritable
+                if IO.select(nil, [socket], nil, timeout)
+                  begin
+                    result = socket.connect_nonblock(sockaddr)
+                    if result == 0 
+                      socket.close
+                      return true
+                    end
+                  rescue Errno::EISCONN
+                    socket.close
+                    return true
+                  rescue
+                    socket.close
+                    return false
+                  end
+                else
+                  socket.close
+                  return false
+                end
+              end
+            end
+            false
+          end
+
           require 'net/ssh'
           require 'net/scp'
 
@@ -41,11 +78,20 @@ module Veewee
                 while !connected do
                   begin
                     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} unless options[:mute]
-                      block.call(ip);
-                      return true
+                    if tcp_test_ssh(ip, options[:port])
+                      Net::SSH.start(ip, options[:user],
+                                     { :port => options[:port],
+                                       :password => options[:password],
+                                       :auth_methods => ['password','publickey','keyboard-interactive'],
+                                       :paranoid => false ,
+                                       :timeout => timeout }) do |ssh|
+
+                        ui.info "\n", {:prefix => false} unless options[:mute]
+                        block.call(ip);
+                        return true
+                      end
+                    else 
+                      sleep 5
                     end
                   rescue Net::SSH::Disconnect, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ENETUNREACH, Errno::ETIMEDOUT
                     sleep 5
@@ -65,7 +111,10 @@ module Veewee
 
           def ssh_transfer_file(host,filename,destination = '.' , options = {})
 
-            defaults={ :paranoid => false }
+            defaults={
+              :paranoid => false,
+              :auth_methods => ['password','publickey','keyboard-interactive']
+            }
             options=defaults.merge(options)
 
             Net::SSH.start( host,options[:user],options ) do |ssh|
@@ -92,7 +141,11 @@ module Veewee
               ui.info "Executing command: #{command}"
             end
 
-            Net::SSH.start(host, options[:user], { :port => options[:port], :password => options[:password], :paranoid => false }) do |ssh|
+            Net::SSH.start(host, options[:user], {
+                             :port => options[:port],
+                             :password => options[:password],
+                             :auth_methods => ['password','publickey','keyboard-interactive'],
+                             :paranoid => false }) do |ssh|
 
               # open a new channel and configure a minimal set of callbacks, then run
               # the event loop until the channel finishes (closes)

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

@@ -3,12 +3,12 @@ module Veewee
     module Core
       module Helper
         require 'webrick'
+
         include WEBrick
-        module Servlet
 
+        module Servlet
 
           class FileServlet < WEBrick::HTTPServlet::AbstractServlet
-
             attr_reader :ui, :threaded
 
             def initialize(server,localfile,ui,threaded)
@@ -37,45 +37,44 @@ module Veewee
               end
             end
           end
-
         end
-        module Web
 
-          def wait_for_http_request(filename,options) # original blocking
-            s = server_for_http_request(filename,options)
+        module Web
+          def wait_for_http_request(filename, urlname, options) # original blocking
+            s = server_for_http_request(filename, urlname, options)
             s.start
           end
 
-          def allow_for_http_request(filename,options) # start in new thread
-            s = server_for_http_request(filename,options.merge({:threaded => false}))
+          def allow_for_http_request(filename, urlname, options) # start in new thread
+            s = server_for_http_request(filename, urlname, options.merge({:threaded => false}))
             Thread.new { s.start }
           end
 
-          def server_for_http_request(filename,options={:timeout => 10, :web_dir => "", :port => 7125, :threaded => false})
+          def server_for_http_request(filename, urlname, options={:timeout => 10, :port => 7125, :threaded => false})
             # Calculate the OS equivalent of /dev/null , on windows this is NUL:
             # http://www.ruby-forum.com/topic/115472
             fn = test(?e, '/dev/null') ? '/dev/null' : 'NUL:'
 
             webrick_logger=WEBrick::Log.new(fn, WEBrick::Log::INFO)
 
-            web_dir=options[:web_dir]
-            filename=filename
             s= ::WEBrick::HTTPServer.new(
               :Port => options[:port],
               :Logger => webrick_logger,
               :AccessLog => webrick_logger
             )
-            mount_filename = filename.start_with?('/') ? filename : "/#{filename}"
-            env.logger.debug("mounting file #{mount_filename}")
-            s.mount("#{mount_filename}", Veewee::Provider::Core::Helper::Servlet::FileServlet,File.join(web_dir,filename),ui,options[:threaded])
+
+            env.logger.debug("mounting file #{urlname}")
+
+            s.mount("#{urlname}", Veewee::Provider::Core::Helper::Servlet::FileServlet, filename, ui, options[:threaded])
+
             trap("INT"){
               s.shutdown
               ui.info "Stopping webserver"
               exit
             }
+
             s
           end
-
         end #Class
       end #Module
     end #Module

data/lib/veewee/provider/kvm/provider.rb

@@ -46,7 +46,7 @@ module Veewee
           conn.pools.any? or raise Veewee::Error, "You need at least one (active) storage pool defined in #{Fog.credentials[:libvirt_uri]}."
 
           env.logger.info "Checking availability of the arp utility"
-          shell_exec("arp").status.zero? or raise Veewee::Error, "Could not execute the arp command. This is required to find the IP address of the VM"
+          shell_exec("arp -an").status.zero? or raise Veewee::Error, "Could not execute the arp command. This is required to find the IP address of the VM"
 
         end
 

data/lib/veewee/provider/virtualbox/box.rb

@@ -28,34 +28,35 @@ module Veewee
   module Provider
     module Virtualbox
       class Box < Veewee::Provider::Core::Box
-
         include ::Veewee::Provider::Virtualbox::BoxCommand
 
-        def initialize(name,env)
+        def initialize(name, env)
           @vboxcmd = self.class.determine_vboxcmd
           super(name, env)
         end
 
         def self.windows_vboxcmd
           # based on Vagrant/plugins/providers/virtualbox/driver/base.rb
-          if OS.windows? && ENV.has_key?("VBOX_INSTALL_PATH")
-            ENV["VBOX_INSTALL_PATH"].split(File::PATH_SEPARATOR).each do |path|
-              vboxmanage = File.join(path,"VBoxManage.exe")
-              return "\"#{vboxmanage}\"" if File.file?(vboxmanage)
+          if OS.windows?
+            if ENV.key?('VBOX_INSTALL_PATH') ||
+               ENV.key?('VBOX_MSI_INSTALL_PATH')
+              path = ENV['VBOX_INSTALL_PATH'] || ENV['VBOX_MSI_INSTALL_PATH']
+              path.split(File::PATH_SEPARATOR).each do |single|
+                vboxmanage = File.join(single, 'VBoxManage.exe')
+                return "\"#{vboxmanage}\"" if File.file?(vboxmanage)
+              end
             end
           end
           nil
         end
 
         def self.default_vboxcmd
-          "VBoxManage"
+          'VBoxManage'
         end
 
         def self.determine_vboxcmd
           @command ||= windows_vboxcmd || default_vboxcmd
         end
-
-
       end # End Class
     end # End Module
   end # End Module

data/lib/veewee/provider/virtualbox/box/export_vagrant.rb

@@ -110,7 +110,7 @@ module Veewee
             end
 
             ui.info "Exporting the box"
-            command = "#{@vboxcmd} export #{name} --output #{File.join(tmp_dir,'box.ovf')}"
+            command = "#{@vboxcmd} export \"#{name}\" --output \"#{File.join(tmp_dir,'box.ovf')}\""
             env.logger.debug("Command: #{command}")
             shell_exec(command, {:mute => false})
 

data/lib/veewee/provider/virtualbox/box/helper/create.rb

@@ -203,7 +203,7 @@ module Veewee
               vm_flag_value=definition.instance_variable_get("@#{vm_flag}")
               ui.info "Setting VM Flag #{vm_flag} to #{vm_flag_value}"
               ui.warn "Used of #{vm_flag} is deprecated - specify your options in the definition file as \n :virtualbox => { :vm_options => [\"#{vm_flag}\" => \"#{vm_flag_value}\"]}"
-              command="#{@vboxcmd} modifyvm #{name} --#{vm_flag.to_s} #{vm_flag_value}"
+              command="#{@vboxcmd} modifyvm \"#{name}\" --#{vm_flag.to_s} #{vm_flag_value}"
               shell_exec("#{command}")
             end
           end
@@ -211,7 +211,7 @@ module Veewee
           unless definition.virtualbox[:vm_options].nil? || definition.virtualbox[:vm_options][0].nil?
             definition.virtualbox[:vm_options][0].each do |vm_flag,vm_flag_value|
               ui.info "Setting VM Flag #{vm_flag} to #{vm_flag_value}"
-              command="#{@vboxcmd} modifyvm #{name} --#{vm_flag.to_s} #{vm_flag_value}"
+              command="#{@vboxcmd} modifyvm \"#{name}\" --#{vm_flag.to_s} #{vm_flag_value}"
               shell_exec("#{command}")
             end
           end

data/lib/veewee/provider/vmfusion/box/template.vmx.erb

@@ -96,7 +96,7 @@ sound.startConnected = "FALSE"
 RemoteDisplay.vnc.enabled = "TRUE"
 RemoteDisplay.vnc.port = "<%= vnc_port %>"
 <% if enable_hypervisor_support == true %>vhv.enable = "TRUE"<% end %>
-<% if fusion_version.start_with?('5.') %>bios.bootOrder = "hdd,CDROM"<% end %>
+<% if fusion_version.start_with?('5.') or fusion_version.start_with?('6.') %>bios.bootOrder = "hdd,CDROM"<% end %>
 <% unless vmdk_file.nil? %>
 scsi0:2.present = "TRUE"
 scsi0:2.fileName = "<%= vmdk_file %>"

data/lib/veewee/version.rb

@@ -4,5 +4,5 @@ end
 
 # Only set the version constant if it wasn't set before
 unless defined?(Veewee::VERSION)
-  ::Veewee::VERSION="0.3.12"
+  ::Veewee::VERSION="0.4.0"
 end

data/templates/.ubuntu/base.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -f .veewee_params ]
 then
   . .veewee_params

data/templates/.ubuntu/chef.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -f .veewee_params ]
 then
   . .veewee_params

data/templates/.ubuntu/cleanup.sh

@@ -1,3 +1,10 @@
+#!/bin/bash
+
+if [ -f .veewee_params ]
+then
+  . .veewee_params
+fi
+
 # Remove items used for building, since they aren't needed anymore
 echo "removing unnessary packages"
 apt-get -y remove linux-headers-$(uname -r) build-essential