veewee 0.3.7 → 0.3.9

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

@@ -15,11 +15,15 @@ module Veewee
         end
 
         def exists_volume?
-          @connection.list_volumes.find { |v| v[:name] == "#{name}.img" }
+          !@connection.list_volumes(:name => @volume_name).first.empty?
         end
 
         def exists_vm?
-          @connection.list_domains.find { |d| d[:name] == name }
+          begin
+            @connection.list_domains(:name => name)
+          rescue Libvirt::RetrieveError
+            false
+          end
         end
 
       end # End Module

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

@@ -12,38 +12,43 @@ module Veewee
           Fog.credentials[:libvirt_uri] ||= "qemu:///system"
 
           env.logger.info "Setting libvirt IP Command if not already defined in .fog config file"
-          Fog.credentials[:libvirt_ip_command] ||= "arp -an |grep $mac|cut -d '(' -f 2 | cut -d ')' -f 1"
+          Fog.credentials[:libvirt_ip_command] ||= "arp -an |grep -i $mac|cut -d '(' -f 2 | cut -d ')' -f 1"
 
+          env.logger.info "Opening a libvirt connection using fog.io"
           begin
-            env.logger.info "Opening a libvirt connection using fog.io"
-            conn = Fog::Compute[:libvirt]
-            env.logger.info "Libvirt connection established"
 
-            env.logger.debug "Found capabilities:"
-            env.logger.debug "#{conn.client.capabilities}"
-
-            env.logger.info "Checking available storagepools"
-            conn.pools.any? or raise Veewee::Error, "You need at least one (active) storage pool defined in #{Fog.credentials[:libvirt_uri]}."
+            unless gems_available?(["ruby-libvirt"])
+              raise Veewee::Error, "Please install ruby-libvirt gem first"
+            end
+          end
 
-            env.logger.info "Checking available networks"
-            conn.networks.any? or raise Veewee::Error,"You need at least one (active) network defined. This needs to be available if you connect to qemu:///system"
+          begin
 
-            # http://www.libvirt.org/html/libvirt-libvirt.html#virGetVersion
-            # format major * 1,000,000 + minor * 1,000 + release
-            env.logger.info "Checking libvirt version"
-            if conn.client.libversion < 8003
-              raise Veewee::Error, "You need at least libvirt version 0.8.3 or higher "
-            end
+            env.logger.info "Opening a libvirt connection using fog.io"
+            conn = Fog::Compute[:libvirt]
           rescue Exception => ex
             raise Veewee::Error, "There was a problem opening a connection to libvirt: #{ex}"
           end
+          env.logger.info "Libvirt connection established"
 
-          unless self.shell_exec("arp").status == 0
-            raise Veewee::Error, "Could not execute the arp command. This is required to find the IP address of the VM"
-          end
+          env.logger.debug "Found capabilities:"
+          env.logger.debug "#{conn.client.capabilities}"
 
-        end
+          env.logger.info "Checking libvirt version"
+          # http://www.libvirt.org/html/libvirt-libvirt.html#virGetVersion
+          # format major * 1,000,000 + minor * 1,000 + release
+          conn.client.libversion > 8003 or raise Veewee::Error, "You need at least libvirt version 0.8.3 or higher "
+
+          env.logger.info "Checking available networks"
+          conn.networks.any? or raise Veewee::Error, "You need at least one (active) network defined in #{Fog.credentials[:libvirt_uri]}."
 
+          env.logger.info "Checking available storagepools"
+          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"
+
+        end
 
         def build(definition_name, box_name, options)
 

data/lib/veewee/provider/kvm/templates/Vagrantfile

@@ -0,0 +1,45 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+
+  # Example configuration of new VM..
+  # 
+  #config.vm.define :test_vm do |test_vm|
+    # Box name
+    #test_vm.vm.box = "centos64"
+
+    # Interfaces for VM
+    # 
+    # Hostonly network is not supported in this version of provider. Bridged
+    # interface with network id specified can be created.
+    #test_vm.vm.network :bridged, :bridge => "default", :adapter => 1
+  #end
+
+  # Options for libvirt vagrant provider.
+  config.vm.provider :libvirt do |libvirt|
+
+    # A hypervisor name to access. Different drivers can be specified, but
+    # this version of provider creates KVM machines only. Some examples of
+    # drivers are qemu (KVM/qemu), xen (Xen hypervisor), lxc (Linux Containers),
+    # esx (VMware ESX), vmwarews (VMware Workstation) and more. Refer to
+    # documentation for available drivers (http://libvirt.org/drivers.html).
+    #libvirt.driver = "qemu"
+
+    # The name of the server, where libvirtd is running.
+    #libvirt.host = "localhost"
+
+    # If use ssh tunnel to connect to Libvirt.
+    #libvirt.connect_via_ssh = false
+
+    # The username and password to access Libvirt. Password is not used when
+    # connecting via ssh.
+    #libvirt.username = "root"
+    #libvirt.password = "secret"
+
+    # Libvirt storage pool name, where box image and instance snapshots will
+    # be stored.
+    #libvirt.storage_pool_name = "default"
+  end
+end
+

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

@@ -8,6 +8,7 @@ require 'veewee/provider/parallels/box/helper/console_type'
 require 'veewee/provider/parallels/box/helper/buildinfo'
 
 require 'veewee/provider/parallels/box/build'
+require 'veewee/provider/parallels/box/export'
 require 'veewee/provider/parallels/box/up'
 require 'veewee/provider/parallels/box/create'
 require 'veewee/provider/parallels/box/poweroff'

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

@@ -0,0 +1,184 @@
+require 'pathname'
+require 'erb'
+module Veewee
+  module Provider
+    module Parallels
+      module BoxCommand
+
+        class ErbBinding < OpenStruct
+          def get_binding
+            return binding()
+          end
+        end
+
+        def export_vagrant(options)
+          # For now, we just assume prlctl is in the path. If not...it'll fail.
+          @prlcmd = "prlctl"
+          @prldisktool = "prl_disk_tool"
+
+          # Check if box already exists
+          unless self.exists?
+            ui.info "#{name} is not found, maybe you need to build it first?"
+            exit
+          end
+
+          if File.exists?("#{name}.box")
+            if options["force"]
+              env.logger.debug("#{name}.box exists, but --force was provided")
+              env.logger.debug("removing #{name}.box first")
+              FileUtils.rm("#{name}.box")
+              env.logger.debug("#{name}.box removed")
+            else
+              raise Veewee::Error, "export file #{name}.box already exists. Use --force option to overwrite."
+            end
+          end
+
+
+          # We need to shutdown first
+          if self.running?
+            ui.info "Vagrant requires the box to be shutdown, before it can export"
+            ui.info "Sudo also needs to work for user #{definition.ssh_user}"
+            ui.info "Performing a clean shutdown now."
+
+            self.halt
+
+            #Wait for state poweroff
+            while (self.running?) do
+              ui.info ".",{:new_line => false}
+              sleep 1
+            end
+            ui.info ""
+            ui.info "Machine #{name} is powered off cleanly"
+          end
+
+          #Vagrant requires a relative path for output of boxes
+
+          #4.0.x. not using boxes as a subdir
+          boxdir=Pathname.new(Dir.pwd)
+
+          full_path=File.join(boxdir,name+".box")
+          path1=Pathname.new(full_path)
+          path2=Pathname.new(Dir.pwd)
+          box_path=File.expand_path(path1.relative_path_from(path2).to_s)
+
+          if File.exists?("#{box_path}")
+            raise Veewee::Error, "box #{name}.box already exists"
+          end
+
+          # VMWare Fusion does this to the real machine, so we will too.
+          optimize_disk
+
+          # Create temp directory
+          current_dir = FileUtils.pwd
+          ui.info "Creating a temporary directory for export"
+          tmp_dir = Dir.mktmpdir
+          env.logger.debug("Create temporary directory for export #{tmp_dir}")
+
+          begin
+
+            ui.info "Adding additional files"
+
+            # Handling the Vagrantfile
+            if options["vagrantfile"].to_s == ""
+
+              # Fetching mac address
+
+              data = {
+                :macaddress => get_mac_address
+              }
+
+              # Prepare the vagrant erb
+              vars = ErbBinding.new(data)
+              template_path = File.join(File.dirname(__FILE__),'..','..','..','templates',"Vagrantfile.erb")
+              template = File.open(template_path).readlines.join
+              erb = ERB.new(template)
+              vars_binding = vars.send(:get_binding)
+              result = erb.result(vars_binding)
+              ui.info("Creating Vagrantfile")
+              vagrant_path = File.join(tmp_dir,'Vagrantfile')
+              env.logger.debug("Path: #{vagrant_path}")
+              env.logger.debug(result)
+              File.open(vagrant_path,'w') {|f| f.write(result) }
+            else
+              f = options["vagrantfile"]
+              env.logger.debug("Including vagrantfile: #{f}")
+              FileUtils.cp(f,File.join(tmp_dir,"Vagrantfile"))
+            end
+
+            #Inject a metadata.json file
+            ui.info("Adding metadata.json file for Parallels Desktop provider")
+            File.open(File.join(tmp_dir, 'metadata.json'), 'w') {|f| f.write(template_metadatafile()) }
+
+            ui.info "Exporting the box"
+            tmp_dest = File.join(tmp_dir, "box.pvm")
+
+            clone_command = "#{@prlcmd} clone #{name} --name #{name}-veewee --template --location #{tmp_dir}"
+            shell_exec clone_command
+            env.logger.debug("Clone #{name} to #{name}-veewee, location #{tmp_dir}")
+
+            # Previous command causes the VM to get registered, so unregister it to keep user's VM list clean
+            unregister_command = "#{@prlcmd} unregister #{name}-veewee"
+            shell_exec unregister_command
+            env.logger.debug "Unregister #{name}-veewee after clone"
+
+            FileUtils.move File.join(tmp_dir, "#{name}-veewee.pvm"), tmp_dest
+            env.logger.debug("Rename Parallels Desktop-created file to what we expect")
+
+            ui.info "Packaging the box"
+            FileUtils.cd(tmp_dir)
+            command_box_path = box_path
+            # Gzip, for extra smallness
+            command = "tar -cvzf '#{command_box_path}' ."
+            env.logger.debug(command)
+            shell_exec (command)
+
+          rescue Errno::ENOENT => ex
+            raise Veewee::Error, "#{ex}"
+          rescue Error => ex
+            raise Veewee::Error, "Packaging of the box failed:\n+#{ex}"
+          ensure
+            # Remove temporary directory
+            ui.info "Cleaning up temporary directory"
+            env.logger.debug("Removing temporary dir #{tmp_dir}")
+            FileUtils.rm_rf(tmp_dir)
+
+            FileUtils.cd(current_dir)
+          end
+          ui.info ""
+
+          ui.info "To import it into vagrant type:"
+          ui.info "vagrant box add '#{name}' '#{box_path}'"
+          ui.info ""
+          ui.info "To use it:"
+          ui.info "vagrant init '#{name}'"
+          ui.info "vagrant up --provider=parallels"
+          ui.info "vagrant ssh"
+        end
+
+        # Inspired by vagrant-parallels
+        def read_settings
+          command = "#{@prlcmd} list --info --json \"#{self.name}\""
+          r = shell_exec(command).stdout
+          JSON.parse (r.gsub("/\s+/", "").gsub(/^(INFO)?\[/, '').gsub(/\]$/, ''))
+        end
+
+        def get_mac_address
+          mac = read_settings.fetch("Hardware").fetch("net0").fetch("mac")
+          env.logger.debug("mac address: #{mac}")
+          return mac
+        end
+
+        def template_metadatafile
+          %Q({"provider": "parallels"}\n)
+        end
+
+        def optimize_disk
+          env.ui.info "Optimizing Disk"
+          path_to_hdd = File.join read_settings.fetch("Home"), "harddisk.hdd"
+          optimize_command = "#{@prldisktool} compact --buildmap --hdd #{path_to_hdd}"
+          shell_exec optimize_command
+        end
+      end #Module
+    end #Module
+  end #Module
+end #Module

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

@@ -15,12 +15,14 @@ module Veewee
         def guest_iso_path
           # So we begin by transferring the ISO file of the vmware tools
 
+          parallels_base_path = "/Applications/Parallels Desktop.app/Contents/Resources/Tools"
+
           # Set default
-          iso_image="/Library/Parallels/Tools/prl-tools-lin.iso"
-          iso_image="/Library/Parallels/Tools/prl-tools-mac.iso" if definition.os_type_id=~/^Darwin/
-          iso_image="/Library/Parallels/Tools/prl-tools-win.iso" if definition.os_type_id=~/^Win/
-          iso_image="/Library/Parallels/Tools/prl-tools-other.iso" if definition.os_type_id=~/^Free/
-          iso_image="/Library/Parallels/Tools/prl-tools-other.iso" if definition.os_type_id=~/^Solaris/
+          iso_image="#{parallels_base_path}/prl-tools-lin.iso"
+          iso_image="#{parallels_base_path}/prl-tools-mac.iso" if definition.os_type_id=~/^Darwin/
+          iso_image="#{parallels_base_path}/prl-tools-win.iso" if definition.os_type_id=~/^Win/
+          iso_image="#{parallels_base_path}/prl-tools-other.iso" if definition.os_type_id=~/^Free/
+          iso_image="#{parallels_base_path}/prl-tools-other.iso" if definition.os_type_id=~/^Solaris/
           return iso_image
 
         end

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

@@ -47,9 +47,10 @@ module Veewee
         def shift(sequence)
           seq=Array.new
           seq << press_key('SHIFT_LEFT')
-          sequence.each do |s|
-            seq << s
-          end
+
+          # We never apply SHIFT_LEFT to more than one logical character at a
+          # time
+          seq << sequence
           return seq
         end
 
@@ -138,8 +139,12 @@ module Veewee
               if thestring.start_with?(key)
                 #take thestring
                 #check if it starts with a special key + pop special string
-                special[key].each do |c|
-                  keycodes.concat("#{c['code']} ")
+                if key=="<Wait>"
+                  sleep 1
+                else
+                  special[key].each do |c|
+                    keycodes.concat("#{c['code']} ")
+                  end
                 end
                 thestring=thestring.slice(key.length,thestring.length-key.length)
                 nospecial=false;
@@ -149,8 +154,9 @@ module Veewee
             if nospecial
               code=k[thestring.slice(0,1)]
               if !code.nil?
+                code=[code] if code.class==String
                 code.each do |c|
-		  if(c == 'SHIFT_LEFT'):
+		  if(c == 'SHIFT_LEFT')
                   	keycodes.concat("#{c}\#")
 		  else
                   	keycodes.concat("#{c} ")

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

@@ -22,6 +22,8 @@ require 'veewee/provider/virtualbox/box/helper/buildinfo'
 require 'veewee/provider/virtualbox/box/helper/console_type'
 require 'veewee/provider/virtualbox/box/up'
 
+require 'whichr'
+
 module Veewee
   module Provider
     module Virtualbox
@@ -30,15 +32,27 @@ module Veewee
         include ::Veewee::Provider::Virtualbox::BoxCommand
 
         def initialize(name,env)
+          @vboxcmd = self.class.determine_vboxcmd
+          super(name, env)
+        end
 
-          #require 'virtualbox'
-          @vboxcmd=determine_vboxcmd
-          super(name,env)
+        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)
+            end
+          end
+          nil
+        end
 
+        def self.default_vboxcmd
+          "VBoxManage"
         end
 
-        def determine_vboxcmd
-          return "VBoxManage"
+        def self.determine_vboxcmd
+          @command ||= windows_vboxcmd || default_vboxcmd
         end
 
 

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

@@ -62,7 +62,7 @@ module Veewee
             end
             self.add_winrm_nat_mapping
           else
-            guessed_port=guess_free_port(definition.ssh_host_port.to_i,definition.ssh_host_port.to_i+40).to_s
+            guessed_port=guess_free_ssh_port(definition.ssh_host_port.to_i,definition.ssh_host_port.to_i+40).to_s
             if guessed_port.to_s!=definition.ssh_host_port
               env.ui.warn "Changing ssh port from #{definition.ssh_host_port} to #{guessed_port}"
               definition.ssh_host_port=guessed_port.to_s

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

@@ -1,9 +1,16 @@
 require 'pathname'
+require 'erb'
 module Veewee
   module Provider
     module Virtualbox
       module BoxCommand
 
+        class ErbBinding < OpenStruct
+          def get_binding
+            return binding()
+          end
+        end
+
         #    Shellutil.execute("vagrant package --base #{vmname} --include /tmp/Vagrantfile --output /tmp/#{vmname}.box", {:progress => "on"})
 
         def export_vagrant(options)
@@ -51,24 +58,91 @@ module Veewee
           full_path=File.join(boxdir,name+".box")
           path1=Pathname.new(full_path)
           path2=Pathname.new(Dir.pwd)
-          box_path=path1.relative_path_from(path2).to_s
+          box_path=File.expand_path(path1.relative_path_from(path2).to_s)
 
           if File.exists?("#{box_path}")
             raise Veewee::Error, "box #{name}.box already exists"
           end
 
-          ui.info "Executing vagrant voodoo:"
-          export_command="vagrant package --base '#{name}' --output '#{box_path}'"
-          export_command += " --include #{options["include"].join(',')}" unless options["include"].empty?
-          export_command += " --vagrantfile #{options["vagrantfile"].join(' ')}" unless options["vagrantfile"].empty?
-          ui.info "#{export_command}"
-          shell_exec("#{export_command}") #hmm, needs to get the gem_home set?
+          # Create temp directory
+          current_dir = FileUtils.pwd
+          ui.info "Creating a temporary directory for export"
+          tmp_dir = Dir.mktmpdir
+          env.logger.debug("Create temporary directory for export #{tmp_dir}")
+
+          begin
+
+            ui.info "Adding additional files"
+
+            # Handling the Vagrantfile
+            if options["vagrantfile"].to_s == ""
+
+              # Fetching mac address
+
+              data = {
+                :macaddress => get_mac_address
+              }
+
+              # Prepare the vagrant erb
+              vars = ErbBinding.new(data)
+              template_path = File.join(File.dirname(__FILE__),'..','..','..','templates',"Vagrantfile.erb")
+              template = File.open(template_path).readlines.join
+              erb = ERB.new(template)
+              vars_binding = vars.send(:get_binding)
+              result = erb.result(vars_binding)
+              ui.info("Creating Vagrantfile")
+              vagrant_path = File.join(tmp_dir,'Vagrantfile')
+              env.logger.debug("Path: #{vagrant_path}")
+              env.logger.debug(result)
+              File.open(vagrant_path,'w') {|f| f.write(result) }
+            else
+              f = options["vagrantfile"]
+              env.logger.debug("Including vagrantfile: #{f}")
+              FileUtils.cp(f,File.join(tmp_dir,"Vagrantfile"))
+            end
+
+            # Handling other includes
+            unless options["include"].nil?
+              options["include"].each do |f|
+                env.logger.debug("Including file: #{f}")
+                FileUtils.cp(f,File.join(tmp_dir,f))
+              end
+            end
+
+            ui.info "Exporting the box"
+            command = "#{@vboxcmd} export #{name} --output #{File.join(tmp_dir,'box.ovf')}"
+            env.logger.debug("Command: #{command}")
+            shell_exec(command, {:mute => false})
+
+            ui.info "Packaging the box"
+            FileUtils.cd(tmp_dir)
+            command_box_path = box_path
+            is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+            if is_windows
+              command_box_path = command_box_path.gsub(/^([A-Z])\:\/(.*)$/i, '/\1/\2')
+            end
+            command = "tar -cvf '#{command_box_path}' ."
+            env.logger.debug(command)
+            shell_exec (command)
+
+          rescue Errno::ENOENT => ex
+            raise Veewee::Error, "#{ex}"
+          rescue Error => ex
+            raise Veewee::Error, "Packaging of the box failed:\n+#{ex}"
+          ensure
+            # Remove temporary directory
+            ui.info "Cleaning up temporary directory"
+            env.logger.debug("Removing temporary dir #{tmp_dir}")
+            FileUtils.rm_rf(tmp_dir)
+
+            FileUtils.cd(current_dir)
+          end
           ui.info ""
 
           #add_ssh_nat_mapping back!!!!
           #vagrant removes the mapping
           #we need to restore it in order to be able to login again
-          self.add_ssh_nat_mapping
+          #self.add_ssh_nat_mapping
 
           ui.info "To import it into vagrant type:"
           ui.info "vagrant box add '#{name}' '#{box_path}'"
@@ -79,6 +153,14 @@ module Veewee
           ui.info "vagrant ssh"
         end
 
+        def get_mac_address
+          command = "#{@vboxcmd} showvminfo --details --machinereadable \"#{self.name}\""
+          shell_results = shell_exec("#{command}")
+          mac = shell_results.stdout.split(/\n/).grep(/^macaddress1/)[0].split('=')[1].split('"')[1]
+          env.logger.debug("mac address: #{mac}")
+          return mac
+        end
+
       end #Module
     end #Module
   end #Module