Adding ssh user support

Author: adamhjk

chef/lib/chef/knife/ssh.rb

@@ -44,11 +44,15 @@ class Ssh < Knife
         :description => "QUERY is a space separated list of servers",
         :default => false
 
+      option :ssh_user,
+        :short => "-x USERNAME",
+        :long => "--ssh-user USERNAME",
+        :description => "The ssh username"
+
       def session
         @session ||= Net::SSH::Multi.start(:concurrent_connections => config[:concurrency])
       end
 
-
       def h
         @highline ||= HighLine.new
       end
@@ -71,7 +75,7 @@ def configure_session
       def session_from_list(list)
         list.each do |item|
           Chef::Log.debug("Adding #{item}")
-          session.use item 
+          session.use config[:ssh_user] ? "#{config[:ssh_user]}@#{item}" : item
           @longest = item.length if item.length > @longest
         end
         session
@@ -173,8 +177,9 @@ def screen
         tf.puts("caption always '%w'")
         tf.puts("hardstatus alwayslastline 'knife ssh #{@name_args[0]}'")
         window = 0
-        session.servers_for.collect { |s| s.host }.each do |server|
-          tf.puts("screen -t \"#{server}\" #{window} ssh #{server}")
+        session.servers_for.each do |server|
+          tf.print("screen -t \"#{server.host}\" #{window} ssh ")
+          server.user ? tf.puts("#{server.user}@#{server.host}") : tf.puts(server.host)
           window += 1
         end
         tf.close