rubygems-update 1.4.2 → 1.5.0

data/test/{test_gem_builder.rb → rubygems/test_gem_builder.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/builder'
 
-class TestGemBuilder < RubyGemTestCase
+class TestGemBuilder < Gem::TestCase
 
   def test_build
     builder = Gem::Builder.new quick_gem('a')

data/test/{test_gem_command.rb → rubygems/test_gem_command.rb}

@@ -1,11 +1,11 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/command'
 
 class Gem::Command
   public :parser
 end
 
-class TestGemCommand < RubyGemTestCase
+class TestGemCommand < Gem::TestCase
 
   def setup
     super
@@ -87,7 +87,7 @@ class TestGemCommand < RubyGemTestCase
     assert done
   end
 
-  def test_invode_with_bad_options
+  def test_invoke_with_bad_options
     use_ui @ui do
       @cmd.when_invoked do true end
 

data/test/{test_gem_command_manager.rb → rubygems/test_gem_command_manager.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/command_manager'
 
-class TestGemCommandManager < RubyGemTestCase
+class TestGemCommandManager < Gem::TestCase
 
   def setup
     super
@@ -10,34 +10,43 @@ class TestGemCommandManager < RubyGemTestCase
   end
 
   def test_run_interrupt
+    old_load_path = $:.dup
+    $: << "test/rubygems"
     Gem.load_env_plugins
 
     use_ui @ui do
-      assert_raises MockGemUi::TermError do
+      assert_raises Gem::MockGemUi::TermError do
         @command_manager.run 'interrupt'
       end
       assert_equal '', ui.output
       assert_equal "ERROR:  Interrupted\n", ui.error
     end
+  ensure
+    $:.replace old_load_path
   end
 
   def test_run_crash_command
+    old_load_path = $:.dup
+    $: << "test/rubygems"
+
     @command_manager.register_command :crash
     use_ui @ui do
-      assert_raises MockGemUi::TermError do
+      assert_raises Gem::MockGemUi::TermError do
         @command_manager.run 'crash'
       end
       assert_equal '', ui.output
       err = ui.error.split("\n").first
       assert_equal "ERROR:  Loading command: crash (RuntimeError)", err
     end
+  ensure
+    $:.replace old_load_path
   end
 
   def test_process_args_bad_arg
     use_ui @ui do
-      assert_raises(MockGemUi::TermError) {
+      assert_raises Gem::MockGemUi::TermError do
         @command_manager.process_args("--bad-arg")
-      }
+      end
     end
 
     assert_match(/invalid option: --bad-arg/i, @ui.error)

data/test/{test_gem_commands_build_command.rb → rubygems/test_gem_commands_build_command.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/build_command'
 require 'rubygems/format'
 
-class TestGemCommandsBuildCommand < RubyGemTestCase
+class TestGemCommandsBuildCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_cert_command.rb → rubygems/test_gem_commands_cert_command.rb}

@@ -1,11 +1,11 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/cert_command'
 
 unless defined? OpenSSL then
   warn "`gem cert` tests are being skipped, module OpenSSL not found"
 end
 
-class TestGemCommandsCertCommand < RubyGemTestCase
+class TestGemCommandsCertCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_check_command.rb → rubygems/test_gem_commands_check_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/check_command'
 
-class TestGemCommandsCheckCommand < RubyGemTestCase
+class TestGemCommandsCheckCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_contents_command.rb → rubygems/test_gem_commands_contents_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/contents_command'
 
-class TestGemCommandsContentsCommand < RubyGemTestCase
+class TestGemCommandsContentsCommand < Gem::TestCase
 
   def setup
     super
@@ -48,7 +48,7 @@ class TestGemCommandsContentsCommand < RubyGemTestCase
   def test_execute_bad_gem
     @cmd.options[:args] = %w[foo]
 
-    assert_raises MockGemUi::TermError do
+    assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end

data/test/{test_gem_commands_dependency_command.rb → rubygems/test_gem_commands_dependency_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/dependency_command'
 
-class TestGemCommandsDependencyCommand < RubyGemTestCase
+class TestGemCommandsDependencyCommand < Gem::TestCase
 
   def setup
     super
@@ -66,7 +66,7 @@ Gem pl-1-x86-linux
   def test_execute_no_match
     @cmd.options[:args] = %w[foo]
 
-    assert_raises MockGemUi::TermError do
+    assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end
@@ -155,7 +155,7 @@ Gem foo-2
     @cmd.options[:reverse_dependencies] = true
     @cmd.options[:domain] = :remote
 
-    assert_raises MockGemUi::TermError do
+    assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end

data/test/{test_gem_commands_environment_command.rb → rubygems/test_gem_commands_environment_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/environment_command'
 
-class TestGemCommandsEnvironmentCommand < RubyGemTestCase
+class TestGemCommandsEnvironmentCommand < Gem::TestCase
 
   def setup
     super
@@ -131,5 +131,14 @@ class TestGemCommandsEnvironmentCommand < RubyGemTestCase
     assert_equal '', @ui.error
   end
 
-end
+  def test_execute_platform
+    @cmd.send :handle_options, %w[platform]
+
+    use_ui @ui do
+      @cmd.execute
+    end
 
+    assert_equal "#{Gem.platforms.join File::PATH_SEPARATOR}\n", @ui.output
+    assert_equal '', @ui.error
+  end
+end

data/test/{test_gem_commands_fetch_command.rb → rubygems/test_gem_commands_fetch_command.rb}

@@ -1,9 +1,9 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/package'
 require 'rubygems/security'
 require 'rubygems/commands/fetch_command'
 
-class TestGemCommandsFetchCommand < RubyGemTestCase
+class TestGemCommandsFetchCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_generate_index_command.rb → rubygems/test_gem_commands_generate_index_command.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/indexer'
 require 'rubygems/commands/generate_index_command'
 
-class TestGemCommandsGenerateIndexCommand < RubyGemTestCase
+class TestGemCommandsGenerateIndexCommand < Gem::TestCase
 
   def setup
     super
@@ -16,15 +16,11 @@ class TestGemCommandsGenerateIndexCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    yaml = File.join @gemhome, 'yaml'
-    yaml_z = File.join @gemhome, 'yaml.Z'
-    quick_index = File.join @gemhome, 'quick', 'index'
-    quick_index_rz = File.join @gemhome, 'quick', 'index.rz'
+    marshal = File.join @gemhome, 'Marshal.4.8'
+    marshal_z = File.join @gemhome, 'Marshal.4.8.Z'
 
-    assert File.exist?(yaml), yaml
-    assert File.exist?(yaml_z), yaml_z
-    assert File.exist?(quick_index), quick_index
-    assert File.exist?(quick_index_rz), quick_index_rz
+    assert File.exist?(marshal), marshal
+    assert File.exist?(marshal_z), marshal_z
   end
 
   def test_execute_rss_update
@@ -33,7 +29,7 @@ class TestGemCommandsGenerateIndexCommand < RubyGemTestCase
     @cmd.options[:rss_gems_host] = 'gems.example.com'
 
     use_ui @ui do
-      assert_raises MockGemUi::TermError do
+      assert_raises Gem::MockGemUi::TermError do
         @cmd.execute
       end
     end

data/test/{test_gem_commands_install_command.rb → rubygems/test_gem_commands_install_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/install_command'
 
-class TestGemCommandsInstallCommand < RubyGemTestCase
+class TestGemCommandsInstallCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_list_command.rb → rubygems/test_gem_commands_list_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/list_command'
 
-class TestGemCommandsListCommand < RubyGemTestCase
+class TestGemCommandsListCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_lock_command.rb → rubygems/test_gem_commands_lock_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/lock_command'
 
-class TestGemCommandsLockCommand < RubyGemTestCase
+class TestGemCommandsLockCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_outdated_command.rb → rubygems/test_gem_commands_outdated_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/outdated_command'
 
-class TestGemCommandsOutdatedCommand < RubyGemTestCase
+class TestGemCommandsOutdatedCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_owner_command.rb → rubygems/test_gem_commands_owner_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/owner_command'
 
-class TestGemCommandsOwnerCommand < RubyGemTestCase
+class TestGemCommandsOwnerCommand < Gem::TestCase
 
   def setup
     super
@@ -38,7 +38,7 @@ EOF
     response = "You don't have permission to push to this gem"
     @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 403, 'Forbidden']
 
-    assert_raises MockGemUi::TermError do
+    assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.show_owners("freewill")
       end
@@ -66,7 +66,7 @@ EOF
     response = "You don't have permission to push to this gem"
     @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
 
-    assert_raises MockGemUi::TermError do
+    assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.add_owners("freewill", ["user-new1@example.com"])
       end
@@ -94,7 +94,7 @@ EOF
     response = "You don't have permission to push to this gem"
     @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
 
-    assert_raises MockGemUi::TermError do
+    assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.remove_owners("freewill", ["user-remove1@example.com"])
       end

data/test/{test_gem_commands_pristine_command.rb → rubygems/test_gem_commands_pristine_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/pristine_command'
 
-class TestGemCommandsPristineCommand < RubyGemTestCase
+class TestGemCommandsPristineCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_push_command.rb → rubygems/test_gem_commands_push_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/push_command'
 
-class TestGemCommandsPushCommand < RubyGemTestCase
+class TestGemCommandsPushCommand < Gem::TestCase
 
   def setup
     super
@@ -68,7 +68,7 @@ class TestGemCommandsPushCommand < RubyGemTestCase
     response = "You don't have permission to push to this gem"
     @fetcher.data["#{Gem.host}/api/v1/gems"] = [response, 403, 'Forbidden']
 
-    assert_raises MockGemUi::TermError do
+    assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.send_gem(@path)
       end

data/test/{test_gem_commands_query_command.rb → rubygems/test_gem_commands_query_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/query_command'
 
-class TestGemCommandsQueryCommand < RubyGemTestCase
+class TestGemCommandsQueryCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_server_command.rb → rubygems/test_gem_commands_server_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/server_command'
 
-class TestGemCommandsServerCommand < RubyGemTestCase
+class TestGemCommandsServerCommand < Gem::TestCase
 
   def setup
     super

data/test/{test_gem_commands_sources_command.rb → rubygems/test_gem_commands_sources_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/sources_command'
 
-class TestGemCommandsSourcesCommand < RubyGemTestCase
+class TestGemCommandsSourcesCommand < Gem::TestCase
 
   def setup
     super
@@ -84,7 +84,9 @@ class TestGemCommandsSourcesCommand < RubyGemTestCase
     util_setup_spec_fetcher
 
     use_ui @ui do
-      @cmd.execute
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
     end
 
     expected = <<-EOF
@@ -102,7 +104,9 @@ Error fetching http://beta-gems.example.com:
     util_setup_spec_fetcher
 
     use_ui @ui do
-      @cmd.execute
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
     end
 
     assert_equal [@gem_repo], Gem.sources
@@ -131,10 +135,6 @@ beta-gems.example.com is not a URI
 
     expected = <<-EOF
 *** Removed specs cache ***
-*** Removed user source cache ***
-*** Removed latest user source cache ***
-*** Removed system source cache ***
-*** Removed latest system source cache ***
     EOF
 
     assert_equal expected, @ui.output

data/test/{test_gem_commands_specification_command.rb → rubygems/test_gem_commands_specification_command.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/commands/specification_command'
 
-class TestGemCommandsSpecificationCommand < RubyGemTestCase
+class TestGemCommandsSpecificationCommand < Gem::TestCase
 
   def setup
     super
@@ -45,7 +45,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
   def test_execute_bad_name
     @cmd.options[:args] = %w[foo]
 
-    assert_raises MockGemUi::TermError do
+    assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
         @cmd.execute
       end