virtualbox 0.4.1 → 0.4.2

data/lib/virtualbox/abstract_model/dirty.rb

@@ -1,7 +1,7 @@
 module VirtualBox
   class AbstractModel
     # Tracks "dirtiness" of values for a class. Its not tied to AbstractModel
-    # in any way other than the namespace. 
+    # in any way other than the namespace.
     #
     # # Checking if a Value was Changed
     #
@@ -12,7 +12,7 @@ module VirtualBox
     # # Previous Value
     #
     # Can also view the previous value of an attribute:
-    # 
+    #
     #     obj.foo # => "foo" initially
     #     obj.foo = "bar"
     #     obj.foo_was # => "foo"
@@ -56,14 +56,14 @@ module VirtualBox
     # on an attribute.
     #
     # # Ignoring Dirtiness Tracking
-    # 
+    #
     # Sometimes, for features such as mass assignment, dirtiness tracking
     # should be disabled. This can be done with the `ignore_dirty` method.
     #
     #     ignore_dirty do |obj|
     #       obj.name = "Foo"
     #     end
-    #     
+    #
     #     obj.changed? # => false
     #
     # # Clearing Dirty State
@@ -107,7 +107,7 @@ module VirtualBox
           end
         end
       end
-      
+
       # Clears dirty state for a field.
       #
       # @param [Symbol] key The field to clear dirty state.
@@ -119,8 +119,8 @@ module VirtualBox
         end
       end
 
-      # Ignores any dirty changes during the duration of the block. 
-      # Guarantees the dirty state will be the same before and after 
+      # Ignores any dirty changes during the duration of the block.
+      # Guarantees the dirty state will be the same before and after
       # the method call, but not within the block itself.
       def ignore_dirty(&block)
         current_changes = @changed_attributes.dup rescue nil
@@ -149,13 +149,13 @@ module VirtualBox
       def changes
         @changed_attributes ||= {}
       end
-      
+
       # Method missing is used to implement the "magic" methods of
       # `field_changed`, `field_change`, and `field_was`.
       def method_missing(meth, *args)
         meth_string = meth.to_s
-        
-        if meth_string =~ /^(.+?)_changed\?$/ 
+
+        if meth_string =~ /^(.+?)_changed\?$/
           changed?($1.to_sym)
         elsif meth_string =~ /^(.+?)_change$/
           changes[$1.to_sym]

data/lib/virtualbox/abstract_model/relatable.rb

@@ -2,10 +2,10 @@ module VirtualBox
   class AbstractModel
     # Provides simple relationship features to any class. These relationships
     # can be anything, since this module makes no assumptions and doesn't
-    # differentiate between "has many" or "belongs to" or any of that. 
+    # differentiate between "has many" or "belongs to" or any of that.
     #
     # The way it works is simple:
-    # 
+    #
     # 1. Relationships are defined with a relationship name and a
     #    class of the relationship objects.
     # 2. When {#populate_relationships} is called, `populate_relationship` is
@@ -50,7 +50,7 @@ module VirtualBox
     #
     # If `Foo` has the `set_relationship` method, then it will be called by
     # `foos=`. It is expected to return the new value for the relationship. To
-    # facilitate this need, the `set_relationship` method is given three 
+    # facilitate this need, the `set_relationship` method is given three
     # parameters: caller, old value, and new value. An example implementation,
     # albeit a silly one, is below:
     #
@@ -66,7 +66,7 @@ module VirtualBox
     #     instance.foos = "bar"
     #     instance.foos # => "Changed to: bar"
     #
-    # If the relationship class _does not implement_ the `set_relationship` 
+    # If the relationship class _does not implement_ the `set_relationship`
     # method, then a {Exceptions::NonSettableRelationshipException} will be raised if
     # a user attempts to set that relationship.
     #
@@ -82,10 +82,10 @@ module VirtualBox
       def self.included(base)
         base.extend ClassMethods
       end
-      
+
       module ClassMethods
         # Define a relationship. The name and class must be specified. This
-        # class will be used to call the `populate_relationship, 
+        # class will be used to call the `populate_relationship,
         # `save_relationship`, etc. methods.
         #
         # @param [Symbol] name Relationship name. This will also be used for
@@ -95,23 +95,23 @@ module VirtualBox
         #   {AbstractModel#destroy} will propagate through to relationships.
         def relationship(name, klass, options = {})
           name = name.to_sym
-          
+
           relationships << [name, { :klass => klass }.merge(options)]
-          
+
           # Define the method to read the relationship
           define_method(name) { relationship_data[name] }
-          
+
           # Define the method to set the relationship
           define_method("#{name}=") { |*args| set_relationship(name, *args) }
         end
-        
+
         # Returns a hash of all the relationships.
         #
         # @return [Hash]
         def relationships_hash
           Hash[*relationships.flatten]
         end
-        
+
         # Returns an array of the relationships in order of being added.
         #
         # @return [Array]
@@ -125,19 +125,19 @@ module VirtualBox
         def has_relationship?(name)
           !!relationships.detect { |r| r[0] == name }
         end
-        
+
         # Used to propagate relationships to subclasses. This method makes sure that
         # subclasses of a class with {Relatable} included will inherit the
         # relationships as well, which would be the expected behaviour.
         def inherited(subclass)
           super rescue NoMethodError
-          
+
           relationships.each do |name, options|
             subclass.relationship(name, nil, options)
           end
         end
       end
-      
+
       # Saves the model, calls save_relationship on all relations. It is up to
       # the relation to determine whether anything changed, etc. Simply
       # calls `save_relationship` on each relationshp class passing in the
@@ -154,7 +154,7 @@ module VirtualBox
           options[:klass].save_relationship(self, relationship_data[name], *args)
         end
       end
-      
+
       # The equivalent to {Attributable#populate_attributes}, but with
       # relationships.
       def populate_relationships(data)
@@ -163,7 +163,7 @@ module VirtualBox
           relationship_data[name] = options[:klass].populate_relationship(self, data)
         end
       end
-      
+
       # Calls `destroy_relationship` on each of the relationships. Any
       # arbitrary args may be added and they will be forarded to the
       # relationship's `destroy_relationship` method.
@@ -172,7 +172,7 @@ module VirtualBox
           destroy_relationship(name, *args)
         end
       end
-      
+
       # Destroys only a single relationship. Any arbitrary args
       # may be added to the end and they will be pushed through to
       # the class's `destroy_relationship` method.
@@ -183,7 +183,7 @@ module VirtualBox
         return unless options && options[:klass].respond_to?(:destroy_relationship)
         options[:klass].destroy_relationship(self, relationship_data[name], *args)
       end
-      
+
       # Hash to data associated with relationships. You should instead
       # use the accessors created by Relatable.
       #
@@ -191,18 +191,18 @@ module VirtualBox
       def relationship_data
         @relationship_data ||= {}
       end
-      
+
       # Returns boolean denoting if a relationship exists.
       #
       # @return [Boolean]
       def has_relationship?(key)
         self.class.has_relationship?(key.to_sym)
       end
-      
+
       # Sets a relationship to the given value. This is not guaranteed to
       # do anything, since "set_relationship" will be called on the class
       # that the relationship is associated with and its expected to return
-      # the resulting relationship to set. 
+      # the resulting relationship to set.
       #
       # If the relationship class doesn't respond to the set_relationship
       # method, then an exception {Exceptions::NonSettableRelationshipException} will
@@ -216,7 +216,7 @@ module VirtualBox
         key = key.to_sym
         relationship = self.class.relationships_hash[key]
         return unless relationship
-        
+
         raise Exceptions::NonSettableRelationshipException.new unless relationship[:klass].respond_to?(:set_relationship)
         relationship_data[key] = relationship[:klass].set_relationship(self, relationship_data[key], value)
       end

data/lib/virtualbox/abstract_model/validatable.rb

@@ -6,12 +6,12 @@ module VirtualBox
       def errors
         @errors ||= {}
       end
-      
+
       def add_error(field, error)
         errors[field] ||= []
         errors[field].push(error)
       end
-      
+
       def clear_errors
         @errors = {}
       end
@@ -20,12 +20,12 @@ module VirtualBox
         validate
         errors.empty?
       end
-      
+
       # Subclasses should override this method.
       def validate
         true
       end
-      
+
       def validates_presence_of(field)
         if field.is_a?(Array)
           field.map { |v| validates_presence_of(v) }.all? { |v| v == true }

data/lib/virtualbox/attached_device.rb

@@ -13,7 +13,7 @@ module VirtualBox
   #     storage_controller.devices << ad
   #     ad.save
   #
-  # The only quirk is that the attached device **must** be attached to a 
+  # The only quirk is that the attached device **must** be attached to a
   # storage controller. The above assumes that `storage_controller` exists,
   # which adds the device.
   #
@@ -25,7 +25,7 @@ module VirtualBox
   #     ad = VirtualBox::AttachedDevice.new
   #     ad.port = 0
   #     ad.image = VirtualBox::DVD.empty_drive
-  #     
+  #
   #     # Now attaching to existing VM
   #     vm = VirtualBox::VM.find("FooVM")
   #     vm.storage_controllers[0].devices << ad
@@ -40,7 +40,7 @@ module VirtualBox
   #
   # Properties of the model are exposed using standard ruby instance
   # methods which are generated on the fly. Because of this, they are not listed
-  # below as available instance methods. 
+  # below as available instance methods.
   #
   # These attributes can be accessed and modified via standard ruby-style
   # `instance.attribute` and `instance.attribute=` methods. The attributes are
@@ -73,7 +73,7 @@ module VirtualBox
     attribute :uuid, :readonly => true
     attribute :port
     relationship :image, Image
-    
+
     class <<self
       # Populate relationship with another model.
       #
@@ -82,7 +82,7 @@ module VirtualBox
       # @return [Array<AttachedDevice>]
       def populate_relationship(caller, data)
         relation = Proxies::Collection.new(caller)
-        
+
         counter = 0
         loop do
           break unless data["#{caller.name}-#{counter}-0".downcase.to_sym]
@@ -90,17 +90,17 @@ module VirtualBox
           relation.push(nic)
           counter += 1
         end
-        
+
         relation
       end
-      
+
       # Destroy attached devices associated with another model.
       #
       # **This method typically won't be used except internally.**
       def destroy_relationship(caller, data, *args)
         data.each { |v| v.destroy(*args) }
       end
-      
+
       # Saves the relationship. This simply calls {#save} on every
       # member of the relationship.
       #
@@ -112,7 +112,7 @@ module VirtualBox
         end
       end
     end
-    
+
     # @overload initialize(data={})
     #   Creates a new AttachedDevice which is a new record. This
     #   should be attached to a storage controller and saved.
@@ -127,7 +127,7 @@ module VirtualBox
     #     to extract the relationship data.
     def initialize(*args)
       super()
-      
+
       if args.length == 3
         populate_from_data(*args)
       elsif args.length == 1
@@ -139,29 +139,29 @@ module VirtualBox
         raise NoMethodError.new
       end
     end
-    
+
     # Validates an attached device.
     def validate
       super
-      
+
       validates_presence_of :parent
       validates_presence_of :image
       validates_presence_of :port
     end
-    
+
     # Saves or creates an attached device.
     #
     # @param [Boolean] raise_errors If true, {Exceptions::CommandFailedException}
     #   will be raised if the command failed.
     # @return [Boolean] True if command was successful, false otherwise.
-    def save(raise_errors=false)      
+    def save(raise_errors=false)
       return true unless changed?
-      
+
       if !valid?
         raise Exceptions::ValidationFailedException.new(errors) if raise_errors
         return false
       end
-      
+
       # If the port changed, we have to destroy the old one, then create
       # a new one
       destroy({:port => port_was}, raise_errors) if port_changed? && !port_was.nil?
@@ -169,13 +169,13 @@ module VirtualBox
       Command.vboxmanage("storageattach #{Command.shell_escape(parent.parent.name)} --storagectl #{Command.shell_escape(parent.name)} --port #{port} --device 0 --type #{image.image_type} --medium #{medium}")
       existing_record!
       clear_dirty!
-      
+
       true
     rescue Exceptions::CommandFailedException
       raise if raise_errors
       false
     end
-    
+
     # Medium of the attached image. This attribute will be dependent
     # on the attached image and will return one of the following values:
     #
@@ -194,7 +194,7 @@ module VirtualBox
         image.uuid
       end
     end
-    
+
     # Destroys the attached device. By default, this only removes any
     # media inserted within the device, but does not destroy it. This
     # option can be specified, however, through the `destroy_image`
@@ -209,21 +209,21 @@ module VirtualBox
       # parent = storagecontroller
       # parent.parent = vm
       destroy_port = options[:port] || port
-      Command.vboxmanage("storageattach #{Command.shell_escape(parent.parent.name)} --storagectl #{Command.shell_escape(parent.name)} --port #{destroy_port} --device 0 --medium none")      
+      Command.vboxmanage("storageattach #{Command.shell_escape(parent.parent.name)} --storagectl #{Command.shell_escape(parent.name)} --port #{destroy_port} --device 0 --medium none")
       image.destroy(raise_errors) if options[:destroy_image] && image
     rescue Exceptions::CommandFailedException
       raise if raise_errors
       false
     end
-    
+
     # Relationship callback when added to a collection. This is automatically
     # called by any relationship collection when this object is added.
     def added_to_relationship(parent)
       write_attribute(:parent, parent)
     end
-    
+
     protected
-    
+
     # Populates the model based on data from a parsed vminfo. This
     # method is used to create a model which already exists and is
     # part of a relationship.

data/lib/virtualbox/command.rb

@@ -12,7 +12,7 @@ module VirtualBox
   #
   class Command
     @@vboxmanage = "VBoxManage"
-    
+
     class <<self
       # Returns true if the last run command was a success. Obviously this
       # will introduce all sorts of thread-safe problems. Those will have to
@@ -20,36 +20,36 @@ module VirtualBox
       def success?
         $?.to_i == 0
       end
-      
+
       # Sets the path to VBoxManage, which is required for this gem to
       # work.
       def vboxmanage=(path)
         @@vboxmanage = path
       end
-      
+
       # Runs a VBoxManage command and returns the output.
       def vboxmanage(command)
-        result = execute("#{@@vboxmanage} #{command}")
+        result = execute("#{@@vboxmanage} -q #{command}")
         raise Exceptions::CommandFailedException.new(result) if !Command.success?
         result
       end
-      
+
       # Runs a command and returns a boolean result showing
-      # if the command ran successfully or not based on the 
+      # if the command ran successfully or not based on the
       # exit code.
       def test(command)
         execute(command)
         success?
       end
-    
+
       # Runs a command and returns the STDOUT result. The reason this is
-      # a method at the moment is because in the future we may want to 
+      # a method at the moment is because in the future we may want to
       # change the way commands are run (replace the backticks), plus it
       # makes testing easier.
       def execute(command)
         `#{command}`
       end
-      
+
       # Shell escapes a string. This is almost a direct copy/paste from
       # the ruby mailing list. I'm not sure how well it works but so far
       # it hasn't failed!