rubygems-update 0.9.4 → 0.9.5

data/test/test_gem_local_remote_options.rb

@@ -0,0 +1,84 @@
+require 'test/unit'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require 'rubygems/local_remote_options'
+require 'rubygems/command'
+
+class TestGemLocalRemoteOptions < RubyGemTestCase
+
+  def setup
+    super
+
+    @cmd = Gem::Command.new 'dummy', 'dummy'
+    @cmd.extend Gem::LocalRemoteOptions
+  end
+
+  def test_add_local_remote_options
+    @cmd.add_local_remote_options
+
+    args = %w[-l -r -b -B 10 --source http://gems.example.com -p --update-sources]
+    assert @cmd.handles?(args)
+  end
+
+  def test_local_eh
+    assert_equal false, @cmd.local?
+
+    @cmd.options[:domain] = :local
+
+    assert_equal true, @cmd.local?
+
+    @cmd.options[:domain] = :both
+
+    assert_equal true, @cmd.local?
+  end
+
+  def test_remote_eh
+    assert_equal false, @cmd.remote?
+
+    @cmd.options[:domain] = :remote
+
+    assert_equal true, @cmd.remote?
+
+    @cmd.options[:domain] = :both
+
+    assert_equal true, @cmd.remote?
+  end
+
+  def test_source_option
+    @cmd.add_source_option
+
+    s1 = URI.parse 'http://more-gems.example.com'
+    s2 = URI.parse 'http://even-more-gems.example.com'
+
+    @cmd.handle_options %W[--source #{s1} --source #{s2}]
+
+    assert_equal [s1, s2], Gem.sources
+  end
+
+  def test_update_sources_option
+    @cmd.add_update_sources_option
+
+    Gem.configuration.update_sources = false
+
+    @cmd.handle_options %W[--update-sources]
+
+    assert_equal true, Gem.configuration.update_sources
+
+    @cmd.handle_options %W[--no-update-sources]
+
+    assert_equal false, Gem.configuration.update_sources
+  end
+
+  def test_source_option_bad
+    @cmd.add_source_option
+
+    s1 = 'htp://more-gems.example.com'
+
+    assert_raise OptionParser::InvalidArgument do
+      @cmd.handle_options %W[--source #{s1}]
+    end
+
+    assert_equal %w[http://gems.example.com], Gem.sources
+  end
+
+end
+

data/test/test_gem_outdated_command.rb

@@ -1,12 +1,17 @@
 require 'test/unit'
-require 'test/gemutilities'
-require 'rubygems/gem_commands'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require 'rubygems/commands/outdated_command'
 
 class TestGemOutdatedCommand < RubyGemTestCase
 
   def setup
-    Gem::CommandManager.instance    
     super
+
+    @cmd = Gem::Commands::OutdatedCommand.new
+  end
+
+  def test_initialize
+    assert @cmd.handles?(%W[--platform #{Gem::Platform.local}])
   end
 
   def test_execute
@@ -23,15 +28,12 @@ class TestGemOutdatedCommand < RubyGemTestCase
                                  remote_20.full_name + ".gemspec"
     FileUtils.rm remote_spec_file
 
-    oc = Gem::Commands::OutdatedCommand.new
-
     util_setup_source_info_cache remote_10, remote_20
 
-    ui = MockGemUi.new 
-    use_ui ui do oc.execute end
+    use_ui @ui do @cmd.execute end
 
-    assert_equal "foo (0.2 < 2.0)\n", ui.output
-    assert_equal "", ui.error
+    assert_equal "foo (0.2 < 2.0)\n", @ui.output
+    assert_equal "", @ui.error
   end
 
 end

data/test/test_gem_platform.rb

@@ -0,0 +1,240 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require 'test/unit'
+require 'rubygems/platform'
+require 'rbconfig'
+
+class TestGemPlatform < RubyGemTestCase
+
+  def test_self_local
+    util_set_arch 'i686-darwin8.10.1'
+
+    assert_equal Gem::Platform.new(%w[x86 darwin 8]), Gem::Platform.local
+  end
+
+  def test_self_match
+    assert Gem::Platform.match(nil), 'nil == ruby'
+    assert Gem::Platform.match(Gem::Platform.local), 'exact match'
+    assert Gem::Platform.match(Gem::Platform.local.to_s), '=~ match'
+    assert Gem::Platform.match(Gem::Platform::RUBY), 'ruby'
+  end
+
+  def test_self_new
+    assert_equal Gem::Platform::RUBY, Gem::Platform.new(Gem::Platform::RUBY)
+    assert_equal Gem::Platform::RUBY, Gem::Platform.new(nil)
+    assert_equal Gem::Platform::RUBY, Gem::Platform.new('')
+  end
+
+  def test_initialize
+    test_cases = {
+      'amd64-freebsd6'         => ['amd64',     'freebsd',   '6'],
+      'hppa2.0w-hpux11.31'     => ['hppa2.0w',  'hpux',      '11'],
+      'java'                   => [nil,         'java',      nil],
+      'jruby'                  => [nil,         'java',      nil],
+      'powerpc-aix5.3.0.0'     => ['powerpc',   'aix',       '5'],
+      'powerpc-darwin7'        => ['powerpc',   'darwin',    '7'],
+      'powerpc-darwin8'        => ['powerpc',   'darwin',    '8'],
+      'powerpc-linux'          => ['powerpc',   'linux',     nil],
+      'powerpc64-linux'        => ['powerpc64', 'linux',     nil],
+      'sparc-solaris2.10'      => ['sparc',     'solaris',   '2.10'],
+      'sparc-solaris2.8'       => ['sparc',     'solaris',   '2.8'],
+      'sparc-solaris2.9'       => ['sparc',     'solaris',   '2.9'],
+      'universal-darwin8'      => ['universal', 'darwin',    '8'],
+      'universal-darwin9'      => ['universal', 'darwin',    '9'],
+      'i386-cygwin'            => ['x86',       'cygwin',    nil],
+      'i686-darwin'            => ['x86',       'darwin',    nil],
+      'i686-darwin8.4.1'       => ['x86',       'darwin',    '8'],
+      'i386-freebsd4.11'       => ['x86',       'freebsd',   '4'],
+      'i386-freebsd5'          => ['x86',       'freebsd',   '5'],
+      'i386-freebsd6'          => ['x86',       'freebsd',   '6'],
+      'i386-freebsd7'          => ['x86',       'freebsd',   '7'],
+      'i386-java1.5'           => ['x86',       'java',      '1.5'],
+      'x86-java1.6'            => ['x86',       'java',      '1.6'],
+      'i386-java1.6'           => ['x86',       'java',      '1.6'],
+      'i686-linux'             => ['x86',       'linux',     nil],
+      'i586-linux'             => ['x86',       'linux',     nil],
+      'i486-linux'             => ['x86',       'linux',     nil],
+      'i386-linux'             => ['x86',       'linux',     nil],
+      'i586-linux-gnu'         => ['x86',       'linux',     nil],
+      'i386-linux-gnu'         => ['x86',       'linux',     nil],
+      'i386-mingw32'           => ['x86',       'mingw32',   nil],
+      'i386-mswin32'           => ['x86',       'mswin32',   nil],
+      'i386-mswin32_80'        => ['x86',       'mswin32',   '80'],
+      'i386-netbsdelf'         => ['x86',       'netbsdelf', nil],
+      'i386-openbsd4.0'        => ['x86',       'openbsd',   '4.0'],
+      'i386-solaris2.10'       => ['x86',       'solaris',   '2.10'],
+      'i386-solaris2.8'        => ['x86',       'solaris',   '2.8'],
+      'x86_64-linux'           => ['x86_64',    'linux',     nil],
+      'x86_64-openbsd3.9'      => ['x86_64',    'openbsd',   '3.9'],
+      'x86_64-openbsd4.0'      => ['x86_64',    'openbsd',   '4.0'],
+    }
+
+    test_cases.each do |arch, expected|
+      platform = Gem::Platform.new arch
+      assert_equal expected, platform.to_a, arch.inspect
+    end
+  end
+
+  def test_initialize_command_line
+    expected = ['x86', 'mswin32', nil]
+
+    platform = Gem::Platform.new 'i386-mswin32'
+
+    assert_equal expected, platform.to_a, 'i386-mswin32'
+
+    expected = ['x86', 'mswin32', '80']
+
+    platform = Gem::Platform.new 'i386-mswin32-80'
+
+    assert_equal expected, platform.to_a, 'i386-mswin32-80'
+  end
+
+  def test_initialize_mswin32_vc6
+    orig_RUBY_SO_NAME = Config::CONFIG['RUBY_SO_NAME']
+    Config::CONFIG['RUBY_SO_NAME'] = 'msvcrt-ruby18'
+
+    expected = ['x86', 'mswin32', nil]
+
+    platform = Gem::Platform.new 'i386-mswin32'
+
+    assert_equal expected, platform.to_a, 'i386-mswin32 VC6'
+  ensure
+    Config::CONFIG['RUBY_SO_NAME'] = orig_RUBY_SO_NAME
+  end
+
+  def test_initialize_platform
+    platform = Gem::Platform.new 'cpu-my_platform1'
+    expected = Gem::Platform.new platform
+
+    assert_equal 'cpu', platform.cpu
+    assert_equal 'my_platform', platform.os
+    assert_equal '1', platform.version
+  end
+
+  def test_initialize_test
+    platform = Gem::Platform.new 'cpu-my_platform1'
+    assert_equal 'cpu', platform.cpu
+    assert_equal 'my_platform', platform.os
+    assert_equal '1', platform.version
+
+    platform = Gem::Platform.new 'cpu-other_platform1'
+    assert_equal 'cpu', platform.cpu
+    assert_equal 'other_platform', platform.os
+    assert_equal '1', platform.version
+  end
+
+  def test_to_s
+    if win_platform? then
+      assert_equal 'x86-mswin32-60', Gem::Platform.local.to_s
+    else
+      assert_equal 'x86-darwin-8', Gem::Platform.local.to_s
+    end
+  end
+
+  def test_equals2
+    my = Gem::Platform.new %w[cpu my_platform 1]
+    other = Gem::Platform.new %w[cpu other_platform 1]
+
+    assert_equal my, my
+    assert_not_equal my, other
+    assert_not_equal other, my
+  end
+
+  def test_equals3
+    my = Gem::Platform.new %w[cpu my_platform 1]
+    other = Gem::Platform.new %w[cpu other_platform 1]
+
+    assert(my === my)
+    assert !(other === my)
+    assert !(my === other)
+  end
+
+  def test_equals3_cpu
+    ppc_darwin8 = Gem::Platform.new 'powerpc-darwin8.0'
+    uni_darwin8 = Gem::Platform.new 'universal-darwin8.0'
+    x86_darwin8 = Gem::Platform.new 'i686-darwin8.0'
+
+    util_set_arch 'powerpc-darwin8'
+    assert((ppc_darwin8 === Gem::Platform.local), 'powerpc =~ universal')
+    assert((uni_darwin8 === Gem::Platform.local), 'powerpc =~ universal')
+    assert !(x86_darwin8 === Gem::Platform.local), 'powerpc =~ universal'
+
+    util_set_arch 'i686-darwin8'
+    assert !(ppc_darwin8 === Gem::Platform.local), 'powerpc =~ universal'
+    assert((uni_darwin8 === Gem::Platform.local), 'x86 =~ universal')
+    assert((x86_darwin8 === Gem::Platform.local), 'powerpc =~ universal')
+
+    util_set_arch 'universal-darwin8'
+    assert((ppc_darwin8 === Gem::Platform.local), 'universal =~ ppc')
+    assert((uni_darwin8 === Gem::Platform.local), 'universal =~ universal')
+    assert((x86_darwin8 === Gem::Platform.local), 'universal =~ x86')
+  end
+
+  def test_equals3_version
+    util_set_arch 'i686-darwin8'
+
+    x86_darwin = Gem::Platform.new ['x86', 'darwin', nil]
+    x86_darwin7 = Gem::Platform.new ['x86', 'darwin', '7']
+    x86_darwin8 = Gem::Platform.new ['x86', 'darwin', '8']
+    x86_darwin9 = Gem::Platform.new ['x86', 'darwin', '9']
+
+    assert((x86_darwin  === Gem::Platform.local), 'x86_darwin === x86_darwin8')
+    assert((x86_darwin8 === Gem::Platform.local), 'x86_darwin8 === x86_darwin8')
+
+    assert !(x86_darwin7 === Gem::Platform.local), 'x86_darwin7 === x86_darwin8'
+    assert !(x86_darwin9 === Gem::Platform.local), 'x86_darwin9 === x86_darwin8'
+  end
+
+  def test_equals_tilde
+    util_set_arch 'i386-mswin32'
+
+    assert_match 'mswin32',      Gem::Platform.local
+    assert_match 'i386-mswin32', Gem::Platform.local
+
+    # oddballs
+    assert_match 'i386-mswin32-mq5.3', Gem::Platform.local
+    assert_match 'i386-mswin32-mq6',   Gem::Platform.local
+    deny_match   'win32-1.8.2-VC7',    Gem::Platform.local
+    deny_match   'win32-1.8.4-VC6',    Gem::Platform.local
+    deny_match   'win32-source',       Gem::Platform.local
+    deny_match   'windows',            Gem::Platform.local
+
+    util_set_arch 'i686-linux'
+    assert_match 'i486-linux', Gem::Platform.local
+    assert_match 'i586-linux', Gem::Platform.local
+    assert_match 'i686-linux', Gem::Platform.local
+
+    util_set_arch 'i686-darwin8'
+    assert_match 'i686-darwin8.4.1', Gem::Platform.local
+    assert_match 'i686-darwin8.8.2', Gem::Platform.local
+
+    util_set_arch 'java'
+    assert_match 'java',  Gem::Platform.local
+    assert_match 'jruby', Gem::Platform.local
+
+    util_set_arch 'powerpc-darwin'
+    assert_match 'powerpc-darwin', Gem::Platform.local
+
+    util_set_arch 'powerpc-darwin7'
+    assert_match 'powerpc-darwin7.9.0', Gem::Platform.local
+
+    util_set_arch 'powerpc-darwin8'
+    assert_match 'powerpc-darwin8.10.0', Gem::Platform.local
+
+    util_set_arch 'sparc-solaris2.8'
+    assert_match 'sparc-solaris2.8-mq5.3', Gem::Platform.local
+  end
+
+  def assert_match(pattern, platform, message = '')
+    full_message = build_message message, "<?> expected to be =~\n<?>.",
+                                 platform, pattern
+    assert_block(full_message) { platform =~ pattern }
+  end
+
+  def deny_match(pattern, platform, message = '')
+    full_message = build_message message, "<?> expected to be !~\n<?>.",
+                                 platform, pattern
+    assert_block(full_message) { platform !~ pattern }
+  end
+
+end
+

data/test/{test_remote_fetcher.rb → test_gem_remote_fetcher.rb}

@@ -5,19 +5,12 @@
 # See LICENSE.txt for permissions.
 #++
 
-
 require 'test/unit'
-require 'zlib'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'webrick'
+require 'zlib'
 require 'rubygems/remote_fetcher'
 
-require 'test/gemutilities'
-require 'test/mockgemui'
-require 'test/yaml_data'
-
-Gem.manage_gems
-include WEBrick
-
 # = Testing Proxy Settings
 #
 # These tests check the proper proxy server settings by running two
@@ -32,26 +25,71 @@ include WEBrick
 # software doesn't really care, as long as we hit the proxy URL when a
 # proxy is configured.
 #
-class TestRemoteFetcher < RubyGemTestCase
+class TestGemRemoteFetcher < RubyGemTestCase
 
   include Gem::DefaultUserInteraction
 
-  SERVER_DATA = YAML_DATA
-  
-  PROXY_PORT = 12344
-  SERVER_PORT = 12345
+  SERVER_DATA = <<-EOY
+--- !ruby/object:Gem::Cache
+gems:
+  rake-0.4.11: !ruby/object:Gem::Specification
+    rubygems_version: "0.7"
+    specification_version: 1
+    name: rake
+    version: !ruby/object:Gem::Version
+      version: 0.4.11
+    date: 2004-11-12
+    summary: Ruby based make-like utility.
+    require_paths:
+      - lib
+    author: Jim Weirich
+    email: jim@weirichhouse.org
+    homepage: http://rake.rubyforge.org
+    rubyforge_project: rake
+    description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.
+    autorequire:
+    default_executable: rake
+    bindir: bin
+    has_rdoc: true
+    required_ruby_version: !ruby/object:Gem::Version::Requirement
+      requirements:
+        -
+          - ">"
+          - !ruby/object:Gem::Version
+            version: 0.0.0
+      version:
+    platform: ruby
+    files:
+      - README
+    test_files: []
+    library_stubs:
+    rdoc_options:
+    extra_rdoc_files:
+    executables:
+      - rake
+    extensions: []
+    requirements: []
+    dependencies: []
+  EOY
+
+  PROXY_DATA = SERVER_DATA.gsub(/0.4.11/, '0.4.2')
+
+  # don't let 1.8 and 1.9 autotest collide
+  RUBY_VERSION =~ /(\d+)\.(\d+)\.(\d+)/
+  PROXY_PORT = 12345 + $1.to_i * 100 + $2.to_i * 10 + $3.to_i
+  SERVER_PORT = 23456 + $1.to_i * 100 + $2.to_i * 10 + $3.to_i
 
   def setup
     super
     self.class.start_servers
     self.class.enable_yaml = true
     self.class.enable_zip = false
-    ENV['http_proxy'] = nil
-    ENV['HTTP_PROXY'] = nil
-    ENV['http_proxy_user'] = nil
-    ENV['HTTP_PROXY_USER'] = nil
-    ENV['http_proxy_pass'] = nil
-    ENV['HTTP_PROXY_PASS'] = nil
+    ENV.delete 'http_proxy'
+    ENV.delete 'HTTP_PROXY'
+    ENV.delete 'http_proxy_user'
+    ENV.delete 'HTTP_PROXY_USER'
+    ENV.delete 'http_proxy_pass'
+    ENV.delete 'HTTP_PROXY_PASS'
 
     base_server_uri = "http://localhost:#{SERVER_PORT}"
     @proxy_uri = "http://localhost:#{PROXY_PORT}"
@@ -77,6 +115,15 @@ class TestRemoteFetcher < RubyGemTestCase
     assert_equal proxy_uri, fetcher.instance_variable_get(:@proxy_uri).to_s
   end
 
+  def test_self_fetcher_with_proxy_URI
+    proxy_uri = URI.parse 'http://proxy.example.com'
+    Gem.configuration[:http_proxy] = proxy_uri
+    fetcher = Gem::RemoteFetcher.fetcher
+    assert_not_nil fetcher
+    assert_kind_of Gem::RemoteFetcher, fetcher
+    assert_equal proxy_uri, fetcher.instance_variable_get(:@proxy_uri)
+  end
+
   def test_fetch_size_bad_uri
     fetcher = Gem::RemoteFetcher.new nil
 
@@ -97,27 +144,27 @@ class TestRemoteFetcher < RubyGemTestCase
       fetcher.fetch_size 'http://gems.example.com/yaml'
     end
 
-    assert_equal 'SocketError(SocketError)', e.message
+    assert_equal 'SocketError (SocketError)', e.message
   end
 
   def test_no_proxy
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       fetcher = Gem::RemoteFetcher.new nil
       assert_data_from_server fetcher.fetch_path(@server_uri)
       assert_equal SERVER_DATA.size, fetcher.fetch_size(@server_uri)
     end
   end
-  
+
   def test_explicit_proxy
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       fetcher = Gem::RemoteFetcher.new @proxy_uri
       assert_equal PROXY_DATA.size, fetcher.fetch_size(@server_uri)
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
   end
-  
+
   def test_explicit_proxy_with_user_auth
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       uri = URI.parse @proxy_uri
       uri.user, uri.password = 'foo', 'bar'
       fetcher = Gem::RemoteFetcher.new uri.to_s
@@ -127,7 +174,7 @@ class TestRemoteFetcher < RubyGemTestCase
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
 
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       uri = URI.parse @proxy_uri
       uri.user, uri.password = 'domain%5Cuser', 'bar'
       fetcher = Gem::RemoteFetcher.new uri.to_s
@@ -137,7 +184,7 @@ class TestRemoteFetcher < RubyGemTestCase
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
 
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       uri = URI.parse @proxy_uri
       uri.user, uri.password = 'user', 'my%20pass'
       fetcher = Gem::RemoteFetcher.new uri.to_s
@@ -149,7 +196,7 @@ class TestRemoteFetcher < RubyGemTestCase
   end
 
   def test_explicit_proxy_with_user_auth_in_env
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       ENV['http_proxy'] = @proxy_uri
       ENV['http_proxy_user'] = 'foo'
       ENV['http_proxy_pass'] = 'bar'
@@ -160,7 +207,7 @@ class TestRemoteFetcher < RubyGemTestCase
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
 
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       ENV['http_proxy'] = @proxy_uri
       ENV['http_proxy_user'] = 'foo\user'
       ENV['http_proxy_pass'] = 'my bar'
@@ -181,7 +228,7 @@ class TestRemoteFetcher < RubyGemTestCase
       fetcher.fetch_path 'uri'
     end
 
-    assert_equal 'EOFError reading uri', e.message
+    assert_equal 'EOFError: EOFError reading uri', e.message
   end
 
   def test_fetch_path_socket_error
@@ -193,7 +240,7 @@ class TestRemoteFetcher < RubyGemTestCase
       fetcher.fetch_path 'uri'
     end
 
-    assert_equal 'SocketError reading uri', e.message
+    assert_equal 'SocketError: SocketError reading uri', e.message
   end
 
   def test_fetch_path_system_call_error
@@ -207,11 +254,30 @@ class TestRemoteFetcher < RubyGemTestCase
       fetcher.fetch_path 'uri'
     end
 
-    assert_equal 'Errno::ECONNREFUSED reading uri', e.message
+    assert_match %r|\AErrno::ECONNREFUSED: .* - connect\(2\) reading uri\z|,
+                 e.message
+  end
+
+  def test_get_proxy_from_env_empty
+    orig_env_HTTP_PROXY = ENV['HTTP_PROXY']
+    orig_env_http_proxy = ENV['http_proxy']
+
+    ENV['HTTP_PROXY'] = ''
+    ENV.delete 'http_proxy'
+
+    fetcher = Gem::RemoteFetcher.new nil
+
+    assert_equal nil, fetcher.send(:get_proxy_from_env)
+
+  ensure
+    orig_env_HTTP_PROXY.nil? ? ENV.delete('HTTP_PROXY') :
+                               ENV['HTTP_PROXY'] = orig_env_HTTP_PROXY
+    orig_env_http_proxy.nil? ? ENV.delete('http_proxy') :
+                               ENV['http_proxy'] = orig_env_http_proxy
   end
 
   def test_implicit_no_proxy
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       ENV['http_proxy'] = 'http://fakeurl:12345'
       fetcher = Gem::RemoteFetcher.new :no_proxy
       assert_data_from_server fetcher.fetch_path(@server_uri)
@@ -219,30 +285,30 @@ class TestRemoteFetcher < RubyGemTestCase
   end
 
   def test_implicit_proxy
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       ENV['http_proxy'] = @proxy_uri
       fetcher = Gem::RemoteFetcher.new nil
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
   end
-  
+
   def test_implicit_upper_case_proxy
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       ENV['HTTP_PROXY'] = @proxy_uri
       fetcher = Gem::RemoteFetcher.new nil
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
   end
-  
+
   def test_implicit_proxy_no_env
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       fetcher = Gem::RemoteFetcher.new nil
       assert_data_from_server fetcher.fetch_path(@server_uri)
     end
   end
-  
+
   def test_zip
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       self.class.enable_zip = true
       fetcher = Gem::RemoteFetcher.new nil
       assert_equal SERVER_DATA.size, fetcher.fetch_size(@server_uri), "probably not from proxy"
@@ -252,14 +318,15 @@ class TestRemoteFetcher < RubyGemTestCase
   end
 
   def test_no_zip
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
+      self.class.enable_zip = false
       fetcher = Gem::RemoteFetcher.new nil
       assert_error { fetcher.fetch_path(@server_z_uri) }
     end
   end
 
   def test_yaml_error_on_size
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       self.class.enable_yaml = false
       fetcher = Gem::RemoteFetcher.new nil
       assert_error { fetcher.size }
@@ -275,40 +342,40 @@ class TestRemoteFetcher < RubyGemTestCase
     rescue exception_class => ex
       got_exception = true
     end
-    assert got_exception, "Expected exception conforming to #{exception_class}" 
+    assert got_exception, "Expected exception conforming to #{exception_class}"
   end
 
   def assert_data_from_server(data)
     assert_block("Data is not from server") { data =~ /0\.4\.11/ }
   end
-    
+
   def assert_data_from_proxy(data)
     assert_block("Data is not from proxy") { data =~ /0\.4\.2/ }
   end
-    
-  class NilLog < Log
+
+  class NilLog < WEBrick::Log
     def log(level, data) #Do nothing
     end
   end
-  
+
   class << self
     attr_reader :normal_server, :proxy_server
     attr_accessor :enable_zip, :enable_yaml
-    
+
     def start_servers
       @normal_server ||= start_server(SERVER_PORT, SERVER_DATA)
       @proxy_server  ||= start_server(PROXY_PORT, PROXY_DATA)
       @enable_yaml = true
       @enable_zip = false
     end
-    
+
     private
-    
+
     def start_server(port, data)
       Thread.new do
         begin
           null_logger = NilLog.new
-          s = HTTPServer.new(
+          s = WEBrick::HTTPServer.new(
             :Port            => port,
             :DocumentRoot    => nil,
             :Logger          => null_logger,
@@ -321,7 +388,7 @@ class TestRemoteFetcher < RubyGemTestCase
               res['Content-Type'] = 'text/plain'
               res['content-length'] = data.size
             else
-              res.code = "404"
+              res.status = "404"
               res.body = "<h1>NOT FOUND</h1>"
               res['Content-Type'] = 'text/html'
             end
@@ -331,18 +398,20 @@ class TestRemoteFetcher < RubyGemTestCase
               res.body = Zlib::Deflate.deflate(data)
               res['Content-Type'] = 'text/plain'
             else
-              res.code = "404"
+              res.status = "404"
               res.body = "<h1>NOT FOUND</h1>"
               res['Content-Type'] = 'text/html'
             end
           }
           s.start
         rescue Exception => ex
+          abort ex.message
           puts "ERROR during server thread: #{ex.message}"
         end
       end
       sleep 0.2                 # Give the servers time to startup
     end
   end
-  
+
 end
+