lib/cli/commands/user.rb in af-0.3.12.3 vs lib/cli/commands/user.rb in af-0.3.13.beta.5

@@ -11,12 +11,16 @@
 
     def login(email=nil)
       email    = @options[:email] unless email
       password = @options[:password]
       tries ||= 0
-      email = ask("Email: ") unless no_prompt || email
-      password = ask("Password: ") {|q| q.echo = '*'} unless no_prompt || password
+
+      unless no_prompt
+        email ||= ask("Email")
+        password ||= ask("Password", :echo => "*")
+      end
+
       err "Need a valid email" unless email
       err "Need a password" unless password
       login_and_save_token(email, password)
       say "Successfully logged into [#{target_url}]".green
     rescue VMC::Client::TargetError
@@ -37,11 +41,11 @@
       info = client_info
       email = info[:user]
       err "Need to be logged in to change password." unless email
       say "Changing password for '#{email}'\n"
       unless no_prompt
-        password = ask("New Password: ") {|q| q.echo = '*'}
-        password2 = ask("Verify Password: ") {|q| q.echo = '*'}
+        password = ask "New Password", :echo => "*"
+        password2 = ask "Verify Password", :echo => "*"
         err "Passwords did not match, try again" if password != password2
       end
       err "Password required" unless password
       client.change_password(password)
       say "\nSuccessfully changed password".green