non-nil user overrides user in .ssh/config

This allows you to fall-back to the .ssh/config by specifying
nil for user, but force a different user by giving a non-nil
value.

2 files changed, 4 insertions, 1 deletions

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 9f208dd..02ee108 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,5 +1,7 @@
 === unreleased
 
+* Specifying non-nil user argument overrides user in .ssh/config [Jamis Buck]
+
 * Ignore requests for non-existent channels (workaround ssh server bug) [Jamis Buck]
 
 * Add terminate! method for hard shutdown scenarios [Jamis Buck]
diff --git a/lib/net/ssh.rb b/lib/net/ssh.rb
index 00a878e..a752392 100644
--- a/lib/net/ssh.rb
+++ b/lib/net/ssh.rb
@@ -159,6 +159,7 @@ module Net
         else Array(options[:config])
         end
       
+      options[:user] = user if user
       options = Net::SSH::Config.for(host, files).merge(options)
       host = options.fetch(:host_name, host)
 
@@ -196,4 +197,4 @@ module Net
       end
     end
   end
-end
\ No newline at end of file
+end