diff options
| -rw-r--r-- | lib/rubygems/gemcutter_utilities.rb | 7 | ||||
| -rw-r--r-- | test/rubygems/test_gem_gemcutter_utilities.rb | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb index afe7957f43..9c22c14fad 100644 --- a/lib/rubygems/gemcutter_utilities.rb +++ b/lib/rubygems/gemcutter_utilities.rb @@ -154,10 +154,11 @@ module Gem::GemcutterUtilities def sign_in(sign_in_host = nil, scope: nil) sign_in_host ||= host - return if api_key - pretty_host = pretty_host(sign_in_host) - + if api_key + say "You are already signed in on #{pretty_host}." + return + end say "Enter your #{pretty_host} credentials." say "Don't have an account yet? " \ "Create one at #{sign_in_host}/sign_up" diff --git a/test/rubygems/test_gem_gemcutter_utilities.rb b/test/rubygems/test_gem_gemcutter_utilities.rb index 9204dc5f20..ca34c8d03d 100644 --- a/test/rubygems/test_gem_gemcutter_utilities.rb +++ b/test/rubygems/test_gem_gemcutter_utilities.rb @@ -150,7 +150,7 @@ class TestGemGemcutterUtilities < Gem::TestCase util_sign_in - assert_equal "", @sign_in_ui.output + assert_match(/You are already signed in/, @sign_in_ui.output) end def test_sign_in_skips_with_key_override @@ -158,7 +158,7 @@ class TestGemGemcutterUtilities < Gem::TestCase @cmd.options[:key] = :KEY util_sign_in - assert_equal "", @sign_in_ui.output + assert_match(/You are already signed in/, @sign_in_ui.output) end def test_sign_in_with_other_credentials_doesnt_overwrite_other_keys |