rubygems-update 1.3.5 → 1.3.6

data/test/fake_certlib/openssl.rb

@@ -4,4 +4,4 @@
 # See LICENSE.txt for permissions.
 #++
 
-fail LoadError, "no such file to load -- openssl"
+raise LoadError, "no such file to load -- openssl"

data/test/functional.rb

@@ -1,10 +1,3 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
 require 'rubygems'
 require 'minitest/unit'
 require 'test/insure_session'

data/test/gem_installer_test_case.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/installer'
 
 class Gem::Installer
@@ -20,12 +20,12 @@ class GemInstallerTestCase < RubyGemTestCase
     super
 
     @spec = quick_gem 'a'
-    @gem = File.join @tempdir, "#{@spec.full_name}.gem"
+    @gem = File.join @tempdir, @spec.file_name
 
     @installer = util_installer @spec, @gem, @gemhome
 
     @user_spec = quick_gem 'b'
-    @user_gem = File.join @tempdir, "#{@user_spec.full_name}.gem"
+    @user_gem = File.join @tempdir, @user_spec.file_name
 
     @user_installer = util_installer @user_spec, @user_gem, Gem.user_dir
     @user_installer.gem_dir = File.join(Gem.user_dir, 'gems',
@@ -82,7 +82,7 @@ class GemInstallerTestCase < RubyGemTestCase
 
   def util_installer(spec, gem_path, gem_home)
     util_build_gem spec
-    FileUtils.mv File.join(@gemhome, 'cache', "#{spec.full_name}.gem"),
+    FileUtils.mv File.join(@gemhome, 'cache', spec.file_name),
                  @tempdir
 
     installer = Gem::Installer.new gem_path

data/test/gem_package_tar_test_case.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/package'
 
 class TarTestCase < RubyGemTestCase

data/test/gemutilities.rb

@@ -1,9 +1,3 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
 at_exit { $SAFE = 1 }
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -75,6 +69,8 @@ class RubyGemTestCase < MiniTest::Unit::TestCase
     @latest_usrcache = File.join(@gemhome, ".gem", "latest_user_cache")
     @userhome = File.join @tempdir, 'userhome'
 
+    Gem.ensure_gem_subdirectories @gemhome
+
     @orig_ENV_HOME = ENV['HOME']
     ENV['HOME'] = @userhome
     Gem.instance_variable_set :@user_home, nil
@@ -167,7 +163,7 @@ class RubyGemTestCase < MiniTest::Unit::TestCase
       end
     end
 
-    gem = File.join(@tempdir, "#{gem.full_name}.gem").untaint
+    gem = File.join(@tempdir, gem.file_name).untaint
     Gem::Installer.new(gem, :wrappers => true).install
   end
 
@@ -245,7 +241,7 @@ class RubyGemTestCase < MiniTest::Unit::TestCase
       yield(s) if block_given?
     end
 
-    path = File.join "specifications", "#{spec.full_name}.gemspec"
+    path = File.join "specifications", spec.spec_name
     written_path = write_file path do |io|
       io.write(spec.to_ruby)
     end
@@ -272,7 +268,7 @@ class RubyGemTestCase < MiniTest::Unit::TestCase
         Gem::Builder.new(spec).build
       end
 
-      FileUtils.mv "#{spec.full_name}.gem",
+      FileUtils.mv spec.file_name,
                    File.join(@gemhome, 'cache', "#{spec.original_name}.gem")
     end
   end
@@ -291,8 +287,7 @@ class RubyGemTestCase < MiniTest::Unit::TestCase
     cache_file = File.join @tempdir, 'gems', "#{spec.original_name}.gem"
     FileUtils.mv File.join(@gemhome, 'cache', "#{spec.original_name}.gem"),
                  cache_file
-    FileUtils.rm File.join(@gemhome, 'specifications',
-                           "#{spec.full_name}.gemspec")
+    FileUtils.rm File.join(@gemhome, 'specifications', spec.spec_name)
 
     spec.loaded_from = nil
     spec.loaded = false
@@ -406,26 +401,6 @@ Also, a list:
     Gem::RemoteFetcher.fetcher = @fetcher
   end
 
-  def util_setup_source_info_cache(*specs)
-    require 'rubygems/source_info_cache'
-    require 'rubygems/source_info_cache_entry'
-
-    specs = Hash[*specs.map { |spec| [spec.full_name, spec] }.flatten]
-    si = Gem::SourceIndex.new specs
-
-    sice = Gem::SourceInfoCacheEntry.new si, 0
-    sic = Gem::SourceInfoCache.new
-
-    sic.set_cache_data( { @gem_repo => sice } )
-    sic.update
-    sic.write_cache
-    sic.reset_cache_data
-
-    Gem::SourceInfoCache.instance_variable_set :@cache, sic
-
-    si
-  end
-
   def util_setup_spec_fetcher(*specs)
     specs = Hash[*specs.map { |spec| [spec.full_name, spec] }.flatten]
     si = Gem::SourceIndex.new specs
@@ -572,6 +547,35 @@ Also, a list:
              'rake'
            end
 
+  ##
+  # Construct a new Gem::Dependency.
+
+  def dep name, *requirements
+    Gem::Dependency.new name, *requirements
+  end
+
+  ##
+  # Construct a new Gem::Requirement.
+
+  def req *requirements
+    return requirements.first if Gem::Requirement === requirements.first
+    Gem::Requirement.create requirements
+  end
+
+  ##
+  # Construct a new Gem::Specification.
+
+  def spec name, version, &block
+    Gem::Specification.new name, v(version), &block
+  end
+
+  ##
+  # Construct a new Gem::Version.
+
+  def v string
+    Gem::Version.create string
+  end
+
 end
 
 MiniTest::Unit.autorun

data/test/insure_session.rb

@@ -1,11 +1,3 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-
 require 'rubygems'
 
 def install_session

data/test/mockgemui.rb

@@ -1,11 +1,3 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-
 require 'stringio'
 require 'rubygems/user_interaction'
 

data/test/simple_gem.rb

@@ -1,10 +1,4 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-    SIMPLE_GEM = <<-GEMDATA
+SIMPLE_GEM = <<-GEMDATA
         MD5SUM = "e3701f9db765a2358aef94c40ded71c8"
         if $0 == __FILE__
           require 'optparse'
@@ -69,4 +63,4 @@ g1CKTjX9BGAj1w==
 eJwDAAAAAAE=
 ---
 eJwrKC0pVlAvzy9XyE3MU+cCACwiBP4=
-    GEMDATA
+GEMDATA

data/test/test_config.rb

@@ -1,18 +1,11 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
-require 'rbconfig'
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems'
 
 class TestConfig < RubyGemTestCase
 
   def test_datadir
-    datadir = Config::CONFIG['datadir']
-    assert_equal "#{datadir}/xyz", Config.datadir('xyz')
+    datadir = RbConfig::CONFIG['datadir']
+    assert_equal "#{datadir}/xyz", RbConfig.datadir('xyz')
   end
 
 end

data/test/test_gem.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems'
 require 'rubygems/gem_openssl'
 require 'rubygems/installer'
@@ -95,7 +95,7 @@ class TestGem < RubyGemTestCase
     bindir = if defined?(RUBY_FRAMEWORK_VERSION) then
                '/usr/bin'
              else
-               Config::CONFIG['bindir']
+               RbConfig::CONFIG['bindir']
              end
 
     assert_equal bindir, Gem.bindir(default)
@@ -181,16 +181,11 @@ class TestGem < RubyGemTestCase
   end
 
   def test_self_default_sources
-    assert_equal %w[http://gems.rubyforge.org/], Gem.default_sources
+    assert_equal %w[http://rubygems.org/], Gem.default_sources
   end
 
   def test_self_dir
     assert_equal @gemhome, Gem.dir
-
-    Gem::DIRECTORIES.each do |filename|
-      assert File.directory?(File.join(Gem.dir, filename)),
-             "expected #{filename} to exist"
-    end
   end
 
   def test_self_ensure_gem_directories
@@ -442,13 +437,13 @@ class TestGem < RubyGemTestCase
   def test_self_refresh
     util_make_gems
 
-    a1_spec = File.join @gemhome, "specifications", "#{@a1.full_name}.gemspec" 
+    a1_spec = File.join @gemhome, "specifications", @a1.spec_name 
 
     FileUtils.mv a1_spec, @tempdir
 
     refute Gem.source_index.gems.include?(@a1.full_name)
 
-    FileUtils.mv File.join(@tempdir, "#{@a1.full_name}.gemspec"), a1_spec
+    FileUtils.mv File.join(@tempdir, @a1.spec_name), a1_spec
 
     Gem.refresh
 
@@ -538,11 +533,11 @@ class TestGem < RubyGemTestCase
     path = [@userhome, other].join File::PATH_SEPARATOR
     Gem.send :set_paths, path
 
-    assert File.exist?(File.join(@userhome, 'gems'))
-    assert File.exist?(File.join(other, 'gems'))
+    assert_equal [@userhome, other, @gemhome], Gem.path
   end
 
   def test_self_set_paths_nonexistent_home
+    ENV['GEM_HOME'] = @gemhome
     Gem.clear_paths
 
     other = File.join @tempdir, 'other'
@@ -551,7 +546,7 @@ class TestGem < RubyGemTestCase
 
     Gem.send :set_paths, other
 
-    refute File.exist?(File.join(other, 'gems'))
+    assert_equal [other, @gemhome], Gem.path
   end
 
   def test_self_source_index
@@ -616,7 +611,7 @@ class TestGem < RubyGemTestCase
     ENV['USERPROFILE'] = orig_user_profile
     ENV['USERDRIVE'] = orig_user_drive
     ENV['USERPATH'] = orig_user_path
-  end
+  end if '1.9' > RUBY_VERSION
 
   def util_ensure_gem_dirs
     Gem.ensure_gem_subdirectories @gemhome

data/test/test_gem_builder.rb

@@ -1,10 +1,4 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/builder'
 
 class TestGemBuilder < RubyGemTestCase

data/test/test_gem_command.rb

@@ -1,11 +1,4 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/command'
 
 class Gem::Command

data/test/test_gem_command_manager.rb

@@ -1,10 +1,4 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/command_manager'
 
 class TestGemCommandManager < RubyGemTestCase

data/test/test_gem_commands_build_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/build_command'
 require 'rubygems/format'
 
@@ -15,7 +15,7 @@ class TestGemCommandsBuildCommand < RubyGemTestCase
   end
 
   def test_execute
-    gemspec_file = File.join(@tempdir, "#{@gem.full_name}.gemspec")
+    gemspec_file = File.join(@tempdir, @gem.spec_name)
 
     File.open gemspec_file, 'w' do |gs|
       gs.write @gem.to_ruby
@@ -25,7 +25,7 @@ class TestGemCommandsBuildCommand < RubyGemTestCase
   end
 
   def test_execute_yaml
-    gemspec_file = File.join(@tempdir, "#{@gem.full_name}.gemspec")
+    gemspec_file = File.join(@tempdir, @gem.spec_name)
 
     File.open gemspec_file, 'w' do |gs|
       gs.write @gem.to_yaml
@@ -61,7 +61,7 @@ class TestGemCommandsBuildCommand < RubyGemTestCase
     assert_equal [], output
     assert_equal '', @ui.error
 
-    gem_file = File.join @tempdir, "#{gem.full_name}.gem"
+    gem_file = File.join @tempdir, gem.file_name
     assert File.exist?(gem_file)
 
     spec = Gem::Format.from_file_by_path(gem_file).spec

data/test/test_gem_commands_cert_command.rb

@@ -1,5 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
-
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/cert_command'
 
 unless defined? OpenSSL then

data/test/test_gem_commands_check_command.rb

@@ -1,10 +1,4 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/check_command'
 
 class TestGemCommandsCheckCommand < RubyGemTestCase

data/test/test_gem_commands_contents_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/contents_command'
 
 class TestGemCommandsContentsCommand < RubyGemTestCase

data/test/test_gem_commands_dependency_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/dependency_command'
 
 class TestGemCommandsDependencyCommand < RubyGemTestCase
@@ -9,12 +9,13 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
     @cmd = Gem::Commands::DependencyCommand.new
     @cmd.options[:domain] = :local
 
-    util_setup_fake_fetcher
+    util_setup_fake_fetcher true
   end
 
   def test_execute
     quick_gem 'foo' do |gem|
       gem.add_dependency 'bar', '> 1'
+      gem.add_dependency 'baz', '> 1'
     end
 
     Gem.source_index = nil
@@ -25,7 +26,8 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_equal "Gem foo-2\n  bar (> 1, runtime)\n\n", @ui.output
+    assert_equal "Gem foo-2\n  bar (> 1, runtime)\n  baz (> 1, runtime)\n\n",
+                 @ui.output
     assert_equal '', @ui.error
   end
 
@@ -41,6 +43,8 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
     expected = <<-EOF
 Gem a-1
 
+Gem a-2.a
+
 Gem a-2
 
 Gem a-3.a
@@ -100,6 +104,8 @@ Gem pl-1-x86-linux
     expected = <<-EOF
 Gem a-1
 
+Gem a-2.a
+
 Gem a-2
 
 Gem a-3.a
@@ -173,8 +179,7 @@ ERROR:  Only reverse dependencies for local gems are supported.
 
     util_setup_spec_fetcher foo
 
-    FileUtils.rm File.join(@gemhome, 'specifications',
-                           "#{foo.full_name}.gemspec")
+    FileUtils.rm File.join(@gemhome, 'specifications', foo.spec_name)
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:domain] = :remote
@@ -187,43 +192,24 @@ ERROR:  Only reverse dependencies for local gems are supported.
     assert_equal '', @ui.error
   end
 
-  def test_execute_remote_legacy
-    foo = quick_gem 'foo' do |gem|
-      gem.add_dependency 'bar', '> 1'
-    end
-
+  def test_execute_prerelease
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher
 
-    Gem::SpecFetcher.fetcher = nil
-    si = util_setup_source_info_cache foo
-
-    @fetcher.data["#{@gem_repo}yaml"] = YAML.dump si
-    @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] =
-      si.dump
-
-    @fetcher.data.delete "#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"
+    util_setup_spec_fetcher @a2_pre
 
-    FileUtils.rm File.join(@gemhome, 'specifications',
-                           "#{foo.full_name}.gemspec")
+    FileUtils.rm File.join(@gemhome, 'specifications', @a2_pre.spec_name)
 
-    @cmd.options[:args] = %w[foo]
+    @cmd.options[:args] = %w[a]
     @cmd.options[:domain] = :remote
+    @cmd.options[:prerelease] = true
 
     use_ui @ui do
       @cmd.execute
     end
 
-    assert_equal "Gem foo-2\n  bar (> 1, runtime)\n\n", @ui.output
-
-    expected = <<-EOF
-WARNING:  RubyGems 1.2+ index not found for:
-\t#{@gem_repo}
-
-RubyGems will revert to legacy indexes degrading performance.
-    EOF
-
-    assert_equal expected, @ui.error
+    assert_equal "Gem a-2.a\n\n", @ui.output
+    assert_equal '', @ui.error
   end
 
 end