Move ask_otp into a single method.

lib/rubygems/commands/owner_command.rb

@@ -88,6 +88,7 @@ def manage_owners(method, name, owners)
         response = send_owner_request(method, name, owner)
 
         if need_ask_otp? response
+          ask_otp
           response = send_owner_request(method, name, owner)
         end
 

lib/rubygems/commands/push_command.rb

@@ -119,6 +119,7 @@ def send_gem(name)
     response = send_push_request(name, args)
 
     if need_ask_otp? response
+      ask_otp
       response = send_push_request(name, args)
     end
 

lib/rubygems/commands/yank_command.rb

@@ -66,6 +66,7 @@ def yank_gem(version, platform)
     response = yank_api_request(*args)
 
     if need_ask_otp? response
+      ask_otp
       response = yank_api_request(*args)
     end
 

lib/rubygems/gemcutter_utilities.rb

@@ -127,6 +127,7 @@ def sign_in(sign_in_host = nil)
     end
 
     if need_ask_otp? response
+      ask_otp
       response = rubygems_api_request(:get, "api/v1/api_key", sign_in_host) do |request|
         request.basic_auth email, password
         request.add_field "OTP", options[:otp]
@@ -184,10 +185,12 @@ def need_ask_otp?(response)
     return false if options[:otp]
     return unless response.kind_of?(Net::HTTPUnauthorized) &&
         response.body.start_with?('You have enabled multifactor authentication')
+    true
+  end
 
+  def ask_otp
     say 'You have enabled multi-factor authentication. Please enter OTP code.'
     options[:otp] = ask 'Code: '
-    true
   end
 
   def set_api_key(host, key)

lib/rubygems/test_utilities.rb

@@ -19,7 +19,7 @@
 #   @fetcher.fetch_path('http://gems.example.com/sequence') # => [1, 2, 3]
 #   @fetcher.fetch_path('http://gems.example.com/sequence') # => [4, 5, 6]
 #
-#   # use procs as fake response
+#   # procs can be accepted
 #
 #   @fetcher.data['http://gems.example.com/random'] = proc do
 #     Random.rand