SSH connect is now SSH `exec`

This commit is contained in:
Mitchell Hashimoto 2012-01-06 18:01:41 -08:00
parent 19c1340e40
commit faaa763d50
2 changed files with 9 additions and 10 deletions

View File

@ -68,7 +68,7 @@ module Vagrant
def ssh_connect(vm, opts) def ssh_connect(vm, opts)
@logger.debug("`exec` into ssh prompt") @logger.debug("`exec` into ssh prompt")
vm.ssh.connect(opts) vm.ssh.exec(opts)
end end
end end
end end

View File

@ -5,9 +5,8 @@ require 'vagrant/util/platform'
require 'vagrant/util/safe_exec' require 'vagrant/util/safe_exec'
module Vagrant module Vagrant
# Manages SSH access to a specific environment. Allows an environment to # Manages SSH connection information as well as allows opening an
# replace the process with SSH itself, run a specific set of commands, # SSH connection.
# upload files, or even check if a host is up.
class SSH class SSH
include Util::SafeExec include Util::SafeExec
@ -47,12 +46,12 @@ module Vagrant
end end
# Connects to the environment's virtual machine, replacing the ruby # Connects to the environment's virtual machine, replacing the ruby
# process with an SSH process. This method optionally takes a hash # process with an SSH process.
# of options which override the configuration values. #
# One specific option, :port_only, if set to true, will cause this method # @param [Hash] opts Options hash
# to skip filling in some default values, such as private_key_path and # @options opts [Boolean] :plain_mode If True, doesn't authenticate with
# username. # the machine, only connects, allowing the user to connect.
def connect(opts={}) def exec(opts={})
# Get the SSH information and cache it here # Get the SSH information and cache it here
ssh_info = info ssh_info = info