kotovalexarian-likes-github/capistrano
1
0
Fork 0
mirror of https://github.com/capistrano/capistrano synced 2023-03-27 23:21:18 -04:00
Code Releases Activity

If you set an level of verboseness on cap, Net::SSH will set verboseness to debug.

Browse source
This commit is contained in:
Mike Gehard 2011-02-27 16:54:05 -07:00
parent fec72c8aa3
commit 97e4328d5b
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/capistrano/ssh.rb
View file

@ -69,6 +69,8 @@ module Capistrano
# Once we've loaded the config, we don't need Net::SSH to do it again. # Once we've loaded the config, we don't need Net::SSH to do it again.
ssh_options[:config] = false ssh_options[:config] = false
ssh_options[:verbose] = :debug if options[:verbose] && options[:verbose] > 0
user = server.user || options[:user] || ssh_options[:username] || user = server.user || options[:user] || ssh_options[:username] ||
ssh_options[:user] || ServerDefinition.default_user ssh_options[:user] || ServerDefinition.default_user
port = server.port || options[:port] || ssh_options[:port] port = server.port || options[:port] || ssh_options[:port]

9
test/ssh_test.rb
View file

@ -82,6 +82,15 @@ class SSHTest < Test::Unit::TestCase
assert_equal success, Capistrano::SSH.connect(@server, :ssh_options => ssh_options, :user => "jamis", :port => 1235) assert_equal success, Capistrano::SSH.connect(@server, :ssh_options => ssh_options, :user => "jamis", :port => 1235)
end end
def test_connect_with_verbose_option_should_set_verbose_option_on_ssh
Net::SSH.expects(:start).with(@server.host, "default-user", @options).returns(success = Object.new)
assert_equal success, Capistrano::SSH.connect(@server, :verbose => 0)
Net::SSH.expects(:start).with(@server.host, "default-user", @options.merge(:verbose => :debug)).returns(success = Object.new)
assert_equal success, Capistrano::SSH.connect(@server, :verbose => 1)
Net::SSH.expects(:start).with(@server.host, "default-user", @options.merge(:verbose => :debug)).returns(success = Object.new)
assert_equal success, Capistrano::SSH.connect(@server, :verbose => 2)
end
def test_connect_with_ssh_options_should_see_server_options_override_ssh_options def test_connect_with_ssh_options_should_see_server_options_override_ssh_options
ssh_options = { :username => "JamisMan", :port => 8125, :forward_agent => true } ssh_options = { :username => "JamisMan", :port => 8125, :forward_agent => true }
server = server("jamis@capistrano:1235") server = server("jamis@capistrano:1235")