Cache SSH connections to VMs.

CHANGELOG.md

@@ -19,6 +19,8 @@
   - Provisioner configuration is no longer cleared when the box
     needs to be downloaded during an `up`. [GH-308]
   - Multiple Chef provisioners no longer overwrite cookbook folders. [GH-407]
+  - SSH connection is now cached after first access internally,
+    speeding up `vagrant up`, `reload`, etc. quite a bit.
 
 ## 0.7.6 (July 2, 2011)
 

lib/vagrant/ssh.rb

@@ -18,6 +18,7 @@ module Vagrant
 
     def initialize(environment)
       @env = environment
+      @current_session = nil
     end
 
     # Connects to the environment's virtual machine, replacing the ruby
@@ -71,17 +72,28 @@ module Vagrant
       opts[:forward_agent] = true if env.config.ssh.forward_agent
       opts[:port] ||= port
 
-      retryable(:tries => 5, :on => Errno::ECONNREFUSED) do
+      # Check if we have a currently open SSH session which has the
-        Net::SSH.start(env.config.ssh.host,
+      # same options, and use that if possible
-                       env.config.ssh.username,
+      session, options = @current_session
-                       opts.merge( :keys => [env.config.ssh.private_key_path],
+
-                                   :keys_only => true,
+      if !session || options != opts
-                                   :user_known_hosts_file => [],
+        session = retryable(:tries => 5, :on => Errno::ECONNREFUSED) do
-                                   :paranoid => false,
+          connection = Net::SSH.start(env.config.ssh.host,
-                                   :config => false)) do |ssh|
+                         env.config.ssh.username,
-          yield SSH::Session.new(ssh, env)
+                         opts.merge( :keys => [env.config.ssh.private_key_path],
+                                     :keys_only => true,
+                                     :user_known_hosts_file => [],
+                                     :paranoid => false,
+                                     :config => false))
+          SSH::Session.new(connection, env)
         end
+
+        # Save the new session along with the options which created it
+        @current_session = [session, opts]
       end
+
+      # Yield our session for executing
+      return yield session if block_given?
     rescue Errno::ECONNREFUSED
       raise Errors::SSHConnectionRefused
     end
@@ -156,7 +168,7 @@ module Vagrant
 
       # Check if a port was specified in the config
       return env.config.ssh.port if env.config.ssh.port
-      
+
       # Check if we have an SSH forwarded port
       pnum = nil
       env.vm.vm.network_adapters.each do |na|

test/vagrant/ssh_test.rb

@@ -171,7 +171,7 @@ class SshTest < Test::Unit::TestCase
 
     should "yield an SSH session object" do
       raw = mock("raw")
-      Net::SSH.expects(:start).yields(raw)
+      Net::SSH.expects(:start).returns(raw)
       @ssh.execute do |ssh|
         assert ssh.is_a?(Vagrant::SSH::Session)
         assert_equal raw, ssh.session