rubygems-update 3.0.3 → 3.4.7

data/test/rubygems/test_gem_gem_runner.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/gem_runner'
+require_relative "helper"
 
 class TestGemGemRunner < Gem::TestCase
-
   def setup
     super
 
+    require "rubygems/command"
     @orig_args = Gem::Command.build_args
+    @orig_specific_extra_args = Gem::Command.specific_extra_args_hash.dup
+    @orig_extra_args = Gem::Command.extra_args.dup
+
+    require "rubygems/gem_runner"
     @runner = Gem::GemRunner.new
   end
 
@@ -15,20 +18,22 @@ class TestGemGemRunner < Gem::TestCase
     super
 
     Gem::Command.build_args = @orig_args
+    Gem::Command.specific_extra_args_hash = @orig_specific_extra_args
+    Gem::Command.extra_args = @orig_extra_args
   end
 
   def test_do_configuration
     Gem.clear_paths
 
-    temp_conf = File.join @tempdir, '.gemrc'
+    temp_conf = File.join @tempdir, ".gemrc"
 
-    other_gem_path = File.join @tempdir, 'other_gem_path'
-    other_gem_home = File.join @tempdir, 'other_gem_home'
+    other_gem_path = File.join @tempdir, "other_gem_path"
+    other_gem_home = File.join @tempdir, "other_gem_home"
 
     Gem.ensure_gem_subdirectories other_gem_path
     Gem.ensure_gem_subdirectories other_gem_home
 
-    File.open temp_conf, 'w' do |fp|
+    File.open temp_conf, "w" do |fp|
       fp.puts "gem: --commands"
       fp.puts "gemhome: #{other_gem_home}"
       fp.puts "gempath:"
@@ -65,4 +70,44 @@ class TestGemGemRunner < Gem::TestCase
     assert_equal %w[--foo], args
   end
 
+  def test_query_is_deprecated
+    args = %w[query]
+
+    use_ui @ui do
+      @runner.run(args)
+    end
+
+    assert_match(/WARNING:  query command is deprecated. It will be removed in Rubygems [0-9]+/, @ui.error)
+    assert_match(/WARNING:  It is recommended that you use `gem search` or `gem list` instead/, @ui.error)
+  end
+
+  def test_info_succeeds
+    args = %w[info]
+
+    use_ui @ui do
+      @runner.run(args)
+    end
+
+    assert_empty @ui.error
+  end
+
+  def test_list_succeeds
+    args = %w[list]
+
+    use_ui @ui do
+      @runner.run(args)
+    end
+
+    assert_empty @ui.error
+  end
+
+  def test_search_succeeds
+    args = %w[search]
+
+    use_ui @ui do
+      @runner.run(args)
+    end
+
+    assert_empty @ui.error
+  end
 end

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -1,39 +1,43 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems'
-require 'rubygems/command'
-require 'rubygems/gemcutter_utilities'
+require_relative "helper"
+require "rubygems"
+require "rubygems/command"
+require "rubygems/gemcutter_utilities"
 
 class TestGemGemcutterUtilities < Gem::TestCase
-
   def setup
     super
+
+    credential_setup
+
     # below needed for random testing, class property
     Gem.configuration.disable_default_gem_server = nil
 
-    ENV['RUBYGEMS_HOST'] = nil
+    ENV["RUBYGEMS_HOST"] = nil
+    ENV["GEM_HOST_OTP_CODE"] = nil
     Gem.configuration.rubygems_api_key = nil
 
-    @cmd = Gem::Command.new '', 'summary'
+    @cmd = Gem::Command.new "", "summary"
     @cmd.extend Gem::GemcutterUtilities
   end
 
   def teardown
-    ENV['RUBYGEMS_HOST'] = nil
+    ENV["RUBYGEMS_HOST"] = nil
+    ENV["GEM_HOST_OTP_CODE"] = nil
     Gem.configuration.rubygems_api_key = nil
 
+    credential_teardown
+
     super
   end
 
   def test_alternate_key_alternate_host
     keys = {
-      :rubygems_api_key => 'KEY',
-      "http://rubygems.engineyard.com" => "EYKEY"
+      :rubygems_api_key => "KEY",
+      "http://rubygems.engineyard.com" => "EYKEY",
     }
 
-    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
-
-    File.open Gem.configuration.credentials_path, 'w' do |f|
+    File.open Gem.configuration.credentials_path, "w" do |f|
       f.write keys.to_yaml
     end
 
@@ -41,27 +45,25 @@ class TestGemGemcutterUtilities < Gem::TestCase
 
     Gem.configuration.load_api_keys
 
-    assert_equal 'EYKEY', @cmd.api_key
+    assert_equal "EYKEY", @cmd.api_key
   end
 
   def test_api_key
-    keys = { :rubygems_api_key => 'KEY' }
-    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
+    keys = { :rubygems_api_key => "KEY" }
 
-    File.open Gem.configuration.credentials_path, 'w' do |f|
+    File.open Gem.configuration.credentials_path, "w" do |f|
       f.write keys.to_yaml
     end
 
     Gem.configuration.load_api_keys
 
-    assert_equal 'KEY', @cmd.api_key
+    assert_equal "KEY", @cmd.api_key
   end
 
   def test_api_key_override
-    keys = { :rubygems_api_key => 'KEY', :other => 'OTHER' }
-    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
+    keys = { :rubygems_api_key => "KEY", :other => "OTHER" }
 
-    File.open Gem.configuration.credentials_path, 'w' do |f|
+    File.open Gem.configuration.credentials_path, "w" do |f|
       f.write keys.to_yaml
     end
 
@@ -70,166 +72,181 @@ class TestGemGemcutterUtilities < Gem::TestCase
     @cmd.add_key_option
     @cmd.handle_options %w[--key other]
 
-    assert_equal 'OTHER', @cmd.api_key
+    assert_equal "OTHER", @cmd.api_key
   end
 
   def test_host
-    assert_equal 'https://rubygems.org', @cmd.host
+    assert_equal "https://rubygems.org", @cmd.host
   end
 
   def test_host_RUBYGEMS_HOST
-    ENV['RUBYGEMS_HOST'] = 'https://other.example'
+    ENV["RUBYGEMS_HOST"] = "https://other.example"
 
-    assert_equal 'https://other.example', @cmd.host
+    assert_equal "https://other.example", @cmd.host
   end
 
   def test_host_RUBYGEMS_HOST_empty
-    ENV['RUBYGEMS_HOST'] = ''
+    ENV["RUBYGEMS_HOST"] = ""
 
-    assert_equal 'https://rubygems.org', @cmd.host
+    assert_equal "https://rubygems.org", @cmd.host
   end
 
   def test_sign_in
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
-    util_sign_in [api_key, 200, 'OK']
+    api_key = "a5fdbb6ba150cbb83aad2bb2fede64cf040453903"
+    util_sign_in HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK")
 
     assert_match %r{Enter your RubyGems.org credentials.}, @sign_in_ui.output
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
   def test_sign_in_with_host
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    api_key = "a5fdbb6ba150cbb83aad2bb2fede64cf040453903"
 
-    util_sign_in [api_key, 200, 'OK'], 'http://example.com', ['http://example.com']
+    util_sign_in HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK"), "http://example.com", ["http://example.com"]
 
     assert_match "Enter your http://example.com credentials.",
                  @sign_in_ui.output
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
-    assert_equal api_key, credentials['http://example.com']
+    credentials = load_yaml_file Gem.configuration.credentials_path
+    assert_equal api_key, credentials["http://example.com"]
   end
 
   def test_sign_in_with_host_nil
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    api_key = "a5fdbb6ba150cbb83aad2bb2fede64cf040453903"
 
-    util_sign_in [api_key, 200, 'OK'], nil, [nil]
+    util_sign_in HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK"), nil, [nil]
 
     assert_match "Enter your RubyGems.org credentials.",
                  @sign_in_ui.output
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
   def test_sign_in_with_host_ENV
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
-    util_sign_in [api_key, 200, 'OK'], 'http://example.com'
+    api_key = "a5fdbb6ba150cbb83aad2bb2fede64cf040453903"
+    util_sign_in HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK"), "http://example.com"
 
     assert_match "Enter your http://example.com credentials.",
                  @sign_in_ui.output
     assert @fetcher.last_request["authorization"]
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials = YAML.load_file Gem.configuration.credentials_path
-    assert_equal api_key, credentials['http://example.com']
+    credentials = load_yaml_file Gem.configuration.credentials_path
+    assert_equal api_key, credentials["http://example.com"]
   end
 
   def test_sign_in_skips_with_existing_credentials
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    api_key = "a5fdbb6ba150cbb83aad2bb2fede64cf040453903"
     Gem.configuration.rubygems_api_key = api_key
 
-    util_sign_in [api_key, 200, 'OK']
+    util_sign_in HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK")
 
     assert_equal "", @sign_in_ui.output
   end
 
   def test_sign_in_skips_with_key_override
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
-    Gem.configuration.api_keys[:KEY]  = 'other'
+    api_key = "a5fdbb6ba150cbb83aad2bb2fede64cf040453903"
+    Gem.configuration.api_keys[:KEY] = "other"
     @cmd.options[:key] = :KEY
-    util_sign_in [api_key, 200, 'OK']
+    util_sign_in HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK")
 
     assert_equal "", @sign_in_ui.output
   end
 
   def test_sign_in_with_other_credentials_doesnt_overwrite_other_keys
-    api_key       = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
-    other_api_key = 'f46dbb18bb6a9c97cdc61b5b85c186a17403cdcbf'
+    api_key       = "a5fdbb6ba150cbb83aad2bb2fede64cf040453903"
+    other_api_key = "f46dbb18bb6a9c97cdc61b5b85c186a17403cdcbf"
 
-    FileUtils.mkdir_p File.dirname(Gem.configuration.credentials_path)
-    File.open Gem.configuration.credentials_path, 'w' do |f|
+    File.open Gem.configuration.credentials_path, "w" do |f|
       f.write Hash[:other_api_key, other_api_key].to_yaml
     end
-    util_sign_in [api_key, 200, 'OK']
+    util_sign_in HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK")
 
     assert_match %r{Enter your RubyGems.org credentials.}, @sign_in_ui.output
     assert_match %r{Signed in.}, @sign_in_ui.output
 
-    credentials   = YAML.load_file Gem.configuration.credentials_path
+    credentials = load_yaml_file Gem.configuration.credentials_path
     assert_equal api_key, credentials[:rubygems_api_key]
     assert_equal other_api_key, credentials[:other_api_key]
   end
 
   def test_sign_in_with_bad_credentials
-    assert_raises Gem::MockGemUi::TermError do
-      util_sign_in ['Access Denied.', 403, 'Forbidden']
+    assert_raise Gem::MockGemUi::TermError do
+      util_sign_in HTTPResponseFactory.create(body: "Access Denied.", code: 403, msg: "Forbidden")
     end
 
     assert_match %r{Enter your RubyGems.org credentials.}, @sign_in_ui.output
     assert_match %r{Access Denied.}, @sign_in_ui.output
   end
 
+  def test_signin_with_env_otp_code
+    ENV["GEM_HOST_OTP_CODE"] = "111111"
+    api_key = "a5fdbb6ba150cbb83aad2bb2fede64cf040453903"
+
+    util_sign_in HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK")
+
+    assert_match "Signed in with API key:", @sign_in_ui.output
+    assert_equal "111111", @fetcher.last_request["OTP"]
+  end
+
   def test_sign_in_with_correct_otp_code
-    api_key       = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
+    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']
+      if (@call_count += 1).odd?
+        HTTPResponseFactory.create(body: response_fail, code: 401, msg: "Unauthorized")
+      else
+        HTTPResponseFactory.create(body: api_key, code: 200, msg: "OK")
+      end
     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']
+    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 with API key:", @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"
+    assert_raise Gem::MockGemUi::TermError do
+      util_sign_in HTTPResponseFactory.create(body: response, code: 401, msg: "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 "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']
+    assert_equal "111111", @fetcher.last_request["OTP"]
   end
 
-  def util_sign_in(response, host = nil, args = [], extra_input = '')
-    email    = 'you@example.com'
-    password = 'secret'
+  def util_sign_in(response, host = nil, args = [], extra_input = "")
+    email            = "you@example.com"
+    password         = "secret"
+    profile_response = HTTPResponseFactory.create(body: "mfa: disabled\n", code: 200, msg: "OK")
 
     if host
-      ENV['RUBYGEMS_HOST'] = host
+      ENV["RUBYGEMS_HOST"] = host
     else
       host = Gem.host
     end
 
     @fetcher = Gem::FakeFetcher.new
     @fetcher.data["#{host}/api/v1/api_key"] = response
+    @fetcher.data["#{host}/api/v1/profile/me.yaml"] = profile_response
     Gem::RemoteFetcher.fetcher = @fetcher
 
-    @sign_in_ui = Gem::MockGemUi.new("#{email}\n#{password}\n" + extra_input)
+    @sign_in_ui = Gem::MockGemUi.new("#{email}\n#{password}\n\n\n\n\n\n\n\n\n" + extra_input)
 
     use_ui @sign_in_ui do
       if args.length > 0
@@ -241,21 +258,19 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
   def test_verify_api_key
-    keys = {:other => 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'}
-    FileUtils.mkdir_p File.dirname(Gem.configuration.credentials_path)
-    File.open Gem.configuration.credentials_path, 'w' do |f|
+    keys = { :other => "a5fdbb6ba150cbb83aad2bb2fede64cf040453903" }
+    File.open Gem.configuration.credentials_path, "w" do |f|
       f.write keys.to_yaml
     end
     Gem.configuration.load_api_keys
 
-    assert_equal 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903',
+    assert_equal "a5fdbb6ba150cbb83aad2bb2fede64cf040453903",
                  @cmd.verify_api_key(:other)
   end
 
   def test_verify_missing_api_key
-    assert_raises Gem::MockGemUi::TermError do
+    assert_raise Gem::MockGemUi::TermError do
       @cmd.verify_api_key :missing
     end
   end
-
 end

data/test/rubygems/test_gem_impossible_dependencies_error.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
 class TestGemImpossibleDependenciesError < Gem::TestCase
-
   def test_message_conflict
-    request = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
+    request = dependency_request dep("net-ssh", ">= 2.0.13"), "rye", "0.9.8"
 
     conflicts = []
 
@@ -12,9 +11,9 @@ class TestGemImpossibleDependenciesError < Gem::TestCase
     # requested-by entries, but they are suitable for testing the message.
     # See #485 to construct a correct conflict.
     net_ssh_2_2_2 =
-      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', request
+      dependency_request dep("net-ssh", ">= 2.6.5"), "net-ssh", "2.2.2", request
     net_ssh_2_6_5 =
-      dependency_request dep('net-ssh', '~> 2.2.2'), 'net-ssh', '2.6.5', request
+      dependency_request dep("net-ssh", "~> 2.2.2"), "net-ssh", "2.6.5", request
 
     conflict1 = Gem::Resolver::Conflict.new \
       net_ssh_2_6_5, net_ssh_2_6_5.requester
@@ -57,5 +56,4 @@ rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted:
 
     assert_equal expected, error.message
   end
-
 end