virtual_box 0.1.1 → 0.1.2

data/lib/virtual_box/vm.rb

@@ -119,14 +119,8 @@ class Vm
   #
   # @return [VirtualBox::Vm] self, for easy call chaining
   def register
-    unregister if registered?
-    
-    result = VirtualBox.run_command ['VBoxManage', 'createvm',
-        '--name', name, '--uuid', uid, '--register']
-    if result.status != 0
-      raise 'Unexpected error code returned by VirtualBox'
-    end
-    
+    VirtualBox.run_command! ['VBoxManage', 'createvm', '--name', name,
+                             '--uuid', uid, '--register']
     begin
       push_config
     rescue
@@ -151,11 +145,8 @@ class Vm
   def start
     register unless registered?
     
-    result = VirtualBox.run_command ['VBoxManage', '--nologo', 'startvm', uid,
-                                     '--type', gui ? 'gui' : 'headless']
-    if result.status != 0
-      raise 'Unexpected error code returned by VirtualBox'
-    end
+    VirtualBox.run_command! ['VBoxManage', '--nologo', 'startvm', uid,
+                             '--type', gui ? 'gui' : 'headless']
     self
   end
   
@@ -185,11 +176,8 @@ class Vm
       'injectnmi'
     end
 
-    result = VirtualBox.run_command ['VBoxManage', '--nologo', 'controlvm', uid,
-                                     action]
-    if result.status != 0
-      raise 'Unexpected error code returned by VirtualBox'
-    end
+    VirtualBox.run_command! ['VBoxManage', '--nologo', 'controlvm', uid,
+                             action]
     self
   end
   
@@ -197,11 +185,8 @@ class Vm
   #
   # @return [Array<String>] UUIDs for VMs that VirtualBox is aware of
   def self.registered_uids
-    result = VirtualBox.run_command ['VBoxManage', '--nologo', 'list', 'vms']
-    if result.status != 0
-      raise 'Unexpected error code returned by VirtualBox'
-    end
-    result.output.split("\n").map do |id_info|
+    output = VirtualBox.run_command! ['VBoxManage', '--nologo', 'list', 'vms']
+    output.split("\n").map do |id_info|
       uid_offset = id_info.rindex(?{) + 1
       uid = id_info[uid_offset...-1]  # Exclude the closing }
     end
@@ -211,12 +196,9 @@ class Vm
   #
   # @return [Array<String>] UUIDs for VMs that are running in VirtualBox
   def self.started_uids
-    result = VirtualBox.run_command ['VBoxManage', '--nologo', 'list',
-                                     'runningvms']
-    if result.status != 0
-      raise 'Unexpected error code returned by VirtualBox'
-    end
-    result.output.split("\n").map do |id_info|
+    output = VirtualBox.run_command! ['VBoxManage', '--nologo', 'list',
+                                      'runningvms']
+    output.split("\n").map do |id_info|
       uid_offset = id_info.rindex(?{) + 1
       uid = id_info[uid_offset...-1]  # Exclude the closing }
     end
@@ -235,9 +217,7 @@ class Vm
         command.concat nic.to_params(index + 1)
       end
     end
-    if VirtualBox.run_command(command).status != 0
-      raise 'Unexpected error code returned by VirtualBox'
-    end
+    VirtualBox.run_command! command
     
     io_buses.each { |bus| bus.add_to self }
      
@@ -248,13 +228,9 @@ class Vm
   #
   # @return [VirtualBox::Vm] self, for easy call chaining
   def pull_config
-    result = VirtualBox.run_command ['VBoxManage', '--nologo', 'showvminfo',
-                                     '--machinereadable', uid]
-    if result.status != 0
-      raise 'Unexpected error code returned by VirtualBox'
-    end
-    
-    config = self.class.parse_machine_readable result.output
+    output = VirtualBox.run_command! ['VBoxManage', '--nologo', 'showvminfo',
+                                      '--machinereadable', uid]
+    config = self.class.parse_machine_readable output
     
     self.name = config['name']
     self.uid = config['UUID']

data/lib/virtual_box.rb

@@ -3,10 +3,11 @@ module VirtualBox
   
 end
 
-require 'hashie/mash'
+require 'posix/spawn'
 require 'uuid'
 
 require 'virtual_box/cli.rb'
+require 'virtual_box/error.rb'
 require 'virtual_box/version.rb'
 
 require 'virtual_box/vm.rb'
@@ -15,5 +16,5 @@ require 'virtual_box/vm/disk.rb'
 require 'virtual_box/vm/io_bus.rb'
 require 'virtual_box/vm/nic.rb'
 
-require 'virtual_box/dhcp.rb'
 require 'virtual_box/net.rb'
+require 'virtual_box/net/dhcp.rb'

data/test/virtual_box/cli_test.rb

@@ -7,12 +7,12 @@ describe 'CLI' do
         @result = VirtualBox.run_command(['echo', 'Hello'])
       end
       
-      it 'should report successful completion' do
-        @result.status.must_equal 0
+      it 'reports successful completion' do
+        @result[:status].must_equal 0
       end
       
-      it 'should return echo output' do
-        @result.output.must_equal "Hello\n"
+      it 'returns echo output' do
+        @result[:output].must_equal "Hello\n"
       end
     end
     
@@ -21,12 +21,32 @@ describe 'CLI' do
         @result = VirtualBox.run_command(['ruby', '-e', 'print "Hi"; exit 1'])
       end
       
-      it 'should return echo output' do
-        @result.output.must_equal 'Hi'
+      it 'returns echo output' do
+        @result[:output].must_equal 'Hi'
       end
       
-      it 'should report exit code 1' do
-        @result.status.must_equal 1
+      it 'reports exit code 1' do
+        @result[:status].must_equal 1
+      end
+    end
+  end
+
+  describe 'run_command!' do
+    describe 'with hello world echo' do
+      before do
+        @output = VirtualBox.run_command!(['echo', 'Hello'])
+      end
+      
+      it 'returns echo output' do
+        @output.must_equal "Hello\n"
+      end
+    end
+    
+    describe 'with inline ruby script' do
+      it 'raises VirtualBox::Error' do
+        lambda {
+          VirtualBox.run_command! ['ruby', '-e', 'print "Hi"; exit 1']
+        }.must_raise VirtualBox::Error
       end
     end
   end

data/test/virtual_box/integration_test.rb

@@ -6,9 +6,9 @@ describe 'VirtualBox' do
   before do
     iso_file = 'test/fixtures/tinycore/remix.iso'
     @net = VirtualBox::Net.new(:ip => '192.168.66.6',
-                               :netmask => '255.255.255.0').add
-    @dhcp = VirtualBox::Dhcp.new(:net_name => @net.name,
-                                 :start_ip => '192.168.66.66').add
+        :netmask => '255.255.255.0',
+        :dhcp => { :start_ip => '192.168.66.66' }).add
+
     @vm = VirtualBox::Vm.new(
         :board => { :ram => 256, :cpus => 1, :video_ram => 16,
                     :os => :linux26 },
@@ -20,7 +20,6 @@ describe 'VirtualBox' do
   
   after do
     @vm.unregister unless @vm.nil?
-    @dhcp.remove unless @dhcp.nil?
     @net.remove unless @net.nil?
   end
   
@@ -39,7 +38,7 @@ describe 'VirtualBox' do
       end
     end
     
-    it 'should respond to a SSH connection' do
+    it 'responds to a SSH connection' do
       output = nil
       Net::SSH.start '192.168.66.66', 'tc', :timeout => 15,
           :global_known_hosts_file => [], :user_known_hosts_file => [],

data/test/virtual_box/{dhcp_test.rb → net/dhcp_test.rb}

@@ -1,9 +1,9 @@
-require File.expand_path('../helper.rb', File.dirname(__FILE__))
+require File.expand_path('../../helper.rb', File.dirname(__FILE__))
 
-describe VirtualBox::Dhcp do
+describe VirtualBox::Net::Dhcp do
   describe 'ip 192.168.0.1' do
     before do
-      @dhcp = VirtualBox::Dhcp.new :ip => '192.168.0.1'
+      @dhcp = VirtualBox::Net::Dhcp.new :ip => '192.168.0.1'
     end
     it 'has a default netmask' do
       @dhcp.netmask.must_equal '255.255.255.0'
@@ -18,7 +18,7 @@ describe VirtualBox::Dhcp do
   
   describe 'startip 192.168.0.64' do
     before do
-      @dhcp = VirtualBox::Dhcp.new :start_ip => '192.168.0.64'
+      @dhcp = VirtualBox::Net::Dhcp.new :start_ip => '192.168.0.64'
     end    
     it 'computes the server IP' do
       @dhcp.ip.must_equal '192.168.0.1'
@@ -26,26 +26,19 @@ describe VirtualBox::Dhcp do
   end
   
   describe 'random rule' do
+    let(:net_name) { 'rbxvbox0' }
+
     before do
-      @dhcp = VirtualBox::Dhcp.new :net_name => 'rbxvbox0', :ip => '10.1.0.1'
-    end
-    
-    it 'is not live' do
-      @dhcp.wont_be :live?
+      @dhcp = VirtualBox::Net::Dhcp.new :ip => '10.1.0.1'
     end
     
     describe 'after being added' do
-      before { @dhcp.add }
-      after { @dhcp.remove }
-      
-      it 'is live' do
-        @dhcp.must_be :live?
-      end
+      before { @dhcp.add net_name }
+      after { @dhcp.remove net_name }
       
       it 'shows up on the list of live servers' do
-        servers = VirtualBox::Dhcp.all
-        dhcp = servers.find { |s| s.net_name == @dhcp.net_name }
-        dhcp.to_hash.must_equal @dhcp.to_hash
+        dhcps = VirtualBox::Net::Dhcp.all
+        dhcps[net_name].to_hash.must_equal @dhcp.to_hash
       end
     end
   end

data/test/virtual_box/net_test.rb

@@ -1,6 +1,30 @@
 require File.expand_path('../helper.rb', File.dirname(__FILE__))
 
 describe VirtualBox::Net do
+  describe 'host_nics' do
+    let(:nics) { VirtualBox::Net.host_nics }
+    
+    it 'has at least 1 card' do
+      nics.length.must_be :>=, 1
+    end
+
+    describe 'first card' do
+      let(:card) { nics.first }
+      
+      it 'has a device name' do
+        card[:name].wont_be_nil
+      end
+      
+      it 'has a MAC' do
+        card[:mac].wont_be_nil
+      end
+      
+      it 'has its device name show up in ifconfig' do
+        `ifconfig -a`.must_include card[:name]
+      end
+    end
+  end
+
   describe 'with no arguments' do
     before { @net = VirtualBox::Net.new }
     
@@ -26,7 +50,7 @@ describe VirtualBox::Net do
       
       it 'has an interface name that shows up in the ifconfig output' do
         @net.if_name.wont_be_nil
-        `ifconfig`.must_include @net.if_name
+        `ifconfig -a`.must_include @net.if_name
       end
       
       it 'has a name' do
@@ -67,7 +91,41 @@ describe VirtualBox::Net do
       
       it 'has an interface name that shows up in the ifconfig output' do
         @net.if_name.wont_be_nil
-        `ifconfig`.must_include @net.if_name
+        `ifconfig -a`.must_include @net.if_name
+      end
+      
+      it 'shows up on the list of live networks' do
+        networks = VirtualBox::Net.all
+        network = networks.find { |n| n.if_name == @net.if_name }
+        network.to_hash.must_equal @net.to_hash
+      end      
+    end
+  end
+
+  describe 'with a dhcp server' do
+    before do
+      @net = VirtualBox::Net.new :dhcp => { :start_ip => '192.168.166.166' }
+    end
+    
+    it 'is not live' do
+      @net.wont_be :live?
+    end
+    
+    it 'has a DHCP server' do
+      @net.dhcp.wont_be_nil
+    end
+    
+    describe 'after adding to VirtualBox' do
+      before { @net.add }
+      after { @net.remove }
+      
+      it 'is live' do
+        @net.must_be :live?
+      end
+      
+      it 'has an interface name that shows up in the ifconfig output' do
+        @net.if_name.wont_be_nil
+        `ifconfig -a`.must_include @net.if_name
       end
       
       it 'shows up on the list of live networks' do

data/test/virtual_box/version_test.rb

@@ -5,21 +5,21 @@ describe 'Version' do
     before do
       VirtualBox.reset_version_info!
       VirtualBox.expects(:run_command).once.
-        returns(Hashie::Mash.new(:status => 0, :output => "3.0.4r50677\n"))
+        returns({ :status => 0, :output => "3.0.4r50677\n" })
     end
     
-    it 'should report release' do
-      VirtualBox.version.release.must_equal '3.0.4'
+    it 'reports release' do
+      VirtualBox.version[:release].must_equal '3.0.4'
     end
-    it 'should report revision' do
-      VirtualBox.version.svn.must_equal 50677
+    it 'reports revision' do
+      VirtualBox.version[:svn].must_equal 50677
     end
-    it 'should report personal edition' do
+    it 'reports personal edition' do
       VirtualBox.ose?.must_equal false
     end    
-    it 'should cache version info' do
-      VirtualBox.version.release.must_equal '3.0.4'
-      VirtualBox.version.svn.must_equal 50677
+    it 'caches version info' do
+      VirtualBox.version[:release].must_equal '3.0.4'
+      VirtualBox.version[:svn].must_equal 50677
     end
   end
   
@@ -27,16 +27,16 @@ describe 'Version' do
     before do
       VirtualBox.reset_version_info!
       VirtualBox.expects(:run_command).once.
-        returns(Hashie::Mash.new(:status => 0, :output => "3.2.8_OSEr64453\n"))
+        returns({ :status => 0, :output => "3.2.8_OSEr64453\n" })
     end
     
-    it 'should report release' do
-      VirtualBox.version.release.must_equal '3.2.8'
+    it 'reports release' do
+      VirtualBox.version[:release].must_equal '3.2.8'
     end
-    it 'should report revision' do
-      VirtualBox.version.svn.must_equal 64453
+    it 'reports revision' do
+      VirtualBox.version[:svn].must_equal 64453
     end
-    it 'should report open-source edition' do
+    it 'reports open-source edition' do
       VirtualBox.ose?.must_equal true
     end    
   end
@@ -45,14 +45,14 @@ describe 'Version' do
     before do
       VirtualBox.reset_version_info!
       VirtualBox.expects(:run_command).once.
-                 returns(Hashie::Mash.new(:status => 127))
+                 returns({:status => 127})
     end
     
-    it 'should not report a release' do
-      VirtualBox.version.release.must_equal nil
+    it 'does not report a release' do
+      VirtualBox.version[:release].must_equal nil
     end
 
-    it 'should raise an exception on ose' do
+    it 'raises an exception on ose' do
       lambda { 
         VirtualBox.ose?
       }.must_raise(RuntimeError)
@@ -64,8 +64,8 @@ describe 'Version' do
       VirtualBox.reset_version_info!
     end
       
-    it 'should report some version' do
-      VirtualBox.version.release.wont_be :empty?
+    it 'reports some version' do
+      VirtualBox.version[:release].wont_be :empty?
     end
   end
 end

data/test/virtual_box/vm/board_test.rb

@@ -5,16 +5,16 @@ describe VirtualBox::Vm::Board do
     before do
       @types = VirtualBox::Vm::Board.os_types
     end
-    it 'should map linux 2.6' do
+    it 'maps linux 2.6' do
       @types.must_include :linux26
     end
     
-    it 'should include linux 2.6 ID' do
+    it 'includes linux 2.6 ID' do
       @types.must_include 'linux26'
       @types.must_include 'Linux26'
     end
 
-    it 'should include linux 2.6 description' do
+    it 'includes linux 2.6 description' do
       @types.must_include 'Linux 2.6'
     end
   end
@@ -29,7 +29,7 @@ describe VirtualBox::Vm::Board do
       @vm.unregister
     end
     
-    it 'should push/pull specification correctly' do
+    it 'pushes/pulls specification correctly' do
       vm = VirtualBox::Vm.new :uid => @vm.uid
       
       vm.pull_config

data/test/virtual_box/vm/disk_test.rb

@@ -6,11 +6,11 @@ describe VirtualBox::Vm::Disk do
       @disk = VirtualBox::Vm::Disk.new :file => 'disk.iso'      
     end
     
-    it 'should guess media type' do
+    it 'guesses media type' do
       @disk.media.must_equal :dvd
     end
     
-    it 'should guess image type' do
+    it 'guesses image type' do
       @disk.format.must_equal :raw
     end
   end
@@ -29,19 +29,19 @@ describe VirtualBox::Vm::Disk do
         File.unlink vmdk_path if File.exist?(vmdk_path)
       end
       
-      it 'should create a small file' do
+      it 'creates a small file' do
         File.stat(vmdk_path).size.must_be :<, 256 * 1024
       end
       
-      it 'should return a Disk pointing to the file' do
+      it 'returns a Disk pointing to the file' do
         @disk.file.must_equal vmdk_path
       end
       
-      it 'should return a HDD Disk' do
+      it 'returns a HDD Disk' do
         @disk.media.must_equal :disk
       end
       
-      it 'should return a VMDK Disk' do
+      it 'returns a VMDK Disk' do
         @disk.format.must_equal :vmdk
       end
     end
@@ -59,19 +59,19 @@ describe VirtualBox::Vm::Disk do
         File.unlink vdi_path if File.exist?(vdi_path)
       end
       
-      it 'should create a 16-megabyte file' do
+      it 'creates a 16-megabyte file' do
         (File.stat(vdi_path).size / (1024 * 1024)).must_equal 16
       end
       
-      it 'should return a Disk pointing to the file' do
+      it 'returns a Disk pointing to the file' do
         @disk.file.must_equal vdi_path
       end
       
-      it 'should return a HDD Disk' do
+      it 'returns a HDD Disk' do
         @disk.media.must_equal :disk
       end
       
-      it 'should return a VDI Disk' do
+      it 'returns a VDI Disk' do
         @disk.format.must_equal :vdi
       end
     end
@@ -106,7 +106,7 @@ describe VirtualBox::Vm::Disk do
       end
     end
     
-    it 'should push/pull specs correctly' do
+    it 'pushes/pulls specs correctly' do
       vm = VirtualBox::Vm.new :uid => @vm.uid
       vm.pull_config
       vm.io_buses.map { |io_bus| io_bus.to_hash }.

data/test/virtual_box/vm/io_bus_test.rb

@@ -2,34 +2,34 @@ require File.expand_path('../../helper.rb', File.dirname(__FILE__))
 
 describe VirtualBox::Vm::IoBus do
   describe 'IDE' do
-    it 'should default to the PIIX4 chipset' do
+    it 'defaults to the PIIX4 chipset' do
       VirtualBox::Vm::IoBus.new(:bus => :ide).chip.must_equal :piix4
     end
     
-    it 'should recognize the PIIX4 chipset' do
+    it 'recognizes the PIIX4 chipset' do
       VirtualBox::Vm::IoBus.new(:chip => :piix4).bus.must_equal :ide
     end
     
-    it 'should be named IDE Controller by default' do
+    it 'ie named IDE Controller by default' do
       VirtualBox::Vm::IoBus.new(:bus => :ide).name.must_equal 'IDE Controller'
     end
   end
   
   describe 'SATA' do
-    it 'should default to the AHCI chipset' do
+    it 'defaults to the AHCI chipset' do
       VirtualBox::Vm::IoBus.new(:bus => :sata).chip.must_equal :ahci
     end
     
-    it 'should recognize the PIIX4 chipset' do
+    it 'recognizes the PIIX4 chipset' do
       VirtualBox::Vm::IoBus.new(:chip => :ahci).bus.must_equal :sata
     end
 
-    it 'should be named SATA Controller by default' do
+    it 'is named SATA Controller by default' do
       VirtualBox::Vm::IoBus.new(:bus => :sata).name.must_equal 'SATA Controller'
     end
   end
 
-  describe 'VM with all bunch of buses' do
+  describe 'VM with a bunch of IO controllers' do
     before do
       @vm = VirtualBox::Vm.new :io_buses => [
         { :bus => :ide, :name => 'Weird Name', :chip => :piix3 },
@@ -44,7 +44,7 @@ describe VirtualBox::Vm::IoBus do
       @vm.unregister
     end
     
-    it 'should push/pull specs correctly' do
+    it 'pushes/pulls specs correctly' do
       vm = VirtualBox::Vm.new :uid => @vm.uid
       vm.pull_config
       vm.io_buses.map { |io_bus| io_bus.to_hash }.

data/test/virtual_box/vm/nic_test.rb

@@ -1,31 +1,11 @@
 require File.expand_path('../../helper.rb', File.dirname(__FILE__))
 
 describe VirtualBox::Vm::Nic do 
-  describe 'host_nics' do
-    let(:nics) { VirtualBox::Vm::Nic.host_nics }
-    
-    it 'should have at least 1 card' do
-      nics.length.must_be :>=, 1
-    end
-
-    describe 'first card' do
-      let(:card) { nics.first }
-      
-      it 'should have an interface ID' do
-        card[:id].wont_be_nil
-      end
-      
-      it 'should have a  MAC' do
-        card[:mac].wont_be_nil
-      end
-    end
-  end
-  
   describe 'NAT card and virtual card' do
     before do            
       @vm = VirtualBox::Vm.new :nics => [
         { :mode => :bridged, :chip => :amd,
-          :net_name => VirtualBox::Vm::Nic.host_nics.first[:id],
+          :net_name => VirtualBox::Net.host_nics.first[:name],
           :mac => 'aabbccddeeff' },
         { :port => 2, :mode => :virtual, :chip => :virtual,
           :net_name => 'rbx00' }
@@ -37,11 +17,11 @@ describe VirtualBox::Vm::Nic do
       @vm.unregister
     end
     
-    it 'should skip NIC 1' do
+    it 'skips NIC 1' do
       @vm.nics[1].must_be_nil
     end
     
-    it 'should push/pull specs correctly' do
+    it 'pushes/pulls specs correctly' do
       vm = VirtualBox::Vm.new :uid => @vm.uid
       vm.pull_config
       vm.to_hash[:nics].must_equal @vm.to_hash[:nics]

data/test/virtual_box/vm_test.rb

@@ -6,15 +6,15 @@ describe VirtualBox::Vm do
       @vm = VirtualBox::Vm.new
     end
     
-    it 'should receive a name' do
+    it 'receives a name' do
       @vm.name.wont_be_nil
     end
     
-    it 'should receive an UID' do
+    it 'receives an UID' do
       @vm.uid.wont_be_nil
     end
     
-    it 'should be unregistered' do
+    it 'is unregistered' do
       @vm.wont_be :registered?
     end
     
@@ -27,11 +27,11 @@ describe VirtualBox::Vm do
         @vm.unregister
       end
       
-      it 'should know it is registered' do
+      it 'knows it is registered' do
         @vm.must_be :registered?
       end
       
-      it 'should show up on the list of registered VM UIDs' do
+      it 'shows up on the list of registered VM UIDs' do
         uids = VirtualBox::Vm.registered_uids
         uids.must_include @vm.uid
       end
@@ -45,7 +45,7 @@ describe VirtualBox::Vm do
           sleep 0.5  # VirtualBox will barf if we unregister the VM right away.
         end
         
-        it 'should show up on the list of started VM UIDs' do
+        it 'shows up on the list of started VM UIDs' do
           uids = VirtualBox::Vm.started_uids
           uids.must_include @vm.uid
         end