veewee 0.3.0.alpha9 → 0.3.0.beta1

data/Gemfile

@@ -6,6 +6,7 @@
 source "http://rubygems.org"
 
 #gem "veewee", :path => "."
+#gem "fission", :path => '/Users/patrick/dev/fission'
 
 group :test do
   gem "rake"

data/doc/definition.md

@@ -1,12 +1,16 @@
 # Veewee definition
 
 ## Creating a definition
-A definition is create be 'cloning' a *template*.
+A definition is created by 'cloning' a *template*.
 
 To create a definition you use the 'define' subcommand:
 
     veewee vbox define 'myubuntu' 'ubuntu-10.10-server-amd64'
 
+If you want to use an external repo for the definition you can specify a git-url
+
+    veewee vbox define 'myubuntu' 'git://github.com/jedi4ever/myubuntu'
+
 ## Modifying a definition
 Definitions are stored under a directory 'definitions' relative to the current directory.
 
@@ -48,6 +52,9 @@ The 'Veewee::Session.declare' is now deprecated and you should use 'Veewee::Defi
 
 The default user of definitions is now 'veewee' and not 'vagrant'. This is because on other virtualizations like fusion and kvm, there is not relationship with the 'vagrant'. Users 'vagrant' are created by the 'vagrant.sh' script and not by the preseed or kickstart.
 
+_Using ERB in files_
+
+Add '.erb' to your files in a definition and they will get rendered (useful for generting kickstart,postinstall) (thx @mconigilaro)
 
 ## Listing existing definitions
 

data/lib/fission/config.rb

@@ -1,24 +1,71 @@
 module Fission
   class Config
+
+    # Public: Gets/Sets the Hash of attributes.
     attr_accessor :attributes
 
+    # Public: Path to the Fission conf file (default: ~/.fissionrc).
     CONF_FILE = File.expand_path '~/.fissionrc'
 
+    # Public: Initializes a Config object.  This also sets the default config
+    # attributes for 'vmrun_bin', 'vmrun_cmd', 'vm_dir', 'plist_file', and
+    # 'gui_bin'.
+    #
+    # Examples
+    #
+    #   Fission::Config.new
+    #
+    # Returns a new Config instance.
     def initialize
       @attributes = {}
-      load_from_file
 
-      if @attributes['vm_dir'].blank?
-        @attributes['vm_dir'] = File.expand_path('~/Documents/Virtual Machines.localized/')
+      @attributes['vm_dir'] = File.expand_path('~/Documents/Virtual Machines.localized/')
+      @attributes['lease_file'] = '/var/db/vmware/vmnet-dhcpd-vmnet8.leases'
+
+      fusion_version = :unknown
+
+      if File.exists?("/Library/Application Support/VMware Fusion/vmrun")
+        @attributes['vmrun_bin'] = '/Library/Application Support/VMware Fusion/vmrun'
+      end
+
+      if File.exists?("/Applications/VMware Fusion.app/Contents/Library/vmrun")  
+        @attributes['vmrun_bin'] = "/Applications/VMware Fusion.app/Contents/Library/vmrun"
+      end
+
+      if fusion_version == :unknown
       end
 
-      @attributes['vmrun_bin'] = '/Library/Application Support/VMware Fusion/vmrun'
-      @attributes['vmrun_cmd'] = "#{@attributes['vmrun_bin'].gsub(' ', '\ ')} -T fusion"
       @attributes['plist_file'] = File.expand_path('~/Library/Preferences/com.vmware.fusion.plist')
       @attributes['gui_bin'] = File.expand_path('/Applications/VMware Fusion.app/Contents/MacOS/vmware')
+
+      load_from_file
+
+      @attributes['vmrun_cmd'] = "#{@attributes['vmrun_bin'].gsub(' ', '\ ')} -T fusion"
+    end
+
+    # Public: Helper method to access config atributes.  This is a shortcut for
+    # querying the config attributes.
+    #
+    # item - The config item to query.
+    #
+    # Examples
+    #
+    #   Fission.config['vmrun_bin']
+    #   # => '/foo/bar/vmrun'
+    #
+    # Returns the value of the specified config item.
+    def [](item)
+      @attributes[item]
     end
 
     private
+    # Internal: Loads config values from the Fission conf file into attributes.
+    #
+    # Examples
+    #
+    #   load_from_file
+    #
+    # Returns nothing.
     def load_from_file
       if File.file?(CONF_FILE)
         @attributes.merge!(YAML.load_file(CONF_FILE))

data/lib/fission.rb

@@ -5,9 +5,10 @@ require 'yaml'
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'fission/error'
+#require 'fission/error'
 require 'fission/cli'
 require 'fission/command'
+require 'fission/command_helpers'
 require 'fission/command/clone'
 require 'fission/command/snapshot_create'
 require 'fission/command/snapshot_list'
@@ -16,12 +17,12 @@ require 'fission/command/start'
 require 'fission/command/status'
 require 'fission/command/stop'
 require 'fission/command/suspend'
-require 'fission/command/delete'
 require 'fission/config'
 require 'fission/core_ext/class'
 require 'fission/core_ext/file'
 require 'fission/core_ext/object'
 require 'fission/fusion'
+require 'fission/lease'
 require 'fission/metadata'
 require 'fission/response'
 require 'fission/ui'
@@ -35,7 +36,4 @@ module Fission
     @config ||= Fission::Config.new
   end
 
-  def ui
-    @ui ||= Fission::UI.new
-  end
 end

data/lib/veewee/cli.rb

@@ -52,4 +52,4 @@ module Veewee
       end
     end
   end
-end #Veewee
+end #Veewee

data/lib/veewee/command/base.rb

@@ -103,4 +103,4 @@ module Veewee
       end
     end
   end
-end
+end

data/lib/veewee/command/{vmfusion.rb → fusion.rb}

@@ -1,6 +1,6 @@
 module Veewee
   module Command
-    class Vmfusion< Veewee::Command::GroupBase
+    class Fusion< Veewee::Command::GroupBase
 
       register "fusion", "Subcommand for Vmware fusion"
       desc "build [BOX_NAME]", "Build box"

data/lib/veewee/command/group_base.rb

@@ -100,7 +100,8 @@ module Veewee
 
       # Override the basename to include the subcommand name.
       def self.basename
-        "#{super} #{@_name}"
+        "#{super}"
+        #"#{super} #{@_name}"
       end
     end
   end

data/lib/veewee/command/kvm.rb

@@ -10,6 +10,7 @@ module Veewee
       method_option :auto,:type => :boolean , :default => false, :aliases => "-a", :desc => "auto answers"
       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 :use_emulation, :type => :boolean , :default => false, :desc => "Use QEMU emulation"
       def build(box_name)
         venv=Veewee::Environment.new(options)
         venv.ui=env.ui

data/lib/veewee/command/{virtualbox.rb → vbox.rb}

@@ -1,6 +1,6 @@
 module Veewee
   module Command
-    class Virtualbox< Veewee::Command::GroupBase
+    class Vbox< Veewee::Command::GroupBase
 
       register "vbox", "Subcommand for VirtualBox"
       desc "build [BOX_NAME]", "Build box"

data/lib/veewee/command.rb

@@ -10,6 +10,6 @@ end
 # The built-in commands must always be loaded
 require 'veewee/command/version'
 require 'veewee/command/kvm'
-require 'veewee/command/virtualbox'
-require 'veewee/command/vmfusion'
+require 'veewee/command/vbox'
+require 'veewee/command/fusion'
 require 'veewee/command/parallels'

data/lib/veewee/definitions.rb

@@ -1,3 +1,4 @@
+require 'grit'
 require 'veewee/definition'
 require 'veewee/templates'
 require 'veewee/template'
@@ -39,7 +40,7 @@ module Veewee
       end
 
       if definitions.length==0
-        env.logger.debug("[Definition] no definitions found") 
+        env.logger.debug("[Definition] no definitions found")
       end
 
       definitions.each(&block)
@@ -61,9 +62,15 @@ module Veewee
 
       env.logger.debug("Forceflag : #{options['force']}")
 
+      git_template=false
+      # Check if the template is a git repo
+      if template_name.start_with?("git://")
+        git_template=true
+      end
+
       # Check if template exists
       template=env.templates[template_name]
-      if template.nil?
+      if template.nil? and ! git_template
         env.logger.fatal("Template '#{template_name}' does not exist")
         raise Veewee::TemplateError, "Template '#{template_name}' does not exist"
       else
@@ -83,19 +90,31 @@ module Veewee
         end
       end
 
-      env.logger.debug("Creating definition #{definition_name} in directory '#{env.definition_dir}' ")
+      env.logger.info("Creating definition #{definition_name} in directory '#{env.definition_dir}' ")
       dst_dir="#{File.join(env.definition_dir,definition_name)}"
       FileUtils.mkdir(dst_dir)
       env.logger.debug("Definition Directory '#{File.join(env.definition_dir,definition_name)}' succesfuly created")
 
       # Start copying/cloning the directory of the template to the definition directory
-      begin
-        env.logger.debug("Starting copy '#{template.path}' to '#{dst_dir}'")
-        FileUtils.cp_r(template.path+"/.",dst_dir)
-        env.logger.debug("Copy '#{template.path}' to '#{dst_dir}' succesfull")
-      rescue Exception => ex
-        env.logger.fatal("Copy '#{template.path}' to #{dst_dir}' failed: #{ex}")
-        raise Veewee::Error , "Copy '#{template.path}' to #{dst_dir}' failed: #{ex}"
+      if (git_template)
+        begin
+          env.logger.info("Starting git clone #{template_name} #{dst_dir}")
+          g = Grit::Git.new(dst_dir)
+          g.clone({ :timeout => false }, template_name, dst_dir)
+        rescue Exception => ex
+          err = "git clone #{template_name} #{dst_dir} failed: #{ex}"
+          env.logger.fatal(err)
+          raise Veewee::DefinitionError, err
+        end
+      else
+        begin
+          env.logger.debug("Starting copy '#{template.path}' to '#{dst_dir}'")
+          FileUtils.cp_r(template.path+"/.",dst_dir)
+          env.logger.debug("Copy '#{template.path}' to '#{dst_dir}' succesfull")
+        rescue Exception => ex
+          env.logger.fatal("Copy '#{template.path}' to #{dst_dir}' failed: #{ex}")
+          raise Veewee::Error , "Copy '#{template.path}' to #{dst_dir}' failed: #{ex}"
+        end
       end
 
       definition=env.definitions[definition_name]

data/lib/veewee/environment.rb

@@ -69,6 +69,14 @@ module Veewee
       }
 
       options = defaults.merge(options)
+      veeweefile_config = defaults.keys.inject({}) do |memo,obj|
+        if config.env.methods.include?(obj) && !config.env.send(obj).nil?
+          memo.merge({ obj => config.env.send(obj) })
+        else
+          memo
+        end
+      end
+      options = options.merge(veeweefile_config)
 
       # We need to set this variable before the first call to the logger object
       if options.has_key?("debug")

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

@@ -19,7 +19,7 @@ module Veewee
                 return result
               rescue RuntimeError => ex
                 error= "Error executing command #{command} : #{ex}"
-                error+="\n"+ex
+                error+="\n#{ex.backtrace.join("\n")}" unless ex.backtrace.empty?
                 raise Veewee::SshError, error
               end
             end

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

@@ -2,7 +2,7 @@ module Veewee
   module Provider
     module Core
       module BoxCommand
-        def create_floppy(filename)
+        def create_floppy(floppy_filename)
           # Todo Check for java
           # Todo check output of commands
 
@@ -15,7 +15,7 @@ module Veewee
               FileUtils.cp("#{full_filename}","#{temp_dir}")
             end
             javacode_dir=File.expand_path(File.join(__FILE__,'..','..','..','..','..','java'))
-            floppy_file=File.join(definition.path,filename)
+            floppy_file=File.join(definition.path,floppy_filename)
             if File.exists?(floppy_file)
               env.logger.info "Removing previous floppy file"
               FileUtils.rm(floppy_file)

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

@@ -91,7 +91,7 @@ module Veewee
               rel_path=path1.relative_path_from(path2).to_s
 
               ui.info ""
-              ui.info "We did not find an isofile in <currentdir>/iso. \n\nThe definition provided the following download information:"
+              ui.info "We did not find an isofile here : #{full_path}. \n\nThe definition provided the following download information:"
               unless "#{self.iso_src}"==""
                 ui.info "- Download url: #{self.iso_src}"
               end

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

@@ -21,10 +21,15 @@ module Veewee
             def do_GET(request,response)
               response['Content-Type']='text/plain'
               response.status = 200
-              ui.info "Serving file #{@localfile}"
-              displayfile=File.open(@localfile,'r')
-              content=displayfile.read()
-              response.body=content
+              content = File.open(@localfile, "r").read
+              response.body = case File.extname(@localfile)
+              when ".erb"
+                ui.info "Rendering and serving file #{@localfile}"
+                ERB.new(content).result(binding)
+              else
+                ui.info "Serving file #{@localfile}"
+                content
+              end
               #If we shut too fast it might not get the complete file
               sleep 2
               @server.shutdown

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

@@ -22,6 +22,7 @@ module Veewee
             :cpus => definition.cpu_count.to_i,
             :volume_capacity => "#{definition.disk_size}M",
             :network_interface_type => "nat",
+            :domain_type => options['use_emulation'] ? 'qemu': 'kvm',
             :iso_file => definition.iso_file,
             :arch => definition.os_type_id.end_with?("_64") ? "x86_64" : "i686",
             :iso_dir => env.config.veewee.iso_dir

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

@@ -27,7 +27,7 @@ module Veewee
           current_dir=FileUtils.pwd
           FileUtils.chdir(vm_path)
           env.ui.info "Creating disk"
-          command="#{fusion_path.shellescape}/vmware-vdiskmanager -c -s #{definition.disk_size}M -a lsilogic -t #{disk_type} #{name}.vmdk"
+          command="#{File.dirname(vmrun_cmd).shellescape}/vmware-vdiskmanager -c -s #{definition.disk_size}M -a lsilogic -t #{disk_type} #{name}.vmdk"
           shell_results=shell_exec("#{command}",{:mute => true})
           FileUtils.chdir(current_dir)
         end

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

@@ -9,7 +9,7 @@ module Veewee
           end
 
           raw.halt if raw.state=="running"
-          ::Fission::VM.delete(name)
+          ::Fission::VM.new(name).delete
           # remove it from memory
           @raw=nil
         end

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

@@ -41,7 +41,7 @@ module Veewee
           # before exporting the system needs to be shut down
 
           # otherwise the debug log will show - The specified virtual disk needs repair
-          shell_exec("#{fusion_path.shellescape}/ovftool/ovftool.bin #{debug} #{flags} #{vmx_file_path.shellescape} #{name}.ova")
+          shell_exec("#{File.dirname(vmrun_cmd).shellescape}/ovftool/ovftool.bin #{debug} #{flags} #{vmx_file_path.shellescape} #{name}.ova")
         end
       end
     end

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

@@ -5,22 +5,30 @@ module Veewee
 
         def build_info
           info=super
-          command="/Library/Application Support/VMware Fusion/vmrun"
-          output=IO.popen("#{command.shellescape}").readlines
+          output=IO.popen("#{vmrun_cmd.shellescape}").readlines
           info << {:filename => ".vmfusion_version",:content => output[1].split(/ /)[2..3].join.strip}
+        end
+
+
+       def guest_iso_directory
+          # use vmware fusion 3.x as default path
+          iso_images_dir="/Library/Application Support/VMware Fusion/isoimages"
 
+          # if path doesn't exist check for vmware fusion 4.x path
+          if( ! File.exists?(iso_images_dir) )
+            iso_images_dir="/Applications/VMware Fusion.app/Contents/Library/isoimages"
+          end
+          return iso_images_dir
         end
 
         # Determine the iso of the guest additions
         def guest_iso_path
           # So we begin by transferring the ISO file of the vmware tools
-
-          iso_image="/Library/Application Support/VMware Fusion/isoimages/linux.iso"
-          iso_image="/Library/Application Support/VMware Fusion/isoimages/darwin.iso" if definition.os_type_id=~/^Darwin/
-          iso_image="/Library/Application Support/VMware Fusion/isoimages/freebsd.iso" if definition.os_type_id=~/^Free/
-          iso_image="/Library/Application Support/VMware Fusion/isoimages/windows.iso" if definition.os_type_id=~/^Win/
+          iso_image=File.join(guest_iso_directory, "linux.iso")
+          iso_image=File.join(guest_iso_directory, "darwin.iso") if definition.os_type_id=~/^Darwin/
+          iso_image=File.join(guest_iso_directory, "freebsd.iso") if definition.os_type_id=~/^Free/
+          iso_image=File.join(guest_iso_directory, "windows.iso") if definition.os_type_id=~/^Win/
           return iso_image
-
         end
 
         # Transfer information provide by the provider to the box

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

@@ -3,14 +3,59 @@ module Veewee
     module Vmfusion
       module BoxCommand
 
-        # Get the IP address of the box
+        # Retrieve the first mac address for a vm
+        # This will only retrieve the first auto generate mac address
+        def mac_address
+          raise ::Fission::Error,"VM #{name} does not exist" unless self.exists?
+
+          line=File.new(vmx_file_path).grep(/^ethernet0.generatedAddress =/)
+          if line.nil?
+            #Fission.ui.output "Hmm, the vmx file #{vmx_path} does not contain a generated mac address "
+            return nil
+          end
+          address=line.first.split("=")[1].strip.split(/\"/)[1]
+          return address
+        end
+
+        # Retrieve the ip address for a vm.
+        # This will only look for dynamically assigned ip address via vmware dhcp
         def ip_address
-          return raw.ip_address
+          # Does not work for now as the vmx path is not escape correctly by fission 0.4.0
+          #return raw.network_info.data.first['ip_address']
+          raise ::Fission::Error,"VM #{name} does not exist" unless self.exists?
+
+          unless mac_address.nil?
+            lease = Fission::Lease.all.data.find { |l| l.mac_address=mac_address}
+            return lease.ip_address unless lease.nil?
+            return nil
+          else
+            # No mac address was found for this machine so we can't calculate the ip-address
+            return nil
+          end
         end
 
         # http://www.thirdbit.net/articles/2008/03/04/dhcp-on-vmware-fusion/
         def host_ip_as_seen_by_guest
-          File.open("/Library/Application Support/VMware Fusion/vmnet8/nat.conf").readlines.grep(/ip = /).first.split(" ")[2]
+
+          # if File.exists?("/Library/Application Support/VMware Fusion/vmnet8/nat.conf")
+          #   file = "/Library/Application Support/VMware Fusion/vmnet8/nat.conf"
+          # end
+
+          # if File.exists?("/Library/Preferences/VMware Fusion/vmnet8/nat.conf")
+          #   file = "/Library/Preferences/VMware Fusion/vmnet8/nat.conf"
+          # end
+          # File.open(file).readlines.grep(/ip = /).first.split(" ")[2]
+
+          # The above is not always correct
+          # There seems also an entry for vmnet8 in the dhcpd.conf
+          # /Library/Preferences/VMware Fusion/vmnet8/dhcpd.conf
+          # host vmnet8 {
+          #   fixed-address
+
+          # The above is fancy but doesn't always agree, we need to do is ifconfig vmnet8
+          # Ifconfig never lies
+          shell_results = shell_exec("ifconfig vmnet8", { :mute => true})
+          shell_results.stdout.split(/\n/).grep(/inet /)[0].strip.split(/ /)[1]
         end
 
       end

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

@@ -4,7 +4,7 @@ module Veewee
       module BoxCommand
 
         def vnc_port
-           lines=File.readlines(raw.vmx_path)
+           lines=File.readlines(vmx_file_path)
            matches=lines.grep(/^RemoteDisplay.vnc.port/)
            if matches.length==0
               raise Veewee::Error,"No VNC port found, maybe it is not enabled?"
@@ -42,7 +42,7 @@ module Veewee
         end
 
         def vnc_enabled?
-           lines=File.readlines(raw.vmx_path)
+           lines=File.readlines(vmx_file_path)
            matches=lines.grep(/^RemoteDisplay.vnc.enabled/)
            if matches.length==0
               return false

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

@@ -33,23 +33,15 @@ module Veewee
         def initialize(name,env)
 
           require 'fission'
-
           super(name,env)
         end
 
-        def determine_vmrun_cmd
-          return "#{fusion_path}/vmrun"
+        def vmrun_cmd
+          return ::Fission.config['vmrun_bin']
         end
 
         def vm_path
-          home=ENV['HOME']
-          dir="#{home}/Documents/Virtual Machines.localized/#{name}.vmwarevm"
-          return dir
-        end
-
-        def fusion_path
-          dir="/Library/Application Support/VMware Fusion/"
-          return dir
+          return File.join(::Fission.config['vm_dir'], "#{name}.vmwarevm")
         end
 
         def vmx_file_path

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

@@ -8,8 +8,21 @@ module Veewee
         #include ::Veewee::Provider::Vmfusion::ProviderCommand
 
         def check_requirements
-          unless File.exists?("/Library/Application Support/VMware Fusion/vmrun")
-            raise Veewee::Error,"The file /Library/Application Support/VMware Fusion/vmrun does not exists. Probably you don't have Vmware fusion installed"
+          fusion_version = :unknown
+
+          require 'fission'
+          if File.exists?("/Library/Application Support/VMware Fusion/vmrun")
+            fusion_version = "3.x"
+            ::Fission.config.attributes["vmrun_bin"] = "/Library/Application Support/VMware Fusion/vmrun"
+          end
+
+          if File.exists?("/Applications/VMware Fusion.app/Contents/Library/vmrun")
+            fusion_version = "4.x"
+            ::Fission.config.attributes["vmrun_bin"] = "/Applications/VMware Fusion.app/Contents/Library/vmrun"
+          end
+
+          if fusion_version == :unknown
+            raise Veewee::Error,"Could not find vmrun at standard locations. Probably you don't have Vmware fusion installed"
           end
         end
 

data/lib/veewee/templates.rb

@@ -15,10 +15,9 @@ module Veewee
         if template.exists?
           result=template
           return result
-        else
-          return nil
         end
       end
+      return nil
     end
 
     # Fetch all Templates

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.0.alpha9"
+  ::Veewee::VERSION="0.3.0.beta1"
 end

data/templates/CentOS-6.2-i386-minimal/base.sh

@@ -0,0 +1,14 @@
+# Base install
+
+sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
+
+cat > /etc/yum.repos.d/epel.repo << EOM
+[epel]
+name=epel
+baseurl=http://download.fedoraproject.org/pub/epel/6/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+
+yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl wget
+

data/templates/CentOS-6.2-i386-minimal/chef.sh

@@ -0,0 +1,3 @@
+# Install Chef
+gem install --no-ri --no-rdoc chef
+

data/templates/CentOS-6.2-i386-minimal/cleanup.sh

@@ -0,0 +1,5 @@
+yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y clean all
+rm -rf /etc/yum.repos.d/{puppetlabs,epel}.repo
+rm -rf VBoxGuestAdditions_*.iso
+