rubygems-update 2.7.10 → 3.0.0

data/test/rubygems/test_gem_dependency_list.rb

@@ -11,7 +11,7 @@ class TestGemDependencyList < Gem::TestCase
 
     @deplist = Gem::DependencyList.new
 
-    # TODO: switch to new_spec
+    # TODO: switch to util_spec
     @a1 = util_spec 'a', '1'
     @a2 = util_spec 'a', '2'
     @a3 = util_spec 'a', '3'
@@ -136,21 +136,21 @@ class TestGemDependencyList < Gem::TestCase
 
     exp = {
       "b" => [
-              Gem::Dependency.new("a", ">= 1")
-             ]
+        Gem::Dependency.new("a", ">= 1")
+      ]
     }
 
     assert_equal exp, @deplist.why_not_ok?
   end
 
   def test_why_not_ok_eh_old_dependency
-    a  = new_spec 'a', '1',
+    a  = util_spec 'a', '1',
                   'b' => '~> 1.0'
 
-    b0 = new_spec 'b', '1.0',
+    b0 = util_spec 'b', '1.0',
                   'd' => '>= 0'
 
-    b1 = new_spec 'b', '1.1'
+    b1 = util_spec 'b', '1.1'
 
     util_clear_gems
 
@@ -257,4 +257,3 @@ class TestGemDependencyList < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_dependency_resolution_error.rb

@@ -26,4 +26,3 @@ class TestGemDependencyResolutionError < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_doctor.rb

@@ -4,7 +4,7 @@ require 'rubygems/doctor'
 
 class TestGemDoctor < Gem::TestCase
 
-  def gem name
+  def gem(name)
     spec = quick_gem name do |gem|
       gem.files = %W[lib/#{name}.rb Rakefile]
     end
@@ -166,4 +166,3 @@ This directory does not appear to be a RubyGems repository, skipping
   end
 
 end
-

data/test/rubygems/test_gem_ext_builder.rb

@@ -50,15 +50,9 @@ install:
 
     results = results.join "\n"
 
-    if RUBY_VERSION > '2.0' then
-      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
-      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
-      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
-    else
-      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
-      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
-      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
-    end
+    assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
+    assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
+    assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
 
     if /nmake/ !~ results
       assert_match %r%^clean: destination$%,   results
@@ -87,15 +81,9 @@ install:
 
     results = results.join "\n"
 
-    if RUBY_VERSION > '2.0' then
-      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
-      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
-      assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
-    else
-      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
-      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
-      refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
-    end
+    assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%,   results
+    assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%,         results
+    assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
   end
 
   def test_build_extensions
@@ -134,11 +122,6 @@ install:
   end
 
   def test_build_extensions_with_gemhome_with_space
-    # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
-    if win_platform? && RUBY_VERSION <= '2.0'
-      skip 'gemhome with spaces does not work with Ruby 1.9.x on Windows'
-    end
-
     new_gemhome = File.join @tempdir, 'gem home'
     File.rename(@gemhome, new_gemhome)
     @gemhome = new_gemhome
@@ -227,6 +210,8 @@ install:
   end
 
   def test_build_extensions_extconf_bad
+    cwd = Dir.pwd
+
     @spec.extensions << 'extconf.rb'
 
     FileUtils.mkdir_p @spec.gem_dir
@@ -257,6 +242,8 @@ install:
 
     assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
                  File.read(gem_make_out)
+
+    assert_equal cwd, Dir.pwd
   end
 
   def test_build_extensions_unsupported

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -10,7 +10,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase
     # Details: https://github.com/rubygems/rubygems/issues/1270#issuecomment-177368340
     skip "CmakeBuilder doesn't work on Windows." if Gem.win_platform?
 
-    `cmake #{Gem::Ext::Builder.redirector}`
+    system('cmake', out: IO::NULL, err: [:child, :out])
 
     skip 'cmake not present' unless $?.success?
 
@@ -25,6 +25,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase
     File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
       cmakelists.write <<-eo_cmake
 cmake_minimum_required(VERSION 2.6)
+project(self_build LANGUAGES NONE)
 install (FILES test.txt DESTINATION bin)
       eo_cmake
     end
@@ -34,7 +35,7 @@ install (FILES test.txt DESTINATION bin)
     output = []
 
     Dir.chdir @ext do
-      Gem::Ext::CmakeBuilder.build nil, nil, @dest_path, output
+      Gem::Ext::CmakeBuilder.build nil, @dest_path, output
     end
 
     output = output.join "\n"
@@ -52,7 +53,7 @@ install (FILES test.txt DESTINATION bin)
 
     error = assert_raises Gem::InstallError do
       Dir.chdir @ext do
-        Gem::Ext::CmakeBuilder.build nil, nil, @dest_path, output
+        Gem::Ext::CmakeBuilder.build nil, @dest_path, output
       end
     end
 
@@ -75,7 +76,7 @@ install (FILES test.txt DESTINATION bin)
     output = []
 
     Dir.chdir @ext do
-      Gem::Ext::CmakeBuilder.build nil, nil, @dest_path, output
+      Gem::Ext::CmakeBuilder.build nil, @dest_path, output
     end
 
     output = output.join "\n"

data/test/rubygems/test_gem_ext_configure_builder.rb

@@ -27,7 +27,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
     output = []
 
     Dir.chdir @ext do
-      Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
+      Gem::Ext::ConfigureBuilder.build nil, @dest_path, output
     end
 
     assert_match(/^current directory:/, output.shift)
@@ -50,7 +50,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
 
     error = assert_raises Gem::InstallError do
       Dir.chdir @ext do
-        Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
+        Gem::Ext::ConfigureBuilder.build nil, @dest_path, output
       end
     end
 
@@ -76,7 +76,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
 
     output = []
     Dir.chdir @ext do
-      Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
+      Gem::Ext::ConfigureBuilder.build nil, @dest_path, output
     end
 
     assert_contains_make_command 'clean', output[1]

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -29,7 +29,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     Dir.chdir @ext do
       result =
-        Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
+        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
 
       assert_same result, output
     end
@@ -54,7 +54,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
       output = []
 
       Dir.chdir @ext do
-        Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
+        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
       end
 
       assert_equal "creating Makefile\n", output[2]
@@ -77,7 +77,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
       assert_raises Gem::InstallError do
         Dir.chdir @ext do
-          Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
+          Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
         end
       end
 
@@ -103,7 +103,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     error = assert_raises Gem::InstallError do
       Dir.chdir @ext do
-        Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
+        Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
       end
     end
 
@@ -130,7 +130,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     output = []
 
     Dir.chdir @ext do
-      Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
+      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
     end
 
     refute_includes(output, "To see why this extension failed to compile, please check the mkmf.log which can be found here:\n")
@@ -172,7 +172,7 @@ end
     output = []
 
     Dir.chdir @ext do
-      Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
+      Gem::Ext::ExtConfBuilder.build 'extconf.rb', @dest_path, output
     end
 
     assert_contains_make_command 'clean', output[4]
@@ -216,14 +216,14 @@ end
     assert_equal 'Makefile not found', error.message
   end
 
-  def configure_args args = nil
+  def configure_args(args = nil)
     configure_args = RbConfig::CONFIG['configure_args']
     RbConfig::CONFIG['configure_args'] = args if args
 
     yield
 
   ensure
-    if configure_args then
+    if configure_args
       RbConfig::CONFIG['configure_args'] = configure_args
     else
       RbConfig::CONFIG.delete 'configure_args'
@@ -231,4 +231,3 @@ end
   end
 
 end
-

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -19,14 +19,14 @@ class TestGemExtRakeBuilder < Gem::TestCase
 
     build_rake_in do |rake|
       Dir.chdir @ext do
-        Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', nil, @dest_path, output
+        Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output
       end
 
       output = output.join "\n"
 
       refute_match %r%^rake failed:%, output
       assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
-      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path}%, output
     end
   end
 
@@ -40,14 +40,29 @@ class TestGemExtRakeBuilder < Gem::TestCase
     build_rake_in do |rake|
       Dir.chdir @ext do
         non_empty_args_list = ['']
-        Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', nil, @dest_path, output, non_empty_args_list
+        Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', @dest_path, output, non_empty_args_list
       end
 
       output = output.join "\n"
 
       refute_match %r%^rake failed:%, output
       assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
-      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path}%, output
+    end
+  end
+
+  def test_class_build_no_mkrf_passes_args
+    output = []
+
+    build_rake_in do |rake|
+      Dir.chdir @ext do
+        Gem::Ext::RakeBuilder.build "ext/Rakefile", @dest_path, output, ["test1", "test2"]
+      end
+
+      output = output.join "\n"
+
+      refute_match %r%^rake failed:%, output
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR\\=#{Regexp.escape @dest_path} RUBYLIBDIR\\=#{Regexp.escape @dest_path} test1 test2%, output
     end
   end
 
@@ -58,7 +73,7 @@ class TestGemExtRakeBuilder < Gem::TestCase
     build_rake_in(false) do |rake|
       error = assert_raises Gem::InstallError do
         Dir.chdir @ext do
-          Gem::Ext::RakeBuilder.build "mkrf_conf.rb", nil, @dest_path, output
+          Gem::Ext::RakeBuilder.build "mkrf_conf.rb", @dest_path, output
         end
       end
 

data/test/rubygems/test_gem_gem_runner.rb

@@ -66,4 +66,3 @@ class TestGemGemRunner < Gem::TestCase
   end
 
 end
-

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -8,6 +8,8 @@ class TestGemGemcutterUtilities < Gem::TestCase
 
   def setup
     super
+    # below needed for random testing, class property
+    Gem.configuration.disable_default_gem_server = nil
 
     ENV['RUBYGEMS_HOST'] = nil
     Gem.configuration.rubygems_api_key = nil
@@ -177,8 +179,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_sign_in_with_bad_credentials
-    skip 'Always uses $stdin on windows' if Gem.win_platform?
-
     assert_raises Gem::MockGemUi::TermError do
       util_sign_in ['Access Denied.', 403, 'Forbidden']
     end
@@ -187,9 +187,35 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert_match %r{Access Denied.}, @sign_in_ui.output
   end
 
-  def util_sign_in response, host = nil, args = []
-    skip 'Always uses $stdin on windows' if Gem.win_platform?
+  def test_sign_in_with_correct_otp_code
+    api_key       = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    response_fail = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
+
+    util_sign_in(proc do
+      @call_count ||= 0
+      (@call_count += 1).odd? ? [response_fail, 401, 'Unauthorized'] : [api_key, 200, 'OK']
+    end, nil, [], "111111\n")
+
+    assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @sign_in_ui.output
+    assert_match 'Code: ', @sign_in_ui.output
+    assert_match 'Signed in.', @sign_in_ui.output
+    assert_equal '111111', @fetcher.last_request['OTP']
+  end
+
+  def test_sign_in_with_incorrect_otp_code
+    response = "You have enabled multifactor authentication but your request doesn't have the correct OTP code. Please check it and retry."
+
+    assert_raises Gem::MockGemUi::TermError do
+      util_sign_in [response, 401, 'Unauthorized'], nil, [], "111111\n"
+    end
+
+    assert_match 'You have enabled multi-factor authentication. Please enter OTP code.', @sign_in_ui.output
+    assert_match 'Code: ', @sign_in_ui.output
+    assert_match response, @sign_in_ui.output
+    assert_equal '111111', @fetcher.last_request['OTP']
+  end
 
+  def util_sign_in(response, host = nil, args = [], extra_input = '')
     email    = 'you@example.com'
     password = 'secret'
 
@@ -203,10 +229,10 @@ class TestGemGemcutterUtilities < Gem::TestCase
     @fetcher.data["#{host}/api/v1/api_key"] = response
     Gem::RemoteFetcher.fetcher = @fetcher
 
-    @sign_in_ui = Gem::MockGemUi.new "#{email}\n#{password}\n"
+    @sign_in_ui = Gem::MockGemUi.new("#{email}\n#{password}\n" + extra_input)
 
     use_ui @sign_in_ui do
-      if args.length > 0 then
+      if args.length > 0
         @cmd.sign_in(*args)
       else
         @cmd.sign_in

data/test/rubygems/test_gem_impossible_dependencies_error.rb

@@ -59,4 +59,3 @@ rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted:
   end
 
 end
-

data/test/rubygems/test_gem_indexer.rb

@@ -2,7 +2,7 @@
 require 'rubygems/test_case'
 require 'rubygems/indexer'
 
-unless defined?(Builder::XChar) then
+unless defined?(Builder::XChar)
   warn "Gem::Indexer tests are being skipped.  Install builder gem." if $VERBOSE
 end
 
@@ -363,4 +363,3 @@ class TestGemIndexer < Gem::TestCase
   end
 
 end if defined?(Builder::XChar)
-

data/test/rubygems/test_gem_install_update_options.rb

@@ -21,8 +21,7 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
       --build-root build_root
       --format-exec
       --ignore-dependencies
-      --rdoc
-      --ri
+      --document
       -E
       -f
       -i /install_to
@@ -92,24 +91,6 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
     assert_equal %w[ri], @cmd.options[:document]
   end
 
-  def test_rdoc
-    @cmd.handle_options %w[--rdoc]
-
-    assert_equal %w[rdoc ri], @cmd.options[:document].sort
-  end
-
-  def test_rdoc_no
-    @cmd.handle_options %w[--no-rdoc]
-
-    assert_equal %w[ri], @cmd.options[:document]
-  end
-
-  def test_ri
-    @cmd.handle_options %w[--no-ri]
-
-    assert_equal %w[], @cmd.options[:document]
-  end
-
   def test_security_policy
     skip 'openssl is missing' unless defined?(OpenSSL::SSL)