virtualbox 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/virtualbox/global.rb

@@ -92,15 +92,25 @@ module VirtualBox
       # has not yet been set, it attempts to infer it based on the
       # platform ruby is running on.
       def vboxconfig
-        return @@vboxconfig unless @@vboxconfig.nil?
-
-        if Platform.mac?
-          "~/Library/VirtualBox/VirtualBox.xml"
-        elsif Platform.linux? || Platform.windows?
-          "~/.VirtualBox/VirtualBox.xml"
-        else
-          "Unknown"
+        if @@vboxconfig.nil?
+          if Platform.mac?
+            @@vboxconfig = "~/Library/VirtualBox/VirtualBox.xml"
+          elsif Platform.linux? || Platform.windows?
+            @@vboxconfig = "~/.VirtualBox/VirtualBox.xml"
+          else
+            @@vboxconfig = "Unknown"
+          end
         end
+        
+        File.expand_path(@@vboxconfig)
+      end
+      
+      # Returns a boolean denoting whether or not the vboxconfig value is
+      # valid or not.
+      #
+      # @return [Boolean]
+      def vboxconfig?
+        File.file?(vboxconfig)
       end
 
       # Returns the XML document of the configuration. This will raise an
@@ -109,8 +119,8 @@ module VirtualBox
       #
       # @return [Nokogiri::XML::Document]
       def config
-        raise Exceptions::ConfigurationException.new("The path to the global VirtualBox config must be set. See Global.vboxconfig=") unless File.exist?(File.expand_path(vboxconfig))
-        Command.parse_xml(File.expand_path(vboxconfig))
+        raise Exceptions::ConfigurationException.new("The path to the global VirtualBox config must be set. See Global.vboxconfig=") unless vboxconfig?
+        Command.parse_xml(vboxconfig)
       end
 
       # Expands path relative to the configuration file.

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 begin
-  require File.expand_path('../.bundle/environment', __FILE__)
+  require File.expand_path('../../.bundle/environment', __FILE__)
 rescue LoadError
   # Fallback on doing the resolve at runtime.
   require "rubygems"

data/test/virtualbox/global_test.rb

@@ -12,32 +12,49 @@ class GlobalTest < Test::Unit::TestCase
 
     should "return the path if its set" do
       VirtualBox::Global.vboxconfig = "foo"
+      File.expects(:expand_path).with("foo").returns("foo")
       assert_equal "foo", VirtualBox::Global.vboxconfig
     end
 
     should "return Mac-path if on mac" do
+      result = "~/Library/VirtualBox/VirtualBox.xml"
       VirtualBox::Platform.stubs(:mac?).returns(true)
-      assert_equal "~/Library/VirtualBox/VirtualBox.xml", VirtualBox::Global.vboxconfig
+      
+      expanded_result = result + result
+      File.expects(:expand_path).with(result).returns(expanded_result)
+      assert_equal expanded_result, VirtualBox::Global.vboxconfig
     end
 
     should "return Windows-path if on windows" do
+      result = "~/.VirtualBox/VirtualBox.xml"
       VirtualBox::Platform.stubs(:mac?).returns(false)
       VirtualBox::Platform.stubs(:windows?).returns(true)
-      assert_equal "~/.VirtualBox/VirtualBox.xml", VirtualBox::Global.vboxconfig
+      
+      expanded_result = result + result
+      File.expects(:expand_path).with(result).returns(expanded_result)
+      assert_equal expanded_result, VirtualBox::Global.vboxconfig
     end
 
     should "return Linux-path if on linux" do
+      result = "~/.VirtualBox/VirtualBox.xml"
       VirtualBox::Platform.stubs(:mac?).returns(false)
       VirtualBox::Platform.stubs(:windows?).returns(false)
       VirtualBox::Platform.stubs(:linux?).returns(true)
-      assert_equal "~/.VirtualBox/VirtualBox.xml", VirtualBox::Global.vboxconfig
+      
+      expanded_result = result + result
+      File.expects(:expand_path).with(result).returns(expanded_result)
+      assert_equal expanded_result, VirtualBox::Global.vboxconfig
     end
 
     should "return 'unknown' otherwise" do
+      result = "Unknown"
       VirtualBox::Platform.stubs(:mac?).returns(false)
       VirtualBox::Platform.stubs(:windows?).returns(false)
       VirtualBox::Platform.stubs(:linux?).returns(false)
-      assert_equal "Unknown", VirtualBox::Global.vboxconfig
+      
+      expanded_result = result + result
+      File.expects(:expand_path).with(result).returns(expanded_result)
+      assert_equal expanded_result, VirtualBox::Global.vboxconfig
     end
   end
 
@@ -63,41 +80,41 @@ class GlobalTest < Test::Unit::TestCase
       assert !VirtualBox::Global.reload?
     end
   end
-
-  context "parsing configuration XML" do
+  
+  context "testingn the config path" do
     setup do
-      VirtualBox::Command.stubs(:vboxconfig).returns("foo")
-      File.stubs(:exist?).returns(true)
-      VirtualBox::Command.stubs(:parse_xml)
+      @result = "foo"
+      VirtualBox::Global.stubs(:vboxconfig).returns(@result)
+    end
+    
+    should "return true if it is a file" do
+      File.expects(:file?).with(@result).returns(true)
+      assert VirtualBox::Global.vboxconfig?
+    end
+    
+    should "return false if it is not a file" do
+      File.expects(:file?).with(@result).returns(false)
+      assert !VirtualBox::Global.vboxconfig?
     end
+  end
 
-    should "check the file with the expanded path" do
-      File.stubs(:expand_path).returns("FOO")
-      File.expects(:exist?).with("FOO").returns(true)
-      VirtualBox::Global.config
+  context "parsing configuration XML" do
+    setup do
+      @vboxconfig = "foo"
+      VirtualBox::Global.stubs(:vboxconfig?).returns(true)
+      VirtualBox::Global.stubs(:vboxconfig).returns(@vboxconfig)
     end
 
-    should "raise an error if the config XML doesn't exist" do
-      File.expects(:exist?).returns(false)
+    should "raise an error if the config XML is invalid" do
+      VirtualBox::Command.stubs(:parse_xml)
+      VirtualBox::Global.expects(:vboxconfig?).returns(false)
       assert_raises(VirtualBox::Exceptions::ConfigurationException) do
         VirtualBox::Global.config
       end
     end
 
     should "use Command.parse_xml to parse" do
-      VirtualBox::Command.expects(:parse_xml).with(anything).once
-      VirtualBox::Global.config
-    end
-
-    should "use the set vboxconfig to parse xml" do
-      VirtualBox::Global.vboxconfig = "/foo"
-      VirtualBox::Command.expects(:parse_xml).with("/foo").once
-      VirtualBox::Global.config
-    end
-
-    should "file expand path the vboxconfig path" do
-      VirtualBox::Global.vboxconfig = "foo"
-      VirtualBox::Command.expects(:parse_xml).with(File.expand_path("foo")).once
+      VirtualBox::Command.expects(:parse_xml).with(@vboxconfig).once
       VirtualBox::Global.config
     end
   end

data/virtualbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{virtualbox}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto"]
-  s.date = %q{2010-03-16}
+  s.date = %q{2010-03-17}
   s.description = %q{Create and modify virtual machines in VirtualBox using pure ruby.}
   s.email = %q{mitchell.hashimoto@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 -07:00
+date: 2010-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency