capistrano 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+*1.3.1* (January 5, 2007)
+
+* Fix connection problems when using gateways [Ezra Zygmuntowicz]
+
 *1.3.0* (December 23, 2006)
 
 * Deprecate rake integration in favor of invoking `cap' directly [Jamis Buck]

data/lib/capistrano/ssh.rb

@@ -21,16 +21,14 @@ module Capistrano
     def self.connect(server, config, port=22, &block)
       methods = [ %w(publickey hostbased), %w(password keyboard-interactive) ]
       password_value = nil
+      
+      user, server_stripped, pport = parse_server(server)       
 
       begin
-        ssh_options = { :username => config.user,
+        ssh_options = { :username => (user || config.user),
                         :password => password_value,
-                        :port => port,
+                        :port => ((pport && pport != port) ? pport : port),
                         :auth_methods => methods.shift }.merge(config.ssh_options)
-                        
-        user, server_stripped, port = parse_server(server)         
-        ssh_options[:username] = user if user   
-        ssh_options[:port] = port if port
         
         Net::SSH.start(server_stripped,ssh_options,&block)
       rescue Net::SSH::AuthenticationFailed
@@ -40,7 +38,7 @@ module Capistrano
       end
     end
     
-    # This regex is used for its byproducts, the $1-9 match vars.
+    # This regex is used for its byproducts, the $1-3 match vars.
     # This regex will always match the ssh hostname and if there 
     # is a username or port they will be matched as well. This 
     # allows us to set the username and ssh port right in the 

data/lib/capistrano/version.rb

@@ -20,7 +20,7 @@ module Capistrano
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join(".")
     

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: capistrano
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
-date: 2006-12-23 00:00:00 -07:00
+  version: 1.3.1
+date: 2007-01-05 00:00:00 -07:00
 summary: Capistrano is a framework and utility for executing commands in parallel on multiple remote machines, via SSH. The primary goal is to simplify and automate the deployment of web applications.
 require_paths: 
 - lib