virtualbox 0.7.2 → 0.7.3

data/Gemfile

@@ -3,10 +3,23 @@ source :gemcutter
 # External Dependencies
 gem "ffi"
 
-# Gems required for testing only.
-group :test do
+# Gems required for development only.
+group :development do
+  # Gem and docs
+  gem "jeweler"
+  gem "yard"
+
+  # Unit tests
   gem "contest", ">= 0.1.2"
   gem "mocha"
+  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
+end

data/Rakefile

@@ -1,49 +1,5 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "virtualbox"
-    gemspec.summary = "Create and modify virtual machines in VirtualBox using pure ruby."
-    gemspec.description = "Create and modify virtual machines in VirtualBox using pure ruby."
-    gemspec.email = "mitchell.hashimoto@gmail.com"
-    gemspec.homepage = "http://github.com/mitchellh/virtualbox"
-    gemspec.authors = ["Mitchell Hashimoto"]
-    gemspec.executables = []
-
-    gemspec.add_dependency('ffi', '>= 0.6.3')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+# 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
 end
-
-require 'rake/testtask'
-
-task :default => :test
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.pattern = 'test/**/*_test.rb'
-end
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |t|
-    t.options = ['--main', 'Readme.md', '--markup', 'markdown']
-    t.options += ['--title', 'VirtualBox Ruby Library Documentation']
-  end
-rescue LoadError
-  puts "Yard not available. Install it with: gem install yard bluecloth"
-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
-  puts "Rcov not available. Coverage data tasks not available."
-  puts "Install it with: gem install rcov"
-end

data/Readme.md

@@ -56,8 +56,7 @@ If you'd like to contribute to VirtualBox, the first step to developing is to
 clone this repo, get [bundler](http://github.com/carlhuda/bundler) if you
 don't have it already, and do the following:
 
-    bundle install
-    bundle lock
+    bundle install --relock
     rake
 
 This will run the test suite, which should come back all green! Then you're good to go!
@@ -68,4 +67,4 @@ These folks went above and beyond with contributions to the virtualbox gem, and
 for that, I have to say "thanks!"
 
 * [Kieran Pilkington](http://github.com/KieranP)
-* [Aleksey Palazhchenko](http://github.com/AlekSi)
+* [Aleksey Palazhchenko](http://github.com/AlekSi)

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/features/README.md

@@ -0,0 +1,33 @@
+# VirtualBox Gem Feature Tests
+
+**Warning: These tests actually hit the real VirtualBox software!**
+
+The tests in this directory are _not_ meant as a replacement
+for the unit tests in the `test/` directory. Instead, these
+features are meant to test the actual integration of the
+virtualbox gem with an actual VirtualBox installation.
+
+Whereas the unit tests try to test every branch of the code in a
+very prescribed, isolated environment, the feature tests do not
+test specific branches of code, but test behavior of the gem.
+The reasoning for both tests is that the unit tests test proper
+behavior _within the library itself_ whereas these feature tests
+test proper behavior _with the outside world_.
+
+## Running Feature Tests
+
+The easiest way to run these feature tests is via `rake` or the
+`cucumber` binary. `rake` shown below:
+
+    rake test:integration
+
+## Feature Coverage
+
+The test coverage of the features are purposefully not trying to
+reach 100% branch coverage. They test the basic functionality (and
+as much as the functionality as possible) to verify the library is
+functional. If a bug is found, then a feature should be added to
+reproduce and verify the bug no longer exists, but I'm not concerned
+with getting 100% branch coverage right away.
+
+For 100% branch coverage, see the unit tests, which do this.

data/features/global.feature

@@ -0,0 +1,19 @@
+Feature: Global Data
+  As a virtualbox library user
+  I want to access information about the global state of VirtualBox
+  In order to get information about my environment
+
+  Scenario: Reading the VMs
+    Given the global object
+    When I read the "vms"
+    Then I should get a matching length for "vms"
+
+  Scenario: Reading the hard drives
+    Given the global object
+    When I read the media "hard drives"
+    Then I should get a matching length of media items
+
+  Scenario: Reading the dvds
+    Given the global object
+    When I read the media "dvds"
+    Then I should get a matching length of media items

data/features/global_extra_data.feature

@@ -0,0 +1,27 @@
+Feature: Global Extra Data
+  As a virtualbox library user
+  I want to access and update global extra data
+
+  Background:
+    Given the global object
+    And I delete the "global" extra data "VirtualBoxGemTest/Key"
+    And the "extra_data" relationship
+
+  Scenario: Reading extra data
+    When I get the extra data of "global"
+    Then all the extra data should match
+
+  @unsafe
+  Scenario: Writing extra data
+    When I set the extra data "VirtualBoxGemTest/Key" to "Value"
+    And I save the relationship
+    And I get the extra data of "global"
+    Then the extra data should include "VirtualBoxGemTest/Key" as "Value"
+
+  @unsafe
+  Scenario: Deleting extra data
+    When I set the extra data "VirtualBoxGemTest/Key" to "Value"
+    And I save the relationship
+    And I delete the extra data "VirtualBoxGemTest/Key"
+    And I get the extra data of "global"
+    Then the extra data should not include "VirtualBoxGemTest/Key"

data/features/step_definitions/abstract_model_steps.rb

@@ -0,0 +1,35 @@
+Given /the "(.+?)" relationship/ do |relationship|
+  @relationship = @model.send(relationship)
+end
+
+Given /I reload the model/ do
+  @model.reload
+end
+
+When /I read the "(.+?)"/ do |property|
+  @value = @model.send(property)
+end
+
+When /I set the property "(.+?)" to "(.+?)"/ do |key, value|
+  value = value == "true" if %W[true false].include?(value)
+  @model.send("#{key}=", value)
+end
+
+When /I set the relationship property "(.+?)" to "(.+?)"/ do |key, value|
+  old = @model
+  @model = @relationship
+  When %Q[I set the property "#{key}" to "#{value}"]
+  @model = old
+end
+
+When /I add the new record to the relationship/ do
+  @relationship << @new_record
+end
+
+When /I save the relationship/ do
+  @relationship.save
+end
+
+When /I save the model/ do
+  @model.save
+end

data/features/step_definitions/extra_data_steps.rb

@@ -0,0 +1,36 @@
+Given /I set the "(.+?)" extra data "(.+?)" to "(.*?)"/ do |name, key, value|
+  name = @name if name == "VM"
+  VBoxManage.execute("setextradata", name, key, value)
+end
+
+Given /I delete the "(.+?)" extra data "(.+?)"/ do |name, key|
+  # Same as setting to empty
+  Given %Q[I set the "#{name}" extra data "#{key}" to ""]
+end
+
+When /I get the extra data of "(.+?)"/ do |name|
+  @extra_data = VBoxManage.extra_data(name)
+end
+
+When /I set the extra data "(.+?)" to "(.+?)"/ do |key, value|
+  @relationship[key] = value
+end
+
+When /I delete the extra data "(.+?)"/ do |key|
+  @relationship.delete(key)
+end
+
+Then /all the extra data should match/ do
+  @relationship.length.should == @extra_data.length
+  @extra_data.each do |k,v|
+    @relationship[k].should == v
+  end
+end
+
+Then /the extra data should include "(.+?)" as "(.+?)"/ do |key, value|
+  @extra_data[key].should == value
+end
+
+Then /the extra data should not include "(.+?)"/ do |key|
+  @extra_data.should_not have_key(key)
+end

data/features/step_definitions/global_steps.rb

@@ -0,0 +1,29 @@
+Given /the global object/ do
+  @model = VirtualBox::Global.global(true)
+end
+
+When /I read the media "(.+?)"/ do |property|
+  @media = property.gsub(" ", "_").to_sym
+  @value = @model.media.send(@media)
+end
+
+Then /I should get a matching length for "vms"/ do
+  output = VBoxManage.execute("list", "vms")
+  @value.length.should == output.split("\n").length
+end
+
+Then /I should get a matching length of media items/ do
+  mapping = {
+    :hard_drives => "hdds",
+    :dvds => "dvds",
+    :floppies => "floppies"
+  }
+
+  output = VBoxManage.execute("list", mapping[@media])
+  count = output.split("\n").inject(0) do |acc, line|
+    acc += 1 if line =~ /^UUID:/
+    acc
+  end
+
+  @value.length.should == count
+end

data/features/step_definitions/network_adapter_steps.rb

@@ -0,0 +1,38 @@
+Given /the adapters are reset/ do
+  VBoxManage.network_adapters(@output).each_with_index do |obj, i|
+    VBoxManage.execute("modifyvm", @name, "--nic#{i+1}", "none")
+  end
+end
+
+Given /the adapter in slot "(.+?)" is type "(.+?)"/ do |slot, type|
+  VBoxManage.execute("modifyvm", @name, "--nic#{slot}", type)
+end
+
+Given /the following adapters are set:/ do |table|
+  table.hashes.each do |hash|
+    Given %Q[the adapter in slot "#{hash["slot"]}" is type "#{hash["type"]}"]
+  end
+end
+
+When /I update the adapter in slot "(.+?)"/ do |slot|
+  adapter = @relationship.find { |na| na.slot == (slot.to_i - 1) }
+  adapter.should_not be_nil
+
+  @model = adapter
+end
+
+Then /the network adapter properties should match/ do
+  adapters = VBoxManage.network_adapters(@output)
+  @relationship.length.should == adapters.length
+
+  @relationship.each do |na|
+    adapter = adapters[na.slot + 1]
+    adapter.should_not be_nil
+
+    if na.enabled?
+      test_mappings(NETWORK_ADAPTER_MAPPINGS, na, adapter)
+    else
+      adapter[:type].should == "none"
+    end
+  end
+end

data/features/step_definitions/shared_folder_steps.rb

@@ -0,0 +1,57 @@
+Given /I add a shared folder "(.+?)" with path "(.+?)" via VBoxManage/ do |name,hostpath|
+  VBoxManage.execute("sharedfolder", "add", @name,
+                     "--name", name,
+                     "--hostpath", hostpath)
+end
+
+Given /I delete the shared folder "(.+?)" via VBoxManage/ do |name|
+  VBoxManage.execute("sharedfolder", "remove", @name,
+                     "--name", name)
+end
+
+Given /a shared folder "(.+?)" exists/ do |name|
+  folders = VBoxManage.shared_folders(@output)
+
+  if !folders.keys.include?(name)
+    Given %Q[I add a shared folder "#{name}" with path "/#{name}" via VBoxManage]
+    Given %Q[I reload the VM]
+    Given %Q[the "shared_folders" relationship]
+  end
+end
+
+Given /no shared folder "(.+?)" exists/ do |name|
+  folders = VBoxManage.shared_folders(@output)
+
+  if folders.keys.include?(name)
+    Given %Q[I delete the shared folder "#{name}" via VBoxManage]
+    Given %Q[I reload the VM]
+    Given %Q[the "shared_folders" relationship]
+  end
+end
+
+When /I create a new shared folder "(.+?)" with path "(.+?)"/ do |name,hostpath|
+  @new_record = VirtualBox::SharedFolder.new
+  @new_record.name = name
+  @new_record.host_path = hostpath
+end
+
+When /I delete the shared folder "(.+?)"$/ do |name|
+  @relationship.each do |sf|
+    sf.destroy if sf.name == name
+  end
+end
+
+Then /the shared folder "(.+?)" should not exist/ do |name|
+  VBoxManage.shared_folders(@output).keys.should_not include(name)
+end
+
+Then /the shared folder properties should match/ do
+  folders = VBoxManage.shared_folders(@output)
+
+  @relationship.length.should == folders.length
+
+  @relationship.each do |sf|
+    folder = folders[sf.name]
+    test_mappings(SHARED_FOLDER_MAPPINGS, sf, folder)
+  end
+end

data/features/step_definitions/storage_controller_steps.rb

@@ -0,0 +1,16 @@
+Then /the number of storage controllers should match/ do
+  @relationship.length.should == VBoxManage.storage_controllers(@output).length
+end
+
+Then /the storage controller properties should match/ do
+  controllers = VBoxManage.storage_controllers(@output)
+
+  @relationship.each do |sc|
+    controller = controllers[sc.name]
+    controller.should_not be_nil
+
+    test_mappings(STORAGE_MAPPINGS, sc, controller) do |value, output|
+      [value.to_s.downcase.gsub("_",""), output.downcase]
+    end
+  end
+end

data/features/step_definitions/virtualbox_steps.rb

@@ -0,0 +1,17 @@
+# Testing VBoxManage -v output
+When /I try to read the virtualbox "(.+?)"/ do |item|
+  @key = item.to_sym
+  @result = VirtualBox.send(item)
+end
+
+Then /the result should match version output/ do
+  data = VBoxManage.execute("-v").split("r")
+  results = {
+    :version => data[0],
+    :revision => data[1],
+    :supported? => !!data
+  }
+
+  @result.should == results[@key]
+end
+

data/features/step_definitions/vm_steps.rb

@@ -0,0 +1,50 @@
+Given /I set the VM "(.+?)" to "(.+?)"/ do |key, value|
+  VBoxManage.execute("modifyvm", @name, "--#{key}", value)
+end
+
+Given /I set the VM properties:/ do |properties|
+  properties.hashes.each do |hash|
+    Given %Q[I set the VM "#{hash["name"]}" to "#{hash["value"]}"]
+  end
+end
+
+Given /I reload the VM$/ do
+  Given %Q[I find a VM identified by "#{@name}"]
+end
+
+When /I find a VM identified by "(.+?)"/ do |name|
+  @name = name
+  @output = VBoxManage.vm_info(name)
+  @vm = VirtualBox::VM.find(name)
+  @model = @vm
+end
+
+When /I reload the VM info$/ do
+  @output = VBoxManage.vm_info(@name)
+end
+
+When /I save the VM/ do
+  @vm.save
+end
+
+Then /the VM should not exist/ do
+  @output.should be_empty
+  @vm.should be_nil
+end
+
+Then /the VM should exist/ do
+  @output.should have_key("UUID")
+  @vm.should_not be_nil
+end
+
+Then /the "(.+?)" properties should match/ do |type|
+  map = {
+    "BIOS" => BIOS_MAPPINGS,
+    "CPU" => CPU_MAPPINGS,
+    "HW virt" => HWVIRT_MAPPINGS,
+    "VM" => VM_MAPPINGS
+  }
+
+  object = type == "VM" ? @vm : @relationship
+  test_mappings(map[type], object, @output)
+end

data/features/support/env.rb

@@ -0,0 +1,56 @@
+# Before everything, load virtualbox, of course
+require 'spec'
+require 'aruba'
+require File.join(File.dirname(__FILE__), %W[.. .. lib virtualbox])
+
+# Configuration settings/info
+IntegrationInfo = {
+  :test_unsafe => !!ENV["TEST_UNSAFE"],
+  :vm_name => "test_vm"
+}
+
+# Mapping of VirtualBox::VM property keys to attributes in the
+# `showvminfo` output.
+VM_MAPPINGS = {
+  :uuid => "UUID",
+  :name => "name",
+  :os_type_id => "ostype",
+  :memory_size => "memory",
+  :vram_size => "vram",
+  :cpu_count => "cpus",
+  :accelerate_3d_enabled => "accelerate3d",
+  :accelerate_2d_video_enabled => "accelerate2dvideo",
+  :clipboard_mode => "clipboard",
+  :monitor_count => "monitorcount"
+}
+
+BIOS_MAPPINGS = {
+  :acpi_enabled => "acpi",
+  :io_apic_enabled => "ioapic"
+}
+
+HWVIRT_MAPPINGS = {
+  :enabled => "hwvirtex",
+  :exclusive => "hwvirtexexcl",
+  :nested_paging => "nestedpaging",
+  :vpid => "vtxvpid"
+}
+
+CPU_MAPPINGS = {
+  :pae => "pae",
+  :synthetic => "synthcpu"
+}
+
+STORAGE_MAPPINGS = {
+  :port_count => "portcount",
+  :controller_type => "type"
+}
+
+SHARED_FOLDER_MAPPINGS = {
+  :host_path => "path"
+}
+
+NETWORK_ADAPTER_MAPPINGS = {
+  :mac_address => "macaddress",
+  :cable_connected => "cableconnected"
+}

data/features/support/helpers.rb

@@ -0,0 +1,23 @@
+module VirtualBox
+  module IntegrationHelpers
+    # Tests that given a mappings hash (see `VM_MAPPINGS` in env.rb),
+    # a model, and an output hash (string to string), that all the
+    # mappings from model match output.
+    def test_mappings(mappings, model, output, match=true)
+      mappings.each do |model_key, output_key|
+        value = model.send(model_key)
+
+        if [TrueClass, FalseClass].include?(value.class)
+          # Convert true/false to VirtualBox-style string boolean values
+          value = value ? "on" : "off"
+        end
+
+        output_value = output[output_key.to_sym] || output[output_key]
+        value, output_value = yield value, output_value if block_given?
+        value.to_s.should == output_value
+      end
+    end
+  end
+end
+
+World(VirtualBox::IntegrationHelpers)

data/features/support/hooks.rb

@@ -0,0 +1,30 @@
+#------------------------------------------------------------
+# Hooks
+#------------------------------------------------------------
+# Unsafe tags specify that a test modifies (writes or deletes)
+# actual data in VirtualBox.
+Around('@unsafe') do |scenario, block|
+  block.call if IntegrationInfo[:test_unsafe]
+end
+
+Around('@pending') do |scenario, block|
+  # Don't run the block
+end
+
+#------------------------------------------------------------
+# Warning/Info messages about settings.
+#------------------------------------------------------------
+if !IntegrationInfo[:test_unsafe]
+  puts <<-MSG
+========================================================================
+
+For your own safety, unsafe tests (tests which modify actual VirtualBox
+data), are disabled unless the environmental variable TEST_UNSAFE is
+set. To enable unsafe tests, the easiest way is to do the following:
+
+    TEST_UNSAFE=yes rake test:integration
+
+========================================================================
+MSG
+end
+

data/features/support/vboxmanage.rb

@@ -0,0 +1,110 @@
+class VBoxManage
+  class << self
+    def command(*args)
+      args = args.dup.flatten
+      args.unshift("-q")
+      "VBoxManage #{args.join(" ")}"
+    end
+
+    def execute(*args)
+      cmd = command(*args)
+      result = `#{cmd}`.chomp
+      raise Exception.new("Failed command: #{cmd}") if $?.exitstatus != 0
+      result
+    end
+
+    # Gets the extra data for a VM of the given ID and returns it in
+    # hash format.
+    def extra_data(name)
+      output = execute("getextradata", name, "enumerate")
+
+      output.split("\n").inject({}) do |acc, line|
+        acc[$1.to_s] = $2.to_s if line =~ /^Key: (.+?), Value: (.+?)$/
+        acc
+      end
+    end
+
+    # Gets the info for a VM and returns it in hash format.
+    def vm_info(name)
+      output = begin
+        execute("showvminfo", name, "--machinereadable")
+      rescue Exception
+        ""
+      end
+
+      output.split("\n").inject({}) do |acc, line|
+        if line =~ /^"?(.+?)"?=(.+?)$/
+          key = $1.to_s
+          value = $2.to_s
+          value = $1.to_s if value =~ /^"(.*?)"$/
+          acc[key] = value
+        end
+
+        acc
+      end
+    end
+
+    # Parses the storage controllers out of VM info output and returns
+    # it in a programmer-friendly hash.
+    def storage_controllers(info)
+      raw = info.inject({}) do |acc, data|
+        k,v = data
+
+        if k =~ /^storagecontroller(.+?)(\d+)$/
+          subkey = $2.to_s
+          acc[subkey] ||= {}
+          acc[subkey][$1.to_s.to_sym] = v
+        end
+
+        acc
+      end
+
+      raw.inject({}) do |acc, data|
+        k,v = data
+        acc[v.delete(:name)] = v
+        acc
+      end
+    end
+
+    # Parses the shared folders out of the VM info output and returns
+    # it in a programmer-friendly hash.
+    def shared_folders(info)
+      raw = info.inject({}) do |acc, data|
+        k,v = data
+
+        if k =~ /^SharedFolder(.+?)MachineMapping(\d+)$/
+          subkey = $2.to_s
+          acc[subkey] ||= {}
+          acc[subkey][$1.to_s.downcase.to_sym] = v
+        end
+
+        acc
+      end
+
+      raw.inject({}) do |acc, data|
+        k,v = data
+        acc[v.delete(:name)] = v
+        acc
+      end
+    end
+
+    # Parses the network adapters out of the VM info output and
+    # returns it in a hash.
+    def network_adapters(info)
+      valid_keys = %W[natnet macaddress cableconnected hostonlyadapter]
+
+      info.inject({}) do |acc, data|
+        k,v = data
+        if k =~ /^nic(\d+)$/
+          acc[$1.to_i] ||= {}
+          acc[$1.to_i][:type] = v
+        elsif k=~ /^(.+?)(\d+)$/ && valid_keys.include?($1.to_s)
+          acc[$2.to_i] ||= {}
+          acc[$2.to_i][$1.to_s.to_sym] = v
+        end
+
+        acc
+      end
+    end
+  end
+end

data/features/version.feature

@@ -0,0 +1,16 @@
+Feature: VirtualBox version information
+  As a virtualbox library user
+  I want to access information about the installed version
+  In order to determine if I support this version of VirtualBox
+
+  Scenario: Reading the version
+    When I try to read the virtualbox "version"
+    Then the result should match version output
+
+  Scenario: Reading the revision
+    When I try to read the virtualbox "revision"
+    Then the result should match version output
+
+  Scenario: Checking if VirtualBox supported
+    When I try to read the virtualbox "supported?"
+    Then the result should match version output

data/features/vm.feature

@@ -0,0 +1,13 @@
+Feature: Virtual Machine
+  As a virtualbox library user
+  I want to access information about specific virtual machines
+  In order to get information about VMs in VirtualBox
+
+  Scenario: Finding a non-existent VM
+    When I find a VM identified by "this_should_never_exist1234"
+    Then the VM should not exist
+
+  Scenario: Finding a VM
+    When I find a VM identified by "test_vm_A"
+    Then the VM should exist
+    And the "VM" properties should match

data/features/vm_bios.feature

@@ -0,0 +1,29 @@
+Feature: Virtual Machine BIOS Settings
+  As a virtualbox library user
+  I want to read and update VM BIOS
+
+  Background:
+    Given I find a VM identified by "test_vm_A"
+    And I set the VM properties:
+      | name   | value |
+      | acpi   | off   |
+      | ioapic | off   |
+    And I reload the VM
+    And the "bios" relationship
+
+  Scenario: Reading BIOS
+    Then the "BIOS" properties should match
+
+  @unsafe
+  Scenario: Updating the BIOS
+    When I set the relationship property "acpi_enabled" to "true"
+    And I save the relationship
+    And I reload the VM info
+    Then the "BIOS" properties should match
+
+  @unsafe
+  Scenario: Updating the BIOS via the VM
+    When I set the relationship property "io_apic_enabled" to "true"
+    And I save the model
+    And I reload the VM info
+    Then the "BIOS" properties should match

data/features/vm_cpu.feature

@@ -0,0 +1,29 @@
+Feature: Virtual Machine CPU Settings
+  As a virtualbox library user
+  I want to read and update VM CPU settings
+
+  Background:
+    Given I find a VM identified by "test_vm_A"
+    And I set the VM properties:
+      | name     | value |
+      | pae      | off   |
+      | synthcpu | off   |
+    And I reload the VM
+    And the "cpu" relationship
+
+  Scenario: Reading CPU settings
+    Then the "CPU" properties should match
+
+  @unsafe
+  Scenario: Updating the CPU settings
+    When I set the relationship property "pae" to "true"
+    And I save the relationship
+    And I reload the VM info
+    Then the "CPU" properties should match
+
+  @unsafe
+  Scenario: Updating the CPU settings via the VM
+    When I set the relationship property "synthetic" to "true"
+    And I save the model
+    And I reload the VM info
+    Then the "CPU" properties should match

data/features/vm_extra_data.feature

@@ -0,0 +1,35 @@
+Feature: VM Extra Data
+  As a virtualbox library user
+  I want to access and update VM extra data
+
+  Background:
+    Given I find a VM identified by "test_vm_A"
+    And I delete the "VM" extra data "VirtualBoxGemTest/Key"
+    And I reload the VM
+    And the "extra_data" relationship
+
+  Scenario: Reading extra data
+    When I get the extra data of "test_vm_A"
+    Then all the extra data should match
+
+  @unsafe
+  Scenario: Writing extra data
+    When I set the extra data "VirtualBoxGemTest/Key" to "Value"
+    And I save the relationship
+    And I get the extra data of "test_vm_A"
+    Then the extra data should include "VirtualBoxGemTest/Key" as "Value"
+
+  @unsafe
+  Scenario: Deleting extra data
+    When I set the extra data "VirtualBoxGemTest/Key" to "Value"
+    And I save the relationship
+    And I delete the extra data "VirtualBoxGemTest/Key"
+    And I get the extra data of "test_vm_A"
+    Then the extra data should not include "VirtualBoxGemTest/Key"
+
+  @unsafe
+  Scenario: Writing extra data and saving VM
+    When I set the extra data "VirtualBoxGemTest/Key" to "Value"
+    And I save the model
+    And I get the extra data of "test_vm_A"
+    Then the extra data should include "VirtualBoxGemTest/Key" as "Value"

data/features/vm_hw_virt.feature

@@ -0,0 +1,29 @@
+Feature: Virtual Machine HW Virtualization
+  As a virtualbox library user
+  I want to read and update HW Virtualization settings
+
+  Background:
+    Given I find a VM identified by "test_vm_A"
+    And I set the VM properties:
+      | name         | value |
+      | hwvirtex     | on    |
+      | nestedpaging | on    |
+    And I reload the VM
+    And the "hw_virt" relationship
+
+  Scenario: Reading
+    Then the "HW virt" properties should match
+
+  @unsafe
+  Scenario: Updating
+    When I set the relationship property "enabled" to "false"
+    And I save the relationship
+    And I reload the VM info
+    Then the "HW virt" properties should match
+
+  @unsafe
+  Scenario: Updating and saving via VM
+    When I set the relationship property "nested_paging" to "false"
+    And I save the model
+    And I reload the VM info
+    Then the "HW virt" properties should match

data/features/vm_network_adapters.feature

@@ -0,0 +1,27 @@
+Feature: Virtual Machine Network Adapters
+  As a virtualbox library user
+  I want to read and update network adapters
+
+  Background:
+    Given I find a VM identified by "test_vm_A"
+    And the "network_adapters" relationship
+
+  @unsafe
+  Scenario: Reading adapters
+    Given the adapters are reset
+    And the following adapters are set:
+      | slot | type |
+      |    1 | nat  |
+    Then the network adapter properties should match
+
+  @unsafe
+  Scenario: Updating adapters
+    Given the adapters are reset
+    And the following adapters are set:
+      | slot | type     |
+      |    1 | nat      |
+    When I update the adapter in slot "1"
+    And I set the property "cable_connected" to "false"
+    And I save the VM
+    And I reload the VM info
+    Then the network adapter properties should match

data/features/vm_shared_folders.feature

@@ -0,0 +1,29 @@
+Feature: Virtual Machine Shared Folders
+  As a virtualbox library user
+  I want to read and update shared folders
+
+  Background:
+    Given I find a VM identified by "test_vm_A"
+    And the "shared_folders" relationship
+
+  @unsafe
+  Scenario: Reading Shared Folders
+    Given a shared folder "foo" exists
+    Then the shared folder properties should match
+
+  @unsafe
+  Scenario: Creating Shared Folders
+    Given no shared folder "bar" exists
+    When I create a new shared folder "bar" with path "/baz"
+    And I add the new record to the relationship
+    And I save the model
+    And I reload the VM info
+    Then the shared folder properties should match
+
+  @unsafe
+  Scenario: Deleting Shared Folders
+    Given a shared folder "foo" exists
+    When I delete the shared folder "foo"
+    And I reload the VM info
+    Then the shared folder "foo" should not exist
+    Then the shared folder properties should match

data/features/vm_storage_controllers.feature

@@ -0,0 +1,11 @@
+Feature: Virtual Machine Storage Controllers
+  As a virtualbox library user
+  I want to read and update storage controllers on a VM
+
+  Background:
+    Given I find a VM identified by "test_vm_A"
+    And the "storage_controllers" relationship
+
+  Scenario: Reading Storage Controllers
+    Then the number of storage controllers should match
+    And the storage controller properties should match

data/lib/virtualbox/abstract_model/version_matcher.rb

@@ -26,6 +26,8 @@ module VirtualBox
       # @return [Array]
       def split_version(version)
         version.split(/\./)[0,2]
+      rescue Exception
+        []
       end
     end
   end

data/lib/virtualbox/version.rb

@@ -20,7 +20,7 @@ module VirtualBox
 
     # Returns the revision string of the VirtualBox installed, ex. "51742"
     def revision
-      Lib.lib.virtualbox.revision
+      Lib.lib.virtualbox.revision.to_s
     end
   end
 end

data/lib/virtualbox/vm.rb

@@ -295,8 +295,6 @@ module VirtualBox
       validates_numericality_of :memory_balloon_size, :monitor_count
       validates_inclusion_of :accelerate_3d_enabled, :accelerate_2d_video_enabled, :teleporter_enabled, :in => [true, false]
 
-      validates_format_of :name, :with => /^[\w\d\s-]+$/, :message => 'must only contain letters, numbers, spaces, underscores, and dashes.'
-
       if !errors_on(:name)
         # Only validate the name if the name has no errors already
         vms_of_same_name = self.class.find(name)

data/tasks/cucumber.task

@@ -0,0 +1,13 @@
+begin
+  require 'cucumber'
+  require 'cucumber/rake/task'
+
+  namespace :test do
+    Cucumber::Rake::Task.new(:integration) do |t|
+      t.cucumber_opts = "features --format pretty"
+    end
+  end
+rescue LoadError
+  puts "Cucumber not available. Feature testing not available."
+  puts "Install it with: gem install cucumber"
+end

data/tasks/jeweler.task

@@ -0,0 +1,21 @@
+begin
+  require 'jeweler'
+
+  namespace :gem do
+    Jeweler::Tasks.new do |gemspec|
+      gemspec.name = "virtualbox"
+      gemspec.summary = "Create and modify virtual machines in VirtualBox using pure ruby."
+      gemspec.description = "Create and modify virtual machines in VirtualBox using pure ruby."
+      gemspec.email = "mitchell.hashimoto@gmail.com"
+      gemspec.homepage = "http://github.com/mitchellh/virtualbox"
+      gemspec.authors = ["Mitchell Hashimoto"]
+      gemspec.executables = []
+
+      gemspec.add_dependency('ffi', '>= 0.6.3')
+    end
+
+    Jeweler::GemcutterTasks.new
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end

data/tasks/rcov.task

@@ -0,0 +1,15 @@
+begin
+  require 'rcov/rcovtask'
+
+  namespace :test do
+    Rcov::RcovTask.new do |t|
+      t.libs << "test"
+      t.test_files = FileList["test/**/*_test.rb"]
+      t.output_dir = "test/coverage"
+      t.verbose = true
+    end
+  end
+rescue LoadError
+  puts "Rcov not available. Coverage data tasks not available."
+  puts "Install it with: gem install rcov"
+end

data/tasks/test.task

@@ -0,0 +1,10 @@
+require 'rake/testtask'
+
+task :default => "test:units"
+
+namespace :test do
+  Rake::TestTask.new(:units) do |t|
+    t.libs << "test"
+    t.pattern = 'test/**/*_test.rb'
+  end
+end

data/tasks/yard.task

@@ -0,0 +1,9 @@
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new do |t|
+    t.options = ['--main', 'Readme.md', '--markup', 'markdown']
+    t.options += ['--title', 'VirtualBox Ruby Library Documentation']
+  end
+rescue LoadError
+  puts "Yard not available. Install it with: gem install yard bluecloth"
+end

data/test/virtualbox/abstract_model/version_matcher_test.rb

@@ -33,5 +33,9 @@ class VersionMatcherTest < Test::Unit::TestCase
       assert_equal %W[3 2], @klass.split_version("3.2.0")
       assert_equal %W[3 1], @klass.split_version("3.1.1.1.1")
     end
+
+    should "return an empty array if it can't split" do
+      assert_equal [], @klass.split_version(nil)
+    end
   end
 end

data/test/virtualbox/version_test.rb

@@ -39,8 +39,7 @@ class VersionTest < Test::Unit::TestCase
   end
 
   should "return the revision" do
-    revision = mock("revision")
-    @vbox.expects(:revision).returns(revision)
-    assert_equal revision, @module.revision
+    @vbox.expects(:revision).returns(7)
+    assert_equal "7", @module.revision
   end
 end

data/virtualbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{virtualbox}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto"]
-  s.date = %q{2010-06-17}
+  s.date = %q{2010-06-28}
   s.description = %q{Create and modify virtual machines in VirtualBox using pure ruby.}
   s.email = %q{mitchell.hashimoto@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,30 @@ Gem::Specification.new do |s|
      "VERSION",
      "docs/GettingStarted.md",
      "docs/WhatsNew.md",
+     "features/README.md",
+     "features/global.feature",
+     "features/global_extra_data.feature",
+     "features/step_definitions/abstract_model_steps.rb",
+     "features/step_definitions/extra_data_steps.rb",
+     "features/step_definitions/global_steps.rb",
+     "features/step_definitions/network_adapter_steps.rb",
+     "features/step_definitions/shared_folder_steps.rb",
+     "features/step_definitions/storage_controller_steps.rb",
+     "features/step_definitions/virtualbox_steps.rb",
+     "features/step_definitions/vm_steps.rb",
+     "features/support/env.rb",
+     "features/support/helpers.rb",
+     "features/support/hooks.rb",
+     "features/support/vboxmanage.rb",
+     "features/version.feature",
+     "features/vm.feature",
+     "features/vm_bios.feature",
+     "features/vm_cpu.feature",
+     "features/vm_extra_data.feature",
+     "features/vm_hw_virt.feature",
+     "features/vm_network_adapters.feature",
+     "features/vm_shared_folders.feature",
+     "features/vm_storage_controllers.feature",
      "lib/virtualbox.rb",
      "lib/virtualbox/abstract_model.rb",
      "lib/virtualbox/abstract_model/attributable.rb",
@@ -211,6 +235,11 @@ Gem::Specification.new do |s|
      "lib/virtualbox/virtual_system_description.rb",
      "lib/virtualbox/vm.rb",
      "lib/virtualbox/vrdp_server.rb",
+     "tasks/cucumber.task",
+     "tasks/jeweler.task",
+     "tasks/rcov.task",
+     "tasks/test.task",
+     "tasks/yard.task",
      "test/test_helper.rb",
      "test/virtualbox/abstract_model/attributable_test.rb",
      "test/virtualbox/abstract_model/dirty_test.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -07:00
+date: 2010-06-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,30 @@ files:
 - VERSION
 - docs/GettingStarted.md
 - docs/WhatsNew.md
+- features/README.md
+- features/global.feature
+- features/global_extra_data.feature
+- features/step_definitions/abstract_model_steps.rb
+- features/step_definitions/extra_data_steps.rb
+- features/step_definitions/global_steps.rb
+- features/step_definitions/network_adapter_steps.rb
+- features/step_definitions/shared_folder_steps.rb
+- features/step_definitions/storage_controller_steps.rb
+- features/step_definitions/virtualbox_steps.rb
+- features/step_definitions/vm_steps.rb
+- features/support/env.rb
+- features/support/helpers.rb
+- features/support/hooks.rb
+- features/support/vboxmanage.rb
+- features/version.feature
+- features/vm.feature
+- features/vm_bios.feature
+- features/vm_cpu.feature
+- features/vm_extra_data.feature
+- features/vm_hw_virt.feature
+- features/vm_network_adapters.feature
+- features/vm_shared_folders.feature
+- features/vm_storage_controllers.feature
 - lib/virtualbox.rb
 - lib/virtualbox/abstract_model.rb
 - lib/virtualbox/abstract_model/attributable.rb
@@ -235,6 +259,11 @@ files:
 - lib/virtualbox/virtual_system_description.rb
 - lib/virtualbox/vm.rb
 - lib/virtualbox/vrdp_server.rb
+- tasks/cucumber.task
+- tasks/jeweler.task
+- tasks/rcov.task
+- tasks/test.task
+- tasks/yard.task
 - test/test_helper.rb
 - test/virtualbox/abstract_model/attributable_test.rb
 - test/virtualbox/abstract_model/dirty_test.rb