rubygems-update 1.7.2 → 1.8.0

data/lib/rubygems/test_case.rb

@@ -11,6 +11,7 @@ begin
 rescue Gem::LoadError
 end
 
+require "rubygems/deprecate"
 require 'minitest/autorun'
 require 'fileutils'
 require 'tmpdir'
@@ -19,6 +20,7 @@ require 'rubygems/package'
 require 'rubygems/test_utilities'
 require 'pp'
 require 'zlib'
+require 'pathname'
 Gem.load_yaml
 
 require 'rubygems/mock_gem_ui'
@@ -38,6 +40,8 @@ module Gem
   # requiring 'rubygems/test_case'
 
   def self.source_index=(si)
+    raise "This method is not supported"
+    Gem::Specification.reset if si # HACK
     @@source_index = si
   end
 
@@ -76,6 +80,18 @@ end
 
 class Gem::TestCase < MiniTest::Unit::TestCase
 
+  # TODO: move to minitest
+  def assert_path_exists path, msg = nil
+    msg = message(msg) { "Expected path '#{path}' to exist" }
+    assert File.exist?(path), msg
+  end
+
+  # TODO: move to minitest
+  def refute_path_exists path, msg = nil
+    msg = message(msg) { "Expected path '#{path}' to not exist" }
+    refute File.exist?(path), msg
+  end
+
   include Gem::DefaultUserInteraction
 
   undef_method :default_test if instance_methods.include? 'default_test' or
@@ -101,12 +117,14 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     @orig_gem_path = ENV['GEM_PATH']
 
     @ui = Gem::MockGemUi.new
+
     tmpdir = nil
     Dir.chdir Dir.tmpdir do tmpdir = Dir.pwd end # HACK OSX /private/tmp
+
     if ENV['KEEP_FILES'] then
-      @tempdir = File.join tmpdir, "test_rubygems_#{$$}.#{Time.now.to_i}"
+      @tempdir = File.join(tmpdir, "test_rubygems_#{$$}.#{Time.now.to_i}")
     else
-      @tempdir = File.join tmpdir, "test_rubygems_#{$$}"
+      @tempdir = File.join(tmpdir, "test_rubygems_#{$$}")
     end
     @tempdir.untaint
     @gemhome  = File.join @tempdir, 'gemhome'
@@ -119,6 +137,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
     Gem.ensure_gem_subdirectories @gemhome
 
+    @orig_LOAD_PATH = $LOAD_PATH.dup
+    $LOAD_PATH.map! { |s| File.expand_path s }
+
     Dir.chdir @tempdir
 
     @orig_ENV_HOME = ENV['HOME']
@@ -129,6 +150,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     FileUtils.mkdir_p @userhome
 
     Gem.use_paths(@gemhome)
+
     Gem.loaded_specs.clear
     Gem.unresolved_deps.clear
 
@@ -184,8 +206,6 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     Gem.pre_uninstall do |uninstaller|
       @pre_uninstall_hook_arg = uninstaller
     end
-
-    @orig_LOAD_PATH = $LOAD_PATH.dup
   end
 
   ##
@@ -209,8 +229,6 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     ENV['GEM_HOME'] = @orig_gem_home
     ENV['GEM_PATH'] = @orig_gem_path
 
-    Gem.clear_paths
-
     _ = @orig_ruby
     Gem.class_eval { @ruby = _ } if _
 
@@ -233,7 +251,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
       end
     end
 
-    gem = File.join(@tempdir, spec.file_name).untaint
+    gem = File.join(@tempdir, File.basename(spec.cache_file)).untaint
 
     Gem::Installer.new(gem, :wrappers => true).install
   end
@@ -243,9 +261,19 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   def uninstall_gem spec
     require 'rubygems/uninstaller'
 
-    uninstaller = Gem::Uninstaller.new spec.name, :executables => true,
-                 :user_install => true
-    uninstaller.uninstall
+    Gem::Uninstaller.new(spec.name,
+                         :executables => true, :user_install => true).uninstall
+  end
+
+  ##
+  # creates a temporary directory with hax
+
+  def create_tmpdir
+    tmpdir = nil
+    Dir.chdir Dir.tmpdir do tmpdir = Dir.pwd end # HACK OSX /private/tmp
+    tmpdir = File.join tmpdir, "test_rubygems_#{$$}"
+    FileUtils.mkdir_p tmpdir
+    return tmpdir
   end
 
   ##
@@ -278,7 +306,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   # Writes a binary file to +path+ which is relative to +@gemhome+
 
   def write_file(path)
-    path = File.join @gemhome, path
+    path = File.join @gemhome, path unless Pathname.new(path).absolute?
     dir = File.dirname path
     FileUtils.mkdir_p dir
 
@@ -289,6 +317,10 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     path
   end
 
+  def all_spec_names
+    Gem::Specification.map(&:full_name)
+  end
+
   ##
   # Creates a Gem::Specification with a minimum of extra work.  +name+ and
   # +version+ are the gem's name and version,  platform, author, email,
@@ -316,19 +348,21 @@ class Gem::TestCase < MiniTest::Unit::TestCase
       yield(s) if block_given?
     end
 
-    path = File.join "specifications", spec.spec_name
-    written_path = write_file path do |io|
+    Gem::Specification.map # HACK: force specs to (re-)load before we write
+
+    written_path = write_file spec.spec_file do |io|
       io.write spec.to_ruby_for_cache
     end
 
     spec.loaded_from = spec.loaded_from = written_path
 
-    Gem.source_index.add_spec spec.for_cache
+    Gem::Specification.add_spec spec.for_cache
 
     return spec
   end
 
   def quick_spec name, version = '2'
+    # TODO: deprecate
     require 'rubygems/specification'
 
     spec = Gem::Specification.new do |s|
@@ -344,10 +378,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase
       yield(s) if block_given?
     end
 
-    path = File.join @gemhome, "specifications", spec.spec_name
-    spec.loaded_from = path
+    spec.loaded_from = spec.spec_file
 
-    Gem.source_index.add_spec spec
+    Gem::Specification.add_spec spec
 
     return spec
   end
@@ -357,7 +390,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   # 'cache'</tt>.  Automatically creates files based on +spec.files+
 
   def util_build_gem(spec)
-    dir = File.join(@gemhome, 'gems', spec.full_name)
+    dir = spec.gem_dir
     FileUtils.mkdir_p dir
 
     Dir.chdir dir do
@@ -371,8 +404,8 @@ class Gem::TestCase < MiniTest::Unit::TestCase
         Gem::Builder.new(spec).build
       end
 
-      FileUtils.mv spec.file_name,
-                   Gem.cache_gem("#{spec.original_name}.gem")
+      cache = spec.cache_file
+      FileUtils.mv File.basename(cache), cache
     end
   end
 
@@ -380,19 +413,16 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   # Removes all installed gems from +@gemhome+.
 
   def util_clear_gems
-    FileUtils.rm_rf File.join(@gemhome, 'gems')
-    FileUtils.rm_rf File.join(@gemhome, 'specifications')
-    Gem.source_index.refresh!
+    FileUtils.rm_rf File.join(@gemhome, "gems") # TODO: use Gem::Dirs
+    FileUtils.rm_rf File.join(@gemhome, "specifications")
+    Gem::Specification.reset
   end
 
   ##
   # Install the provided specs
 
   def install_specs(*specs)
-    specs.each do |spec|
-      # TODO: inverted responsibility
-      Gem.source_index.add_spec spec
-    end
+    Gem::Specification.add_specs(*specs)
     Gem.searcher = nil
   end
 
@@ -401,19 +431,42 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   # up properly. Use this instead of util_spec and util_gem.
 
   def new_spec name, version, deps = nil, *files
-    # TODO: unfactor and deprecate util_gem and util_spec
-    spec, = unless files.empty? then
-              util_gem name, version do |s|
-                Array(deps).each do |n,v|
-                  s.add_dependency n, v
-                end
-                s.files.push(*files)
-              end
-            else
-              util_spec name, version, deps
-            end
-    spec.loaded_from = File.join @gemhome, 'specifications', spec.spec_name
-    spec.loaded = false
+    require 'rubygems/specification'
+
+    spec = Gem::Specification.new do |s|
+      s.platform    = Gem::Platform::RUBY
+      s.name        = name
+      s.version     = version
+      s.author      = 'A User'
+      s.email       = 'example@example.com'
+      s.homepage    = 'http://example.com'
+      s.summary     = "this is a summary"
+      s.description = "This is a test description"
+
+      Array(deps).each do |n, req|
+        s.add_dependency n, (req || '>= 0')
+      end
+
+      s.files.push(*files) unless files.empty?
+
+      yield s if block_given?
+    end
+
+    spec.loaded_from = spec.spec_file
+
+    unless files.empty? then
+      write_file spec.spec_file do |io|
+        io.write spec.to_ruby_for_cache
+      end
+
+      util_build_gem spec
+
+      cache_file = File.join @tempdir, 'gems', "#{spec.full_name}.gem"
+      FileUtils.mkdir_p File.dirname cache_file
+      FileUtils.mv spec.cache_file, cache_file
+      FileUtils.rm spec.spec_file
+    end
+
     spec
   end
 
@@ -421,6 +474,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   # Creates a spec with +name+, +version+ and +deps+.
 
   def util_spec(name, version, deps = nil, &block)
+    # TODO: deprecate
     raise "deps or block, not both" if deps and block
 
     if deps then
@@ -441,6 +495,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   # location are returned.
 
   def util_gem(name, version, deps = nil, &block)
+    # TODO: deprecate
     raise "deps or block, not both" if deps and block
 
     if deps then
@@ -457,11 +512,10 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
     cache_file = File.join @tempdir, 'gems', "#{spec.original_name}.gem"
     FileUtils.mkdir_p File.dirname cache_file
-    FileUtils.mv Gem.cache_gem("#{spec.original_name}.gem"), cache_file
-    FileUtils.rm File.join(@gemhome, 'specifications', spec.spec_name)
+    FileUtils.mv spec.cache_file, cache_file
+    FileUtils.rm spec.spec_file
 
     spec.loaded_from = nil
-    spec.loaded = false
 
     [spec, cache_file]
   end
@@ -509,8 +563,8 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 This line is really, really long.  So long, in fact, that it is more than eighty characters long!  The purpose of this line is for testing wrapping behavior because sometimes people don't wrap their text to eighty characters.  Without the wrapping, the text might not look good in the RSS feed.
 
 Also, a list:
-  * An entry that's actually kind of sort
-  * an entry that's really long, which will probably get wrapped funny.  That's ok, somebody wasn't thinking straight when they made it more than eighty characters.
+  * An entry that\'s actually kind of sort
+  * an entry that\'s really long, which will probably get wrapped funny.  That's ok, somebody wasn't thinking straight when they made it more than eighty characters.
       DESC
     end
 
@@ -549,9 +603,7 @@ Also, a list:
       util_build_gem spec
     end
 
-    FileUtils.rm_r File.join(@gemhome, 'gems', @pl1.original_name)
-
-    Gem.source_index = nil
+    FileUtils.rm_r File.join(@gemhome, "gems", @pl1.original_name)
   end
 
   ##
@@ -581,6 +633,7 @@ Also, a list:
     @fetcher = Gem::FakeFetcher.new
 
     util_make_gems(prerelease)
+    Gem::Specification.reset
 
     @all_gems = [@a1, @a2, @a3a, @a_evil9, @b2, @c1_2].sort
     @all_gem_names = @all_gems.map { |gem| gem.full_name }
@@ -588,14 +641,6 @@ Also, a list:
     gem_names = [@a1.full_name, @a2.full_name, @a3a.full_name, @b2.full_name]
     @gem_names = gem_names.sort.join("\n")
 
-    @source_index = Gem::SourceIndex.new
-    @source_index.add_spec @a1
-    @source_index.add_spec @a2
-    @source_index.add_spec @a3a
-    @source_index.add_spec @a_evil9
-    @source_index.add_spec @c1_2
-    @source_index.add_spec @a2_pre if prerelease
-
     Gem::RemoteFetcher.fetcher = @fetcher
   end
 
@@ -604,37 +649,42 @@ Also, a list:
   # Best used with +@all_gems+ from #util_setup_fake_fetcher.
 
   def util_setup_spec_fetcher(*specs)
-    si = Gem::SourceIndex.new
-    si.add_specs(*specs)
+    specs -= Gem::Specification._all
+    Gem::Specification.add_specs(*specs)
 
     spec_fetcher = Gem::SpecFetcher.fetcher
 
+    prerelease, _ = Gem::Specification.partition { |spec|
+      spec.version.prerelease?
+    }
+
     spec_fetcher.specs[@uri] = []
-    si.gems.sort_by { |_, spec| spec }.each do |_, spec|
+    Gem::Specification.each do |spec|
       spec_tuple = [spec.name, spec.version, spec.original_platform]
       spec_fetcher.specs[@uri] << spec_tuple
     end
 
     spec_fetcher.latest_specs[@uri] = []
-    si.latest_specs.sort.each do |spec|
+    Gem::Specification.latest_specs.each do |spec|
       spec_tuple = [spec.name, spec.version, spec.original_platform]
       spec_fetcher.latest_specs[@uri] << spec_tuple
     end
 
     spec_fetcher.prerelease_specs[@uri] = []
-    si.prerelease_specs.sort.each do |spec|
+    prerelease.each do |spec|
       spec_tuple = [spec.name, spec.version, spec.original_platform]
       spec_fetcher.prerelease_specs[@uri] << spec_tuple
     end
 
-    (si.gems.merge si.prerelease_gems).sort_by { |_,spec| spec }.each do |_, spec|
-      path = "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{spec.original_name}.gemspec.rz"
+    v = Gem.marshal_version
+    Gem::Specification.each do |spec|
+      path = "#{@gem_repo}quick/Marshal.#{v}/#{spec.original_name}.gemspec.rz"
       data = Marshal.dump spec
       data_deflate = Zlib::Deflate.deflate data
       @fetcher.data[path] = data_deflate
     end
 
-    si
+    nil # force errors
   end
 
   ##

data/lib/rubygems/test_utilities.rb

@@ -97,8 +97,8 @@ class Gem::FakeFetcher
   end
 
   def download spec, source_uri, install_dir = Gem.dir
-    name = spec.file_name
-    path = Gem.cache_gem(name, install_dir)
+    name = File.basename spec.cache_file
+    path = File.join install_dir, "cache", name
 
     Gem.ensure_gem_subdirectories install_dir
 
@@ -114,7 +114,8 @@ class Gem::FakeFetcher
   end
 
   def download_to_cache dependency
-    found = Gem::SpecFetcher.fetcher.fetch dependency
+    found = Gem::SpecFetcher.fetcher.fetch dependency, true, true,
+                                           dependency.prerelease?
 
     return if found.empty?
 

data/lib/rubygems/text.rb

@@ -15,7 +15,7 @@ module Gem::Text
 
     while work.length > wrap do
       if work =~ /^(.{0,#{wrap}})[ \n]/ then
-        result << $1
+        result << $1.rstrip
         work.slice!(0, $&.length)
       else
         result << work.slice!(0, wrap)

data/lib/rubygems/uninstaller.rb

@@ -42,26 +42,23 @@ class Gem::Uninstaller
   # Constructs an uninstaller that will uninstall +gem+
 
   def initialize(gem, options = {})
-    @gem = gem
-    @version = options[:version] || Gem::Requirement.default
-    gem_home = options[:install_dir] || Gem.dir
-    @gem_home = File.expand_path gem_home
+    @gem               = gem
+    @version           = options[:version] || Gem::Requirement.default
+    @gem_home          = File.expand_path(options[:install_dir] || Gem.dir)
     @force_executables = options[:executables]
-    @force_all = options[:all]
-    @force_ignore = options[:ignore]
-    @bin_dir = options[:bin_dir]
+    @force_all         = options[:all]
+    @force_ignore      = options[:ignore]
+    @bin_dir           = options[:bin_dir]
     @format_executable = options[:format_executable]
 
     # only add user directory if install_dir is not set
     @user_install = false
     @user_install = options[:user_install] unless options[:install_dir]
 
-    spec_dir = File.join @gem_home, 'specifications'
-    @source_index = Gem::SourceIndex.new [spec_dir]
-
     if @user_install then
-      user_dir = File.join Gem.user_dir, 'specifications'
-      @user_index = Gem::SourceIndex.new [user_dir]
+      Gem.use_paths Gem.user_dir, @gem_home
+    else
+      Gem.use_paths @gem_home
     end
   end
 
@@ -70,8 +67,7 @@ class Gem::Uninstaller
   # directory, and the cached .gem file.
 
   def uninstall
-    list = @source_index.find_name @gem, @version
-    list += @user_index.find_name @gem, @version if @user_install
+    list = Gem::Specification.find_all_by_name(@gem, @version)
 
     if list.empty? then
       raise Gem::InstallError, "cannot uninstall, check `gem list -d #{@gem}`"
@@ -93,14 +89,14 @@ class Gem::Uninstaller
         say "Error: must enter a number [1-#{list.size+1}]"
       end
     else
-      uninstall_gem list.first, list.dup
+      uninstall_gem list.first
     end
   end
 
   ##
   # Uninstalls gem +spec+
 
-  def uninstall_gem(spec, specs)
+  def uninstall_gem(spec)
     @spec = spec
 
     unless dependencies_ok? spec
@@ -115,7 +111,7 @@ class Gem::Uninstaller
     end
 
     remove_executables @spec
-    remove @spec, specs
+    remove @spec
 
     Gem.post_uninstall_hooks.each do |hook|
       hook.call self
@@ -131,10 +127,8 @@ class Gem::Uninstaller
   def remove_executables(spec)
     return if spec.nil? or spec.executables.empty?
 
-    bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path)
-
-    list = @source_index.find_name(spec.name).delete_if { |s|
-      s.version == spec.version
+    list = Gem::Specification.find_all { |s|
+      s.name == spec.name && s.version != spec.version
     }
 
     executables = spec.executables.clone
@@ -159,6 +153,8 @@ class Gem::Uninstaller
     unless remove then
       say "Executables and scripts will remain installed."
     else
+      bindir = @bin_dir || Gem.bindir(spec.base_dir)
+
       raise Gem::FilePermissionError, bindir unless File.writable? bindir
 
       spec.executables.each do |exe_name|
@@ -185,7 +181,7 @@ class Gem::Uninstaller
   # Warning: this method modifies the +list+ parameter.  Once it has
   # uninstalled a gem, it is removed from that list.
 
-  def remove(spec, list)
+  def remove(spec)
     unless path_ok?(@gem_home, spec) or
            (@user_install and path_ok?(Gem.user_dir, spec)) then
       e = Gem::GemNotInHomeException.new \
@@ -195,28 +191,27 @@ class Gem::Uninstaller
       raise e
     end
 
-    raise Gem::FilePermissionError, spec.installation_path unless
-      File.writable?(spec.installation_path)
+    raise Gem::FilePermissionError, spec.base_dir unless
+      File.writable?(spec.base_dir)
 
     FileUtils.rm_rf spec.full_gem_path
 
-    original_platform_name = [
-      spec.name, spec.version, spec.original_platform].join '-'
+    # TODO: should this be moved to spec?... I vote eww (also exists in docmgr)
+    old_platform_name = [spec.name,
+                         spec.version,
+                         spec.original_platform].join '-'
 
-    spec_dir = File.join spec.installation_path, 'specifications'
-    gemspec = File.join spec_dir, spec.spec_name
+    gemspec = spec.spec_file
 
     unless File.exist? gemspec then
-      gemspec = File.join spec_dir, "#{original_platform_name}.gemspec"
+      gemspec = File.join(File.dirname(gemspec), "#{old_platform_name}.gemspec")
     end
 
     FileUtils.rm_rf gemspec
 
-    gem = Gem.cache_gem(spec.file_name, spec.installation_path)
-
-    unless File.exist? gem then
-      gem = Gem.cache_gem("#{original_platform_name}.gem", spec.installation_path)
-    end
+    gem = spec.cache_file
+    gem = File.join(spec.cache_dir, "#{old_platform_name}.gem") unless
+      File.exist? gem
 
     FileUtils.rm_rf gem
 
@@ -224,14 +219,14 @@ class Gem::Uninstaller
 
     say "Successfully uninstalled #{spec.full_name}"
 
-    list.delete spec
+    Gem::Specification.remove_spec spec
   end
 
   ##
   # Is +spec+ in +gem_dir+?
 
   def path_ok?(gem_dir, spec)
-    full_path = File.join gem_dir, 'gems', spec.full_name
+    full_path     = File.join gem_dir, 'gems', spec.full_name
     original_path = File.join gem_dir, 'gems', spec.original_name
 
     full_path == spec.full_gem_path || original_path == spec.full_gem_path
@@ -240,8 +235,7 @@ class Gem::Uninstaller
   def dependencies_ok?(spec)
     return true if @force_ignore
 
-    deplist = Gem::DependencyList.from_source_index @source_index
-    deplist.add(*@user_index.gems.values) if @user_install
+    deplist = Gem::DependencyList.from_specs
     deplist.ok_to_remove?(spec.full_name)
   end
 
@@ -249,11 +243,13 @@ class Gem::Uninstaller
     msg = ['']
     msg << 'You have requested to uninstall the gem:'
     msg << "\t#{spec.full_name}"
-    spec.dependent_gems.each do |gem,dep,satlist|
+
+    spec.dependent_gems.each do |dep_spec, dep, satlist|
       msg <<
-        ("#{gem.name}-#{gem.version} depends on " +
-        "[#{dep.name} (#{dep.requirement})]")
+        ("#{dep_spec.name}-#{dep_spec.version} depends on " +
+         "[#{dep.name} (#{dep.requirement})]")
     end
+
     msg << 'If you remove this gems, one or more dependencies will not be met.'
     msg << 'Continue with Uninstall?'
     return ask_yes_no(msg.join("\n"), true)
@@ -266,7 +262,4 @@ class Gem::Uninstaller
       filename
     end
   end
-
-
 end
-