@@ -1,5 +1,7 @@ *unreleased* +* Let Net::SSH manage the default SSH port selection [Ben Lavender] + * Changed capture() helper to not raise an exception on error, but to warn instead [Jeff Forcier] CHANGELOG @@ -23,9 +23,6 @@ module Capistrano attr_accessor :xserver end - # The default port for SSH. - DEFAULT_PORT = 22 - # An abstraction to make it possible to connect to the server via public key # without prompting for the password. If the public key authentication fails # this will fall back to password authentication. @@ -58,10 +55,11 @@ module Capistrano methods = [ %w(publickey hostbased), %w(password keyboard-interactive) ] password_value = nil - ssh_options = (server.options[:ssh_options] || {}).merge(options[:ssh_options] || {}) - user = server.user || options[:user] || ssh_options[:username] || ServerDefinition.default_user - ssh_options[:port] = server.port || options[:port] || ssh_options[:port] || DEFAULT_PORT + ssh_options = (server.options[:ssh_options] || {}).merge(options[:ssh_options] || {}) + user = server.user || options[:user] || ssh_options[:username] || ServerDefinition.default_user + port = server.port || options[:port] || ssh_options[:port] + ssh_options[:port] = port if port ssh_options.delete(:username) begin lib/capistrano/ssh.rb @@ -60,7 +60,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase def test_connection_factory_should_return_gateway_instance_if_gateway_variable_is_set @config.values[:gateway] = "j@capistrano" - Net::SSH::Gateway.expects(:new).with("capistrano", "j", :port => 22, :password => nil, :auth_methods => %w(publickey hostbased)).returns(stub_everything) + Net::SSH::Gateway.expects(:new).with("capistrano", "j", :password => nil, :auth_methods => %w(publickey hostbased)).returns(stub_everything) assert_instance_of Capistrano::Configuration::Connections::GatewayConnectionFactory, @config.connection_factory end @@ -324,4 +324,4 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase :max_hosts => options[:max_hosts] ) end -end \ No newline at end of file +end test/configuration/connections_test.rb @@ -5,7 +5,6 @@ class SSHTest < Test::Unit::TestCase def setup Capistrano::ServerDefinition.stubs(:default_user).returns("default-user") @options = { :password => nil, - :port => 22, :auth_methods => %w(publickey hostbased) } @server = server("capistrano") end test/ssh_test.rb a6223b3939f0ef91c928f94502c806a68a011e74 Ben Lavender ben@ben.local http://github.com/jamis/capistrano/commit/babc48a04c799d21145f843080c57b91119fbae9 babc48a04c799d21145f843080c57b91119fbae9 2008-06-23T08:28:27-07:00 2008-06-18T07:19:52-07:00 Remove explicit SSH Port 22 to allow ssh configuration files to overwrite it. ffd3e82005f23960218bb6174421624aa6e76fb4 Jamis Buck jamis@37signals.com