vagrantup 1.0.7 → 1.1.0

data/lib/vagrant/driver/virtualbox_base.rb

@@ -1,326 +0,0 @@
-require 'log4r'
-
-require 'vagrant/util/busy'
-require 'vagrant/util/platform'
-require 'vagrant/util/retryable'
-require 'vagrant/util/subprocess'
-
-module Vagrant
-  module Driver
-    # Base class for all VirtualBox drivers.
-    #
-    # This class provides useful tools for things such as executing
-    # VBoxManage and handling SIGINTs and so on.
-    class VirtualBoxBase
-      # Include this so we can use `Subprocess` more easily.
-      include Vagrant::Util
-      include Vagrant::Util::Retryable
-
-      def initialize
-        @logger = Log4r::Logger.new("vagrant::driver::virtualbox_base")
-
-        # This flag is used to keep track of interrupted state (SIGINT)
-        @interrupted = false
-
-        # Set the path to VBoxManage
-        @vboxmanage_path = "VBoxManage"
-
-        if Util::Platform.windows?
-          @logger.debug("Windows. Trying VBOX_INSTALL_PATH for VBoxManage")
-
-          # On Windows, we use the VBOX_INSTALL_PATH environmental
-          # variable to find VBoxManage.
-          if ENV.has_key?("VBOX_INSTALL_PATH")
-            # The path usually ends with a \ but we make sure here
-            path = ENV["VBOX_INSTALL_PATH"]
-            path += "\\" if !path.end_with?("\\")
-            @vboxmanage_path = "#{path}VBoxManage.exe"
-          end
-        end
-
-        @logger.info("VBoxManage path: #{@vboxmanage_path}")
-      end
-
-      # Clears the forwarded ports that have been set on the virtual machine.
-      def clear_forwarded_ports
-      end
-
-      # Clears the shared folders that have been set on the virtual machine.
-      def clear_shared_folders
-      end
-
-      # Creates a DHCP server for a host only network.
-      #
-      # @param [String] network Name of the host-only network.
-      # @param [Hash] options Options for the DHCP server.
-      def create_dhcp_server(network, options)
-      end
-
-      # Creates a host only network with the given options.
-      #
-      # @param [Hash] options Options to create the host only network.
-      # @return [Hash] The details of the host only network, including
-      #   keys `:name`, `:ip`, and `:netmask`
-      def create_host_only_network(options)
-      end
-
-      # Deletes the virtual machine references by this driver.
-      def delete
-      end
-
-      # Deletes any host only networks that aren't being used for anything.
-      def delete_unused_host_only_networks
-      end
-
-      # Discards any saved state associated with this VM.
-      def discard_saved_state
-      end
-
-      # Enables network adapters on the VM.
-      #
-      # The format of each adapter specification should be like so:
-      #
-      # {
-      #   :type     => :hostonly,
-      #   :hostonly => "vboxnet0",
-      #   :mac_address => "tubes"
-      # }
-      #
-      # This must support setting up both host only and bridged networks.
-      #
-      # @param [Array<Hash>] adapters Array of adapters to enable.
-      def enable_adapters(adapters)
-      end
-
-      # Execute a raw command straight through to VBoxManage.
-      #
-      # @param [Array] command Command to execute.
-      def execute_command(command)
-      end
-
-      # Exports the virtual machine to the given path.
-      #
-      # @param [String] path Path to the OVF file.
-      # @yield [progress] Yields the block with the progress of the export.
-      def export(path)
-      end
-
-      # Forwards a set of ports for a VM.
-      #
-      # This will not affect any previously set forwarded ports,
-      # so be sure to delete those if you need to.
-      #
-      # The format of each port hash should be the following:
-      #
-      #     {
-      #       :name => "foo",
-      #       :hostport => 8500,
-      #       :guestport => 80,
-      #       :adapter => 1,
-      #       :protocol => "tcp"
-      #     }
-      #
-      # Note that "adapter" and "protocol" are optional and will default
-      # to 1 and "tcp" respectively.
-      #
-      # @param [Array<Hash>] ports An array of ports to set. See documentation
-      #   for more information on the format.
-      def forward_ports(ports)
-      end
-
-      # Halts the virtual machine (pulls the plug).
-      def halt
-      end
-
-      # Imports the VM from an OVF file.
-      #
-      # @param [String] ovf Path to the OVF file.
-      # @return [String] UUID of the imported VM.
-      def import(ovf)
-      end
-
-      # Returns a list of forwarded ports for a VM.
-      #
-      # @param [String] uuid UUID of the VM to read from, or `nil` if this
-      #   VM.
-      # @param [Boolean] active_only If true, only VMs that are running will
-      #   be checked.
-      # @return [Array<Array>]
-      def read_forwarded_ports(uuid=nil, active_only=false)
-      end
-
-      # Returns a list of bridged interfaces.
-      #
-      # @return [Hash]
-      def read_bridged_interfaces
-      end
-
-      # Returns the guest additions version that is installed on this VM.
-      #
-      # @return [String]
-      def read_guest_additions_version
-      end
-
-      # Returns a list of available host only interfaces.
-      #
-      # @return [Hash]
-      def read_host_only_interfaces
-      end
-
-      # Returns the MAC address of the first network interface.
-      #
-      # @return [String]
-      def read_mac_address
-      end
-
-      # Returns the folder where VirtualBox places it's VMs.
-      #
-      # @return [String]
-      def read_machine_folder
-      end
-
-      # Returns a list of network interfaces of the VM.
-      #
-      # @return [Hash]
-      def read_network_interfaces
-      end
-
-      # Returns the current state of this VM.
-      #
-      # @return [Symbol]
-      def read_state
-      end
-
-      # Returns a list of all forwarded ports in use by active
-      # virtual machines.
-      #
-      # @return [Array]
-      def read_used_ports
-      end
-
-      # Returns a list of all UUIDs of virtual machines currently
-      # known by VirtualBox.
-      #
-      # @return [Array<String>]
-      def read_vms
-      end
-
-      # Sets the MAC address of the first network adapter.
-      #
-      # @param [String] mac MAC address without any spaces/hyphens.
-      def set_mac_address(mac)
-      end
-
-      # Share a set of folders on this VM.
-      #
-      # @param [Array<Hash>] folders
-      def share_folders(folders)
-      end
-
-      # Reads the SSH port of this VM.
-      #
-      # @param [Integer] expected Expected guest port of SSH.
-      def ssh_port(expected)
-      end
-
-      # Starts the virtual machine.
-      #
-      # @param [String] mode Mode to boot the VM. Either "headless"
-      #   or "gui"
-      def start(mode)
-      end
-
-      # Suspend the virtual machine.
-      def suspend
-      end
-
-      # Verifies that the driver is ready to accept work.
-      #
-      # This should raise a VagrantError if things are not ready.
-      def verify!
-      end
-
-      # Verifies that an image can be imported properly.
-      #
-      # @param [String] path Path to an OVF file.
-      # @return [Boolean]
-      def verify_image(path)
-      end
-
-      # Checks if a VM with the given UUID exists.
-      #
-      # @return [Boolean]
-      def vm_exists?(uuid)
-      end
-
-      # Execute the given subcommand for VBoxManage and return the output.
-      def execute(*command, &block)
-        # Get the options hash if it exists
-        opts = {}
-        opts = command.pop if command.last.is_a?(Hash)
-
-        tries = 0
-        tries = 3 if opts[:retryable]
-
-        # Variable to store our execution result
-        r = nil
-
-        retryable(:on => Errors::VBoxManageError, :tries => tries, :sleep => 1) do
-          # Execute the command
-          r = raw(*command, &block)
-
-          # If the command was a failure, then raise an exception that is
-          # nicely handled by Vagrant.
-          if r.exit_code != 0
-            if @interrupted
-              @logger.info("Exit code != 0, but interrupted. Ignoring.")
-            else
-              raise Errors::VBoxManageError, :command => command.inspect
-            end
-          else
-            # Sometimes, VBoxManage fails but doesn't actual return a non-zero
-            # exit code. For this we inspect the output and determine if an error
-            # occurred.
-            if r.stderr =~ /VBoxManage: error:/
-              @logger.info("VBoxManage error text found, assuming error.")
-              raise Errors::VBoxManageError, :command => command.inspect
-            end
-          end
-        end
-
-        # Return the output, making sure to replace any Windows-style
-        # newlines with Unix-style.
-        r.stdout.gsub("\r\n", "\n")
-      end
-
-      # Executes a command and returns the raw result object.
-      def raw(*command, &block)
-        int_callback = lambda do
-          @interrupted = true
-          @logger.info("Interrupted.")
-        end
-
-        # The following is a workaround for a combined VirtualBox and
-        # Mac OS X 10.8 bug:
-        #
-        # Remove the DYLD_LIBRARY_PATH environmental variable on Mac. This
-        # is to fix a bug in Mac OS X 10.8 where a warning is printed to the
-        # console if this is set when executing certain programs, which
-        # can cause some VBoxManage commands to break because they work
-        # by just reading stdout and don't expect the OS to just inject
-        # garbage into it.
-        old_dyld_lib_path = ENV.delete("DYLD_LIBRARY_PATH")
-        old_ld_lib_path   = ENV.delete("LD_LIBRARY_PATH")
-
-        Util::Busy.busy(int_callback) do
-          Subprocess.execute(@vboxmanage_path, *command, &block)
-        end
-      ensure
-        # Reset the library path if it was set before. See above comments
-        # for more information on why this was unset in the first place.
-        ENV["DYLD_LIBRARY_PATH"] = old_dyld_lib_path if old_dyld_lib_path
-        ENV["LD_LIBRARY_PATH"]   = old_ld_lib_path if old_ld_lib_path
-      end
-    end
-  end
-end

data/lib/vagrant/guest.rb

@@ -1,18 +0,0 @@
-module Vagrant
-  module Guest
-    autoload :Base, 'vagrant/guest/base'
-
-    # Specific guests
-    autoload :Arch,    'vagrant/guest/arch'
-    autoload :Debian,  'vagrant/guest/debian'
-    autoload :Fedora,  'vagrant/guest/fedora'
-    autoload :FreeBSD, 'vagrant/guest/freebsd'
-    autoload :Gentoo,  'vagrant/guest/gentoo'
-    autoload :Linux,   'vagrant/guest/linux'
-    autoload :OpenBSD, 'vagrant/guest/openbsd'
-    autoload :Redhat,  'vagrant/guest/redhat'
-    autoload :Solaris, 'vagrant/guest/solaris'
-    autoload :Suse,    'vagrant/guest/suse'
-    autoload :Ubuntu,  'vagrant/guest/ubuntu'
-  end
-end

data/lib/vagrant/guest/arch.rb

@@ -1,56 +0,0 @@
-require 'set'
-require 'tempfile'
-
-require 'vagrant/util/template_renderer'
-
-module Vagrant
-  module Guest
-    class Arch < Linux
-      # Make the TemplateRenderer top-level
-      include Vagrant::Util
-
-      def change_host_name(name)
-        # Only do this if the hostname is not already set
-        if !vm.channel.test("sudo hostname | grep '#{name}'")
-          vm.channel.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/rc.conf")
-          vm.channel.sudo("hostname #{name}")
-          vm.channel.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} @' /etc/hosts")
-        end
-      end
-
-      def configure_networks(networks)
-        # Remove previous Vagrant-managed network interfaces
-        vm.channel.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/rc.conf > /tmp/vagrant-network-interfaces")
-        vm.channel.sudo("cat /tmp/vagrant-network-interfaces > /etc/rc.conf")
-
-        # Configure the network interfaces
-        interfaces = Set.new
-        entries = []
-        networks.each do |network|
-          interfaces.add(network[:interface])
-          entry = TemplateRenderer.render("guests/arch/network_#{network[:type]}",
-                                          :options => network)
-
-          entries << entry
-        end
-
-        # Perform the careful dance necessary to reconfigure
-        # the network interfaces
-        temp = Tempfile.new("vagrant")
-        temp.binmode
-        temp.write(entries.join("\n"))
-        temp.close
-
-        vm.channel.upload(temp.path, "/tmp/vagrant-network-entry")
-
-        # Reconfigure the network interfaces
-        vm.channel.sudo("cat /tmp/vagrant-network-entry >> /etc/rc.conf")
-        vm.channel.sudo("/etc/rc.d/network restart")
-
-        interfaces.each do |interface|
-          vm.channel.sudo("dhcpcd -k eth#{interface} && dhcpcd eth#{interface} && sleep 3")
-        end
-      end
-    end
-  end
-end

data/lib/vagrant/guest/base.rb

@@ -1,99 +0,0 @@
-module Vagrant
-  module Guest
-    # The base class for a "system." A system represents an installed
-    # operating system on a given box. There are some portions of
-    # Vagrant which are fairly OS-specific (such as mounting shared
-    # folders) and while the number is few, this abstraction allows
-    # more obscure operating systems to be installed without having
-    # to directly modify Vagrant internals.
-    #
-    # Subclasses of the system base class are expected to implement
-    # all the methods. These methods are described in the comments
-    # above their definition.
-    #
-    # **This is by no means a complete specification. The methods
-    # required by systems can and will change at any time. Any
-    # changes will be noted on release notes.**
-    class Base
-      class BaseError < Errors::VagrantError
-        error_namespace("vagrant.guest.base")
-      end
-
-      include Vagrant::Util
-
-      # The VM which this system is tied to.
-      attr_reader :vm
-
-      # Initializes the system. Any subclasses MUST make sure this
-      # method is called on the parent. Therefore, if a subclass overrides
-      # `initialize`, then you must call `super`.
-      def initialize(vm)
-        @vm = vm
-      end
-
-      # This method is automatically called when the system is available (when
-      # Vagrant can successfully SSH into the machine) to give the system a chance
-      # to determine the distro and return a distro-specific system.
-      #
-      # **Warning:** If a return value which subclasses from {Base} is
-      # returned, Vagrant will use it as the new system instance for the
-      # class.
-      def distro_dispatch; end
-
-      # Halt the machine. This method should gracefully shut down the
-      # operating system. This method will cause `vagrant halt` and associated
-      # commands to _block_, meaning that if the machine doesn't halt
-      # in a reasonable amount of time, this method should just return.
-      #
-      # If when this method returns, the machine's state isn't "powered_off,"
-      # Vagrant will proceed to forcefully shut the machine down.
-      def halt
-        raise BaseError, :_key => :unsupported_halt
-      end
-
-      # Mounts a shared folder.
-      #
-      # This method should create, mount, and properly set permissions
-      # on the shared folder. This method should also properly
-      # adhere to any configuration values such as `shared_folder_uid`
-      # on `config.vm`.
-      #
-      # @param [String] name The name of the shared folder.
-      # @param [String] guestpath The path on the machine which the user
-      #   wants the folder mounted.
-      # @param [Hash] options Additional options for the shared folder
-      #   which can be honored.
-      def mount_shared_folder(name, guestpath, options)
-        raise BaseError, :_key => :unsupported_shared_folder
-      end
-
-      # Mounts a shared folder via NFS. This assumes that the exports
-      # via the host are already done.
-      def mount_nfs(ip, folders)
-        raise BaseError, :_key => :unsupported_nfs
-      end
-
-      # Configures the given list of networks on the virtual machine.
-      #
-      # The networks parameter will be an array of hashes where the hashes
-      # represent the configuration of a network interface. The structure
-      # of the hash will be roughly the following:
-      #
-      # {
-      #   :type      => :static,
-      #   :ip        => "192.168.33.10",
-      #   :netmask   => "255.255.255.0",
-      #   :interface => 1
-      # }
-      #
-      def configure_networks(networks)
-        raise BaseError, :_key => :unsupported_configure_networks
-      end
-
-      # Called to change the hostname of the virtual machine.
-      def change_host_name(name)
-        raise BaseError, :_key => :unsupported_host_name
-      end
-    end
-  end
-end