Fix password prompts.

lib/mina/exec_helpers.rb

@@ -26,7 +26,7 @@ def pretty_system(code)
           pid_in  = Sys.stream_stdin!     { |chr| i.putc chr }
 
           # __In the foreground,__ stream stdout to the output helper.
-          Sys.stream_stdout(o) { |str| print_str str }
+          Sys.stream_stdout(o) { |ch| print_char ch }
 
           Process.waitpid pid_err
           Process.kill 'TERM', pid_in
@@ -93,7 +93,7 @@ def stream_stdin!(&blk)
       # output helper.
 
       def stream_stdout(o, &blk)
-        while str = o.gets
+        while str = o.getc
           yield str
         end
       end

lib/mina/output_helpers.rb

@@ -19,18 +19,38 @@ module OutputHelpers
     #
     # Returns nothing.
     #
-    def print_str(str)
-      if str =~ /^\-+> (.*?)$/
+    def print_str(line)
+      if line =~ /^\-+> (.*?)$/
         print_status $1
-      elsif str =~ /^! (.*?)$/
+      elsif line =~ /^! (.*?)$/
         print_error $1
-      elsif str =~ /^\$ (.*?)$/
+      elsif line =~ /^\$ (.*?)$/
         print_command $1
       else
-        print_stdout str
+        print_stdout line
       end
     end
 
+    # ### print_char
+    # Prints a single character.
+    def print_char(ch)
+      $last ||= ''
+
+      if ch == "\n"
+        print_clear
+        print_str $last
+        $last = ''
+      else
+        print '       ' if $last == ''
+        print ch
+        $last += ch
+      end
+    end
+
+    def print_clear
+      print "\033[1K\r"
+    end
+
     # ### print_status
     # Prints a status message. (`----->`)
     def print_status(msg)

spec/helpers/output_helper_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe 'Output Helpers' do
+  before :each do
+    @out = Object.new
+    @out.send :extend, Mina::OutputHelpers
+
+    allow(@out).to receive(:print_stdout)
+    allow(@out).to receive(:print_status)
+    allow(@out).to receive(:print_error)
+    allow(@out).to receive(:print_command)
+    allow(@out).to receive(:print_clear)
+  end
+
+  it 'print_str to stdout' do
+    @out.print_str "Hello there\n"
+
+    expect(@out).to have_received(:print_stdout).with("Hello there\n")
+  end
+
+  it 'print_str to status' do
+    @out.print_str "-----> Getting password"
+
+    expect(@out).to have_received(:print_status).with("Getting password")
+  end
+
+  it 'print_str to status (2)' do
+    @out.print_str "-> Getting password"
+
+    expect(@out).to have_received(:print_status).with("Getting password")
+  end
+
+  it 'print_str to error' do
+    @out.print_str "! Something went wrong"
+
+    expect(@out).to have_received(:print_error).with("Something went wrong")
+  end
+end

test_env/config/deploy.rb

@@ -63,5 +63,5 @@
 
 task :get_password do
   set :term_mode, :pretty
-  queue %[echo -n "Password: "; read x; echo out: $x;]
+  queue %[echo "-> Getting password"; echo -n "Password: "; read x; echo ""; echo out: $x;]
 end