veewee 0.4.3 → 0.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGYzYTZiOTM2OGM2Nzc3Yjc4NTEyNzhiMjRjMGYyMmQzYTk0OTJlZQ==
+    YzM2NTRjOTM1ODExZDQ4OWI1NjU1ZTk5ZWVhMzViNGIwNDA4ZGE0Mw==
   data.tar.gz: !binary |-
-    NjdiN2ZkN2QyZGM4YjdiMTk1NGJkMGE4NjdiYWFkYTUzMmE5ZGUxOQ==
+    YzM0MDk2Y2IxYzFiNjU3NGRiNGU3NmM0YzcxZTA2M2FhNzU4YTc4Zg==
 SHA512:
   metadata.gz: !binary |-
-    YTIwNmFmYzIyYWNkZTgwM2NhZWRlODgzMWZhMTYwYzk4OGQwNjczNTU3YjI1
-    NTdjYTBjMTNmNDI3M2Y3MTNjNDA4NzNmMDk2ZjVkOTA2NzczOTFmZDEwYjE4
-    OGM1OTdkOTFmMmI4OTE4MGU4YzAxNWY3Y2U1ZDZiYzY5ZTM2YjI=
+    ZGQ4M2I3ZDY3MWQyMWIyNmQ2MThkMTllMjk2YWI1ZDcyMjE5OTczZjJjY2Q5
+    MzAyN2Q1ZTBkN2Q1MDgzMzBhODVlNmZiNDdlYzQyYTkzMjcxMDRhMTJhODhh
+    MjU3MjJlZGYwZGE0OTFlOWRmZTMxZmFlOGI4N2Y3MDhlN2VhZTQ=
   data.tar.gz: !binary |-
-    NWIxZWQ5Yzk0MDUzNjk4YzdkNWZkNzVkYzQwMzc5Mjg5ZDE0ODdjOWU4ZWM4
-    NzNkMzZlYjBmNmQ1ZTM2M2YwNDAxOTcwMWEyODUwOTcyZGU2ZGI0Y2FlNjRh
-    OGI0ZWNmZDdkYjk0ZGY5MTBkZGRmYWE5NjQwYTVhNzQ1NWJjZGE=
+    NzMxYjkxY2YyMjA2NzBiZmZjYjJmNzczYWRjMzJjYThiZjUyYTIyMWQyNWRh
+    NzZkMjQ4ZTdkNzE3YjZlMWQ3NTdmYzI4NGQzNWVmZjQzODc1NDViYmFmYWI0
+    N2JhNDVmYzE2NmU2OGI0OGJjMjczMjEzZmIzMzdkOTBlZDMzYmU=

data/doc/basics.md

@@ -14,8 +14,8 @@ Each template folder name follows a naming scheme to help you choosing the right
 For example, the template for a Ubuntu 12.10 server (i386) basebox looks like this:
 
     ubuntu-12.10-server-i386[-netboot]
-    ^       ^           ^     ^ 
-    |       |           |     +----- install flavor                        
+    ^       ^           ^     ^
+    |       |           |     +----- install flavor
     |       |           +----- architecture
     |       +----- version
     +----- OS name
@@ -97,9 +97,9 @@ Or you can remove the folder under `definitions`:
 
 ## Manage ISO files
 
-The distro ISOs (also called *disk images*) provide all files needed to install the OS. This file is essential for starting the installation process. 
+The distro ISOs (also called *disk images*) provide all files needed to install the OS. This file is essential for starting the installation process.
 
-If you already have an `.iso` file for the desired distribution on your disk, put it inside the `iso/` directory and make sure `definition.rb` is referencing the correct file. 
+If you already have an `.iso` file for the desired distribution on your disk, put it inside the `iso/` directory and make sure `definition.rb` is referencing the correct file.
 
 If an expected ISO is not found in the `iso/` directory, Veewee will ask you to download the ISO file from the web. Depending on your internet connection fetching an ISO file can take a while.
 
@@ -113,7 +113,7 @@ In order to build the defined box, execute this subcommand:
 The `build` subcommand can take the following optional flags:
 
 Flag Option                     | Description
---------------------------------|-------------    
+--------------------------------|-------------
 -f --force                      | overwrites if already exists
 -a --auto                       | automatically downloads the ISO without asking
 -n --nogui                      | builds in the background rather than opening a VM GUI and building in the GUI window
@@ -133,7 +133,7 @@ The `build` subcommand will run the following routines behind the scenes:
 * Mount the ISO file `:iso_file`
 * Boot up the machine and wait for `:boot_time`
 * Send the keystrokes in `:boot_cmd_sequence`
-* Start up a webserver on `:kickstart_port` to wait for a request from the `:kickstart_file`
+* Start up a webserver on `:kickstart_port` to wait `:kickstart_timeout` for a request for the `:kickstart_file`
   IMPORTANT: Do NOT navigate to the file in your browser or the server will stop and the installer will not be able to find your preseed
 * Wait for ssh login to work with `:ssh_user` and `:ssh_password`
 * `sudo` execute the `:postinstall_files`
@@ -198,7 +198,7 @@ Validation is highly recommended before requesting a fork pull on any modified t
 
 Finally let's export the box so it can be distributed or used by Vagrant:
 
-    $ bundle exec veewee vbox export 'myubuntubox'    
+    $ bundle exec veewee vbox export 'myubuntubox'
 
 
 ## Up Next

data/doc/customize.md

@@ -92,7 +92,7 @@ All other settings are used internally by Veewee, the virtualization provider, o
             'initrd=/install/initrd.gz -- <Enter>'
         ],
         :kickstart_port => "7122",
-        :kickstart_timeout => "10000",
+        :kickstart_timeout => "60",
         :kickstart_file => "preseed.cfg",
         :ssh_login_timeout => "10000",
         :ssh_user => "vagrant",
@@ -128,7 +128,6 @@ Definition Option               | Default                 | Provider
 :boot_wait                      | uninitialised           | core
 :boot_cmd_sequence              | empty                   | core
 :kickstart_port                 | uninitialised           | core
-:kickstart_ip                   | uninitialised           | core
 :kickstart_timeout              | uninitialised           | core
 :kickstart_file                 | uninitialised           | core
 :ssh_login_timeout              | uninitialised           | kvm, parallels, virtualbox, vmfusion

data/lib/veewee/definition.rb

@@ -21,7 +21,7 @@ module Veewee
 
     attr_accessor :boot_wait, :boot_cmd_sequence
 
-    attr_accessor :kickstart_port, :kickstart_ip, :kickstart_timeout, :kickstart_file
+    attr_accessor :kickstart_port, :kickstart_timeout, :kickstart_file
 
     attr_accessor :ssh_login_timeout, :ssh_user, :ssh_password, :ssh_key, :ssh_host_port, :ssh_guest_port
 
@@ -92,7 +92,7 @@ module Veewee
       #        :hostiocache => 'off' ,
       #        :os_type_id => 'Ubuntu',
       #        :boot_wait => "10", :boot_cmd_sequence => [ "boot"],
-      #        :kickstart_port => "7122", :kickstart_ip => "127.0.0.1", :kickstart_timeout => 10000,#
+      #        :kickstart_port => "7122", :kickstart_timeout => 60,#
       #        :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant",:ssh_key => "",
       @ssh_host_port = "2222" ; @ssh_guest_port = "22"
       #        :ssh_host_port => "2222", :ssh_guest_port => "22", :sudo_cmd => "echo '%p'|sudo -S sh '%f'",

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

@@ -72,10 +72,12 @@ module Veewee
           })
 
           # Type the boot sequence
+          t =
           Thread.new do
             self.console_type(boot_sequence)
             run_hook(:after_boot_sequence)
           end
+          t.abort_on_exception = true
 
           self.handle_kickstart(options)
         end
@@ -221,34 +223,30 @@ module Veewee
         # It requires a definition to find all the necessary information
         def handle_kickstart(options)
 
-          # Handling the kickstart by web
-          kickstartfiles=definition.kickstart_file
+          case definition.kickstart_file
+          when Array  then kickstartfiles = definition.kickstart_file
+          when String then kickstartfiles = definition.kickstartfiles.split
+          when nil    then kickstartfiles = []
+          else raise "Do not know how to handle kickstart_file: #{kickstart_file.inspect}"
+          end
 
-          if kickstartfiles.nil? || kickstartfiles.length == 0
+          if kickstartfiles.empty?
             env.ui.info "Skipping webserver as no kickstartfile was specified"
           else
-            env.ui.info "Starting a webserver #{definition.kickstart_ip}:#{definition.kickstart_port}\n"
-          end
-
-          # Check if the kickstart is an array or a single string
-          if kickstartfiles.is_a?(String)
-            # Let's turn it into an array
-            kickstartfiles=kickstartfiles.split
+            env.ui.info "Starting a webserver #{host_ip_as_seen_by_guest}:#{definition.kickstart_port}, check your firewall if nothing happens\n"
+            timeouts = Array(definition.kickstart_timeout).map(&:to_i)
           end
 
           # For each kickstart file spinup a webserver and wait for the file to be fetched
-          unless kickstartfiles.nil?
-            kickstartfiles.each do |kickfile|
-              wait_for_http_request(
-                File.join(definition.path, kickfile),
-                kickfile.start_with?('/') ? kickfile : '/' + kickfile,
-                {
-                  :port => definition.kickstart_port,
-                  :host => definition.kickstart_ip,
-                  :timeout => definition.kickstart_timeout,
-                }
-              )
-            end
+          kickstartfiles.each_with_index do |kickfile, index|
+            wait_for_http_request(
+              File.join(definition.path, kickfile),
+              kickfile.start_with?('/') ? kickfile : '/' + kickfile,
+              {
+                :port => definition.kickstart_port,
+                :timeout => timeouts.fetch(index, timeouts.last), # get the matching kickfile timeout or the last defined
+              }
+            )
           end
         end
 

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

@@ -5,8 +5,14 @@ module Veewee
 
         def copy_to_box(localfile,remotefile,options={})
           raise Veewee::Error,"Box is not running" unless self.running?
-          if definition.winrm_user && definition.winrm_password # prefer winrm 
+          if
+            definition.winrm_user && definition.winrm_password # prefer winrm
+          then
             self.wincp(localfile,remotefile,options)
+          elsif
+            definition.os_type_id =~ /^Windows/
+          then
+            raise "Trying to transfer #{localfile} to windows machine without 'winrm_user' and 'winrm_password' set in definition."
           else
             self.scp(localfile,remotefile,options)
           end

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

@@ -12,26 +12,25 @@ module Veewee
       def vnc_type(sequence,host,display=20)
         counter=0
         env.logger.info "Opening VNC #{host} on display #{display}"
-        vnc=Net::VNC.open("#{host}:#{display}",{:wait => 0.001})
-        sequence.each { |s|
-          counter=counter+1
+        Net::VNC.open("#{host}:#{display}",{:wait => 0.001}) do |vnc|
+          sequence.each { |s|
+            counter=counter+1
 
-          ui.info "Typing:[#{counter}]: "+s
+            ui.info "Typing:[#{counter}]: "+s
 
-          keycodes=string_to_vnccode(s)
+            keycodes=string_to_vnccode(s)
 
-            keycodes.each do |keycode|
-              if keycode==:wait
-                sleep 1
-              else
-                send_vnc_keycode(vnc,keycode)
+              keycodes.each do |keycode|
+                if keycode==:wait
+                  sleep 1
+                else
+                  send_vnc_keycode(vnc,keycode)
+                end
               end
-            end
-        }
-        vnc.close
-        ui.info "Done typing."
-        ui.info ""
-
+          }
+          ui.info "Done typing."
+          ui.info ""
+        end
       end
 
       def send_vnc_keycode(vnc,keycode)
@@ -48,7 +47,7 @@ module Veewee
 
       def string_to_vnccode(thestring)
 
-	# https://github.com/aquasync/ruby-vnc/blob/master/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

@@ -32,11 +32,10 @@ module Veewee
               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}"

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

@@ -37,6 +37,10 @@ module Veewee::Provider::Core::Helper::Ssh
     return ssh_options
   end
 
+  def ssh_options
+    build_ssh_options
+  end
+
   def ssh_key_to_a(ssh_key)
     case ssh_key
     when "" then []

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

@@ -23,7 +23,8 @@ module Veewee
               response['Content-Type']='text/plain'
               response.status = 200
               content = File.open(@localfile, "r").read
-              response.body = case File.extname(@localfile)
+              response.body =
+              case File.extname(@localfile)
               when ".erb"
                 ui.info "Rendering and serving file #{@localfile}"
                 ERB.new(content).result(binding)
@@ -47,34 +48,38 @@ module Veewee
 
           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 }
+            t = Thread.new { s.start }
+            t.abort_on_exception = true
           end
 
-          def server_for_http_request(filename, urlname, options={:timeout => 10, :port => 7125, :threaded => false})
+          def server_for_http_request(filename, urlname, options)
             # 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)
 
-            webrick_logger=WEBrick::Log.new(fn, WEBrick::Log::INFO)
-
-            s= ::WEBrick::HTTPServer.new(
-              :Port => options[:port],
-              :Logger => webrick_logger,
-              :AccessLog => webrick_logger
-            )
-
-            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
+            timeout = options[:timeout] || 60
+            server  = nil
+            Timeout.timeout(timeout) do
+              server =
+              ::WEBrick::HTTPServer.new(
+                :Port => options[:port],
+                :Logger => webrick_logger,
+                :AccessLog => webrick_logger
+              )
+              env.logger.debug("mounting file #{urlname}")
+              server.mount("#{urlname}", Veewee::Provider::Core::Helper::Servlet::FileServlet, filename, ui, options[:threaded])
+              trap("INT"){
+                server.shutdown
+                ui.info "Stopping webserver"
+                exit
+              }
+            end
+          rescue Timeout::Error
+            server.shutdown unless server.nil?
+            raise "File #{filename.inspect} was not requested in #{timeout}seconds, are you using firewall blocking connections to port: #{options[:port]}?"
           end
+
         end #Class
       end #Module
     end #Module

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

@@ -33,6 +33,10 @@ module Veewee
             }
           end
 
+          def winrm_options
+            build_winrm_options
+          end
+
           def winrm_up?(ip,options)
             begin
               if not @winrm_up

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

@@ -11,7 +11,6 @@ require 'veewee/provider/kvm/box/destroy'
 require 'veewee/provider/kvm/box/export_vagrant'
 
 require 'veewee/provider/kvm/box/helper/ip'
-require 'veewee/provider/kvm/box/helper/ssh_options'
 require 'veewee/provider/kvm/box/helper/status'
 require 'veewee/provider/kvm/box/helper/console_type'
 

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

@@ -6,6 +6,11 @@ module Veewee
         def up(options={})
           matched_servers=@connection.servers.all(:name => name)
           matched_servers.first.start unless matched_servers.nil?
+        rescue Libvirt::Error => e
+          warn "
+Libvirt Error! Make sure your user has permissions to run anything.
+"
+          raise e
         end
 
       end # End Module

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

@@ -3,7 +3,6 @@ require 'veewee/provider/core/helper/tcp'
 
 require 'veewee/provider/parallels/box/helper/status'
 require 'veewee/provider/parallels/box/helper/ip'
-require 'veewee/provider/parallels/box/helper/ssh_options'
 require 'veewee/provider/parallels/box/helper/console_type'
 require 'veewee/provider/parallels/box/helper/buildinfo'
 

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

@@ -4,8 +4,6 @@ require 'veewee/provider/core/helper/tcp'
 
 require 'veewee/provider/vmfusion/box/helper/status'
 require 'veewee/provider/vmfusion/box/helper/ip'
-require 'veewee/provider/vmfusion/box/helper/ssh_options'
-require 'veewee/provider/vmfusion/box/helper/winrm_options'
 require 'veewee/provider/vmfusion/box/helper/vnc'
 require 'veewee/provider/vmfusion/box/helper/console_type'
 require 'veewee/provider/vmfusion/box/helper/buildinfo'

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.4.3"
+  ::Veewee::VERSION="0.4.4"
 end

data/templates/CentOS-4.8-i386/definition.rb

@@ -5,7 +5,7 @@ Veewee::Definition.declare({
   :iso_file => "CentOS-4.8-i386-bin-DVD.iso", :iso_src => "", :iso_md5 => "", :iso_download_timeout => 1000,
   :iso_download_instructions => "This iso is no more available, for instructions see http://vault.centos.org/4.8/isos/i386/",
   :boot_wait => "10", :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
-  :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
+  :kickstart_port => "7122", :kickstart_timeout => 300, :kickstart_file => "ks.cfg",
   :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",

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

@@ -18,7 +18,7 @@ Veewee::Session.declare({
   :boot_wait => "10",
   :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122",
-  :kickstart_timeout => 10000,
+  :kickstart_timeout => 300,
   :kickstart_file => "ks.cfg",
   :ssh_login_timeout => "10000",
   :ssh_user => "vagrant",

data/templates/CentOS-5.10-i386/definition.rb

@@ -18,7 +18,7 @@ Veewee::Session.declare({
   :boot_wait => "10",
   :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122",
-  :kickstart_timeout => 10000,
+  :kickstart_timeout => 300,
   :kickstart_file => "ks.cfg",
   :ssh_login_timeout => "10000",
   :ssh_user => "vagrant",

data/templates/CentOS-5.10-x86_64-netboot/definition.rb

@@ -18,7 +18,7 @@ Veewee::Session.declare({
   :boot_wait => "10",
   :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122",
-  :kickstart_timeout => 10000,
+  :kickstart_timeout => 300,
   :kickstart_file => "ks.cfg",
   :ssh_login_timeout => "10000",
   :ssh_user => "vagrant",

data/templates/CentOS-5.10-x86_64/definition.rb

@@ -18,7 +18,7 @@ Veewee::Session.declare({
   :boot_wait => "10",
   :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122",
-  :kickstart_timeout => 10000,
+  :kickstart_timeout => 300,
   :kickstart_file => "ks.cfg",
   :ssh_login_timeout => "10000",
   :ssh_user => "vagrant",