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

@@ -13,24 +13,25 @@
       email    = @options[:email] unless email
       password = @options[:password]
       tries ||= 0
 
       unless no_prompt
+        display "Attempting login to [#{target_url}]" if target_url
         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
-      display "Problem with login, invalid account or password.".red
+      display "Problem with login, invalid account or password when attempting to login to '#{target_url}'".red
       retry if (tries += 1) < 3 && prompt_ok && !@options[:password]
       exit 1
     rescue => e
-      display "Problem with login, #{e}, try again or register for an account.".red
+      display "Problem with login to '#{target_url}', #{e}, try again or register for an account.".red
       exit 1
     end
 
     def logout
       VMC::Cli::Config.remove_token_file
@@ -54,10 +55,10 @@
 
     private
 
     def login_and_save_token(email, password)
       token = client.login(email, password)
-      VMC::Cli::Config.store_token(token)
+      VMC::Cli::Config.store_token(token, @options[:token_file])
     end
 
   end
 
 end