virtual_box 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/virtual_box/{board.rb → vm/board.rb}

@@ -1,5 +1,7 @@
 module VirtualBox
 
+class Vm
+
 # Specification for a virtual machine's motherboard.
 class Board
   # The number of CPUs (cores) on this board.
@@ -156,7 +158,7 @@ class Board
   #
   # @param [Hash<String, String>] params the "VBoxManage showvminfo" output,
   #                                      parsed by Vm.parse_machine_readble
-  # @return [VirtualBox::Board] self, for easy call chaining
+  # @return [VirtualBox::Vm::Board] self, for easy call chaining
   def from_params(params)
     self.cpus = params['cpus'].to_i
     self.ram = params['memory'].to_i
@@ -200,7 +202,7 @@ class Board
   # Resets to default settings.
   #
   # The defaults are chosen somewhat arbitrarily by the gem's author.
-  # @return [VirtualBox::Board] self, for easy call chaining
+  # @return [VirtualBox::Vm::Board] self, for easy call chaining
   def reset
     self.cpus = 1
     self.ram = 512
@@ -282,6 +284,8 @@ class Board
     end
     Hash[types]
   end
-end  # class VirtualBox::Board
+end  # class VirtualBox::Vm::Board
+
+end  # class VirtualBox::Vm
 
 end  # namespace VirtualBox

data/lib/virtual_box/{disk.rb → vm/disk.rb}

@@ -1,5 +1,7 @@
 module VirtualBox
 
+class Vm
+
 # Descriptor for a VirtualBox hard-disk or DVD image.
 class Disk
   # Path to the file storing this disk image.
@@ -41,11 +43,11 @@ class Disk
   # Attaches this disk to a virtual machine.
   #
   # @param [VirtualBox::Vm] vm the VM that this image will be attached to
-  # @param [VirtualBox::IoBus] io_bus the IO controller that this disk will be
-  #                                   attached to
+  # @param [VirtualBox::Vm::IoBus] io_bus the IO controller that this disk will
+  #                                       be attached to
   # @param [Integer] port the IO bus port this disk will be connected to
   # @param [Integer] device number indicating the device's ordering on its port
-  # @return [VirtualBox::Disk] self, for easy call chaining
+  # @return [VirtualBox::Vm::Disk] self, for easy call chaining
   def add_to(vm, io_bus, port, device)
     media_arg = case media
     when :disk
@@ -80,7 +82,7 @@ class Disk
   # @option options [Boolean] prealloc unless explicitly set to true, the image
   #     file will grow in size as the disk's blocks are used
   #
-  # @return [VirtualBox::Disk] a Disk describing the image that was created
+  # @return [VirtualBox::Vm::Disk] a Disk describing the image that was created
   def self.create(options)
     path = options[:file]
     format = options[:format] || guess_image_format(path)
@@ -95,7 +97,7 @@ class Disk
       raise 'Unexpected error code returned by VirtualBox'
     end
     
-    Disk.new :file => path, :format => format, :media => :disk
+    new :file => path, :format => format, :media => :disk
   end
   
   # Disk image format based on the extension in the file name.
@@ -133,6 +135,8 @@ class Disk
       :disk
     end
   end
-end  # class VirtualBox::Disk
+end  # class VirtualBox::Vm::Disk
+
+end  # class VirtualBox::Vm
 
 end  # namespace VirtualBox

data/lib/virtual_box/{io_bus.rb → vm/io_bus.rb}

@@ -1,5 +1,7 @@
 module VirtualBox
 
+class Vm
+
 # Specification for a IO controller attached to a virtual machine.
 class IoBus
   # A user-friendly name for the I/O controller.
@@ -39,7 +41,7 @@ class IoBus
   attr_accessor :max_ports
   
   # The disks connected to this controller's bus.
-  # @return [Hash<Array<Integer>, VirtualBox::Disk>]
+  # @return [Hash<Array<Integer>, VirtualBox::Vm::Disk>]
   attr_accessor :disks
   
   undef :name
@@ -112,13 +114,13 @@ class IoBus
   def disks=(new_disks)
     @disks = {}
     new_disks.each do |disk|
-      if disk.kind_of? VirtualBox::Disk
+      if disk.kind_of? VirtualBox::Vm::Disk
         @disks[[first_free_port, 0]] = disk
       else
         options = disk.dup
         port = options.delete(:port) || first_free_port
         device = options.delete(:device) || 0
-        @disks[[port, device]] = VirtualBox::Disk.new options
+        @disks[[port, device]] = VirtualBox::Vm::Disk.new options
       end
     end
     new_disks
@@ -126,7 +128,7 @@ class IoBus
   
   # Parses "VBoxManage showvminfo --machinereadable" output into this instance.
   #
-  # @return [VirtualBox::IoBus] self, for easy call chaining
+  # @return [VirtualBox::Vm::IoBus] self, for easy call chaining
   def from_params(params, bus_id)
     self.name = params["storagecontrollername#{bus_id}"]
     self.bootable = params["storagecontrollerbootable#{bus_id}"] == 'on'
@@ -157,7 +159,7 @@ class IoBus
       next unless match = image_re.match(key)
       next if value == 'none'
       port, device = match[1].to_i, match[2].to_i
-      @disks[[port, device]] = VirtualBox::Disk.new :file => value
+      @disks[[port, device]] = VirtualBox::Vm::Disk.new :file => value
     end
     self
   end
@@ -192,7 +194,7 @@ class IoBus
   #
   # @param [VirtualBox::Vm] vm the virtual machine that this IO controller will
   #                            be added to
-  # @return [VirtualBox::IoBus] self, for easy call chaining
+  # @return [VirtualBox::Vm::IoBus] self, for easy call chaining
   def add_to(vm)
     add_bus_to vm
     disks.each do |port_device, disk|
@@ -205,7 +207,7 @@ class IoBus
   #
   # @param [VirtualBox::Vm] vm the virtual machine that this IO controller will
   #                            be removed from
-  # @return [VirtualBox::IoBus] self, for easy call chaining
+  # @return [VirtualBox::Vm::IoBus] self, for easy call chaining
   def remove_from(vm)
     result = VirtualBox.run_command ['VBoxManage', '--nologo', 'storagectl',
                                      vm.uuid, '--name', name, '--remove']
@@ -219,7 +221,7 @@ class IoBus
   #
   # @param [VirtualBox::Vm] vm the virtual machine that this IO bus will be
   #                            added to
-  # @return [VirtualBox::IoBus] self, for easy call chaining
+  # @return [VirtualBox::Vm::IoBus] self, for easy call chaining
   def add_bus_to(vm)
     command = ['VBoxManage', '--nologo', 'storagectl', vm.uid].concat to_params
     result = VirtualBox.run_command command
@@ -256,6 +258,8 @@ class IoBus
   def first_free_port
     disks.empty? ? 0 : disks.keys.min.first + 1
   end
-end  # class VirtualBox::IoBus
+end  # class VirtualBox::Vm::IoBus
+
+end  # class VirtualBox::Vm
 
 end  # namespace VirtualBox

data/lib/virtual_box/{nic.rb → vm/nic.rb}

@@ -2,6 +2,8 @@ require 'securerandom'
 
 module VirtualBox
 
+class Vm
+
 # Configuration for a network card.
 class Nic
   # The kind of network emulation implemented on this card.
@@ -128,7 +130,7 @@ class Nic
   # @param [Hash<String, String>] params the "VBoxManage showvminfo" output,
   #                                      parsed by Vm.parse_machine_readble
   # @param [Integer] nic_id the NIC's number in the VM
-  # @return [VirtualBox::Nic] self, for easy call chaining
+  # @return [VirtualBox::Vm::Nic] self, for easy call chaining
   def from_params(params, nic_id)
     case params["nic#{nic_id}"]
     when 'nat'
@@ -208,6 +210,8 @@ class Nic
       }
     end
   end
-end  # class VirtualBox::Nic
+end  # class VirtualBox::Vm::Nic
+
+end  # class VirtualBox::Vm
 
 end  # namespace VirtualBox

data/lib/virtual_box/vm.rb

@@ -18,15 +18,15 @@ class Vm
   attr_accessor :name
   
   # The general VM configuration.
-  # @return [VirtualBox::Board]
+  # @return [VirtualBox::Vm::Board]
   attr_accessor :board
   
   # The IO controllers (and disks) connected to the VM.
-  # @return [Array<VirtualBox::IoBus>]
+  # @return [Array<VirtualBox::Vm::IoBus>]
   attr_accessor :io_buses
   
   # The network cards connected to this virtual machine.
-  # @return [Array<VirtualBox::Nic>]
+  # @return [Array<VirtualBox::Vm::Nic>]
   attr_accessor :nics
   
   # If true, the VM's screen will be displayed in a GUI.
@@ -49,20 +49,20 @@ class Vm
   
   undef :board=
   def board=(new_board)
-    @board = if new_board.kind_of?(VirtualBox::Board)
+    @board = if new_board.kind_of?(VirtualBox::Vm::Board)
       new_board
     else
-      VirtualBox::Board.new new_board
+      VirtualBox::Vm::Board.new new_board
     end
   end
 
   undef :io_buses=
   def io_buses=(new_io_buses)
     @io_buses = new_io_buses.map do |io_bus|
-      if io_bus.kind_of?(VirtualBox::IoBus)
+      if io_bus.kind_of?(VirtualBox::Vm::IoBus)
         io_bus
       else
-        VirtualBox::IoBus.new io_bus
+        VirtualBox::Vm::IoBus.new io_bus
       end
     end
   end
@@ -71,12 +71,12 @@ class Vm
   def nics=(new_nics)
     @nics = []
     new_nics.each do |nic|
-      if nic.kind_of?(VirtualBox::Nic) || nic.nil?
+      if nic.kind_of?(VirtualBox::Vm::Nic) || nic.nil?
         @nics << nic
       else
         options = nic.dup
         port = options.delete(:port) || @nics.length
-        @nics[port] = VirtualBox::Nic.new options
+        @nics[port] = VirtualBox::Vm::Nic.new options
       end
     end
     new_nics
@@ -265,7 +265,7 @@ class Vm
       if config["nic#{index}"] == 'none'
         nics[index - 1] = nil
       else
-        nics[index - 1] ||= VirtualBox::Nic.new
+        nics[index - 1] ||= VirtualBox::Vm::Nic.new
         nics[index - 1].from_params config, index
       end
     end
@@ -274,7 +274,7 @@ class Vm
       /^storagecontrollername\d+$/ =~ key
     }.max || "storagecontrollername-1")[21..-1].to_i
     0.upto bus_count - 1 do |index|
-      io_buses[index] ||= VirtualBox::IoBus.new
+      io_buses[index] ||= VirtualBox::Vm::IoBus.new
       io_buses[index].from_params config, index
     end
     

data/lib/virtual_box.rb

@@ -6,12 +6,14 @@ end
 require 'hashie/mash'
 require 'uuid'
 
-require 'virtual_box/board.rb'
 require 'virtual_box/cli.rb'
-require 'virtual_box/dhcp.rb'
-require 'virtual_box/disk.rb'
-require 'virtual_box/io_bus.rb'
-require 'virtual_box/net.rb'
-require 'virtual_box/nic.rb'
 require 'virtual_box/version.rb'
+
 require 'virtual_box/vm.rb'
+require 'virtual_box/vm/board.rb'
+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'

data/test/virtual_box/integration_test.rb

@@ -41,7 +41,7 @@ describe 'VirtualBox' do
     
     it 'should respond to a SSH connection' do
       output = nil
-      Net::SSH.start '192.168.66.66', 'tc', :timeout => 10,
+      Net::SSH.start '192.168.66.66', 'tc', :timeout => 15,
           :global_known_hosts_file => [], :user_known_hosts_file => [],
           :paranoid => false, :password => '' do |ssh|
         output = ssh.exec!('ifconfig')

data/test/virtual_box/{board_test.rb → vm/board_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::Board do 
+describe VirtualBox::Vm::Board do 
   describe 'os_types' do
     before do
-      @types = VirtualBox::Board.os_types
+      @types = VirtualBox::Vm::Board.os_types
     end
     it 'should map linux 2.6' do
       @types.must_include :linux26

data/test/virtual_box/{disk_test.rb → vm/disk_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::Disk do
+describe VirtualBox::Vm::Disk do
   describe 'new with ISO' do
     before do
-      @disk = VirtualBox::Disk.new :file => 'disk.iso'      
+      @disk = VirtualBox::Vm::Disk.new :file => 'disk.iso'      
     end
     
     it 'should guess media type' do
@@ -21,8 +21,8 @@ describe VirtualBox::Disk do
     
       before do
         File.unlink vmdk_path if File.exist?(vmdk_path)
-        @disk = VirtualBox::Disk.create :file => vmdk_path, :prealloc => false,
-            :size => 16 * 1024 * 1024
+        @disk = VirtualBox::Vm::Disk.create :file => vmdk_path,
+            :prealloc => false, :size => 16 * 1024 * 1024
       end
       
       after do
@@ -51,8 +51,8 @@ describe VirtualBox::Disk do
       
       before do
         File.unlink vdi_path if File.exist?(vdi_path)
-        @disk = VirtualBox::Disk.create :file => vdi_path, :prealloc => true,
-            :size => 16 * 1024 * 1024
+        @disk = VirtualBox::Vm::Disk.create :file => vdi_path,
+            :prealloc => true, :size => 16 * 1024 * 1024
       end
       
       after do
@@ -85,7 +85,7 @@ describe VirtualBox::Disk do
     before do
       [disk1_file, disk2_file, disk3_file].each do |file|
         File.unlink file if File.exist?(file)
-        VirtualBox::Disk.create :file => file, :size => 16 * 1024 * 1024
+        VirtualBox::Vm::Disk.create :file => file, :size => 16 * 1024 * 1024
       end
     
       @vm = VirtualBox::Vm.new :io_buses => [

data/test/virtual_box/{io_bus_test.rb → vm/io_bus_test.rb}

@@ -1,31 +1,31 @@
-require File.expand_path('../helper.rb', File.dirname(__FILE__))
+require File.expand_path('../../helper.rb', File.dirname(__FILE__))
 
-describe VirtualBox::IoBus do
+describe VirtualBox::Vm::IoBus do
   describe 'IDE' do
     it 'should default to the PIIX4 chipset' do
-      VirtualBox::IoBus.new(:bus => :ide).chip.must_equal :piix4
+      VirtualBox::Vm::IoBus.new(:bus => :ide).chip.must_equal :piix4
     end
     
     it 'should recognize the PIIX4 chipset' do
-      VirtualBox::IoBus.new(:chip => :piix4).bus.must_equal :ide
+      VirtualBox::Vm::IoBus.new(:chip => :piix4).bus.must_equal :ide
     end
     
     it 'should be named IDE Controller by default' do
-      VirtualBox::IoBus.new(:bus => :ide).name.must_equal 'IDE Controller'
+      VirtualBox::Vm::IoBus.new(:bus => :ide).name.must_equal 'IDE Controller'
     end
   end
   
   describe 'SATA' do
     it 'should default to the AHCI chipset' do
-      VirtualBox::IoBus.new(:bus => :sata).chip.must_equal :ahci
+      VirtualBox::Vm::IoBus.new(:bus => :sata).chip.must_equal :ahci
     end
     
     it 'should recognize the PIIX4 chipset' do
-      VirtualBox::IoBus.new(:chip => :ahci).bus.must_equal :sata
+      VirtualBox::Vm::IoBus.new(:chip => :ahci).bus.must_equal :sata
     end
 
     it 'should be named SATA Controller by default' do
-      VirtualBox::IoBus.new(:bus => :sata).name.must_equal 'SATA Controller'
+      VirtualBox::Vm::IoBus.new(:bus => :sata).name.must_equal 'SATA Controller'
     end
   end
 

data/test/virtual_box/{nic_test.rb → vm/nic_test.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../helper.rb', File.dirname(__FILE__))
+require File.expand_path('../../helper.rb', File.dirname(__FILE__))
 
-describe VirtualBox::Nic do 
+describe VirtualBox::Vm::Nic do 
   describe 'host_nics' do
-    let(:nics) { VirtualBox::Nic.host_nics }
+    let(:nics) { VirtualBox::Vm::Nic.host_nics }
     
     it 'should have at least 1 card' do
       nics.length.must_be :>=, 1
@@ -25,7 +25,7 @@ describe VirtualBox::Nic do
     before do            
       @vm = VirtualBox::Vm.new :nics => [
         { :mode => :bridged, :chip => :amd,
-          :net_name => VirtualBox::Nic.host_nics.first[:id],
+          :net_name => VirtualBox::Vm::Nic.host_nics.first[:id],
           :mac => 'aabbccddeeff' },
         { :port => 2, :mode => :virtual, :chip => :virtual,
           :net_name => 'rbx00' }

data/virtual_box.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "virtual_box"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2012-05-01"
+  s.date = "2012-05-04"
   s.description = "Drives the VirtualBox command-line to manage VMs"
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [
@@ -28,26 +28,26 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/virtual_box.rb",
-    "lib/virtual_box/board.rb",
     "lib/virtual_box/cli.rb",
     "lib/virtual_box/dhcp.rb",
-    "lib/virtual_box/disk.rb",
-    "lib/virtual_box/io_bus.rb",
     "lib/virtual_box/net.rb",
-    "lib/virtual_box/nic.rb",
     "lib/virtual_box/version.rb",
     "lib/virtual_box/vm.rb",
+    "lib/virtual_box/vm/board.rb",
+    "lib/virtual_box/vm/disk.rb",
+    "lib/virtual_box/vm/io_bus.rb",
+    "lib/virtual_box/vm/nic.rb",
     "test/helper.rb",
     "test/tasks/tinycore.rake",
-    "test/virtual_box/board_test.rb",
     "test/virtual_box/cli_test.rb",
     "test/virtual_box/dhcp_test.rb",
-    "test/virtual_box/disk_test.rb",
     "test/virtual_box/integration_test.rb",
-    "test/virtual_box/io_bus_test.rb",
     "test/virtual_box/net_test.rb",
-    "test/virtual_box/nic_test.rb",
     "test/virtual_box/version_test.rb",
+    "test/virtual_box/vm/board_test.rb",
+    "test/virtual_box/vm/disk_test.rb",
+    "test/virtual_box/vm/io_bus_test.rb",
+    "test/virtual_box/vm/nic_test.rb",
     "test/virtual_box/vm_test.rb",
     "virtual_box.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtual_box
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -174,26 +174,26 @@ files:
 - Rakefile
 - VERSION
 - lib/virtual_box.rb
-- lib/virtual_box/board.rb
 - lib/virtual_box/cli.rb
 - lib/virtual_box/dhcp.rb
-- lib/virtual_box/disk.rb
-- lib/virtual_box/io_bus.rb
 - lib/virtual_box/net.rb
-- lib/virtual_box/nic.rb
 - lib/virtual_box/version.rb
 - lib/virtual_box/vm.rb
+- lib/virtual_box/vm/board.rb
+- lib/virtual_box/vm/disk.rb
+- lib/virtual_box/vm/io_bus.rb
+- lib/virtual_box/vm/nic.rb
 - test/helper.rb
 - test/tasks/tinycore.rake
-- test/virtual_box/board_test.rb
 - test/virtual_box/cli_test.rb
 - test/virtual_box/dhcp_test.rb
-- test/virtual_box/disk_test.rb
 - test/virtual_box/integration_test.rb
-- test/virtual_box/io_bus_test.rb
 - test/virtual_box/net_test.rb
-- test/virtual_box/nic_test.rb
 - test/virtual_box/version_test.rb
+- test/virtual_box/vm/board_test.rb
+- test/virtual_box/vm/disk_test.rb
+- test/virtual_box/vm/io_bus_test.rb
+- test/virtual_box/vm/nic_test.rb
 - test/virtual_box/vm_test.rb
 - virtual_box.gemspec
 homepage: http://github.com/csail/police
@@ -211,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3916852811291954048
+      hash: -2226999384598290668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: