Add verify! method & exact match for sudo errors.

Signed-off-by: Vivek Singh <[email protected]>

Author: Vivek Singh

lib/train/extras/command_wrapper.rb

@@ -56,22 +56,27 @@ def verify
       res = @backend.run_command(run("echo"))
       return nil if res.exit_status == 0
 
-      rawerr = res.stdout + " " + res.stderr
-      msg, reason =
-        case rawerr
-        when /Sorry, try again/
-          ["Wrong sudo password.", :bad_sudo_password]
-        when /sudo: no tty present and no askpass program specified/
-          ["Sudo requires a password, please configure it.", :sudo_password_required]
-        when /sudo: command not found/
-          ["Can't find sudo command. Please either install and "\
-            "configure it on the target or deactivate sudo.", :sudo_command_not_found]
-        when /sudo: sorry, you must have a tty to run sudo/
-          ["Sudo requires a TTY. Please see the README on how to configure "\
-            "sudo to allow for non-interactive usage.", :sudo_no_tty]
-        else
-          rawerr
-        end
+      rawerr = "#{res.stdout} #{res.stderr}".strip
+
+      case rawerr
+      when "Sorry, try again"
+        ["Wrong sudo password.", :bad_sudo_password]
+      when "sudo: no tty present and no askpass program specified"
+        ["Sudo requires a password, please configure it.", :sudo_password_required]
+      when "sudo: command not found"
+        ["Can't find sudo command. Please either install and "\
+          "configure it on the target or deactivate sudo.", :sudo_command_not_found]
+      when "sudo: sorry, you must have a tty to run sudo"
+        ["Sudo requires a TTY. Please see the README on how to configure "\
+          "sudo to allow for non-interactive usage.", :sudo_no_tty]
+      else
+        [rawerr, nil]
+      end
+    end
+
+    def verify!
+      msg, reason = verify
+      return nil unless msg
 
       raise Train::UserError.new("Sudo failed: #{msg}", reason)
     end
@@ -168,7 +173,7 @@ def self.load(transport, options)
         return nil unless LinuxCommand.active?(options)
 
         res = LinuxCommand.new(transport, options)
-        res.verify
+        res.verify!
 
         res
       elsif transport.platform.windows?

test/unit/extras/command_wrapper_test.rb

@@ -121,35 +121,35 @@ def mock_connect_result(stderr, exit_status)
     it "error message for bad sudo password" do
       backend.stubs(:run_command).returns(mock_connect_result("Sorry, try again", 1))
       lc = cls.new(backend, { sudo: true })
-      err = _ { lc.verify }.must_raise Train::UserError
+      err = _ { lc.verify! }.must_raise Train::UserError
       _(err.message).must_match(/Sudo failed: Wrong sudo password./)
     end
 
     it "error message for sudo password required" do
       backend.stubs(:run_command).returns(mock_connect_result("sudo: no tty present and no askpass program specified", 1))
       lc = cls.new(backend, { sudo: true })
-      err = _ { lc.verify }.must_raise Train::UserError
+      err = _ { lc.verify! }.must_raise Train::UserError
       _(err.message).must_match(/Sudo requires a password, please configure it./)
     end
 
     it "error message for sudo: command not found" do
       backend.stubs(:run_command).returns(mock_connect_result("sudo: command not found", 1))
       lc = cls.new(backend, { sudo: true })
-      err = _ { lc.verify }.must_raise Train::UserError
+      err = _ { lc.verify! }.must_raise Train::UserError
       _(err.message).must_match(/Can't find sudo command. Please either install and configure it on the target or deactivate sudo./)
     end
 
     it "error message for requires tty" do
       backend.stubs(:run_command).returns(mock_connect_result("sudo: sorry, you must have a tty to run sudo", 1))
       lc = cls.new(backend, { sudo: true })
-      err = _ { lc.verify }.must_raise Train::UserError
+      err = _ { lc.verify! }.must_raise Train::UserError
       _(err.message).must_match(/Sudo failed: Sudo requires a TTY. Please see the README/)
     end
 
     it "error message for other sudo related errors" do
       backend.stubs(:run_command).returns(mock_connect_result("Other sudo related error", 1))
       lc = cls.new(backend, { sudo: true })
-      err = _ { lc.verify }.must_raise Train::UserError
+      err = _ { lc.verify! }.must_raise Train::UserError
       _(err.message).must_match(/Other sudo related error/)
     end
   end