rubygems-update 1.7.2 → 1.8.0

data/test/rubygems/test_gem_builder.rb

@@ -1,5 +1,6 @@
 require 'rubygems/test_case'
 require 'rubygems/builder'
+require 'rubygems/package'
 
 class TestGemBuilder < Gem::TestCase
 
@@ -23,5 +24,21 @@ class TestGemBuilder < Gem::TestCase
     end
   end
 
-end
+  def test_build_specification_result
+    util_make_gems
+
+    spec = build_gem_and_yield_spec @a1
+
+    assert_operator @a1, :eql?, spec
+  end
 
+  def build_gem_and_yield_spec(spec)
+    builder = Gem::Builder.new spec
+
+    spec = Dir.chdir @tempdir do
+      FileUtils.mkdir 'lib'
+      File.open('lib/code.rb', 'w') { |f| f << "something" }
+      Gem::Package.open(File.open(builder.build)) { |x| x.metadata }
+    end
+  end
+end

data/test/rubygems/test_gem_command_manager.rb

@@ -23,6 +23,7 @@ class TestGemCommandManager < Gem::TestCase
     end
   ensure
     $:.replace old_load_path
+    Gem::CommandManager.reset
   end
 
   def test_run_crash_command
@@ -40,6 +41,7 @@ class TestGemCommandManager < Gem::TestCase
     end
   ensure
     $:.replace old_load_path
+    @command_manager.unregister_command :crash
   end
 
   def test_process_args_bad_arg

data/test/rubygems/test_gem_commands_build_command.rb

@@ -34,10 +34,38 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     util_test_build_gem @gem, gemspec_file
   end
 
-  def test_execute_bad_gem
+  def test_execute_bad_spec
+    @gem.date = "2010-11-08"
+
+    gemspec_file = File.join(@tempdir, @gem.spec_name)
+
+    File.open gemspec_file, 'w' do |gs|
+      gs.write @gem.to_ruby.sub(/11-08/, "11-8")
+    end
+
+    @cmd.options[:args] = [gemspec_file]
+
+    out, err = use_ui @ui do
+      capture_io do
+        assert_raises Gem::MockGemUi::TermError do
+          @cmd.execute
+        end
+      end
+    end
+
+    assert_equal "", out
+    assert_match(/invalid date format in specification/, err)
+
+    assert_equal '', @ui.output
+    assert_equal "ERROR:  Error loading gemspec. Aborting.\n", @ui.error
+  end
+
+  def test_execute_missing_file
     @cmd.options[:args] = %w[some_gem]
     use_ui @ui do
-      @cmd.execute
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
     end
 
     assert_equal '', @ui.output
@@ -61,7 +89,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_equal [], output
     assert_equal '', @ui.error
 
-    gem_file = File.join @tempdir, gem.file_name
+    gem_file = File.join @tempdir, File.basename(gem.cache_file)
     assert File.exist?(gem_file)
 
     spec = Gem::Format.from_file_by_path(gem_file).spec

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -0,0 +1,51 @@
+require 'rubygems/test_case'
+require 'rubygems/commands/cleanup_command'
+
+class TestGemCommandsCleanupCommand < Gem::TestCase
+  
+  def setup
+    super
+
+    @cmd = Gem::Commands::CleanupCommand.new
+
+    @a_1 = quick_spec 'a', 1
+    @a_2 = quick_spec 'a', 2
+
+    install_gem @a_1
+    install_gem @a_2
+  end
+
+  def test_execute
+    @cmd.options[:args] = %w[a]
+
+    @cmd.execute
+
+    refute_path_exists @a_1.gem_dir
+  end
+
+  def test_execute_all
+    @b_1 = quick_spec 'b', 1
+    @b_2 = quick_spec 'b', 2
+
+    install_gem @b_1
+    install_gem @b_2
+
+    @cmd.options[:args] = []
+
+    @cmd.execute
+
+    refute_path_exists @a_1.gem_dir
+    refute_path_exists @b_1.gem_dir
+  end
+
+  def test_execute_dry_run
+    @cmd.options[:args] = %w[a]
+    @cmd.options[:dryrun] = true
+
+    @cmd.execute
+
+    assert_path_exists @a_1.gem_dir
+  end
+
+end
+

data/test/rubygems/test_gem_commands_dependency_command.rb

@@ -18,8 +18,6 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
       gem.add_dependency 'baz', '> 1'
     end
 
-    Gem.source_index = nil
-
     @cmd.options[:args] = %w[foo]
 
     use_ui @ui do
@@ -32,8 +30,6 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
   end
 
   def test_execute_no_args
-    Gem.source_index = nil
-
     @cmd.options[:args] = []
 
     use_ui @ui do
@@ -93,8 +89,6 @@ Gem pl-1-x86-linux
   end
 
   def test_execute_regexp
-    Gem.source_index = nil
-
     @cmd.options[:args] = %w[/[ab]/]
 
     use_ui @ui do
@@ -130,8 +124,6 @@ Gem b-2
       gem.add_dependency 'foo'
     end
 
-    Gem.source_index = nil
-
     @cmd.options[:args] = %w[foo]
     @cmd.options[:reverse_dependencies] = true
 
@@ -197,10 +189,9 @@ ERROR:  Only reverse dependencies for local gems are supported.
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher
 
+    util_clear_gems
     util_setup_spec_fetcher @a2_pre
 
-    FileUtils.rm File.join(@gemhome, 'specifications', @a2_pre.spec_name)
-
     @cmd.options[:args] = %w[a]
     @cmd.options[:domain] = :remote
     @cmd.options[:prerelease] = true

data/test/rubygems/test_gem_commands_fetch_command.rb

@@ -16,7 +16,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase
     util_setup_spec_fetcher @a2
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      File.read(Gem.cache_gem(@a2.file_name, @gemhome))
+      File.read(@a2.cache_file)
 
     @cmd.options[:args] = [@a2.name]
 
@@ -32,12 +32,13 @@ class TestGemCommandsFetchCommand < Gem::TestCase
 
   def test_execute_prerelease
     util_setup_fake_fetcher true
+    util_clear_gems
     util_setup_spec_fetcher @a2, @a2_pre
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      File.read(Gem.cache_gem(@a2.file_name, @gemhome))
+      File.read(@a2.cache_file)
     @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      File.read(Gem.cache_gem(@a2_pre.file_name, @gemhome))
+      File.read(@a2_pre.cache_file)
 
     @cmd.options[:args] = [@a2.name]
     @cmd.options[:prerelease] = true
@@ -57,7 +58,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase
     util_setup_spec_fetcher @a1, @a2
 
     @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
-      File.read(Gem.cache_gem(@a1.file_name, @gemhome))
+      File.read(@a1.cache_file)
 
     @cmd.options[:args] = [@a2.name]
     @cmd.options[:version] = Gem::Requirement.new '1'

data/test/rubygems/test_gem_commands_help_command.rb

@@ -0,0 +1,58 @@
+require "rubygems"
+require "rubygems/test_case"
+require "rubygems/commands/help_command"
+require "rubygems/format"
+require "rubygems/command_manager"
+
+class TestGemCommandsHelpCommand < Gem::TestCase
+  def setup
+    super
+
+    @cmd = Gem::Commands::HelpCommand.new
+  end
+
+  def test_gem_help_bad
+    util_gem 'bad' do |out, err|
+      assert_equal('', out)
+      assert_match(/Unknown command bad. Try gem help commands\n/, err)
+    end
+  end
+
+  def test_gem_help_platforms
+    util_gem 'platforms' do |out, err|
+      assert_match(/x86-freebsd/, out)
+      assert_equal '', err
+    end
+  end
+
+  def test_gem_help_commands
+    mgr = Gem::CommandManager.new
+
+    util_gem 'commands' do |out, err|
+      mgr.command_names.each do |cmd|
+        assert_match(/\s+#{cmd}\s+\S+/, out)
+      end
+      assert_equal '', err
+    end
+  end
+
+  def test_gem_no_args_shows_help
+    util_gem do |out, err|
+      assert_match(/Usage:/, out)
+      assert_match(/gem install/, out)
+      assert_equal '', err
+    end
+  end
+
+  def util_gem *args
+    @cmd.options[:args] = args
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    yield @ui.output, @ui.error
+  end
+end

data/test/rubygems/test_gem_commands_install_command.rb

@@ -18,13 +18,13 @@ class TestGemCommandsInstallCommand < Gem::TestCase
   end
 
   def test_execute_exclude_prerelease
-    util_setup_fake_fetcher(:prerelease)
-    util_setup_spec_fetcher @a2, @a2_pre
+    util_setup_fake_fetcher :prerelease
+    util_setup_spec_fetcher
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(Gem.cache_gem(@a2.file_name, @gemhome))
+      read_binary(@a2.cache_file)
     @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(Gem.cache_gem(@a2_pre.file_name, @gemhome))
+      read_binary(@a2_pre.cache_file)
 
     @cmd.options[:args] = [@a2.name]
 
@@ -40,13 +40,13 @@ class TestGemCommandsInstallCommand < Gem::TestCase
   end
 
   def test_execute_explicit_version_includes_prerelease
-    util_setup_fake_fetcher(:prerelease)
-    util_setup_spec_fetcher @a2, @a2_pre
+    util_setup_fake_fetcher :prerelease
+    util_setup_spec_fetcher
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(Gem.cache_gem(@a2.file_name, @gemhome))
+      read_binary(@a2.cache_file)
     @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(Gem.cache_gem(@a2_pre.file_name, @gemhome))
+      read_binary(@a2_pre.cache_file)
 
     @cmd.handle_options [@a2_pre.name, '--version', @a2_pre.version.to_s,
                          "--no-ri", "--no-rdoc"]
@@ -86,7 +86,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     util_setup_fake_fetcher
     @cmd.options[:domain] = :local
 
-    FileUtils.mv Gem.cache_gem(@a2.file_name, @gemhome), @tempdir
+    FileUtils.mv @a2.cache_file, @tempdir
 
     @cmd.options[:args] = [@a2.name]
 
@@ -115,15 +115,15 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     util_setup_fake_fetcher
     @cmd.options[:user_install] = false
 
-    FileUtils.mv Gem.cache_gem(@a2.file_name, @gemhome), @tempdir
+    FileUtils.mv @a2.cache_file, @tempdir
 
     @cmd.options[:args] = [@a2.name]
 
     use_ui @ui do
       orig_dir = Dir.pwd
       begin
-        File.chmod 0755, @userhome
-        File.chmod 0555, @gemhome
+        FileUtils.chmod 0755, @userhome
+        FileUtils.chmod 0555, @gemhome
 
         Dir.chdir @tempdir
         assert_raises Gem::FilePermissionError do
@@ -131,7 +131,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
         end
       ensure
         Dir.chdir orig_dir
-        File.chmod 0755, @gemhome
+        FileUtils.chmod 0755, @gemhome
       end
     end
   end
@@ -202,13 +202,14 @@ ERROR:  Possible alternatives: non_existent_with_hint
   end
 
   def test_execute_prerelease
-    util_setup_fake_fetcher(:prerelease)
+    util_setup_fake_fetcher :prerelease
+    util_clear_gems
     util_setup_spec_fetcher @a2, @a2_pre
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(Gem.cache_gem(@a2.file_name, @gemhome))
+      read_binary(@a2.cache_file)
     @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(Gem.cache_gem(@a2_pre.file_name, @gemhome))
+      read_binary(@a2_pre.cache_file)
 
     @cmd.options[:prerelease] = true
     @cmd.options[:args] = [@a2_pre.name]
@@ -229,10 +230,10 @@ ERROR:  Possible alternatives: non_existent_with_hint
     @cmd.options[:generate_ri] = true
 
     util_setup_fake_fetcher
-    util_setup_spec_fetcher @a2
+    util_setup_spec_fetcher
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(Gem.cache_gem(@a2.file_name, @gemhome))
+      read_binary(@a2.cache_file)
 
     @cmd.options[:args] = [@a2.name]
 
@@ -259,9 +260,9 @@ ERROR:  Possible alternatives: non_existent_with_hint
     util_setup_fake_fetcher
     @cmd.options[:domain] = :local
 
-    FileUtils.mv Gem.cache_gem(@a2.file_name, @gemhome), @tempdir
+    FileUtils.mv @a2.cache_file, @tempdir
 
-    FileUtils.mv Gem.cache_gem(@b2.file_name, @gemhome), @tempdir
+    FileUtils.mv @b2.cache_file, @tempdir
 
     @cmd.options[:args] = [@a2.name, @b2.name]
 
@@ -287,10 +288,10 @@ ERROR:  Possible alternatives: non_existent_with_hint
 
   def test_execute_conservative
     util_setup_fake_fetcher
-    util_setup_spec_fetcher @b2
+    util_setup_spec_fetcher
 
     @fetcher.data["#{@gem_repo}gems/#{@b2.file_name}"] =
-      read_binary(Gem.cache_gem(@b2.file_name, @gemhome))
+      read_binary(@b2.cache_file)
 
     uninstall_gem(@b2)
 
@@ -302,16 +303,16 @@ ERROR:  Possible alternatives: non_existent_with_hint
       orig_dir = Dir.pwd
       begin
         Dir.chdir @tempdir
-        e = assert_raises Gem::SystemExitException do
+        assert_raises Gem::SystemExitException do
           @cmd.execute
         end
-        assert_equal 0, e.exit_code
       ensure
         Dir.chdir orig_dir
       end
     end
 
     out = @ui.output.split "\n"
+    assert_equal "", @ui.error
     assert_equal "Successfully installed #{@b2.full_name}", out.shift
     assert_equal "1 gem installed", out.shift
     assert out.empty?, out.inspect

data/test/rubygems/test_gem_commands_list_command.rb

@@ -20,16 +20,13 @@ class TestGemCommandsListCommand < Gem::TestCase
   def test_execute_installed
     @cmd.handle_options %w[c --installed]
 
-    e = assert_raises Gem::SystemExitException do
+    assert_raises Gem::MockGemUi::SystemExitException do
       use_ui @ui do
         @cmd.execute
       end
     end
 
-    assert_equal 0, e.exit_code
-
     assert_equal "true\n", @ui.output
-
     assert_equal '', @ui.error
   end