rubygems-update 2.7.11 → 3.0.0

data/test/rubygems/test_gem_commands_push_command.rb

@@ -161,6 +161,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
 
     @response = "Successfully registered gem: freebird (1.0.1)"
     @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+
     send_battery
   end
 
@@ -230,6 +231,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
       spec.metadata['allowed_push_host'] = "https://privategemserver.example"
     end
 
+
     response = %{ERROR:  "#{@host}" is not allowed by the gemspec, which only allows "https://privategemserver.example"}
 
     assert_raises Gem::MockGemUi::TermError do
@@ -347,4 +349,41 @@ class TestGemCommandsPushCommand < Gem::TestCase
                  @fetcher.last_request["Authorization"]
   end
 
+  def test_otp_verified_success
+    response_fail = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
+    response_success = 'Successfully registered gem: freewill (1.0.0)'
+
+    @fetcher.data["#{Gem.host}/api/v1/gems"] = proc do
+      @call_count ||= 0
+      (@call_count += 1).odd? ? [response_fail, 401, 'Unauthorized'] : [response_success, 200, 'OK']
+    end
+
+    @otp_ui = Gem::MockGemUi.new "111111\n"
+    use_ui @otp_ui do
+      @cmd.send_gem(@path)
+    end
+
+    assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @otp_ui.output
+    assert_match 'Code: ', @otp_ui.output
+    assert_match response_success, @otp_ui.output
+    assert_equal '111111', @fetcher.last_request['OTP']
+  end
+
+  def test_otp_verified_failure
+    response = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
+    @fetcher.data["#{Gem.host}/api/v1/gems"] = [response, 401, 'Unauthorized']
+
+    @otp_ui = Gem::MockGemUi.new "111111\n"
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @otp_ui do
+        @cmd.send_gem(@path)
+      end
+    end
+
+    assert_match response, @otp_ui.output
+    assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @otp_ui.output
+    assert_match 'Code: ', @otp_ui.output
+    assert_equal '111111', @fetcher.last_request['OTP']
+  end
+
 end

data/test/rubygems/test_gem_commands_query_command.rb

@@ -9,8 +9,10 @@ module TestGemCommandsQueryCommandSetup
     @cmd = Gem::Commands::QueryCommand.new
 
     @specs = add_gems_to_fetcher
+    @stub_ui = Gem::MockGemUi.new
+    @stub_fetcher = Gem::FakeFetcher.new
 
-    @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
+    @stub_fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do
       raise Gem::RemoteFetcher::FetchError
     end
   end
@@ -26,7 +28,7 @@ class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase
 
     @cmd.handle_options %w[-r]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -38,8 +40,8 @@ a (2)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_all
@@ -49,7 +51,7 @@ pl (1 i386-linux)
 
     @cmd.handle_options %w[-r --all]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -61,8 +63,8 @@ a (2, 1)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_all_prerelease
@@ -72,7 +74,7 @@ pl (1 i386-linux)
 
     @cmd.handle_options %w[-r --all --prerelease]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -84,8 +86,8 @@ a (3.a, 2, 1)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_details
@@ -101,7 +103,7 @@ pl (1 i386-linux)
 
     @cmd.handle_options %w[-r -d]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -124,8 +126,8 @@ pl (1)
     this is a summary
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_details_cleans_text
@@ -141,7 +143,7 @@ pl (1)
 
     @cmd.handle_options %w[-r -d]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -164,8 +166,8 @@ pl (1)
     this is a summary
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_details_truncates_summary
@@ -181,7 +183,7 @@ pl (1)
 
     @cmd.handle_options %w[-r -d]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -204,34 +206,34 @@ pl (1)
     this is a summary
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_installed
     @cmd.handle_options %w[-n a --installed]
 
     assert_raises Gem::MockGemUi::SystemExitException do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.execute
       end
     end
 
-    assert_equal "true\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "true\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_installed_inverse
     @cmd.handle_options %w[-n a --no-installed]
 
     e = assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.execute
       end
     end
 
-    assert_equal "false\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "false\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
 
     assert_equal 1, e.exit_code
   end
@@ -240,26 +242,26 @@ pl (1)
     @cmd.handle_options %w[-n not_installed --no-installed]
 
     assert_raises Gem::MockGemUi::SystemExitException do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.execute
       end
     end
 
-    assert_equal "true\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "true\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_installed_no_name
     @cmd.handle_options %w[--installed]
 
     e = assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.execute
       end
     end
 
-    assert_equal '', @ui.output
-    assert_equal "ERROR:  You must specify a gem name\n", @ui.error
+    assert_equal '', @stub_ui.output
+    assert_equal "ERROR:  You must specify a gem name\n", @stub_ui.error
 
     assert_equal 4, e.exit_code
   end
@@ -268,13 +270,13 @@ pl (1)
     @cmd.handle_options %w[-n not_installed --installed]
 
     e = assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.execute
       end
     end
 
-    assert_equal "false\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "false\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
 
     assert_equal 1, e.exit_code
   end
@@ -283,26 +285,26 @@ pl (1)
     @cmd.handle_options %w[-n a --installed --version 2]
 
     assert_raises Gem::MockGemUi::SystemExitException do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.execute
       end
     end
 
-    assert_equal "true\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "true\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_installed_version_not_installed
     @cmd.handle_options %w[-n c --installed --version 2]
 
     e = assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
+      use_ui @stub_ui do
         @cmd.execute
       end
     end
 
-    assert_equal "false\n", @ui.output
-    assert_equal '', @ui.error
+    assert_equal "false\n", @stub_ui.output
+    assert_equal '', @stub_ui.error
 
     assert_equal 1, e.exit_code
   end
@@ -314,7 +316,7 @@ pl (1)
 
     @cmd.options[:domain] = :local
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -326,8 +328,8 @@ a (3.a, 2, 1)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_local_notty
@@ -337,9 +339,9 @@ pl (1 i386-linux)
 
     @cmd.handle_options %w[]
 
-    @ui.outs.tty = false
+    @stub_ui.outs.tty = false
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -348,8 +350,8 @@ a (3.a, 2, 1)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_local_quiet
@@ -360,7 +362,7 @@ pl (1 i386-linux)
     @cmd.options[:domain] = :local
     Gem.configuration.verbose = false
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -369,8 +371,8 @@ a (3.a, 2, 1)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_no_versions
@@ -380,7 +382,7 @@ pl (1 i386-linux)
 
     @cmd.handle_options %w[-r --no-versions]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -392,8 +394,8 @@ a
 pl
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_notty
@@ -403,9 +405,9 @@ pl
 
     @cmd.handle_options %w[-r]
 
-    @ui.outs.tty = false
+    @stub_ui.outs.tty = false
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -414,14 +416,14 @@ a (2)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_prerelease
     @cmd.handle_options %w[-r --prerelease]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -432,8 +434,8 @@ pl (1 i386-linux)
 a (3.a)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_prerelease_local
@@ -443,7 +445,7 @@ a (3.a)
 
     @cmd.handle_options %w[-l --prerelease]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -455,8 +457,8 @@ a (3.a, 2, 1)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal "WARNING:  prereleases are always shown locally\n", @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal "WARNING:  prereleases are always shown locally\n", @stub_ui.error
   end
 
   def test_execute_remote
@@ -466,7 +468,7 @@ pl (1 i386-linux)
 
     @cmd.options[:domain] = :remote
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -478,8 +480,8 @@ a (2)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_remote_notty
@@ -489,9 +491,9 @@ pl (1 i386-linux)
 
     @cmd.handle_options %w[]
 
-    @ui.outs.tty = false
+    @stub_ui.outs.tty = false
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -500,8 +502,8 @@ a (3.a, 2, 1)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_remote_quiet
@@ -512,7 +514,7 @@ pl (1 i386-linux)
     @cmd.options[:domain] = :remote
     Gem.configuration.verbose = false
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -521,14 +523,14 @@ a (2)
 pl (1 i386-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_make_entry
     a_2_name = @specs['a-2'].original_name
 
-    @fetcher.data.delete \
+    @stub_fetcher.data.delete \
       "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a_2_name}.gemspec.rz"
 
     a2 = @specs['a-2']
@@ -552,26 +554,26 @@ pl (1 i386-linux)
 
     @cmd.handle_options %w[a pl]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
-    assert_match %r%^a %, @ui.output
-    assert_match %r%^pl %, @ui.output
-    assert_equal '', @ui.error
+    assert_match %r%^a %, @stub_ui.output
+    assert_match %r%^pl %, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_show_gems
     @cmd.options[:name] = //
     @cmd.options[:domain] = :remote
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.send :show_gems, /a/i, false
     end
 
-    assert_match %r%^a %,  @ui.output
-    refute_match %r%^pl %, @ui.output
-    assert_empty @ui.error
+    assert_match %r%^a %,  @stub_ui.output
+    refute_match %r%^pl %, @stub_ui.output
+    assert_empty @stub_ui.error
   end
 
   private
@@ -602,7 +604,7 @@ class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase
 
     @cmd.handle_options %w[-r -a]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -613,8 +615,8 @@ class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase
 a (2 universal-darwin, 1 ruby x86-linux)
     EOF
 
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
+    assert_equal expected, @stub_ui.output
+    assert_equal '', @stub_ui.error
   end
 
   def test_execute_show_default_gems
@@ -623,7 +625,7 @@ a (2 universal-darwin, 1 ruby x86-linux)
     a1 = new_default_spec 'a', 1
     install_default_specs a1
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -634,7 +636,7 @@ a (2 universal-darwin, 1 ruby x86-linux)
 a (2, default: 1)
 EOF
 
-    assert_equal expected, @ui.output
+    assert_equal expected, @stub_ui.output
   end
 
   def test_execute_show_default_gems_with_platform
@@ -642,7 +644,7 @@ EOF
     a1.platform = 'java'
     install_default_specs a1
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -653,7 +655,7 @@ EOF
 a (default: 1 java)
 EOF
 
-    assert_equal expected, @ui.output
+    assert_equal expected, @stub_ui.output
   end
 
   def test_execute_default_details
@@ -666,7 +668,7 @@ EOF
 
     @cmd.handle_options %w[-l -d]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -683,7 +685,7 @@ a (2, 1)
     this is a summary
     EOF
 
-    assert_equal expected, @ui.output
+    assert_equal expected, @stub_ui.output
   end
 
   def test_execute_local_details
@@ -704,11 +706,11 @@ a (2, 1)
 
     @cmd.handle_options %w[-l -d]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
-    str = @ui.output
+    str = @stub_ui.output
 
     str.gsub!(/\(\d\): [^\n]*/, "-")
     str.gsub!(/at: [^\n]*/, "at: -")
@@ -738,7 +740,7 @@ pl (1)
     this is a summary
     EOF
 
-    assert_equal expected, @ui.output
+    assert_equal expected, @stub_ui.output
   end
 
   def test_execute_exact_remote
@@ -750,7 +752,7 @@ pl (1)
 
     @cmd.handle_options %w[--remote --exact coolgem]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -761,7 +763,7 @@ pl (1)
 coolgem (4.2.1)
     EOF
 
-    assert_equal expected, @ui.output
+    assert_equal expected, @stub_ui.output
   end
 
   def test_execute_exact_local
@@ -773,7 +775,7 @@ coolgem (4.2.1)
 
     @cmd.handle_options %w[--exact coolgem]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -784,7 +786,7 @@ coolgem (4.2.1)
 coolgem (4.2.1)
     EOF
 
-    assert_equal expected, @ui.output
+    assert_equal expected, @stub_ui.output
   end
 
   def test_execute_exact_multiple
@@ -800,7 +802,7 @@ coolgem (4.2.1)
 
     @cmd.handle_options %w[--exact coolgem othergem]
 
-    use_ui @ui do
+    use_ui @stub_ui do
       @cmd.execute
     end
 
@@ -815,7 +817,7 @@ coolgem (4.2.1)
 othergem (1.2.3)
     EOF
 
-    assert_equal expected, @ui.output
+    assert_equal expected, @stub_ui.output
   end
 
   private