rubygems-update 1.3.5 → 1.3.6

data/test/test_gem_install_update_options.rb

@@ -1,5 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)),
-                  'gem_installer_test_case')
+require File.expand_path('../gem_installer_test_case', __FILE__)
 require 'rubygems/install_update_options'
 require 'rubygems/command'
 
@@ -20,11 +19,6 @@ class TestGemInstallUpdateOptions < GemInstallerTestCase
     assert @cmd.handles?(args)
   end
 
-  def test_prerelease
-    @cmd.handle_options %w[--prerelease]
-    assert_equal true, @cmd.options[:prerelease]
-  end
-
   def test_security_policy
     @cmd.handle_options %w[-P HighSecurity]
 

data/test/test_gem_installer.rb

@@ -1,11 +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__)),
-                  'gem_installer_test_case')
+require File.expand_path('../gem_installer_test_case', __FILE__)
 
 class TestGemInstaller < GemInstallerTestCase
 
@@ -108,19 +101,6 @@ load Gem.bin_path('a', 'my_exec', version)
     assert_equal 'a requires b (> 2, runtime)', e.message
   end
 
-  def test_expand_and_validate_gem_dir
-    @installer.gem_dir = '/nonexistent'
-    expanded_gem_dir = @installer.send(:expand_and_validate_gem_dir)
-    if win_platform?
-      expected = File.expand_path('/nonexistent').downcase
-      expanded_gem_dir = expanded_gem_dir.downcase
-    else
-      expected = '/nonexistent'
-    end
-
-    assert_equal expected, expanded_gem_dir
-  end
-
   def test_extract_files
     format = Object.new
     def format.file_entries
@@ -516,7 +496,7 @@ load Gem.bin_path('a', 'my_exec', version)
 
     @installer.generate_bin
 
-    default_shebang = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+    default_shebang = Gem.ruby
     shebang_line = open("#{@gemhome}/bin/my_exec") { |f| f.readlines.first }
     assert_match(/\A#!/, shebang_line)
     assert_match(/#{default_shebang}/, shebang_line)
@@ -524,11 +504,11 @@ load Gem.bin_path('a', 'my_exec', version)
 
   def test_initialize
     spec = quick_gem 'a' do |s| s.platform = Gem::Platform.new 'mswin32' end
-    gem = File.join @tempdir, "#{spec.full_name}.gem"
+    gem = File.join @tempdir, spec.file_name
 
     Dir.mkdir util_inst_bindir
     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
@@ -540,7 +520,7 @@ load Gem.bin_path('a', 'my_exec', version)
     Dir.mkdir util_inst_bindir
     util_setup_gem
 
-    cache_file = File.join @gemhome, 'cache', "#{@spec.full_name}.gem"
+    cache_file = File.join @gemhome, 'cache', @spec.file_name
 
     Gem.pre_install do |installer|
       refute File.exist?(cache_file), 'cache file should not exist yet'
@@ -568,8 +548,7 @@ load Gem.bin_path('a', 'my_exec', version)
 
     assert File.exist?(File.join(gemdir, 'ext', 'a', 'Rakefile'))
 
-    spec_file = File.join(@gemhome, 'specifications',
-                          "#{@spec.full_name}.gemspec")
+    spec_file = File.join(@gemhome, 'specifications', @spec.spec_name)
 
     assert_equal spec_file, @spec.loaded_from
     assert File.exist?(spec_file)
@@ -583,7 +562,7 @@ load Gem.bin_path('a', 'my_exec', version)
 
     use_ui @ui do
       Dir.chdir @tempdir do Gem::Builder.new(@spec).build end
-      gem = File.join @tempdir, "#{@spec.full_name}.gem"
+      gem = File.join @tempdir, @spec.file_name
     end
 
     gem_data = File.open gem, 'rb' do |fp| fp.read 1024 end
@@ -666,8 +645,7 @@ load Gem.bin_path('a', 'my_exec', version)
     assert_equal 0111, exe_mode, "0%o" % exe_mode unless win_platform?
     assert File.exist?(File.join(gemdir, 'lib', 'code.rb'))
 
-    assert File.exist?(File.join(@gemhome, 'specifications',
-                                 "#{@spec.full_name}.gemspec"))
+    assert File.exist?(File.join(@gemhome, 'specifications', @spec.spec_name))
   end
 
   def test_install_missing_dirs
@@ -677,7 +655,7 @@ load Gem.bin_path('a', 'my_exec', version)
 
     use_ui @ui do
       Dir.chdir @tempdir do Gem::Builder.new(@spec).build end
-      gem = File.join @tempdir, "#{@spec.full_name}.gem"
+      gem = File.join @tempdir, @spec.file_name
 
       @installer.install
     end
@@ -686,50 +664,8 @@ load Gem.bin_path('a', 'my_exec', version)
     File.directory? File.join(Gem.dir, 'docs')
     File.directory? File.join(Gem.dir, 'specifications')
 
-    assert File.exist?(File.join(@gemhome, 'cache', "#{@spec.full_name}.gem"))
-    assert File.exist?(File.join(@gemhome, 'specifications',
-                                 "#{@spec.full_name}.gemspec"))
-  end
-
-  unless win_platform? # File.chmod doesn't work
-    def test_install_user_local_fallback
-      Dir.mkdir util_inst_bindir
-      File.chmod 0755, @userhome
-      File.chmod 0000, util_inst_bindir
-      File.chmod 0000, Gem.dir
-      @spec.executables = ["executable"]
-
-      build_rake_in do
-        use_ui @ui do
-          util_setup_gem
-          @installer.install
-        end
-      end
-
-      assert File.exist?(File.join(Gem.user_dir, 'gems',
-                                   @spec.full_name, 'lib', 'code.rb'))
-      assert File.exist?(File.join(Gem.user_dir, 'bin', 'executable'))
-    ensure
-      File.chmod 0755, Gem.dir
-      File.chmod 0755, util_inst_bindir
-    end
-
-    def test_install_bindir_read_only
-      Dir.mkdir util_inst_bindir
-      File.chmod 0755, @userhome
-      File.chmod 0000, util_inst_bindir
-
-      build_rake_in do
-        use_ui @ui do
-          util_setup_gem
-          @installer.install
-        end
-      end
-
-      assert File.exist?(File.join(Gem.user_dir, 'bin', 'executable'))
-    ensure
-      File.chmod 0755, util_inst_bindir
-    end
+    assert File.exist?(File.join(@gemhome, 'cache', @spec.file_name))
+    assert File.exist?(File.join(@gemhome, 'specifications', @spec.spec_name))
   end
 
   def test_install_with_message
@@ -750,7 +686,7 @@ load Gem.bin_path('a', 'my_exec', version)
       e = assert_raises Gem::InstallError do
         installer.install
       end
-      assert_equal 'old_ruby_required requires Ruby version = 1.4.6',
+      assert_equal 'old_ruby_required requires Ruby version = 1.4.6.',
                    e.message
     end
   end
@@ -762,15 +698,15 @@ load Gem.bin_path('a', 'my_exec', version)
 
     util_build_gem spec
 
-    gem = File.join @gemhome, 'cache', "#{spec.full_name}.gem"
+    gem = File.join @gemhome, 'cache', spec.file_name
 
     use_ui @ui do
       @installer = Gem::Installer.new gem
       e = assert_raises Gem::InstallError do
         @installer.install
       end
-      assert_equal 'old_rubygems_required requires RubyGems version < 0',
-                   e.message
+      assert_equal 'old_rubygems_required requires RubyGems version < 0. ' +
+        "Try 'gem update --system' to update RubyGems itself.", e.message
     end
   end
 
@@ -826,7 +762,11 @@ load Gem.bin_path('a', 'my_exec', version)
     @installer.env_shebang = true
 
     shebang = @installer.shebang 'my_exec'
-    assert_equal "#!/usr/bin/env #{Gem::ConfigMap[:ruby_install_name]}", shebang
+
+    env_shebang = "/usr/bin/env" unless Gem.win_platform?
+
+    assert_equal("#!#{env_shebang} #{Gem::ConfigMap[:ruby_install_name]}",
+                 shebang)
   end
 
   def test_shebang_nested
@@ -890,7 +830,7 @@ load Gem.bin_path('a', 'my_exec', version)
 
   def test_write_spec
     spec_dir = File.join @gemhome, 'specifications'
-    spec_file = File.join spec_dir, "#{@spec.full_name}.gemspec"
+    spec_file = File.join spec_dir, @spec.spec_name
     FileUtils.rm spec_file
     refute File.exist?(spec_file)
 
@@ -910,7 +850,7 @@ load Gem.bin_path('a', 'my_exec', version)
 
     util_build_gem spec
 
-    File.join @gemhome, 'cache', "#{spec.full_name}.gem"
+    File.join @gemhome, 'cache', spec.file_name
   end
 
 end

data/test/test_gem_local_remote_options.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/local_remote_options'
 require 'rubygems/command'
 

data/test/test_gem_package_tar_header.rb

@@ -1,11 +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__)),
-                  'gem_package_tar_test_case')
+require File.expand_path('../gem_package_tar_test_case', __FILE__)
 require 'rubygems/package'
 
 class TestGemPackageTarHeader < TarTestCase

data/test/test_gem_package_tar_input.rb

@@ -1,11 +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__)),
-                  'gem_package_tar_test_case')
+require File.expand_path('../gem_package_tar_test_case', __FILE__)
 require 'rubygems/package/tar_input'
 
 class TestGemPackageTarInput < TarTestCase

data/test/test_gem_package_tar_output.rb

@@ -1,11 +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__)),
-                  'gem_package_tar_test_case')
+require File.expand_path('../gem_package_tar_test_case', __FILE__)
 require 'rubygems/package/tar_output'
 
 class TestGemPackageTarOutput < TarTestCase

data/test/test_gem_package_tar_reader.rb

@@ -1,11 +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__)),
-                  'gem_package_tar_test_case')
+require File.expand_path('../gem_package_tar_test_case', __FILE__)
 require 'rubygems/package'
 
 class TestGemPackageTarReader < TarTestCase

data/test/test_gem_package_tar_reader_entry.rb

@@ -1,11 +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__)),
-                  'gem_package_tar_test_case')
+require File.expand_path('../gem_package_tar_test_case', __FILE__)
 require 'rubygems/package'
 
 class TestGemPackageTarReaderEntry < TarTestCase

data/test/test_gem_package_tar_writer.rb

@@ -1,11 +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__)),
-                  'gem_package_tar_test_case')
+require File.expand_path('../gem_package_tar_test_case', __FILE__)
 require 'rubygems/package/tar_writer'
 
 class TestTarWriter < TarTestCase

data/test/test_gem_package_task.rb

@@ -1,25 +1,4 @@
-# Copyright (c) 2003, 2004 Jim Weirich, 2009 Eric Hodel
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems'
 require 'rubygems/package_task'
 
@@ -35,7 +14,6 @@ class TestGemPackageTask < MiniTest::Unit::TestCase
       p.package_files << "y"
     end
     assert_equal ["x", "y"], pkg.package_files
-    assert_equal "pkgr-1.2.3.gem", pkg.gem_file
   end
 
   def test_gem_package_with_current_platform
@@ -49,7 +27,6 @@ class TestGemPackageTask < MiniTest::Unit::TestCase
       p.package_files << "y"
     end
     assert_equal ["x", "y"], pkg.package_files
-    assert_match(/^pkgr-1\.2\.3-(\S+)\.gem$/, pkg.gem_file)
   end
 
   def test_gem_package_with_ruby_platform
@@ -63,7 +40,6 @@ class TestGemPackageTask < MiniTest::Unit::TestCase
       p.package_files << "y"
     end
     assert_equal ["x", "y"], pkg.package_files
-    assert_equal "pkgr-1.2.3.gem", pkg.gem_file
   end
 
 end

data/test/test_gem_platform.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/platform'
 require 'rbconfig'
 
@@ -100,8 +100,8 @@ class TestGemPlatform < RubyGemTestCase
   end
 
   def test_initialize_mswin32_vc6
-    orig_RUBY_SO_NAME = Config::CONFIG['RUBY_SO_NAME']
-    Config::CONFIG['RUBY_SO_NAME'] = 'msvcrt-ruby18'
+    orig_RUBY_SO_NAME = RbConfig::CONFIG['RUBY_SO_NAME']
+    RbConfig::CONFIG['RUBY_SO_NAME'] = 'msvcrt-ruby18'
 
     expected = ['x86', 'mswin32', nil]
 
@@ -109,7 +109,7 @@ class TestGemPlatform < RubyGemTestCase
 
     assert_equal expected, platform.to_a, 'i386-mswin32 VC6'
   ensure
-    Config::CONFIG['RUBY_SO_NAME'] = orig_RUBY_SO_NAME
+    RbConfig::CONFIG['RUBY_SO_NAME'] = orig_RUBY_SO_NAME
   end
 
   def test_initialize_platform

data/test/test_gem_remote_fetcher.rb

@@ -1,14 +1,8 @@
-#--
-# 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 'ostruct'
 require 'webrick'
-require 'zlib'
 require 'rubygems/remote_fetcher'
-require 'ostruct'
+require 'rubygems/format'
 
 # = Testing Proxy Settings
 #
@@ -208,7 +202,7 @@ gems:
 
     fetcher = util_fuck_with_fetcher a1_data
 
-    a1_cache_gem = File.join(@gemhome, 'cache', "#{@a1.full_name}.gem")
+    a1_cache_gem = File.join(@gemhome, 'cache', @a1.file_name)
     assert_equal a1_cache_gem, fetcher.download(@a1, 'http://gems.example.com')
     assert_equal("http://gems.example.com/gems/a-1.gem",
                  fetcher.instance_variable_get(:@test_arg).to_s)
@@ -220,20 +214,20 @@ gems:
 
     inst = Gem::RemoteFetcher.fetcher
 
-    assert_equal File.join(@gemhome, 'cache', "#{@a1.full_name}.gem"),
+    assert_equal File.join(@gemhome, 'cache', @a1.file_name),
                  inst.download(@a1, 'http://gems.example.com')
   end
 
   def test_download_local
     FileUtils.mv @a1_gem, @tempdir
-    local_path = File.join @tempdir, "#{@a1.full_name}.gem"
+    local_path = File.join @tempdir, @a1.file_name
     inst = nil
 
     Dir.chdir @tempdir do
       inst = Gem::RemoteFetcher.fetcher
     end
 
-    assert_equal File.join(@gemhome, 'cache', "#{@a1.full_name}.gem"),
+    assert_equal File.join(@gemhome, 'cache', @a1.file_name),
                  inst.download(@a1, local_path)
   end
 
@@ -241,14 +235,14 @@ gems:
     space_path = File.join @tempdir, 'space path'
     FileUtils.mkdir space_path
     FileUtils.mv @a1_gem, space_path
-    local_path = File.join space_path, "#{@a1.full_name}.gem"
+    local_path = File.join space_path, @a1.file_name
     inst = nil
 
     Dir.chdir @tempdir do
       inst = Gem::RemoteFetcher.fetcher
     end
 
-    assert_equal File.join(@gemhome, 'cache', "#{@a1.full_name}.gem"),
+    assert_equal File.join(@gemhome, 'cache', @a1.file_name),
                  inst.download(@a1, local_path)
   end
 
@@ -262,7 +256,7 @@ gems:
 
     install_dir = File.join @tempdir, 'more_gems'
 
-    a1_cache_gem = File.join install_dir, 'cache', "#{@a1.full_name}.gem"
+    a1_cache_gem = File.join install_dir, 'cache', @a1.file_name
     FileUtils.mkdir_p(File.dirname(a1_cache_gem))
     actual = fetcher.download(@a1, 'http://gems.example.com', install_dir)
 
@@ -276,7 +270,7 @@ gems:
   unless win_platform? # File.chmod doesn't work
     def test_download_local_read_only
       FileUtils.mv @a1_gem, @tempdir
-      local_path = File.join @tempdir, "#{@a1.full_name}.gem"
+      local_path = File.join @tempdir, @a1.file_name
       inst = nil
       File.chmod 0555, File.join(@gemhome, 'cache')
 
@@ -284,7 +278,7 @@ gems:
         inst = Gem::RemoteFetcher.fetcher
       end
 
-      assert_equal File.join(@tempdir, "#{@a1.full_name}.gem"),
+      assert_equal File.join(@tempdir, @a1.file_name),
         inst.download(@a1, local_path)
     ensure
       File.chmod 0755, File.join(@gemhome, 'cache')
@@ -296,8 +290,7 @@ gems:
 
       fetcher = util_fuck_with_fetcher File.read(@a1_gem)
       fetcher.download(@a1, 'http://gems.example.com')
-      assert File.exist?(File.join(Gem.user_dir, 'cache',
-                                   "#{@a1.full_name}.gem"))
+      assert File.exist?(File.join(Gem.user_dir, 'cache', @a1.file_name))
     ensure
       File.chmod 0755, File.join(@gemhome)
       File.chmod 0755, File.join(@gemhome, 'cache')
@@ -319,7 +312,7 @@ gems:
 
     fetcher = util_fuck_with_fetcher e1_data, :blow_chunks
 
-    e1_cache_gem = File.join(@gemhome, 'cache', "#{e1.full_name}.gem")
+    e1_cache_gem = File.join(@gemhome, 'cache', e1.file_name)
 
     assert_equal e1_cache_gem, fetcher.download(e1, 'http://gems.example.com')
 
@@ -328,6 +321,23 @@ gems:
     assert File.exist?(e1_cache_gem)
   end
 
+  def test_download_same_file
+    FileUtils.mv @a1_gem, @tempdir
+    local_path = File.join @tempdir, @a1.file_name
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::RemoteFetcher.fetcher
+    end
+
+    cache_path = File.join @gemhome, 'cache', @a1.file_name
+    FileUtils.mv local_path, cache_path
+
+    gem = Gem::Format.from_file_by_path cache_path
+
+    assert_equal cache_path, inst.download(gem.spec, cache_path)
+  end
+
   def test_download_unsupported
     inst = Gem::RemoteFetcher.fetcher