veewee 0.3.1 → 0.3.2

data/Gemfile

@@ -10,5 +10,9 @@ source "http://rubygems.org"
 
 group :test do
   gem "rake"
+  #gem "ruby-libvirt"
+  gem "em-winrm", :git => 'git://github.com/hh/em-winrm.git', :ref => '31745601d3'
+  #gem "chef"
+  #gem "knife-windows"
 end
 gemspec

data/README.md

@@ -34,4 +34,4 @@ IDEAS:
 
 [whren - 2012/04/12]
 
-See [use of pre_postinstall_file in defition.rb](https://github.com/whren/veewee/wiki/Use-of-pre_postinstall_file-in-definition.rb)
+See [use of pre_postinstall_file in definition.rb](https://github.com/whren/veewee/wiki/Use-of-pre_postinstall_file-in-definition.rb)

data/doc/definition.md

@@ -63,3 +63,21 @@ Add '.erb' to your files in a definition and they will get rendered (useful for
 ## Removing a definition
 
     veewee vbox undefine 'myubuntu'
+
+## Provider ``vm_options``
+
+Each provider _can_ take options that are specific to them ; more detail will
+be available in each provider documentation but let's have a quick overview.
+
+    Veewee::Definition.declare( {
+        :cpu_count => '1', :memory_size=> '256', 
+        :disk_size => '10140', :disk_format => 'VDI', :disk_variant => 'Standard',
+        # […]
+        :postinstall_files => [ "postinstall.sh"],:postinstall_timeout => "10000"
+        :kvm => { :vm_options => ['network_type' => 'bridge', 'network_bridge_name' => 'brlxc0']}
+        :virtualbox => { :vm_options => [ 'pae' => 'on', 'ioapic' => 'one'] }
+     }
+    )
+
+This box will have ``pae`` and ``ioapic`` enabled on virtualbox, and will use
+the ``brlxc0`` bridge on with kvm (on libvirt).

data/doc/kvm.md

@@ -1,8 +1,35 @@
 NOTE:Virtualbox doesn't like KVM to be enabled
 
-check with 
+## Prerequires
 
+To check if you're kernel can run kvm :
+
+    # kvm_ok or kvm-ok command (on Ubuntu at least)
     kvm_ok
+    # or look for vmx or svm in /proc/cpuinfo
+    egrep '^flags.*(vmx|svm)' /proc/cpuinfo
+
+The modules needed are the following : kvm, kvm_intel or kvm-amd.
+
+## Define a new box
+
+The workflow to create a box is almost the same as with the Virtualbox
+provider (and others).
+
+## Options
+
+There is currently few options supported :
+
+1. **network_type**: the type of network used by this box on libvirt. It could
+   be either _network_ (for using the default network) or _bridge_.
+2. **network_bridge_name**: the name of the bridge. It is used just in case
+   **network_type** is set to _bridge_.
+3. **pool_name**: the _storage_ pool name to be used when creating the box. If
+   not specified, the default one is used. _Note: it is currently not working
+   with the current fog version (1.7.0) but should be fixed as soon as the fog
+   gem is released_.
+
+## Notes
 
 Remove modules:
 

data/doc/template.md

@@ -14,23 +14,44 @@ To see all the templates provided:
     veewee vbox define '<box_name>' 'archlinux-x86_64'
     veewee vbox define '<box_name>' 'archlinux-x86_64-netboot'
     veewee vbox define '<box_name>' 'CentOS-4.8-i386'
+    veewee vbox define '<box_name>' 'CentOS-5.5-i386-netboot'
     veewee vbox define '<box_name>' 'CentOS-5.5-x86_64-netboot'
     veewee vbox define '<box_name>' 'CentOS-5.6-i386'
     veewee vbox define '<box_name>' 'CentOS-5.6-i386-netboot'
     veewee vbox define '<box_name>' 'CentOS-5.6-x86_64-netboot'
+    veewee vbox define '<box_name>' 'CentOS-5.6-x86_64-netboot-packages'
     veewee vbox define '<box_name>' 'CentOS-5.7-i386-netboot'
     veewee vbox define '<box_name>' 'CentOS-5.7-x86_64-netboot'
+    veewee vbox define '<box_name>' 'CentOS-5.8-i386'
+    veewee vbox define '<box_name>' 'CentOS-5.8-i386-netboot'
+    veewee vbox define '<box_name>' 'CentOS-5.8-x86_64'
+    veewee vbox define '<box_name>' 'CentOS-5.8-x86_64-netboot'
     veewee vbox define '<box_name>' 'CentOS-6.0-i386'
     veewee vbox define '<box_name>' 'CentOS-6.0-i386-netboot'
     veewee vbox define '<box_name>' 'CentOS-6.0-x86_64'
     veewee vbox define '<box_name>' 'CentOS-6.0-x86_64-minimal'
     veewee vbox define '<box_name>' 'CentOS-6.0-x86_64-netboot'
     veewee vbox define '<box_name>' 'CentOS-6.1-x86_64-minimal'
+    veewee vbox define '<box_name>' 'CentOS-6.1-x86_64-netboot'
+    veewee vbox define '<box_name>' 'CentOS-6.2-i386-minimal'
     veewee vbox define '<box_name>' 'CentOS-6.2-x86_64-minimal'
+    veewee vbox define '<box_name>' 'CentOS-6.2-x86_64-netboot'
+    veewee vbox define '<box_name>' 'CentOS-6.3-i386-minimal'
+    veewee vbox define '<box_name>' 'CentOS-6.3-x86_64-minimal'
     veewee vbox define '<box_name>' 'Debian-5.0.8-amd64-netboot'
     veewee vbox define '<box_name>' 'Debian-5.0.8-i386-netboot'
+    veewee vbox define '<box_name>' 'Debian-5.0.10-amd64-netboot'
+    veewee vbox define '<box_name>' 'Debian-5.0.10-i386-netboot'
     veewee vbox define '<box_name>' 'Debian-6.0.3-amd64-netboot'
     veewee vbox define '<box_name>' 'Debian-6.0.3-i386-netboot'
+    veewee vbox define '<box_name>' 'Debian-6.0.4-amd64-netboot'
+    veewee vbox define '<box_name>' 'Debian-6.0.4-i386-netboot'
+    veewee vbox define '<box_name>' 'Debian-6.0.5-amd64-netboot'
+    veewee vbox define '<box_name>' 'Debian-6.0.5-i386-netboot'
+    veewee vbox define '<box_name>' 'Debian-6.0.6-amd64-netboot'
+    veewee vbox define '<box_name>' 'Debian-6.0.6-i386-netboot'
+    veewee vbox define '<box_name>' 'Debian-7.0-b2-i386-netboot'
+    veewee vbox define '<box_name>' 'Debian-7.0-b3-amd64-netboot'
     veewee vbox define '<box_name>' 'Fedora-14-amd64'
     veewee vbox define '<box_name>' 'Fedora-14-amd64-netboot'
     veewee vbox define '<box_name>' 'Fedora-14-i386'
@@ -41,10 +62,17 @@ To see all the templates provided:
     veewee vbox define '<box_name>' 'Fedora-15-x86_64-netboot'
     veewee vbox define '<box_name>' 'Fedora-16-i386'
     veewee vbox define '<box_name>' 'Fedora-16-x86_64'
+    veewee vbox define '<box_name>' 'Fedora-16-x86_64-netboot'
+    veewee vbox define '<box_name>' 'Fedora-17-i386'
+    veewee vbox define '<box_name>' 'Fedora-17-x86_64'
+    veewee vbox define '<box_name>' 'Fedora-18-i386'
+    veewee vbox define '<box_name>' 'Fedora-18-x86_64'
     veewee vbox define '<box_name>' 'freebsd-8.2-experimental'
     veewee vbox define '<box_name>' 'freebsd-8.2-pcbsd-i386'
     veewee vbox define '<box_name>' 'freebsd-8.2-pcbsd-i386-netboot'
+    veewee vbox define '<box_name>' 'freebsd-9.0-RELEASE-amd64'
     veewee vbox define '<box_name>' 'funtoo-latest-generic_64-stable'
+    veewee vbox define '<box_name>' 'funtoo-latest-x86_64'
     veewee vbox define '<box_name>' 'gentoo-latest-i386-experimental'
     veewee vbox define '<box_name>' 'gentoo-latest-x86_64-experimental'
     veewee vbox define '<box_name>' 'openbsd50_amd64'
@@ -57,8 +85,13 @@ To see all the templates provided:
     veewee vbox define '<box_name>' 'openSUSE-11.4-NET-x86_64'
     veewee vbox define '<box_name>' 'openSUSE-12.1-DVD+NET-i586'
     veewee vbox define '<box_name>' 'openSUSE-12.1-DVD+NET-x86_64'
+    veewee vbox define '<box_name>' 'OracleLinux-6.3-x86_64-DVD'
     veewee vbox define '<box_name>' 'scientificlinux-6.1-i386-netboot'
     veewee vbox define '<box_name>' 'scientificlinux-6.1-x86_64-netboot'
+    veewee vbox define '<box_name>' 'scientificlinux-6.2-i386-netboot'
+    veewee vbox define '<box_name>' 'scientificlinux-6.2-x86_64-netboot'
+    veewee vbox define '<box_name>' 'scientificlinux-6.3-i386-netboot'
+    veewee vbox define '<box_name>' 'scientificlinux-6.3-x86_64-netboot'
     veewee vbox define '<box_name>' 'SLES-11-SP1-DVD-i586-GM'
     veewee vbox define '<box_name>' 'SLES-11-SP1-DVD-x86_64-GM'
     veewee vbox define '<box_name>' 'solaris-11-express-i386'
@@ -68,6 +101,8 @@ To see all the templates provided:
     veewee vbox define '<box_name>' 'ubuntu-10.04.3-server-amd64'
     veewee vbox define '<box_name>' 'ubuntu-10.04.3-server-amd64-alt'
     veewee vbox define '<box_name>' 'ubuntu-10.04.3-server-i386'
+    veewee vbox define '<box_name>' 'ubuntu-10.04.4-server-amd64'
+    veewee vbox define '<box_name>' 'ubuntu-10.04.4-server-i386'
     veewee vbox define '<box_name>' 'ubuntu-10.10-server-amd64'
     veewee vbox define '<box_name>' 'ubuntu-10.10-server-amd64-netboot'
     veewee vbox define '<box_name>' 'ubuntu-10.10-server-i386'
@@ -77,19 +112,35 @@ To see all the templates provided:
     veewee vbox define '<box_name>' 'ubuntu-11.10-server-amd64'
     veewee vbox define '<box_name>' 'ubuntu-11.10-server-amd64-ishaya'
     veewee vbox define '<box_name>' 'ubuntu-11.10-server-amd64-ruby192'
+    veewee vbox define '<box_name>' 'ubuntu-11.10-server-amd64-rvm'
     veewee vbox define '<box_name>' 'ubuntu-11.10-server-i386'
+    veewee vbox define '<box_name>' 'ubuntu-12.04.1-server-amd64'
+    veewee vbox define '<box_name>' 'ubuntu-12.04.1-server-amd64-packages'
+    veewee vbox define '<box_name>' 'ubuntu-12.04.1-server-i386'
+    veewee vbox define '<box_name>' 'ubuntu-12.04.1-server-i386-packages'
+    veewee vbox define '<box_name>' 'ubuntu-12.10-server-amd64'
+    veewee vbox define '<box_name>' 'ubuntu-12.10-server-amd64-packages'
+    veewee vbox define '<box_name>' 'ubuntu-12.10-server-i386'
+    veewee vbox define '<box_name>' 'ubuntu-12.10-server-i386-packages'
     veewee vbox define '<box_name>' 'ubuntu-8.04.4-server-amd64'
     veewee vbox define '<box_name>' 'ubuntu-8.04.4-server-i386'
     veewee vbox define '<box_name>' 'windows-2008R1-serverstandard-amd64'
+    veewee vbox define '<box_name>' 'windows-2008R1-serverweb-amd64'
+    veewee vbox define '<box_name>' 'windows-2008R1-serverwebcore-amd64'
+    veewee vbox define '<box_name>' 'windows-2008R1-serverweb-i386'
     veewee vbox define '<box_name>' 'windows-2008R2-amd64'
     veewee vbox define '<box_name>' 'windows-2008R2-serverstandard-amd64'
+    veewee vbox define '<box_name>' 'windows-2008R2-serverstandard-amd64-winrm'
+    veewee vbox define '<box_name>' 'windows-2008R2-serverweb-amd64'
+    veewee vbox define '<box_name>' 'windows-2008R2-serverwebcore-amd64'
     veewee vbox define '<box_name>' 'windows-7-enterprise-amd64'
+    veewee vbox define '<box_name>' 'windows-7-enterprise-amd64-winrm'
     veewee vbox define '<box_name>' 'windows-7-enterprise-i386'
     veewee vbox define '<box_name>' 'windows-7-premium-amd64'
     veewee vbox define '<box_name>' 'windows-7-professional-amd64'
-    veewee vbox define '<box_name>' 'windows-7-ultimate-amd64'
     veewee vbox define '<box_name>' 'windows-7sp1-ultimate-amd64'
-    veewee vbox define '<box_name>' 'windows-8-preview-dev-amd64'
+    veewee vbox define '<box_name>' 'windows-7-ultimate-amd64'
+    veewee vbox define '<box_name>' 'windows-8-preview-amd64'
 
 
 ## Structure

data/lib/veewee/command/fusion.rb

@@ -1,5 +1,20 @@
+
+
 module Veewee
   module Command
+    class Fusion < Veewee::Command::GroupBase
+      register "add_share", "Adds a Share to the Guest"
+      desc "add_share [BOX_NAME] [SHARE_NAME] [SHARE_PATH]", "hello"
+      def add_share(box_name, share_name, share_path)
+        venv=Veewee::Environment.new(options)
+        venv.ui=env.ui
+#          command="#{File.dirname().shellescape}/vmware-vdiskmanager -c -s #{definition.disk_size}M -a lsilogic -t #{disk_type} #{name}.vmdk"
+#          shell_results=shell_exec("#{command}",{:mute => true})
+        venv.providers["vmfusion"].get_box(box_name).add_share(share_name, share_path)
+        
+      end
+    end
+
     class Fusion< Veewee::Command::GroupBase
 
       register "fusion", "Subcommand for Vmware fusion"
@@ -16,7 +31,7 @@ module Veewee
         venv.providers["vmfusion"].get_box(box_name).build(options)
       end
 
-      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the destroy" 
+      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the destroy"
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
       method_option :nogui,:type => :boolean , :default => false, :aliases => "-n", :desc => "no gui"
       desc "destroy [BOXNAME]", "Destroys the virtualmachine that was built"
@@ -27,7 +42,7 @@ module Veewee
       end
 
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the shutdown" 
+      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the shutdown"
       desc "halt [BOXNAME]", "Activates a shutdown the virtualmachine"
       def halt(box_name)
         venv=Veewee::Environment.new(options)
@@ -52,6 +67,25 @@ module Veewee
         venv.providers["vmfusion"].get_box(box_name).issh(command)
       end
 
+
+      desc "winrm [BOXNAME] [COMMAND]", "Execute command via winrm"
+      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      def winrm(box_name,command=nil)
+        venv=Veewee::Environment.new(options)
+        venv.ui=env.ui
+        venv.providers["vmfusion"].get_box(box_name).winrm(command,{:exitcode => "*"})
+      end
+
+      desc "copy [BOXNAME] [SRC] [DST]", "Copy a file to the VM"
+      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      def copy(box_name,src,dst)
+        venv=Veewee::Environment.new(options)
+        venv.ui=env.ui
+        venv.providers["vmfusion"].get_box(box_name).copy_to_box(src,dst)
+      end
+
+
+
       desc "define [BOXNAME] [TEMPLATE]", "Define a new basebox starting from a template"
       method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite the definition"
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
@@ -94,7 +128,7 @@ module Veewee
         venv=Veewee::Environment.new(options)
         venv.ui=env.ui
         venv.ostypes.each do |name|
-           env.ui.info "- #{name}"
+          env.ui.info "- #{name}"
         end
       end
 

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

@@ -8,6 +8,7 @@ require 'veewee/command/vagrant/destroy'
 require 'veewee/command/vagrant/up'
 require 'veewee/command/vagrant/halt'
 require 'veewee/command/vagrant/ssh'
+require 'veewee/command/vagrant/winrm'
 require 'veewee/command/vagrant/define'
 require 'veewee/command/vagrant/undefine'
 require 'veewee/command/vagrant/validate'
@@ -33,6 +34,7 @@ module Veewee
           @subcommands.register(:up)    { Veewee::Command::Vagrant::Up }
           @subcommands.register(:halt)    { Veewee::Command::Vagrant::Halt }
           @subcommands.register(:ssh)    { Veewee::Command::Vagrant::Ssh }
+          @subcommands.register(:winrm)    { Veewee::Command::Vagrant::Winrm }
           @subcommands.register(:define)    { Veewee::Command::Vagrant::Define }
           @subcommands.register(:undefine)    { Veewee::Command::Vagrant::Undefine }
           @subcommands.register(:export)    { Veewee::Command::Vagrant::Export }

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

@@ -0,0 +1,39 @@
+require 'optparse'
+
+module Veewee
+  module Command
+    module Vagrant
+      class Winrm < ::Vagrant::Command::Base
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |opts|
+            opts.banner = "Winrm into the basebox"
+            opts.separator ""
+            opts.separator "Usage: vagrant basebox winrm <boxname> <command>"
+
+            opts.on("-d", "--debug", "enable debugging") do |d|
+              options['debug'] = d
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+          raise ::Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 1
+
+          begin
+            venv=Veewee::Environment.new(options)
+            venv.ui=@env.ui
+            venv.providers["virtualbox"].get_box(argv[0]).winrm(argv[1])
+          rescue Veewee::Error => ex
+            venv.ui.error ex
+            exit -1
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/veewee/command/vbox.rb

@@ -53,6 +53,24 @@ module Veewee
         venv.providers["virtualbox"].get_box(box_name).issh(command)
       end
 
+
+      desc "winrm [BOXNAME] [COMMAND]", "Execute command via winrm"
+      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      def winrm(box_name,command=nil)
+        venv=Veewee::Environment.new(options)
+        venv.ui=env.ui
+        venv.providers["virtualbox"].get_box(box_name).winrm(command,{:exitcode => "*"})
+      end
+
+      desc "copy [BOXNAME] [SRC] [DST]", "Copy a file to the VM"
+      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      def copy(box_name,src,dst)
+        venv=Veewee::Environment.new(options)
+        venv.ui=env.ui
+        venv.providers["virtualbox"].get_box(box_name).copy_to_box(src,dst)
+      end
+
+
       desc "define [BOXNAME] [TEMPLATE]", "Define a new basebox starting from a template"
       method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite the definition"
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"

data/lib/veewee/definition.rb

@@ -21,6 +21,8 @@ module Veewee
 
     attr_accessor :ssh_login_timeout, :ssh_user , :ssh_password, :ssh_key, :ssh_host_port, :ssh_guest_port
 
+    attr_accessor :winrm_login_timeout, :winrm_user , :winrm_password, :winrm_host_port, :winrm_guest_port
+
     attr_accessor :sudo_cmd
     attr_accessor :shutdown_cmd
 
@@ -31,14 +33,15 @@ module Veewee
     attr_accessor :floppy_files
 
 
-    attr_accessor :use_hw_virt_ext,:use_pae,:hostiocache
+    attr_accessor :use_hw_virt_ext,:use_pae,:hostiocache, :use_sata
 
     attr_accessor :iso_dowload_timeout, :iso_src,:iso_md5 ,:iso_download_instructions
 
     attr_accessor :virtualbox
     attr_accessor :vmfusion
     attr_accessor :kvm
-
+    attr_accessor :add_shares
+    attr_accessor :vmdk_file
 
     def ui
       return @_ui if defined?(@_ui)
@@ -64,6 +67,9 @@ module Veewee
       # Default there is no ISO file mounted
       @iso_file = nil, @iso_src = nil ; @iso_md5 = nil ; @iso_download_timeout=1000 ; @iso_download_instructions = nil
 
+      # Shares to add
+      @add_shares = []
+
       # Default is no floppy mounted
       @floppy_files = nil
 
@@ -73,6 +79,7 @@ module Veewee
 
       @iso_file=""
       @disk_size = '10240'; @disk_format = 'VDI'; @disk_variant = 'Standard'
+      @use_sata = true
 
       #        :hostiocache => 'off' ,
       #        :os_type_id => 'Ubuntu',
@@ -83,6 +90,9 @@ module Veewee
       #        :ssh_host_port => "2222", :ssh_guest_port => "22", :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
       #       :shutdown_cmd => "shutdown -h now",
       #        :kickstart_file => nil,
+      @winrm_host_port = "5985"; @winrm_guest_port = "5985"
+      @winrm_login_timeout = "10000"
+      @boot_cmd_sequence = [] # Empty list by default
 
       @virtualbox={:vm_options => {}}
       @vmfusion={:vm_options => {}}
@@ -171,7 +181,7 @@ module Veewee
 
       # Postinstall files require a valid user and password
       unless self.postinstall_files.nil?
-        if self.ssh_user.nil? || self.ssh_password.nil?
+        if (self.ssh_user.nil? || self.ssh_password.nil?) && (self.winrm_user.nil? || self.winrm_password.nil?)
           return false
         end
       end

data/lib/veewee/error.rb

@@ -17,6 +17,9 @@ module Veewee
 
     class SshError < Error
     end
+
+    class WinrmError < Error
+    end
 end
 
 #Usage (from the exceptional ruby book)

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

@@ -3,15 +3,20 @@ require 'veewee/provider/core/helper/ssh'
 require 'veewee/provider/core/helper/web'
 require 'veewee/provider/core/helper/shell'
 require 'veewee/provider/core/helper/iso'
+require 'veewee/provider/core/helper/winrm'
+require 'veewee/provider/core/helper/comm'
 
 require 'veewee/provider/core/box/build'
 require 'veewee/provider/core/box/scp'
+require 'veewee/provider/core/box/wincp'
+require 'veewee/provider/core/box/copy'
 require 'veewee/provider/core/box/exec'
 require 'veewee/provider/core/box/poweroff'
 require 'veewee/provider/core/box/halt'
 require 'veewee/provider/core/box/sudo'
 require 'veewee/provider/core/box/ssh'
 require 'veewee/provider/core/box/issh'
+require 'veewee/provider/core/box/winrm'
 require 'veewee/provider/core/box/floppy'
 require 'veewee/provider/core/box/validate_tags'
 
@@ -28,6 +33,8 @@ module Veewee
         include ::Veewee::Provider::Core::Helper::Web
         include ::Veewee::Provider::Core::Helper::Shell
         include ::Veewee::Provider::Core::Helper::Ssh
+        include ::Veewee::Provider::Core::Helper::Winrm
+        include ::Veewee::Provider::Core::Helper::Comm
         include ::Veewee::Provider::Core::Helper::Iso
 
         include ::Veewee::Provider::Core::BoxCommand