virtualbox 0.8.6 → 0.9.0

data/lib/virtualbox/exceptions.rb

@@ -12,7 +12,7 @@ module VirtualBox
     class ReadonlyVMStateException < Exception; end
     class UnsupportedVersionException < Exception; end
 
-    class FFIException < Exception
+    class COMException < Exception
       attr_accessor :data
 
       def initialize(data={})
@@ -23,17 +23,18 @@ module VirtualBox
 
     # FFI Exceptions, these exceptions are only raised on *nix machines
     # when some error occurs in the foreign function interface.
-    class ObjectNotFoundException < FFIException; end
-    class InvalidVMStateException < FFIException; end
-    class VMErrorException < FFIException; end
-    class FileErrorException < FFIException; end
-    class SubsystemException < FFIException; end
-    class PDMException < FFIException; end
-    class InvalidObjectStateException < FFIException; end
-    class HostErrorException < FFIException; end
-    class NotSupportedException < FFIException; end
-    class XMLErrorException < FFIException; end
-    class InvalidSessionStateException < FFIException; end
-    class ObjectInUseException < FFIException; end
+    class ObjectNotFoundException < COMException; end
+    class InvalidVMStateException < COMException; end
+    class VMErrorException < COMException; end
+    class FileErrorException < COMException; end
+    class SubsystemException < COMException; end
+    class PDMException < COMException; end
+    class InvalidObjectStateException < COMException; end
+    class HostErrorException < COMException; end
+    class NotSupportedException < COMException; end
+    class XMLErrorException < COMException; end
+    class InvalidSessionStateException < COMException; end
+    class ObjectInUseException < COMException; end
+    class InvalidArgException < COMException; end
   end
 end

data/lib/virtualbox/extra_data.rb

@@ -1,3 +1,5 @@
+require 'virtualbox/abstract_model/dirty'
+
 module VirtualBox
   # Represents "extra data" which can be set on a specific
   # virtual machine or on VirtualBox as a whole. Extra data is persistent

data/lib/virtualbox/hard_drive.rb

@@ -132,7 +132,7 @@ module VirtualBox
 
       validates_presence_of :location
 
-      max_vdi_size = Global.global.system_properties.max_vdi_size
+      max_vdi_size = Global.global.system_properties.info_vdi_size
       validates_inclusion_of :logical_size, :in => (0..max_vdi_size), :message => "must be between 0 and #{max_vdi_size}."
     end
 

data/lib/virtualbox/host_network_interface.rb

@@ -91,7 +91,7 @@ module VirtualBox
     def attached_vms
       parent.parent.vms.find_all do |vm|
         result = vm.network_adapters.find do |adapter|
-          adapter.enabled? && adapter.host_interface == name
+          adapter.enabled? && adapter.host_only_interface == name
         end
 
         !result.nil?

data/lib/virtualbox/lib.rb

@@ -1,3 +1,5 @@
+require 'virtualbox/ext/platform'
+
 module VirtualBox
   # Used by the rest of the VirtualBox library to interface with
   # the VirtualBox XPCOM library (VBoxXPCOMC). Most users will never need

data/lib/virtualbox/medium.rb

@@ -1,3 +1,5 @@
+require 'virtualbox/ext/subclass_listing'
+
 module VirtualBox
   # Represents a medium object part of VirtualBox. A medium is a
   # hard drive, DVD, floppy disk, etc. Each of these share common

data/lib/virtualbox/network_adapter.rb

@@ -44,7 +44,7 @@ module VirtualBox
   #     attribute :cable_connected, :boolean => true
   #     attribute :nat_network
   #     attribute :internal_network
-  #     attribute :host_interface
+  #     attribute :host_only_interface
   #     attribute :interface, :readonly => true, :property => false
   #
   class NetworkAdapter < AbstractModel
@@ -57,7 +57,7 @@ module VirtualBox
     attribute :cable_connected, :boolean => true
     attribute :nat_network
     attribute :internal_network
-    attribute :host_interface
+    attribute :host_only_interface
     attribute :interface, :readonly => true, :property => false
     relationship :nat_driver, :NATEngine, :lazy => true
 
@@ -70,8 +70,9 @@ module VirtualBox
       def populate_relationship(caller, imachine)
         relation = Proxies::Collection.new(caller)
 
-        # Get the count of network adapters
-        count = imachine.parent.system_properties.network_adapter_count
+        # Get the count of network adapters for a chipset of the type
+        # that is our machine.
+        count = imachine.parent.system_properties.get_max_network_adapters(imachine.chipset_type)
 
         count.times do |i|
           relation << new(caller, imachine.get_network_adapter(i))
@@ -125,35 +126,18 @@ module VirtualBox
     # exists.
     def host_interface_object
       VirtualBox::Global.global.host.network_interfaces.find do |ni|
-        ni.name == host_interface
+        ni.name == host_only_interface
       end
     end
 
     # Save a network adapter.
     def save
       modify_adapter do |adapter|
-        save_attachment_type(adapter)
         save_changed_interface_attributes(adapter)
         save_relationships
       end
     end
 
-    # Saves the attachment type. This should never be called directly. Instead,
-    # {save} should be called, which will call this method if appropriate.
-    def save_attachment_type(adapter)
-      return unless attachment_type_changed?
-
-      mapping = {
-        :nat => :attach_to_nat,
-        :bridged => :attach_to_bridged_interface,
-        :internal => :attach_to_internal_network,
-        :host_only => :attach_to_host_only_interface
-      }
-
-      adapter.send(mapping[attachment_type])
-      clear_dirty!(:attachment_type)
-    end
-
     # Opens a session, yields the adapter and then saves the machine at
     # the end
     def modify_adapter

data/lib/virtualbox/proxies.rb

@@ -0,0 +1,6 @@
+module VirtualBox
+  module Proxies
+    autoload :Collection, 'virtualbox/proxies/collection'
+  end
+end
+

data/lib/virtualbox/system_properties.rb

@@ -13,7 +13,6 @@ module VirtualBox
     attribute :min_guest_cpu_count, :readonly => true
     attribute :max_guest_cpu_count, :readonly => true
     attribute :info_vd_size, :readonly => true
-    attribute :network_adapter_count, :readonly => true
     attribute :serial_port_count, :readonly => true
     attribute :parallel_port_count, :readonly => true
     attribute :max_boot_position, :readonly => true

data/lib/virtualbox/version.rb

@@ -1,36 +1,34 @@
 module VirtualBox
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 
-  module Version
-    # Returns a boolean denoting whether the current VirtualBox
-    # version is supported or not. This will return `false` if the
-    # version is invalid, the version is not detected, etc. That means
-    # that even if VirtualBox is not installed, this will simply
-    # return `false`.
-    #
-    # @return [Boolean]
-    def supported?
-      !version.nil?
-    end
+  # Returns a boolean denoting whether the current VirtualBox
+  # version is supported or not. This will return `false` if the
+  # version is invalid, the version is not detected, etc. That means
+  # that even if VirtualBox is not installed, this will simply
+  # return `false`.
+  #
+  # @return [Boolean]
+  def self.supported?
+    !version.nil?
+  end
 
-    # Returns the version string of the VirtualBox installed, ex. "3.1.6"
-    # This string is cached since the version typically doesn't change
-    # during runtime. If you must refresh the version, send the boolean
-    # `true` as the first parameter.
-    def version(refresh=false)
-      @_version = Lib.lib.virtualbox.version if @_version.nil? || refresh
-      @_version
-    rescue Exception
-      nil
-    end
+  # Returns the version string of the VirtualBox installed, ex. "3.1.6"
+  # This string is cached since the version typically doesn't change
+  # during runtime. If you must refresh the version, send the boolean
+  # `true` as the first parameter.
+  def self.version(refresh=false)
+    @_version = Lib.lib.virtualbox.version if @_version.nil? || refresh
+    @_version
+  rescue Exception
+    nil
+  end
 
-    # Returns the revision string of the VirtualBox installed, ex. "51742"
-    # This string is cached since the revision doesn't typically change during
-    # runtime. If you must refresh the version, send the boolean `true` as the
-    # first parameter.
-    def revision(refresh=false)
-      @_revision = Lib.lib.virtualbox.revision.to_s if @_revision.nil? || refresh
-      @_revision
-    end
+  # Returns the revision string of the VirtualBox installed, ex. "51742"
+  # This string is cached since the revision doesn't typically change during
+  # runtime. If you must refresh the version, send the boolean `true` as the
+  # first parameter.
+  def self.revision(refresh=false)
+    @_revision = Lib.lib.virtualbox.revision.to_s if @_revision.nil? || refresh
+    @_revision
   end
 end

data/lib/virtualbox/vm.rb

@@ -133,52 +133,57 @@ module VirtualBox
   #     relationship :current_snapshot, :Snapshot
   #
   class VM < AbstractModel
-    attribute :uuid, :readonly => true, :property => :id
-    attribute :name
-    attribute :os_type_id
-    attribute :description
-    attribute :memory_size
-    attribute :memory_balloon_size
-    attribute :vram_size
-    attribute :cpu_count
-    attribute :accelerate_3d_enabled, :boolean => true
-    attribute :accelerate_2d_video_enabled, :boolean => true
-    attribute :clipboard_mode
-    attribute :monitor_count
-    attribute :state, :readonly => true
-    attribute :accessible, :readonly => true, :boolean => true
-    attribute :hardware_version
-    attribute :hardware_uuid
-    attribute :firmware_type
-    attribute :snapshot_folder
-    attribute :settings_file_path, :readonly => true
-    attribute :last_state_change, :readonly => true
-    attribute :state_file_path, :readonly => true
-    attribute :log_folder, :readonly => true
-    attribute :snapshot_count, :readonly => true
-    attribute :current_state_modified, :readonly => true
-    attribute :guest_property_notification_patterns
-    attribute :teleporter_enabled, :boolean => true
-    attribute :teleporter_port
-    attribute :teleporter_address
-    attribute :teleporter_password
-    attribute :boot_order,
-      :property_getter => Proc.new { |instance, *args| instance.get_boot_order(*args) },
-      :property_setter => Proc.new { |instance, *args| instance.set_boot_order(*args) }
+    attribute_scope :lazy => true do
+      attribute :uuid, :readonly => true, :property => :id
+      attribute :name
+      attribute :os_type_id
+      attribute :description
+      attribute :memory_size
+      attribute :memory_balloon_size
+      attribute :vram_size
+      attribute :cpu_count
+      attribute :cpu_hot_plug_enabled, :boolean => true
+      attribute :cpu_execution_cap
+      attribute :accelerate_3d_enabled, :boolean => true
+      attribute :accelerate_2d_video_enabled, :boolean => true
+      attribute :clipboard_mode
+      attribute :monitor_count
+      attribute :state, :readonly => true
+      attribute :accessible, :readonly => true, :boolean => true
+      attribute :hardware_version
+      attribute :hardware_uuid
+      attribute :firmware_type
+      attribute :snapshot_folder
+      attribute :settings_file_path, :readonly => true
+      attribute :last_state_change, :readonly => true
+      attribute :state_file_path, :readonly => true
+      attribute :log_folder, :readonly => true
+      attribute :snapshot_count, :readonly => true
+      attribute :current_state_modified, :readonly => true
+      attribute :guest_property_notification_patterns
+      attribute :teleporter_enabled, :boolean => true
+      attribute :teleporter_port
+      attribute :teleporter_address
+      attribute :teleporter_password
+      attribute :boot_order,
+        :property_getter => Proc.new { |instance, *args| instance.get_boot_order(*args) },
+        :property_setter => Proc.new { |instance, *args| instance.set_boot_order(*args) }
+    end
+
     attribute :interface, :readonly => true, :property => false
-    relationship :audio_adapter, :AudioAdapter
-    relationship :bios, :BIOS
-    relationship :hw_virt, :HWVirtualization
-    relationship :cpu, :CPU
-    relationship :vrde_server, :VRDEServer
-    relationship :storage_controllers, :StorageController, :dependent => :destroy
-    relationship :medium_attachments, :MediumAttachment
-    relationship :shared_folders, :SharedFolder
-    relationship :extra_data, :ExtraData
-    relationship :forwarded_ports, :ForwardedPort, :version => "3.1"
-    relationship :network_adapters, :NetworkAdapter
-    relationship :usb_controller, :USBController
-    relationship :current_snapshot, :Snapshot
+    relationship :audio_adapter, :AudioAdapter, :lazy => true
+    relationship :bios, :BIOS, :lazy => true
+    relationship :hw_virt, :HWVirtualization, :lazy => true
+    relationship :cpu, :CPU, :lazy => true
+    relationship :vrde_server, :VRDEServer, :lazy => true
+    relationship :storage_controllers, :StorageController, :dependent => :destroy, :lazy => true
+    relationship :medium_attachments, :MediumAttachment, :lazy => true
+    relationship :shared_folders, :SharedFolder, :lazy => true
+    relationship :extra_data, :ExtraData, :lazy => true
+    relationship :forwarded_ports, :ForwardedPort, :version => "3.1", :lazy => true
+    relationship :network_adapters, :NetworkAdapter, :lazy => true
+    relationship :usb_controller, :USBController, :lazy => true
+    relationship :current_snapshot, :Snapshot, :lazy => true
 
     class << self
       # Returns an array of all available VMs.
@@ -193,7 +198,12 @@ module VirtualBox
       #
       # @return [VM]
       def find(name)
-        all.detect { |o| o.name == name || o.uuid == name }
+        new(Lib.lib.virtualbox.find_machine(name))
+      rescue Exceptions::ObjectNotFoundException
+        nil
+      rescue Exceptions::COMException
+        # NOTE: This only happens on JRuby/Windows
+        nil
       end
 
       # Imports a VM, blocking the entire thread during this time.
@@ -250,12 +260,6 @@ module VirtualBox
     end
 
     def initialize_attributes(machine)
-      # Load the interface attributes
-      load_interface_attributes(machine)
-
-      # Setup the relationships
-      populate_relationships(machine)
-
       # Clear dirtiness, since this should only be called initially and
       # therefore shouldn't affect dirtiness
       clear_dirty!
@@ -264,11 +268,26 @@ module VirtualBox
       existing_record!
     end
 
+    def load_attribute(key)
+      read_interface_attribute(key, interface)
+    end
+
+    def load_relationship(name)
+      # Load only the requested relationship
+      populate_relationship(name, interface)
+    end
+
     # Reload the model so that all the attributes and relationships are
     # up to date. This method will automatically discard any changes to
     # the VM and any of its relationships.
     def reload
+      # Reset relationships and attributes
+      reset_attributes
+      reset_relationships
+
+      # Initialize again
       initialize_attributes(interface)
+
       self
     end
 
@@ -554,14 +573,15 @@ module VirtualBox
     #     also unregister attached media. If set to `:delete`, it will
     #     not only unregister attached media, but will also physically
     #     remove their respective data.
-    def destroy(*args)
+    def destroy
       # Do a full cleanup on the machine, then delete all the media attached
       media = interface.unregister(:full)
 
       if !media.empty?
-        if Platform.windows? && !Platform.jruby?
+        if Platform.windows?
           # The MSCOM interface in CRuby to delete media is broken,
-          # so we do this ghettoness.
+          # so we do this ghettoness. Also, in JRuby, passing an array
+          # to objects is broken. So once again, we do this.
           path = interface.settings_file_path
 
           # A simple sanity check to make sure we don't attempt to delete

data/test/test_helper.rb

@@ -11,8 +11,5 @@ require 'virtualbox'
 class Test::Unit::TestCase
 end
 
-# Initialize the FFI stuff. This is typically done dynamically when
-# FFI is initialized (on non-windows machines). Since the tests test
-# the FFI classes, we force initialize a specific version here. It
-# doesn't matter what version, since no actual FFI calls are made.
-VirtualBox::COM::FFI.setup("3.2.x") unless defined?(VirtualBox::COM::FFI::Version_3_2_X)
+# Set the interface version manually since we don't do detection in tests
+VirtualBox::COM::Util.set_interface_version("4.0.x")

data/test/virtualbox/abstract_model/attributable_test.rb

@@ -194,6 +194,28 @@ class AttributableTest < Test::Unit::TestCase
     end
   end
 
+  context "resetting attributes" do
+    class ResetAttributeModel < AttributeModel
+      attribute :normal
+      attribute :lazy, :lazy => true
+    end
+
+    setup do
+      @model = ResetAttributeModel.new
+      @model.populate_attributes({
+        :normal => "normal",
+        :lazy   => "lazy"
+      })
+    end
+
+    should "only reset the lazy attributes" do
+      assert @model.loaded_attribute?(:lazy)
+      @model.reset_attributes
+      assert !@model.loaded_attribute?(:lazy)
+      assert_equal "normal", @model.normal
+    end
+  end
+
   context "reading and writing attributes" do
     class VersionedAttributeModel < AttributeModel
       attribute :ver, :version => "3.1"

data/test/virtualbox/abstract_model/relatable_test.rb

@@ -152,6 +152,27 @@ class RelatableTest < Test::Unit::TestCase
     end
   end
 
+  context "resetting relationships" do
+    class ResetRelatableModel < EmptyRelatableModel
+      relationship :foos, RelatableTest::Relatee
+      relationship :bars, RelatableTest::BarRelatee, :lazy => true
+    end
+
+    setup do
+      @model = ResetRelatableModel.new
+    end
+
+    should "reset only the lazy relationship" do
+      @model.relationship_data[:foos] = "YES"
+      @model.relationship_data[:bars] = "YES"
+
+      assert @model.loaded_relationship?(:bars)
+      @model.reset_relationships
+      assert !@model.loaded_relationship?(:bars)
+      assert_equal "YES", @model.foos
+    end
+  end
+
   context "lazy relationships" do
     class LazyRelatableModel < EmptyRelatableModel
       relationship :foos, RelatableTest::Relatee, :lazy => true