veewee 0.3.12 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGJiYzY0MzVhMmQ3NWE3YWMzODhkZjg0NzJkOTVmYzEzYjg1YmM5OQ==
+  data.tar.gz: !binary |-
+    MmQzNmI5ZDI4OWIzM2QyNjM3MGY0NTVjNmZhMTYwZDgxZmVmNzkwMg==
+SHA512:
+  metadata.gz: !binary |-
+    MjIyMGM1YmVkMmI1YzU4ZjA2MzFmYTcwNmU3OWYwZDRhNWJmNTk4YmRjZDZi
+    ZTI3MmFkNDA3MWI3MmZjNjA1MzdmY2MxYTQyOTEwNjZhMzgwMzA3ZDhiOGJm
+    NDY3NTRhYmFhYjVhY2NlYWQwNjhiZjZjNWI4ZTkzOWU4OWUyNDc=
+  data.tar.gz: !binary |-
+    M2FiMDk4M2Q4ZWU0YTczZWJkM2YyOTczYWRkOGJjZmE3NzM3YTM4NWMxMGFm
+    Yjg1OWUyMGRhZDhjMjJjOWFjZDUxZjc1MzkzYjM2NmVlNDllNmNjNThjNWVm
+    NjNkY2I1M2VhMWQ1OTYzNTc1ZTc2YTY4MWFiNGYwNzFkMjMyNmI=

data/.gitattributes

@@ -0,0 +1,2 @@
+#ensures shell scripts aren't broken when checking out on Windows (see issue #805)
+*.sh eol=lf

data/.gitignore

@@ -20,5 +20,7 @@ pkg/*
 virtualfloppy.vfd
 *.swp
 AutoPartition.app
+.ruby-version
 .rbenv-gemsets
 .project
+.ruby-version

data/.rvmrc

@@ -1,4 +1,4 @@
-rvm use ruby-1.9.2@veewee --create
+rvm use ruby-1.9.3@veewee --create
 #rvm use ruby-1.8.7@veewee --create
 
 alias veewee="bundle exec veewee"

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.2-p320
   - 1.9.3
   - 2.0
+  - 2.1
 notifications:
   irc: "chat.freenode.net#veewee"

data/Gemfile

@@ -13,7 +13,7 @@ group :kvm do
 end
 
 group :windows do
-  gem "em-winrm", :git => 'http://github.com/hh/em-winrm.git', :ref => '31745601d3'
+  gem "em-winrm", :git => 'https://github.com/hh/em-winrm.git', :ref => '31745601d3'
   gem "log4r"
 end
 

data/bin/veewee

@@ -25,4 +25,5 @@ begin
 
 rescue Veewee::Error => e
   env.ui.error "#{e}"
+  exit 1
 end

data/doc/basics.md

@@ -75,6 +75,8 @@ If you want to use an external repository for the definition, you can specify a
 
     $ bundle exec veewee <provider> define 'myubuntubox' 'git://github.com/jedi4ever/myubuntubox'
 
+Can be `git://`, `git+ssh://` or `git+http://`.
+
 
 ## Modify a definition (optional)
 
@@ -110,15 +112,19 @@ In order to build the defined box, execute this subcommand:
 
 The `build` subcommand can take the following optional flags:
 
-Flag Option                  | Description
------------------------------|-------------    
---force                      | overwrites if already exists
---auto                       | automatically downloads the ISO without asking
---nogui                      | builds in the background rather than opening a VM GUI and building in the GUI window
---debug                      | enabled debug mode output
---redirectconsole            | redirects console output
---postinstall-include=[...]  | forces specified file(s) to get included in postinstall even if filename has a leading underscore
---postinstall-exclude=[...]  | forces specified file(s) to get excluded from postinstall even if filename has no leading underscore
+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
+-d --debug                      | enabled debug mode output
+-r --redirectconsole            | redirects console output
+-i --include                    | ruby regexp of postinstall filenames to additionally include
+-e --exclude                    | ruby regexp of postinstall filenames to exclude
+-i --postinstall-include=[...]  | forces specified file(s) to get included in postinstall even if filename has a leading underscore
+-e --postinstall-exclude=[...]  | forces specified file(s) to get excluded from postinstall even if filename has no leading underscore
+--[no-]checksum                 | force to check iso file check sum
+--skip-to-postinstall           | Skip the installation and go streight to postinstall. This is usefully for testing you post-install scripts.
 
 The `build` subcommand will run the following routines behind the scenes:
 
@@ -148,7 +154,7 @@ Validate will run some [cucumber tests](http://cukes.info/) against the box to s
 
 The following subcommand take care of exporting:
 
-    $ bundle exec veewee <provider> export 'mybuntubox'
+    $ bundle exec veewee <provider> export 'myubuntubox'
 
 The exported filetype depends on the provider. For more details on the providers, please have a look at the [Providers](providers.md) doc.
 
@@ -169,7 +175,7 @@ Then use the `define` command to create a new definition with a custom name. The
     # You can now edit the definition files stored in definitions/myubuntubox or build the box with:
     # veewee vbox build 'myubuntubox'
 
-**IMPORTANT:** You should avoid dots in the name because the box name gets used as the hostname also. Dots in the box name currently lead to invalid hostnames which causes several negative side effects (e.g. preventing the network devices to start).    
+**IMPORTANT:** You should avoid dots and underscores in the name because the box name gets used as the hostname also. Dots in the box name currently lead to invalid hostnames which causes several negative side effects (e.g. preventing the network devices to start). Underscores might prevent the build altogether.
 
 Confirm that all expected files are in place:
 

data/doc/build_hooks.md

@@ -7,6 +7,7 @@ The following hooks are currently available:
 * `:after_create` after box is created
 * `:after_up` after box is started
 * `:after_boot_sequence` after boot command sequence is executed
+* `:before_postinstall` before post-install files are executed
 * `:after_postinstall` after post-install files are executed
 * `:before_ssh` before each SSH login
 

data/doc/customize.md

@@ -105,6 +105,59 @@ All other settings are used internally by Veewee, the virtualization provider, o
         :postinstall_timeout => "10000"
     })
 
+Available definitions:
+
+Definition Option               | Default                 | Provider
+--------------------------------|-------------------------|-------------------------------------------
+:params                         | empty                   | core
+:cpu_count                      | 1 CPU                   | kvm, parallels, virtualbox, vmfusion
+:memory_size                    | 256 MB of memory        | kvm, parallels, virtualbox, vmfusion
+:video_memory_size              | 10 MB of video memory   | virtualbox
+:iso_file                       | no ISO file mounted     | core, kvm, parallels, virtualbox, vmfusion
+:iso_download_timeout           | 1000                    | unused
+:iso_src                        | empty                   | core
+:iso_md5                        | empty                   | core
+:iso_sha1                       | empty                   | core
+:iso_sha256                     | empty                   | core
+:iso_download_instructions      | empty                   | core
+:disk_size                      | 10240                   | kvm, virtualbox, vmfusion
+:disk_format                    | VDI                     | kvm, virtualbox
+:disk_variant                   | Standard                | virtualbox
+:disk_count                     | 1                       | virtualbox
+:os_type_id                     | uninitialised           | core, kvm, parallels, virtualbox, vmfusion
+: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
+:ssh_user                       | uninitialised           | core, kvm, parallels, virtualbox, vmfusion
+:ssh_password                   | uninitialised           | core, kvm, parallels, virtualbox, vmfusion
+:ssh_key                        | uninitialised           | core
+:ssh_host_port                  | 2222                    | core, virtualbox
+:ssh_guest_port                 | 22                      | virtualbox
+:winrm_login_timeout            | 10000                   | virtualbox, vmfusion
+:winrm_user                     | uninitialised           | core, virtualbox, vmfusion
+:winrm_password                 | uninitialised           | core, virtualbox, vmfusion
+:winrm_host_port                | 5985                    | core, virtualbox, vmfusion
+:winrm_guest_port               | 5985                    | virtualbox
+:sudo_cmd                       | uninitialised           | core
+:shutdown_cmd                   | uninitialised           | core
+:pre_postinstall_file           | empty                   | core
+:postinstall_files              | empty                   | core
+:postinstall_timeout            | 10000                   | unused
+:floppy_files                   | empty                   | core, kvm, virtualbox, vmfusion
+:use_hw_virt_ext                | unused                  | unused
+:use_pae                        | unused                  | unused
+:hostiocache                    | uninitialised           | virtualbox
+:use_sata                       | true                    | virtualbox
+:add_shares                     | empty                   | vmfusion
+:vmdk_file                      | uninitialised           | vmfusion
+:skip_iso_transfer              | false                   | core
+:skip_nat_mapping               | false                   | virtualbox
+:force_ssh_port                 | false                   | core
+
 **IMPORTANT:** If you change values directly in a template, be sure to run `bundle exec veewee <provider> undefine` to remove the old definition and then `bundle exec veewee <provider> define` again to copy the updated template files into the definition.
 
 If you are an experienced devops veteran and have enhanced template settings, please let us know why. We are very interested in improving Veewee's templates.

data/doc/installation.md

@@ -8,6 +8,11 @@ The Veewee project is moving quickly and the Rubygem might be outdated. Therefor
 
     $ gem install veewee
 
+The above command may fail when using OS X Mavericks and XCode 5.1 due to [Apple telling the install to fail when unknown flags are used](http://stackoverflow.com/questions/22313407/clang-error-unknown-argument-mno-fused-madd-python-package-installation-fa#22315129). To get around this, use:
+
+	$ ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future gem install veewee
+	
+
 Projects that include the `veewee` gem can also benefit from utilizing Ruby version management (see below).
 
 

data/doc/requirements.md

@@ -48,7 +48,7 @@ It is highly recommended that you use either `rvm` or `rbenv` to manage your rub
 
 [RVM](https://rvm.io/) is Veewee's prefered ruby version manager. 
 
-RVM will allow Veewee to install it's own [gemset](https://rvm.io/gemsets/basics/) and configure it's own ruby version - which keeps Veewee and it's dependancies completely separate from your other projects. Please see https://rvm.io/gemsets/basics/ for details if you are new to the concept of 'gemsets'.
+RVM will allow Veewee to install its own [gemset](https://rvm.io/gemsets/basics/) and configure its own ruby version - which keeps Veewee and its dependancies completely separate from your other projects. Please see https://rvm.io/gemsets/basics/ for details if you are new to the concept of 'gemsets'.
 
 
 ##### Installing RVM

data/doc/vagrant.md

@@ -8,8 +8,8 @@ If you don't find what you're looking for here, please see the official [Vagrant
 A simple workflow to build a VirtualBox VM for Vagrant would be:
 
     $ bundle exec veewee vbox templates | grep -i ubuntu
-    $ bundle exec veewee vbox define 'mybuntubox' 'ubuntu-12.10-server-amd64'
-    $ bundle exec veewee vbox build 'mybuntubox'
+    $ bundle exec veewee vbox define 'myubuntubox' 'ubuntu-12.10-server-amd64'
+    $ bundle exec veewee vbox build 'myubuntubox'
 
 For additional box building instructions, see the [Veewee Basics](basics.md) and [Definition Customization](customize.md) docs.
 

data/lib/veewee/command/fusion.rb

@@ -16,6 +16,9 @@ module Veewee
       method_option :checksum , :type => :boolean , :default => false, :desc => "verify checksum"
       method_option :postinstall_include, :type => :array, :default => [], :aliases => "-i", :desc => "ruby regexp of postinstall filenames to additionally include"
       method_option :postinstall_exclude, :type => :array, :default => [], :aliases => "-e", :desc => "ruby regexp of postinstall filenames to exclude"
+      method_option :skip_to_postinstall, :aliases => ['--skip-to-postinstall'],  :type => :boolean,
+                    :default => false,
+                    :desc => "Skip to postinstall."
       def build(box_name)
         env.get_box(box_name).build(options)
       end

data/lib/veewee/command/kvm.rb

@@ -14,6 +14,9 @@ module Veewee
       method_option :checksum , :type => :boolean , :default => false, :desc => "verify checksum"
       method_option :postinstall_include, :type => :array, :default => [], :aliases => "-i", :desc => "ruby regexp of postinstall filenames to additionally include"
       method_option :postinstall_exclude, :type => :array, :default => [], :aliases => "-e", :desc => "ruby regexp of postinstall filenames to exclude"
+      method_option :skip_to_postinstall, :aliases => ['--skip-to-postinstall'],  :type => :boolean,
+                    :default => false,
+                    :desc => "Skip to postinstall."
 
       method_option :use_emulation, :type => :boolean , :default => false, :desc => "Use QEMU emulation"
       method_option :pool_name, :type => :string, :default => nil, :desc => "Name of the libvirt storage pool to be used"

data/lib/veewee/command/parallels.rb

@@ -13,6 +13,9 @@ module Veewee
       method_option :checksum , :type => :boolean , :default => false, :desc => "verify checksum"
       method_option :postinstall_include, :type => :array, :default => [], :aliases => "-i", :desc => "ruby regexp of postinstall filenames to additionally include"
       method_option :postinstall_exclude, :type => :array, :default => [], :aliases => "-e", :desc => "ruby regexp of postinstall filenames to exclude"
+      method_option :skip_to_postinstall, :aliases => ['--skip-to-postinstall'],  :type => :boolean,
+                    :default => false,
+                    :desc => "Skip to postinstall."
       def build(box_name)
         env.get_box(box_name).build(options)
       end

data/lib/veewee/command/vbox.rb

@@ -15,6 +15,9 @@ module Veewee
       method_option :redirectconsole,:type => :boolean , :default => false, :aliases => "-r", :desc => "redirects console output"
       method_option :postinstall_include, :type => :array, :default => [], :aliases => "-i", :desc => "ruby regexp of postinstall filenames to additionally include"
       method_option :postinstall_exclude, :type => :array, :default => [], :aliases => "-e", :desc => "ruby regexp of postinstall filenames to exclude"
+      method_option :skip_to_postinstall, :aliases => ['--skip-to-postinstall'],  :type => :boolean,
+                    :default => false,
+                    :desc => "Skip to postinstall."
       def build(box_name)
         env.get_box(box_name).build(options)
       end

data/lib/veewee/config/ostypes.yml

@@ -19,6 +19,16 @@ Windows8_64:
   :kvm:
   :vbox: Windows8_64
   :parallels: win-8
+Windows81:
+  :fusion:
+  :kvm:
+  :vbox: Windows81
+  :parallels: win-8
+Windows81_64:
+  :fusion:
+  :kvm:
+  :vbox: Windows81_64
+  :parallels: win-8
 WindowsNT:
   :fusion: winNT
   :kvm:
@@ -288,6 +298,10 @@ Solaris_64:
   :kvm:
   :vbox: Solaris_64
   :parallels: solaris-10
+Solaris11_64:
+  :fusion: solaris10-64
+  :kvm:
+  :vbox: Solaris11_64
 Solaris9:
   :fusion: solaris
   :kvm:
@@ -341,15 +355,15 @@ ESXi5:
 Darwin_10_7:
   :fusion: darwin11
   :kvm:
-  :vbox:
+  :vbox: MacOS
   :parallels:
 Darwin_10_7_64:
   :fusion: darwin11-64
   :kvm:
-  :vbox:
+  :vbox: MacOS_64
   :parallels:
 Darwin_10_8_64:
   :fusion: darwin12-64
   :kvm:
-  :vbox:
+  :vbox: MacOS_64
   :parallels:

data/lib/veewee/definition.rb

@@ -37,7 +37,7 @@ module Veewee
 
     attr_accessor :use_hw_virt_ext, :use_pae, :hostiocache, :use_sata
 
-    attr_accessor :iso_dowload_timeout, :iso_src, :iso_md5, :iso_sha1 , :iso_download_instructions
+    attr_accessor :iso_download_timeout, :iso_src, :iso_md5, :iso_sha1, :iso_sha256, :iso_download_instructions
 
     attr_accessor :virtualbox
     attr_accessor :vmfusion
@@ -72,7 +72,7 @@ module Veewee
       @cpu_count = '1' ; @memory_size = '256'; @video_memory_size = '10'
 
       # Default there is no ISO file mounted
-      @iso_file = nil, @iso_src = nil ; @iso_md5 = nil ; @iso_sha1;  @iso_download_timeout = 1000 ; @iso_download_instructions = nil
+      @iso_file = nil, @iso_src = nil ; @iso_md5 = nil ; @iso_sha1;  @iso_sha256;  @iso_download_timeout = 1000 ; @iso_download_instructions = nil
 
       # Shares to add
       @add_shares = []

data/lib/veewee/definitions.rb

@@ -67,7 +67,7 @@ module Veewee
 
       git_template = false
       # Check if the template is a git repo
-      if template_name.start_with?("git://")
+      if template_name.start_with?("git://", "git+ssh://", "git+http://")
         git_template = true
       end
 
@@ -184,8 +184,8 @@ module Veewee
           env.logger.debug("DefinitionDir '#{env.definition_dir}' succesfuly created")
         end
       else
-        env.logger.fatal("DefinitionDir '#{definition_dir}' is not writable")
-        raise Veewee::Error, "DefinitionDir '#{definition_dir}' is not writable"
+        env.logger.fatal("DefinitionDir '#{env.definition_dir}' is not writable")
+        raise Veewee::Error, "DefinitionDir '#{env.definition_dir}' is not writable"
       end
     end
 

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

@@ -1,3 +1,5 @@
+require 'to_slug'
+
 module Veewee
   module Provider
     module Core
@@ -17,24 +19,8 @@ module Veewee
           end
         end
 
-        def build(options={})
-
-          if definition.nil?
-            raise Veewee::Error,"Could not find the definition. Make sure you are one level above the definitions directory when you execute the build command."
-          end
-
-          # Requires valid definition
-
-          ui.info "Building Box #{name} with Definition #{definition.name}:"
-          options.each do |name,value|
-            ui.info "- #{name} : #{value}"
-          end
-
-          # Checking regexp of postinstall include/excludes
-          validate_postinstall_regex(options)
-
-          # Check the iso file we need to build the box
-          definition.verify_iso(options)
+        protected
+        def kickstart(options)
 
           if self.exists?
             # check if --force option was given
@@ -92,6 +78,39 @@ module Veewee
           end
 
           self.handle_kickstart(options)
+        end
+
+        def build(options={})
+
+          if definition.nil?
+            raise Veewee::Error,"Could not find the definition. Make sure you are one level above the definitions directory when you execute the build command."
+          end
+
+          # Requires valid definition
+          ui.info "Building Box #{name} with Definition #{definition.name}:"
+          options.each do |name,value|
+            ui.info "- #{name} : #{value}"
+          end
+
+          # Checking regexp of postinstall include/excludes
+          validate_postinstall_regex(options)
+
+          # Check the iso file we need to build the box
+          definition.verify_iso(options)
+
+          if (self.exists? && options['skip_to_postinstall'] == true) then
+            ui.info "Skipping to postinstall."
+            if ! self.running? then
+              self.up(options)
+              run_hook(:after_up)
+              # Waiting for it to boot
+              ui.info "Waiting #{definition.boot_wait.to_i} seconds for the machine to boot"
+              sleep definition.boot_wait.to_i
+            end
+          else
+            self.kickstart(options)
+          end
+
 
           # Wait for an ipaddress
           # This needs to be done after the kickstart:
@@ -109,6 +128,8 @@ module Veewee
           # into .veewee_params
           self.transfer_params(options)
 
+          run_hook(:before_postinstall)
+
           # Filtering post install files based upon --postinstall-include and --postinstall--exclude
           definition.postinstall_files=filter_postinstall_files(options)
 
@@ -218,12 +239,15 @@ module Veewee
           # 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(kickfile,{
-                :port => definition.kickstart_port,
-                :host => definition.kickstart_ip,
-                :timeout => definition.kickstart_timeout,
-                :web_dir => definition.path
-              })
+              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
           end
         end