virtualbox 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/virtualbox/command.rb

@@ -14,6 +14,16 @@ module VirtualBox
     @@vboxmanage = "VBoxManage"
 
     class <<self
+      # Returns a string of the version of VirtualBox installed, or nil if
+      # it can't detect VirtualBox.
+      #
+      # @return [String]
+      def version
+        result = execute("#{@@vboxmanage} --version")
+        return nil unless Command.success?
+        result.chomp
+      end
+
       # Reads the XML file and returns a Nokogiri document. Reads the XML data
       # from the specified file and returns a Nokogiri document.
       #

data/lib/virtualbox/vm.rb

@@ -305,11 +305,7 @@ module VirtualBox
     def load_attribute(name)
       info = self.class.raw_info(@original_name)
 
-      if name == :state
-        # Simply force a state reload, and it'll write the attribute up
-        write_attribute(:state, info[:vmstate])
-      end
-
+      write_attribute(:state, info[:vmstate]) if name == :state
       write_attribute(:synthcpu, info[:synthcpu]) unless loaded_attribute?(:synthcpu)
     end
 
@@ -323,6 +319,7 @@ module VirtualBox
     def state(reload=false)
       if reload
         load_attribute(:state)
+        clear_dirty!(:state)
       end
 
       read_attribute(:state)
@@ -332,13 +329,21 @@ module VirtualBox
     # attributes of the virtual machine. If any related attributes were saved
     # as well (such as storage controllers), those will be saved, too.
     def save(raise_errors=false)
-      # Make sure we save the new name first if that was changed, or
-      # we'll get some inconsistencies later
-      if name_changed?
-        save_attribute(:name, name)
-        @original_name = name
+      # First save all the changed attributes in a single batch
+      saves = changes.inject([]) do |acc, kv|
+        key, values = kv
+        acc << ["--#{key}", values[1]]
       end
 
+      # Flatten to pass into vboxmanage
+      saves.flatten!
+
+      # Save all the attributes in one command
+      Command.vboxmanage("modifyvm", @original_name, *saves)
+
+      # Now clear attributes and call super so relationships are saved
+      @original_name = name
+      clear_dirty!
       super()
 
       # Force reload
@@ -350,15 +355,6 @@ module VirtualBox
       return false
     end
 
-    # Saves a single attribute of the virtual machine. This should **not**
-    # be called except interally. Instead, you're probably looking for {#save}.
-    #
-    # **This method typically won't be used except internally.**
-    def save_attribute(key, value)
-      Command.vboxmanage("modifyvm", @original_name, "--#{key}", value)
-      super
-    end
-
     # Exports a virtual machine. The virtual machine will be exported
     # to the specified OVF file name. This directory will also have the
     # `mf` file which contains the file checksums and also the virtual

data/test/test_helper.rb

@@ -3,8 +3,6 @@ begin
 rescue LoadError
   # Fallback on doing the resolve at runtime.
   require "rubygems"
-  require "bundler"
-  Bundler.setup
 end
 
 # ruby-debug, not necessary, but useful if we have it

data/test/virtualbox/command_test.rb

@@ -1,6 +1,35 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class CommandTest < Test::Unit::TestCase
+  context "getting the version" do
+    setup do
+      VirtualBox::Command.stubs(:execute)
+      VirtualBox::Command.stubs(:success?).returns(true)
+    end
+
+    should "run the command with the version flag" do
+      VirtualBox::Command.expects(:execute).with("VBoxManage --version").once.returns("7")
+      VirtualBox::Command.version
+    end
+
+    should "return the value of the command if it succeeded" do
+      version = "3.1.4r1940"
+      VirtualBox::Command.expects(:execute).returns(version)
+      assert_equal version, VirtualBox::Command.version
+    end
+
+    should "return the value of nil if the command failed" do
+      VirtualBox::Command.expects(:success?).returns(false)
+      assert_nil VirtualBox::Command.version
+    end
+
+    should "strip the newlines from the result" do
+      version = "3.1.4r1940"
+      VirtualBox::Command.expects(:execute).returns(version + "\n")
+      assert_equal version, VirtualBox::Command.version
+    end
+  end
+
   context "parsing XML" do
     should "open the file, parse it, and close the file" do
       arg = "foo"

data/test/virtualbox/vm_test.rb

@@ -34,6 +34,12 @@ class VMTest < Test::Unit::TestCase
       assert_equal "on", @vm.state
     end
 
+    should "never have state as dirty" do
+      VirtualBox::VM.expects(:raw_info).returns({ :vmstate => "on" })
+      @vm.expects(:clear_dirty!).with(:state).once
+      @vm.state(true)
+    end
+
     should "provide conveniance methods for determining VM state" do
       VirtualBox::VM.expects(:raw_info).returns({ :vmstate => "poweroff" })
       assert_equal "poweroff", @vm.state(true)
@@ -313,16 +319,23 @@ raw
     end
 
     should "save name first if changed, then following values should modify new VM" do
-      save_seq = sequence("save_seq")
       new_name = "foo2"
-      VirtualBox::Command.expects(:vboxmanage).with("modifyvm", @name, "--name", new_name).in_sequence(save_seq)
-      VirtualBox::Command.expects(:vboxmanage).with("modifyvm", new_name, "--ostype", "Zubuntu").in_sequence(save_seq)
+      VirtualBox::Command.expects(:vboxmanage).with("modifyvm", @name, "--ostype", "Zubuntu", "--name", new_name)
 
       @vm.name = new_name
       @vm.ostype = "Zubuntu"
       assert @vm.save
     end
 
+    should "save the new name as the original name after saving" do
+      new_name = "foo2"
+      assert_equal @name, @vm.instance_variable_get(:@original_name)
+
+      @vm.name = new_name
+      assert @vm.save
+      assert_equal new_name, @vm.instance_variable_get(:@original_name)
+    end
+
     should "save the relationships as well" do
       VirtualBox::Nic.expects(:save_relationship).once
       VirtualBox::StorageController.expects(:save_relationship).once

data/virtualbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{virtualbox}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto"]
-  s.date = %q{2010-02-16}
+  s.date = %q{2010-03-09}
   s.description = %q{Create and modify virtual machines in VirtualBox using pure ruby.}
   s.email = %q{mitchell.hashimoto@gmail.com}
   s.extra_rdoc_files = [
@@ -79,7 +79,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mitchellh/virtualbox}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Create and modify virtual machines in VirtualBox using pure ruby.}
   s.test_files = [
     "test/test_helper.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: virtualbox
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 -08:00
+date: 2010-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Create and modify virtual machines in VirtualBox using pure ruby.
 email: mitchell.hashimoto@gmail.com
 executables: []
@@ -103,18 +112,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Create and modify virtual machines in VirtualBox using pure ruby.