rubygems-update 3.0.9 → 3.1.0.pre1

data/test/rubygems/test_gem_commands_push_command.rb

@@ -27,7 +27,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
 
     @cmd = Gem::Commands::PushCommand.new
 
-    class << Gem
+    singleton_gem_class.class_eval do
       alias_method :orig_latest_rubygems_version, :latest_rubygems_version
 
       def latest_rubygems_version
@@ -39,7 +39,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
   def teardown
     super
 
-    class << Gem
+    singleton_gem_class.class_eval do
       remove_method :latest_rubygems_version
       alias_method :latest_rubygems_version, :orig_latest_rubygems_version
     end
@@ -132,7 +132,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     ENV["RUBYGEMS_HOST"] = @host
     Gem.configuration.disable_default_gem_server = true
     @response = "Successfully registered gem: freewill (1.0.0)"
-    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+    @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK']
 
     send_battery
   end
@@ -160,14 +160,14 @@ class TestGemCommandsPushCommand < Gem::TestCase
     FileUtils.rm Gem.configuration.credentials_path
 
     @response = "Successfully registered gem: freebird (1.0.1)"
-    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+    @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK']
 
     send_battery
   end
 
   def test_sending_gem
     @response = "Successfully registered gem: freewill (1.0.0)"
-    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+    @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK']
 
     send_battery
   end
@@ -195,7 +195,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     FileUtils.rm Gem.configuration.credentials_path
 
     @response = "Successfully registered gem: freebird (1.0.1)"
-    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+    @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK']
     send_battery
   end
 
@@ -210,7 +210,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     ENV["GEM_HOST_API_KEY"] = "PRIVKEY"
 
     @response = "Successfully registered gem: freebird (1.0.1)"
-    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+    @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK']
     send_battery
   end
 
@@ -237,7 +237,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     FileUtils.rm Gem.configuration.credentials_path
 
     @response = "Successfully registered gem: freebird (1.0.1)"
-    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+    @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK']
     send_battery
   end
 
@@ -246,7 +246,6 @@ 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
@@ -311,7 +310,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
     FileUtils.rm Gem.configuration.credentials_path
 
     @response = "Successfully registered gem: freebird (1.0.1)"
-    @fetcher.data["#{host}/api/v1/gems"]  = [@response, 200, 'OK']
+    @fetcher.data["#{host}/api/v1/gems"] = [@response, 200, 'OK']
 
     # do not set @host
     use_ui(@ui) { @cmd.send_gem(@path) }
@@ -368,10 +367,10 @@ class TestGemCommandsPushCommand < Gem::TestCase
     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
+    @fetcher.data["#{Gem.host}/api/v1/gems"] = [
+      [response_fail, 401, 'Unauthorized'],
+      [response_success, 200, 'OK']
+    ]
 
     @otp_ui = Gem::MockGemUi.new "111111\n"
     use_ui @otp_ui do
@@ -401,4 +400,10 @@ class TestGemCommandsPushCommand < Gem::TestCase
     assert_equal '111111', @fetcher.last_request['OTP']
   end
 
+  private
+
+  def singleton_gem_class
+    class << Gem; self; end
+  end
+
 end

data/test/rubygems/test_gem_commands_query_command.rb

@@ -19,6 +19,7 @@ module TestGemCommandsQueryCommandSetup
 end
 
 class TestGemCommandsQueryCommandWithInstalledGems < Gem::TestCase
+
   include TestGemCommandsQueryCommandSetup
 
   def test_execute
@@ -458,7 +459,28 @@ pl (1 i386-linux)
     EOF
 
     assert_equal expected, @stub_ui.output
-    assert_equal "WARNING:  prereleases are always shown locally\n", @stub_ui.error
+  end
+
+  def test_execute_no_prerelease_local
+    spec_fetcher do |fetcher|
+      fetcher.legacy_platform
+    end
+
+    @cmd.handle_options %w[-l --no-prerelease]
+
+    use_ui @stub_ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** LOCAL GEMS ***
+
+a (2, 1)
+pl (1 i386-linux)
+    EOF
+
+    assert_equal expected, @stub_ui.output
   end
 
   def test_execute_remote
@@ -568,7 +590,7 @@ pl (1 i386-linux)
     @cmd.options[:domain] = :remote
 
     use_ui @stub_ui do
-      @cmd.send :show_gems, /a/i, false
+      @cmd.send :show_gems, /a/i
     end
 
     assert_match %r%^a %,  @stub_ui.output
@@ -585,9 +607,11 @@ pl (1 i386-linux)
       fetcher.spec 'a', '3.a'
     end
   end
+
 end
 
 class TestGemCommandsQueryCommandWithoutInstalledGems < Gem::TestCase
+
   include TestGemCommandsQueryCommandSetup
 
   def test_execute_platform
@@ -829,4 +853,5 @@ othergem (1.2.3)
       fetcher.download 'a', '3.a'
     end
   end
+
 end

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -10,7 +10,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
   if File.exist?(bundler_gemspec)
     BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1]
   else
-    BUNDLER_VERS = "1.16.2".freeze
+    BUNDLER_VERS = "2.0.1".freeze
   end
 
   def setup
@@ -23,17 +23,36 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     FileUtils.mkdir_p 'bin'
     FileUtils.mkdir_p 'lib/rubygems/ssl_certs/rubygems.org'
 
-    File.open 'bin/gem',                   'w' do |io| io.puts '# gem'          end
-    File.open 'lib/rubygems.rb',           'w' do |io| io.puts '# rubygems.rb'  end
-    File.open 'lib/rubygems/test_case.rb', 'w' do |io| io.puts '# test_case.rb' end
-    File.open 'lib/rubygems/ssl_certs/rubygems.org/foo.pem', 'w' do |io| io.puts 'PEM'       end
+    File.open 'bin/gem',                   'w' do
+      |io| io.puts '# gem'
+    end
+
+    File.open 'lib/rubygems.rb',           'w' do |io|
+      io.puts '# rubygems.rb'
+    end
+
+    File.open 'lib/rubygems/test_case.rb', 'w' do |io|
+      io.puts '# test_case.rb'
+    end
+
+    File.open 'lib/rubygems/ssl_certs/rubygems.org/foo.pem', 'w' do |io|
+      io.puts 'PEM'
+    end
 
     FileUtils.mkdir_p 'bundler/exe'
     FileUtils.mkdir_p 'bundler/lib/bundler'
 
-    File.open 'bundler/exe/bundle',        'w' do |io| io.puts '# bundle'       end
-    File.open 'bundler/lib/bundler.rb',    'w' do |io| io.puts '# bundler.rb'   end
-    File.open 'bundler/lib/bundler/b.rb',  'w' do |io| io.puts '# b.rb'         end
+    File.open 'bundler/exe/bundle',        'w' do |io|
+      io.puts '# bundle'
+    end
+
+    File.open 'bundler/lib/bundler.rb',    'w' do |io|
+      io.puts '# bundler.rb'
+    end
+
+    File.open 'bundler/lib/bundler/b.rb',  'w' do |io|
+      io.puts '# b.rb'
+    end
 
     FileUtils.mkdir_p 'default/gems'
 
@@ -48,7 +67,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       io.puts gemspec.to_ruby
     end
 
-    open(File.join(Gem::Specification.default_specifications_dir, "bundler-1.15.4.gemspec"), 'w') do |io|
+    open(File.join(Gem.default_specifications_dir, "bundler-1.15.4.gemspec"), 'w') do |io|
       gemspec.version = "1.15.4"
       io.puts gemspec.to_ruby
     end
@@ -116,24 +135,17 @@ class TestGemCommandsSetupCommand < Gem::TestCase
 
     gem_exec = sprintf Gem.default_exec_format, 'gem'
     default_gem_bin_path = File.join @install_dir, 'bin', gem_exec
-    if Gem::USE_BUNDLER_FOR_GEMDEPS
-      bundle_exec = sprintf Gem.default_exec_format, 'bundle'
-      default_bundle_bin_path = File.join @install_dir, 'bin', bundle_exec
-    end
-
+    bundle_exec = sprintf Gem.default_exec_format, 'bundle'
+    default_bundle_bin_path = File.join @install_dir, 'bin', bundle_exec
     ruby_exec = sprintf Gem.default_exec_format, 'ruby'
 
     if Gem.win_platform?
       assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_gem_bin_path)
-      if Gem::USE_BUNDLER_FOR_GEMDEPS
-        assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_bundle_bin_path)
-      end
+      assert_match %r%\A#!\s*#{ruby_exec}%, File.read(default_bundle_bin_path)
       assert_match %r%\A#!\s*#{ruby_exec}%, File.read(gem_bin_path)
     else
       assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_gem_bin_path)
-      if Gem::USE_BUNDLER_FOR_GEMDEPS
-        assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_bundle_bin_path)
-      end
+      assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(default_bundle_bin_path)
       assert_match %r%\A#!/usr/bin/env #{ruby_exec}%, File.read(gem_bin_path)
     end
   end
@@ -157,10 +169,8 @@ class TestGemCommandsSetupCommand < Gem::TestCase
       assert_path_exists File.join(dir, 'rubygems.rb')
       assert_path_exists File.join(dir, 'rubygems/ssl_certs/rubygems.org/foo.pem')
 
-      if Gem::USE_BUNDLER_FOR_GEMDEPS
-        assert_path_exists File.join(dir, 'bundler.rb')
-        assert_path_exists File.join(dir, 'bundler/b.rb')
-      end
+      assert_path_exists File.join(dir, 'bundler.rb')
+      assert_path_exists File.join(dir, 'bundler/b.rb')
     end
   end
 
@@ -171,7 +181,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     @cmd.install_default_bundler_gem bin_dir
 
     bundler_spec = Gem::Specification.load("bundler/bundler.gemspec")
-    default_spec_path = File.join(Gem::Specification.default_specifications_dir, "#{bundler_spec.full_name}.gemspec")
+    default_spec_path = File.join(Gem.default_specifications_dir, "#{bundler_spec.full_name}.gemspec")
     spec = Gem::Specification.load(default_spec_path)
 
     spec.executables.each do |e|
@@ -179,10 +189,10 @@ class TestGemCommandsSetupCommand < Gem::TestCase
         assert_path_exists File.join(bin_dir, "#{e}.bat")
       end
 
-      assert_path_exists File.join bin_dir, e
+      assert_path_exists File.join bin_dir, Gem.default_exec_format % e
     end
 
-    default_dir = Gem::Specification.default_specifications_dir
+    default_dir = Gem.default_specifications_dir
 
     # expect to remove other versions of bundler gemspecs on default specification directory.
     refute_path_exists File.join(default_dir, "bundler-1.15.4.gemspec")
@@ -204,7 +214,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
 
     # expect to not remove bundler-* direcotyr.
     assert_path_exists 'default/gems/bundler-audit-1.0.0'
-  end if Gem::USE_BUNDLER_FOR_GEMDEPS
+  end
 
   def test_remove_old_lib_files
     lib                   = File.join @install_dir, 'lib'
@@ -212,7 +222,7 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     lib_bundler           = File.join lib, 'bundler'
     lib_rubygems_defaults = File.join lib_rubygems, 'defaults'
 
-    securerandom_rb    = File.join lib, 'securerandom.rb'
+    securerandom_rb = File.join lib, 'securerandom.rb'
 
     engine_defaults_rb = File.join lib_rubygems_defaults, 'jruby.rb'
     os_defaults_rb     = File.join lib_rubygems_defaults, 'operating_system.rb'
@@ -224,20 +234,35 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     FileUtils.mkdir_p lib_rubygems_defaults
     FileUtils.mkdir_p lib_bundler
 
-    File.open securerandom_rb,    'w' do |io| io.puts '# securerandom.rb'     end
+    File.open securerandom_rb,    'w' do |io|
+      io.puts '# securerandom.rb'
+    end
 
-    File.open old_builder_rb,     'w' do |io| io.puts '# builder.rb'          end
-    File.open old_format_rb,      'w' do |io| io.puts '# format.rb'           end
-    File.open old_bundler_c_rb,   'w' do |io| io.puts '# c.rb'                end
+    File.open old_builder_rb,     'w' do |io|
+      io.puts '# builder.rb'
+    end
 
-    File.open engine_defaults_rb, 'w' do |io| io.puts '# jruby.rb'            end
-    File.open os_defaults_rb,     'w' do |io| io.puts '# operating_system.rb' end
+    File.open old_format_rb,      'w' do |io|
+      io.puts '# format.rb'
+    end
+
+    File.open old_bundler_c_rb,   'w' do |io|
+      io.puts '# c.rb'
+    end
+
+    File.open engine_defaults_rb, 'w' do |io|
+      io.puts '# jruby.rb'
+    end
+
+    File.open os_defaults_rb,     'w' do |io|
+      io.puts '# operating_system.rb'
+    end
 
     @cmd.remove_old_lib_files lib
 
     refute_path_exists old_builder_rb
     refute_path_exists old_format_rb
-    refute_path_exists old_bundler_c_rb if Gem::USE_BUNDLER_FOR_GEMDEPS
+    refute_path_exists old_bundler_c_rb
 
     assert_path_exists securerandom_rb
     assert_path_exists engine_defaults_rb
@@ -298,4 +323,4 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     @ui.outs.set_encoding @default_external if @default_external
   end
 
-end
+end unless Gem.java_platform?

data/test/rubygems/test_gem_commands_signin_command.rb

@@ -26,7 +26,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase
   end
 
   def test_execute_when_already_signed_in_with_same_host
-    host            = 'http://some-gemcutter-compatible-host.org'
+    host = 'http://some-gemcutter-compatible-host.org'
 
     util_capture(nil, host) { @cmd.execute }
     old_credentials = YAML.load_file Gem.configuration.credentials_path
@@ -38,10 +38,10 @@ class TestGemCommandsSigninCommand < Gem::TestCase
   end
 
   def test_execute_when_already_signed_in_with_different_host
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf04045xxxx'
+    api_key = 'a5fdbb6ba150cbb83aad2bb2fede64cf04045xxxx'
 
     util_capture(nil, nil, api_key) { @cmd.execute }
-    host        = 'http://some-gemcutter-compatible-host.org'
+    host = 'http://some-gemcutter-compatible-host.org'
 
     util_capture(nil, host, api_key) { @cmd.execute }
     credentials = YAML.load_file Gem.configuration.credentials_path
@@ -87,7 +87,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase
     fetcher.data[data_key]     = response
     Gem::RemoteFetcher.fetcher = fetcher
 
-    sign_in_ui                 = ui_stub || Gem::MockGemUi.new("#{email}\n#{password}\n")
+    sign_in_ui = ui_stub || Gem::MockGemUi.new("#{email}\n#{password}\n")
 
     use_ui sign_in_ui do
       yield
@@ -95,4 +95,5 @@ class TestGemCommandsSigninCommand < Gem::TestCase
 
     sign_in_ui
   end
+
 end

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -7,11 +7,17 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
   def setup
     super
 
-    spec_fetcher
-
     @cmd = Gem::Commands::SourcesCommand.new
 
     @new_repo = "http://beta-gems.example.com"
+
+    @old_https_proxy_config = Gem.configuration[:http_proxy]
+  end
+
+  def teardown
+    Gem.configuration[:http_proxy] = @old_https_proxy_config
+
+    super
   end
 
   def test_initialize_proxy
@@ -40,9 +46,9 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
       fetcher.spec 'a', 1
     end
 
-    specs = Gem::Specification.map { |spec|
+    specs = Gem::Specification.map do |spec|
       [spec.name, spec.version, spec.original_platform]
-    }
+    end
 
     specs_dump_gz = StringIO.new
     Zlib::GzipWriter.wrap specs_dump_gz do |io|
@@ -69,6 +75,8 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
   end
 
   def test_execute_add_nonexistent_source
+    spec_fetcher
+
     uri = "http://beta-gems.example.com/specs.#{@marshal_version}.gz"
     @fetcher.data[uri] = proc do
       raise Gem::RemoteFetcher::FetchError.new('it died', uri)
@@ -92,6 +100,8 @@ Error fetching http://beta-gems.example.com:
   end
 
   def test_execute_add_redundant_source
+    spec_fetcher
+
     @cmd.handle_options %W[--add #{@gem_repo}]
 
     use_ui @ui do
@@ -109,6 +119,8 @@ source #{@gem_repo} already present in the cache
   end
 
   def test_execute_add_redundant_source_trailing_slash
+    spec_fetcher
+
     # Remove pre-existing gem source (w/ slash)
     repo_with_slash = "http://gems.example.com/"
     @cmd.handle_options %W[--remove #{repo_with_slash}]
@@ -167,9 +179,9 @@ source http://gems.example.com/ already present in the cache
       fetcher.spec 'a', 1
     end
 
-    specs = Gem::Specification.map { |spec|
+    specs = Gem::Specification.map do |spec|
       [spec.name, spec.version, spec.original_platform]
-    }
+    end
 
     specs_dump_gz = StringIO.new
     Zlib::GzipWriter.wrap specs_dump_gz do |io|
@@ -266,6 +278,8 @@ beta-gems.example.com is not a URI
   end
 
   def test_execute_remove_no_network
+    spec_fetcher
+
     @cmd.handle_options %W[--remove #{@gem_repo}]
 
     @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] = proc do