virtualbox 0.7.5 → 0.7.6

data/.gitignore

@@ -4,4 +4,5 @@ pkg/*
 test/coverage/*
 .bundle/*
 Gemfile.lock
-test.rb
+test.rb
+*.rbc

data/Gemfile

@@ -1,25 +1,16 @@
 source "http://rubygems.org"
 
-# External Dependencies
-gem "ffi"
+gemspec
 
 # Gems required for development only.
 group :development do
-  # Gem and docs
-  gem "jeweler"
+  # Docs
   gem "yard"
 
   # Unit tests
-  gem "contest", ">= 0.1.2"
-  gem "mocha"
-  gem "rcov"
+  # gem "rcov"
 
   # Integration tests
   gem "cucumber", "~> 0.8.0"
-  gem "aruba", "~> 0.1.9"
   gem "rspec"
-
-  # Generally good to have
-  gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
-  gem "ruby-debug19", ">= 0.11.6" if RUBY_VERSION >= '1.9'
 end

data/Rakefile

@@ -1,5 +1,37 @@
-# Tests are placed into *.task files in the tasks/ directory since
-# the Rakefile was getting quite large and intimidating to approach.
-Dir[File.join(File.dirname(__FILE__), "tasks", "**", "*.task")].each do |f|
-  load f
+require "rubygems"
+require "bundler/setup"
+require "rake/testtask"
+
+require "cucumber"
+require "cucumber/rake/task"
+require "yard"
+Bundler::GemHelper.install_tasks
+
+task :default => "test:units"
+
+namespace :test do
+  Rake::TestTask.new(:units) do |t|
+    t.libs << "test"
+    t.pattern = 'test/**/*_test.rb'
+  end
+
+  Cucumber::Rake::Task.new(:integration) do |t|
+    t.cucumber_opts = "features --format pretty"
+  end
+
+  begin
+    require "rcov/rcovtask"
+
+    Rcov::RcovTask.new do |t|
+      t.libs << "test"
+      t.test_files = FileList["test/**/*_test.rb"]
+      t.output_dir = "test/coverage"
+      t.verbose = true
+    end
+  rescue LoadError; end
+end
+
+YARD::Rake::YardocTask.new do |t|
+  t.options = ['--main', 'Readme.md', '--markup', 'markdown']
+  t.options += ['--title', 'VirtualBox Ruby Library Documentation']
 end

data/features/support/env.rb

@@ -1,6 +1,5 @@
 # Before everything, load virtualbox, of course
 require 'spec'
-require 'aruba'
 require File.join(File.dirname(__FILE__), %W[.. .. lib virtualbox])
 
 # Configuration settings/info

data/lib/virtualbox/abstract_model/attributable.rb

@@ -153,7 +153,7 @@ module VirtualBox
         #   a custom populate key to use for {Attributable#populate_attributes}
         def attribute(name, options = {})
           name = name.to_sym
-          attributes[name] = @__attribute_scope || {}
+          attributes[name] = defined?(@__attribute_scope) ? @__attribute_scope : {}
           attributes[name].merge!(options)
 
           # Create the method for reading this attribute

data/lib/virtualbox/abstract_model/dirty.rb

@@ -125,7 +125,7 @@ module VirtualBox
       # Guarantees the dirty state will be the same before and after
       # the method call, but not within the block itself.
       def ignore_dirty(&block)
-        current_changes = @changed_attributes.dup rescue nil
+        current_changes = changes.dup
         yield self
         @changed_attributes = current_changes
       end
@@ -174,4 +174,4 @@ module VirtualBox
       end
     end
   end
-end
+end

data/lib/virtualbox/abstract_model.rb

@@ -57,7 +57,7 @@ module VirtualBox
     # is {HardDrive#save} which will create a new hard drive if it didn't
     # previously exist, or save an old one if it did exist.
     def new_record?
-      new_record! if @new_record.nil?
+      new_record! if !defined?(@new_record) || @new_record.nil?
       @new_record
     end
 

data/lib/virtualbox/com/ffi/vboxxpcomc.rb

@@ -5,7 +5,7 @@ module VirtualBox
       callback :pfnGetVersion, [], :uint
       callback :pfnComInitialize, [:string, :pointer, :string, :pointer], :void
       callback :pfnComUninitialize, [], :void
-      callback :pfnComUnallocMem, [:void], :void
+      callback :pfnComUnallocMem, [:pointer], :void
       callback :pfnUtf16Free, [:pointer], :void
       callback :pfnUtf8Free, [:string], :void
       callback :pfnUtf16ToUtf8, [:pointer, :pointer], :int
@@ -28,4 +28,4 @@ module VirtualBox
       end
     end
   end
-end
+end

data/lib/virtualbox/com/interface/3.1.x/access_mode.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_3_2_X
+        class AccessMode < AbstractEnum
+          map [:null, :access_mode_read_only, :access_mode_read_write]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/3.1.x/machine.rb

@@ -60,7 +60,7 @@ module VirtualBox
           function :get_medium_attachments_of_controller, [:MediumAttachments], [WSTRING]
           function :get_medium_attachment, :MediumAttachment, [WSTRING, T_INT32, T_INT32]
           function :get_network_adapter, :NetworkAdapter, [T_UINT32]
-          function :add_storage_controller, :StorageController, [WSTRING, T_UINT32]
+          function :add_storage_controller, :StorageController, [WSTRING, :StorageBus]
           function :get_storage_controller_by_name, :StorageController, [WSTRING]
           function :get_storage_controller_by_instance, :StorageController, [T_UINT32]
           function :remove_storage_controller, nil, [WSTRING]

data/lib/virtualbox/com/interface/3.1.x/virtualbox.rb

@@ -31,7 +31,7 @@ module VirtualBox
           function :unregister_machine, :Machine, [WSTRING]
           function :create_appliance, :Appliance, []
           function :create_hard_disk, :Medium, [WSTRING, WSTRING]
-          function :open_hard_disk, :Medium, [WSTRING, T_UINT32, T_BOOL, WSTRING, T_BOOL, WSTRING]
+          function :open_hard_disk, :Medium, [WSTRING, :AccessMode, T_BOOL, WSTRING, T_BOOL, WSTRING]
           function :get_hard_disk, :Medium, [WSTRING]
           function :find_hard_disk, :Medium, [WSTRING]
           function :open_dvd_image, :Medium, [WSTRING, WSTRING]

data/lib/virtualbox/com/interface/3.2.x/access_mode.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_3_2_X
+        class AccessMode < AbstractEnum
+          map [:null, :access_mode_read_only, :access_mode_read_write]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/3.2.x/machine.rb

@@ -68,7 +68,7 @@ module VirtualBox
           function :get_medium_attachments_of_controller, [:MediumAttachments], [WSTRING]
           function :get_medium_attachment, :MediumAttachment, [WSTRING, T_INT32, T_INT32]
           function :get_network_adapter, :NetworkAdapter, [T_UINT32]
-          function :add_storage_controller, :StorageController, [WSTRING, T_UINT32]
+          function :add_storage_controller, :StorageController, [WSTRING, :StorageBus]
           function :get_storage_controller_by_name, :StorageController, [WSTRING]
           function :get_storage_controller_by_instance, :StorageController, [T_UINT32]
           function :remove_storage_controller, nil, [WSTRING]

data/lib/virtualbox/com/interface/3.2.x/virtualbox.rb

@@ -31,7 +31,7 @@ module VirtualBox
           function :unregister_machine, :Machine, [WSTRING]
           function :create_appliance, :Appliance, []
           function :create_hard_disk, :Medium, [WSTRING, WSTRING]
-          function :open_hard_disk, :Medium, [WSTRING, T_UINT32, T_BOOL, WSTRING, T_BOOL, WSTRING]
+          function :open_hard_disk, :Medium, [WSTRING, :AccessMode, T_BOOL, WSTRING, T_BOOL, WSTRING]
           function :get_hard_disk, :Medium, [WSTRING]
           function :find_hard_disk, :Medium, [WSTRING]
           function :open_dvd_image, :Medium, [WSTRING, WSTRING]

data/lib/virtualbox/ext/platform.rb

@@ -13,6 +13,10 @@ module VirtualBox
         platform.include?("linux")
       end
 
+      def solaris?
+        platform.include?("solaris")
+      end
+
       def platform
         RUBY_PLATFORM.downcase
       end

data/lib/virtualbox/lib.rb

@@ -57,6 +57,8 @@ module VirtualBox
             @@lib_path = ["/Applications/VirtualBox.app/Contents/MacOS/VBoxXPCOMC.dylib"]
           elsif Platform.linux?
             @@lib_path = ["/opt/VirtualBox/VBoxXPCOMC.so", "/usr/lib/virtualbox/VBoxXPCOMC.so"]
+          elsif Platform.solaris?
+            @@lib_path = ["/opt/VirtualBox/amd64/VBoxXPCOMC.so", "/opt/VirtualBox/i386/VBoxXPCOMC.so"]
           elsif Platform.windows?
             @@lib_path = "Unknown"
           else

data/lib/virtualbox/version.rb

@@ -1,4 +1,6 @@
 module VirtualBox
+  VERSION = "0.7.6"
+
   module Version
     # Returns a boolean denoting whether the current VirtualBox
     # version is supported or not. This will return `false` if the

data/test/test_helper.rb

@@ -1,10 +1,3 @@
-begin
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  # Fallback on doing the resolve at runtime.
-  require "rubygems"
-end
-
 # ruby-debug, not necessary, but useful if we have it
 begin
   require 'ruby-debug'
@@ -12,9 +5,7 @@ rescue LoadError; end
 
 require 'contest'
 require 'mocha'
-
-# The actual library
-require File.join(File.dirname(__FILE__), '..', 'lib', 'virtualbox')
+require 'virtualbox'
 
 # Data
 class Test::Unit::TestCase

data/test/virtualbox/abstract_model/attributable_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class AttributableTest < Test::Unit::TestCase
   class EmptyAttributeModel

data/test/virtualbox/abstract_model/dirty_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class DirtyTest < Test::Unit::TestCase
   class DirtyModel
@@ -80,4 +80,4 @@ class DirtyTest < Test::Unit::TestCase
       assert_raises(NoMethodError) { @model.foobarbaz }
     end
   end
-end
+end

data/test/virtualbox/abstract_model/interface_attributes_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class InterfaceAttributesTest < Test::Unit::TestCase
   class EmptyInterfaceAttributeModel

data/test/virtualbox/abstract_model/relatable_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class RelatableTest < Test::Unit::TestCase
   class Relatee

data/test/virtualbox/abstract_model/validatable_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class ValidatableTest < Test::Unit::TestCase
   class ValidatableModel
@@ -305,4 +305,4 @@ class ValidatableTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/virtualbox/abstract_model/version_matcher_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class VersionMatcherTest < Test::Unit::TestCase
   setup do

data/test/virtualbox/abstract_model_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class AbstractModelTest < Test::Unit::TestCase
   class Foo
@@ -406,6 +406,7 @@ class AbstractModelTest < Test::Unit::TestCase
 
     context "saving all changed interface attributes" do
       setup do
+        @interface = mock("interface")
         @changes = [[:a, []], [:b, []], [:c, []]]
         @model.stubs(:changes).returns(@changes)
       end

data/test/virtualbox/appliance_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class ApplianceTest < Test::Unit::TestCase
   setup do

data/test/virtualbox/audio_adapter_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class AudioAdapterTest < Test::Unit::TestCase
   setup do
@@ -80,4 +80,4 @@ class AudioAdapterTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/virtualbox/bios_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class BIOSTest < Test::Unit::TestCase
   setup do
@@ -80,4 +80,4 @@ class BIOSTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/virtualbox/com/abstract_enum_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class COMAbstractEnumTest < Test::Unit::TestCase
   context "setting up the map" do
@@ -46,4 +46,4 @@ class COMAbstractEnumTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/virtualbox/com/abstract_implementer_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class AbstractImplementerTest < Test::Unit::TestCase
   setup do

data/test/virtualbox/com/abstract_interface_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class AbstractInterfaceTest < Test::Unit::TestCase
   class EmptyAITest < VirtualBox::COM::AbstractInterface

data/test/virtualbox/com/ffi/interface_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require File.expand_path("../../../../test_helper", __FILE__)
 
 class COMFFIInterfaceTest < Test::Unit::TestCase
   setup do
@@ -246,4 +246,4 @@ class COMFFIInterfaceTest < Test::Unit::TestCase
       assert_equal vtbl, instance.vtbl
     end
   end
-end
+end

data/test/virtualbox/com/ffi/util_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require File.expand_path("../../../../test_helper", __FILE__)
 
 class COMFFIUtilTest < Test::Unit::TestCase
   setup do
@@ -105,4 +105,4 @@ class COMFFIUtilTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/virtualbox/com/ffi_interface_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class COMFFIInterfaceBaseTest < Test::Unit::TestCase
   setup do
@@ -39,4 +39,4 @@ class COMFFIInterfaceBaseTest < Test::Unit::TestCase
   context "initializing com interface" do
     # TODO
   end
-end
+end

data/test/virtualbox/com/implementer/base_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require File.expand_path("../../../../test_helper", __FILE__)
 
 class COMImplementerBaseTest < Test::Unit::TestCase
   setup do

data/test/virtualbox/com/implementer/ffi_test.rb

@@ -1,13 +1,13 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require File.expand_path("../../../../test_helper", __FILE__)
 
 class COMImplementerFFITest < Test::Unit::TestCase
   setup do
     @klass = VirtualBox::COM::Implementer::FFI
+    @interface = mock("interface")
   end
 
   context "initializing" do
     setup do
-      @interface = mock("interface")
       @interface.stubs(:class).returns(VirtualBox::COM::Util.versioned_interface(:Session))
 
       @ffi = mock("ffi")

data/test/virtualbox/com/implementer/mscom_test.rb

@@ -1,17 +1,14 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
+require File.expand_path("../../../../test_helper", __FILE__)
 
 class COMImplementerMSCOMTest < Test::Unit::TestCase
   setup do
     @klass = VirtualBox::COM::Implementer::MSCOM
+    @interface = mock("interface")
+    @lib = mock("lib")
+    @object = mock("object")
   end
 
   context "initializing" do
-    setup do
-      @interface = mock("interface")
-      @lib = mock("lib")
-      @object = mock("object")
-    end
-
     should "make the lib base and object accessible" do
       instance = @klass.new(@interface, @lib, @object)
       assert_equal @lib, instance.lib
@@ -21,8 +18,6 @@ class COMImplementerMSCOMTest < Test::Unit::TestCase
 
   context "with an instance" do
     setup do
-      @lib = mock("lib")
-      @object = mock("object")
       @instance = @klass.new(@interface, @lib, @object)
     end
 
@@ -249,4 +244,4 @@ class COMImplementerMSCOMTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/virtualbox/com/mscom_interface_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class COMMSCOMInterfaceBaseTest < Test::Unit::TestCase
   setup do
@@ -14,4 +14,4 @@ class COMMSCOMInterfaceBaseTest < Test::Unit::TestCase
   context "initializing mscom interface" do
     # TODO
   end
-end
+end

data/test/virtualbox/com/util_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 
 class COMUtilTest < Test::Unit::TestCase
   setup do
@@ -14,4 +14,4 @@ class COMUtilTest < Test::Unit::TestCase
       assert !@klass.interface?(:IDontExist)
     end
   end
-end
+end

data/test/virtualbox/cpu_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class CPUTest < Test::Unit::TestCase
   setup do
@@ -100,4 +100,4 @@ class CPUTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/virtualbox/dhcp_server_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class DHCPServerTest < Test::Unit::TestCase
   setup do

data/test/virtualbox/dvd_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class DVDTest < Test::Unit::TestCase
   setup do
@@ -25,4 +25,4 @@ class DVDTest < Test::Unit::TestCase
       assert result.is_a?(Array)
     end
   end
-end
+end

data/test/virtualbox/ext/byte_normalizer_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 require 'virtualbox/ext/byte_normalizer'
 
 class ByteNormalizerTest < Test::Unit::TestCase
@@ -31,4 +31,4 @@ class ByteNormalizerTest < Test::Unit::TestCase
       assert_equal out, @instance.bytes_to_megabytes(input)
     end
   end
-end
+end

data/test/virtualbox/ext/platform_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 require 'virtualbox/ext/platform'
 
 class PlatformTest < Test::Unit::TestCase
@@ -47,4 +47,4 @@ class PlatformTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/virtualbox/ext/subclass_listing_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+require File.expand_path("../../../test_helper", __FILE__)
 require 'virtualbox/ext/subclass_listing'
 
 class SubclassListingTest < Test::Unit::TestCase
@@ -22,4 +22,4 @@ class SubclassListingTest < Test::Unit::TestCase
   should "list direct subclasses if flag is set" do
     assert_equal [B, D], A.subclasses(true).sort_by { |c| c.name }
   end
-end
+end

data/test/virtualbox/extra_data_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class ExtraDataTest < Test::Unit::TestCase
   setup do

data/test/virtualbox/forwarded_port_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class ForwardedPortTest < Test::Unit::TestCase
   setup do

data/test/virtualbox/global_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class GlobalTest < Test::Unit::TestCase
   setup do
@@ -43,4 +43,4 @@ class GlobalTest < Test::Unit::TestCase
       assert_equal @lib, @instance.lib
     end
   end
-end
+end

data/test/virtualbox/hard_drive_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class HardDriveTest < Test::Unit::TestCase
   setup do

data/test/virtualbox/host_network_interface_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class HostNetworkInterfaceTest < Test::Unit::TestCase
   setup do

data/test/virtualbox/host_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require File.expand_path("../../test_helper", __FILE__)
 
 class HostTest < Test::Unit::TestCase
   setup do