Merge ff46887 into e9f3e2f

lib/train/extras/command_wrapper.rb

@@ -162,7 +162,13 @@ class CommandWrapper
     include_options WindowsCommand
 
     def self.load(transport, options)
-      if transport.os.unix?
+      if transport.class != Train::Transports::Local::Connection && !transport.connected?
+        # Need to call run_command here to get the message and show it to user while raising exception
+        msg = transport.run_command("whoami").stdout
+        # this will throw the error as
+        # Train::UserError: Ssh failed: Please login as the user "username" rather than the user "root".
+        raise Train::UserError.new("Ssh failed: #{msg}")
+      elsif transport.os.unix?
         return nil unless LinuxCommand.active?(options)
         res = LinuxCommand.new(transport, options)
         verification_res = res.verify

lib/train/transports/ssh_connection.rb

@@ -101,6 +101,11 @@ def login_command
       LoginCommand.new("ssh", args)
     end
 
+    def connected?
+      return false if session.nil?
+      session.exec!("whoami").match?(/Please login as the user/) ? false : true
+    end
+
     # (see Base::Connection#upload)
     def upload(locals, remote)
       waits = []