lib/faastruby/cli/commands/account/signup.rb in faastruby-0.5.24 vs lib/faastruby/cli/commands/account/signup.rb in faastruby-0.5.25

@@ -9,52 +9,42 @@
           parse_options
           FaaStRuby::CLI.error("You are currently logged in. Please run 'faastruby logout' to logout, then try again.") if has_user_logged_in?
         end
 
         def run
-          puts "\nWelcome to FaaStRuby! Please enter your email address:"
-          print "Email: "
-          email = STDIN.gets.chomp
+          email = prompt(command: "Welcome to FaaStRuby! Please enter your email address.", label: "Email: ", secure: false)
+
           until email_is_valid?(email) do
-            puts "You entered an invalid email address. Please try again:".red
-            print "Email: "
-            email = STDIN.gets.chomp
+            email = prompt(command: "\nYou entered an invalid email address. Please try again.".red, label: "Email: ", secure: false)
           end
-          puts "\nNow type in a password. It must contain 8 to 50 characters and have at least one uppercase letter, one lowercase letter, one number and one special character @ $ ! % * ? &"
-          print "Password: "
-          password = STDIN.noecho(&:gets).chomp
-          until password_is_valid?(password) do
-            puts "\nYour password must contain 8 to 50 characters and have at least one uppercase letter, one lowercase letter, one number and one special character @ $ ! % * ? &\nPlease try again:".red
-            print "Password: "
-            password = STDIN.noecho(&:gets).chomp
-          end
+
+          password = prompt_for_password
+
+          prompt_to_confirm_password(password)
+
           spinner = spin("Creating your account...")
           user = User.create(email: email, password: password)
           if user.errors.any?
             spinner.error
             FaaStRuby::CLI.error(user.errors)
           end
+
           spinner.success
           exec("faastruby confirm-account --email #{email}")
           exit 0
         end
 
         def email_is_valid?(email)
           email.match(EMAIL_REGEX)
         end
 
-        def password_is_valid?(password)
-          password.match(PASSWORD_REGEX)
-        end
-
         def self.help
           "signup"
         end
 
         def usage
           puts "Usage: faastruby #{self.class.help}"
         end
-
 
         def parse_options
           @options = {}
           while @args.any?
             option = @args.shift