virtualbox 0.8.3 → 0.8.4

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

@@ -54,6 +54,7 @@ module VirtualBox
 
           # 4.0.x interfaces
           if version == "4.0.x"
+            create_interface(:BandwidthControl, :NSISupports)
             create_interface(:VRDEServer, :NSISupports)
           end
         end

data/lib/virtualbox/com/implementer/mscom.rb

@@ -73,34 +73,48 @@ module VirtualBox
             end
           end.compact
 
-          spec = spec.collect do |item|
-            if item == T_BOOL
-              args.shift ? 1 : 0
-            elsif item.to_s[0,1] == item.to_s[0,1].upcase
-              # Try to get the class from the interfaces
-              interface = interface_klass(item.to_sym)
-
-              if interface.superclass == COM::AbstractInterface
-                # For interfaces, get the instance, then dig deep to get the pointer
-                # to the VtblParent, which is what the API expects
-                instance = args.shift
-
-                if !instance.nil?
-                  # Get the actual MSCOM object, rather than the AbstractInterface
-                  instance.implementer.object
-                else
-                  # If the argument was nil, just pass a nil pointer as the argument
-                  nil
-                end
-              elsif interface.superclass == COM::AbstractEnum
-                # For enums, we need the value of the enum
-                interface.index(args.shift.to_sym)
+          spec = spec.inject([]) do |results, item|
+            single_type_to_arg(args, item, results)
+          end
+        end
+
+        # Converts a single type and args list to the proper formal args list
+        def single_type_to_arg(args, item, results)
+          if item.is_a?(Array) && item.length == 1
+            # Array argument
+            data = args.shift
+
+            # If its a regular type (int, bool, etc.) then just make it an
+            # array of that
+            results << data.inject([]) do |converted_data, single|
+              single_type_to_arg([single], item[0], converted_data)
+            end
+          elsif item.to_s[0,1] == item.to_s[0,1].upcase
+            # Try to get the class from the interfaces
+            interface = interface_klass(item.to_sym)
+
+            if interface.superclass == COM::AbstractInterface
+              # For interfaces, get the instance, then dig deep to get the pointer
+              # to the VtblParent, which is what the API expects
+              instance = args.shift
+
+              results << if !instance.nil?
+                # Get the actual MSCOM object, rather than the AbstractInterface
+                instance.implementer.object
+              else
+                # If the argument was nil, just pass a nil pointer as the argument
+                nil
               end
-            else
-              # Simply replace spec item with next item in args
-              # list
-              args.shift
+            elsif interface.superclass == COM::AbstractEnum
+              # For enums, we need the value of the enum
+              results << interface.index(args.shift.to_sym)
             end
+          elsif item == T_BOOL
+            results << (args.shift ? 1 : 0)
+          else
+            # Simply replace spec item with next item in args
+            # list
+            results << args.shift
           end
         end
 

data/lib/virtualbox/com/interface/4.0.x/bandwidth_control.rb

@@ -0,0 +1,18 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class BandwidthControl < AbstractInterface
+          IID_STR = "D0A24DB0-F756-11DF-98CF-0800200C9A66"
+
+          property :num_groups, T_UINT32, :readonly => true
+
+          function :create_bandwidth_group, nil, [WSTRING, :BandwidthGroupType, T_UINT32]
+          function :delete_bandwidth_group, nil, [WSTRING]
+          function :get_bandwidth_group, :BandwidthGroup, [WSTRING]
+          function :get_all_bandwidth_groups, [:BandwidthGroup], []
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/bandwidth_group.rb

@@ -0,0 +1,16 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class BandwidthGroup < AbstractInterface
+          IID_STR = "BADEA2D7-0261-4146-89F0-6A57CC34833D"
+
+          property :name, WSTRING, :readonly => true
+          property :type, :BandwidthGroupType, :readonly => true
+          property :reference, T_UINT32, :readonly => true
+          property :max_mb_per_sec, T_UINT32, :readonly => true
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/bandwidth_group_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class BandwidthGroupType < AbstractEnum
+          map [:null, :disk, :network]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/chipset_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class ChipsetType < AbstractEnum
+          map [:null, :piix3, :ich9]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/data_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class DataType < AbstractEnum
+          map [:int32, :int8, :string]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/pci_device_attachment.rb

@@ -0,0 +1,16 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class PciDeviceAttachment < AbstractInterface
+          IID_STR = "91F33D6F-E621-4F70-A77E-15F0E3C714D5"
+
+          property :name, WSTRING, :readonly => true
+          property :is_physical_device, T_BOOL, :readonly => true
+          property :host_address, T_UINT32, :readonly => true
+          property :guest_address, T_UINT32, :readonly => true
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/storage_controller.rb

@@ -14,6 +14,7 @@ module VirtualBox
           property :bus, :StorageBus, :readonly => true
           property :controller_type, :StorageControllerType
           property :use_host_io_cache, T_BOOL
+          property :bootable, T_BOOL, :readonly => true
 
           function :get_ide_emulation_port, T_INT32, [T_INT32]
           function :set_ide_emulation_port, nil, [T_INT32, T_INT32]

data/lib/virtualbox/ext/platform.rb

@@ -19,6 +19,10 @@ module VirtualBox
         platform.include?("solaris")
       end
 
+      def jruby?
+        RbConfig::CONFIG["ruby_install_name"] == "jruby"
+      end
+
       def platform
         RbConfig::CONFIG["host_os"].downcase
       end

data/lib/virtualbox/version.rb

@@ -1,5 +1,5 @@
 module VirtualBox
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 
   module Version
     # Returns a boolean denoting whether the current VirtualBox

data/lib/virtualbox/vm.rb

@@ -1,3 +1,6 @@
+require 'pathname'
+require 'virtualbox/ext/platform'
+
 module VirtualBox
   # Represents a single VirtualBox virtual machine. All attributes which are
   # not read-only can be modified and saved.
@@ -556,12 +559,24 @@ module VirtualBox
       media = interface.unregister(:full)
 
       if !media.empty?
-        interface.delete(media)
-
-        # TODO: This sleep is silly. The progress object returned by the media
-        # delete always fails to "wait" for some reason, so I do this. I hope
-        # to solve this issue soon.
-        sleep 1
+        if Platform.windows? && !Platform.jruby?
+          # The MSCOM interface in CRuby to delete media is broken,
+          # so we do this ghettoness.
+          path = interface.settings_file_path
+
+          # A simple sanity check to make sure we don't attempt to delete
+          # the root or something
+          if path.length > 10
+            Pathname.new(path).parent.rmtree
+          end
+        else
+          interface.delete(media)
+
+          # TODO: This sleep is silly. The progress object returned by the media
+          # delete always fails to "wait" for some reason, so I do this. I hope
+          # to solve this issue soon.
+          sleep 1
+        end
       end
     end
 

data/virtualbox.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "virtualbox"
 
-  s.add_dependency "ffi", "~> 0.6.3"
+  s.add_dependency "ffi", "~> 1.0"
   s.add_development_dependency "contest", "~> 0.1.2"
   s.add_development_dependency "mocha", "~> 0.9.8"
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: virtualbox
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 3
-  version: 0.8.3
+  prerelease: 
+  version: 0.8.4
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -08:00
+date: 2011-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,11 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 3
-        version: 0.6.3
+        version: "1.0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -39,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 2
         version: 0.1.2
   type: :development
   prerelease: false
@@ -54,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :development
   prerelease: false
@@ -266,12 +250,17 @@ files:
 - lib/virtualbox/com/interface/4.0.x/audio_controller_type.rb
 - lib/virtualbox/com/interface/4.0.x/audio_driver_type.rb
 - lib/virtualbox/com/interface/4.0.x/auth_type.rb
+- lib/virtualbox/com/interface/4.0.x/bandwidth_control.rb
+- lib/virtualbox/com/interface/4.0.x/bandwidth_group.rb
+- lib/virtualbox/com/interface/4.0.x/bandwidth_group_type.rb
 - lib/virtualbox/com/interface/4.0.x/bios_boot_menu_mode.rb
 - lib/virtualbox/com/interface/4.0.x/bios_settings.rb
+- lib/virtualbox/com/interface/4.0.x/chipset_type.rb
 - lib/virtualbox/com/interface/4.0.x/cleanup_mode.rb
 - lib/virtualbox/com/interface/4.0.x/clipboard_mode.rb
 - lib/virtualbox/com/interface/4.0.x/console.rb
 - lib/virtualbox/com/interface/4.0.x/cpu_property_type.rb
+- lib/virtualbox/com/interface/4.0.x/data_type.rb
 - lib/virtualbox/com/interface/4.0.x/device_type.rb
 - lib/virtualbox/com/interface/4.0.x/dhcp_server.rb
 - lib/virtualbox/com/interface/4.0.x/event_source.rb
@@ -306,6 +295,7 @@ files:
 - lib/virtualbox/com/interface/4.0.x/nsiexception.rb
 - lib/virtualbox/com/interface/4.0.x/nsisupports.rb
 - lib/virtualbox/com/interface/4.0.x/parallel_port.rb
+- lib/virtualbox/com/interface/4.0.x/pci_device_attachment.rb
 - lib/virtualbox/com/interface/4.0.x/pointing_hid_type.rb
 - lib/virtualbox/com/interface/4.0.x/port_mode.rb
 - lib/virtualbox/com/interface/4.0.x/progress.rb
@@ -435,7 +425,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3085819186325211373
+      hash: -3965605946174079114
       segments: 
       - 0
       version: "0"
@@ -444,15 +434,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: virtualbox
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Create and modify virtual machines in VirtualBox using pure ruby