rubygems-update 2.0.0.preview2.2 → 2.0.0.rc.1

data/lib/rubygems/commands/update_command.rb

@@ -142,7 +142,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
     gems_to_update = which_to_update hig, options[:args], :system
     name, up_ver   = gems_to_update.first
-    current_ver    = Gem::Version.new Gem::VERSION
+    current_ver    = Gem.rubygems_version
 
     target = if options[:system] == true then
                up_ver

data/lib/rubygems/dependency.rb

@@ -10,14 +10,14 @@ class Gem::Dependency
   #--
   # When this list is updated, be sure to change
   # Gem::Specification::CURRENT_SPECIFICATION_VERSION as well.
-
+  #
   # REFACTOR: This type of constant, TYPES, indicates we might want
-  # two classes, used via inheretance or duck typing.
+  # two classes, used via inheritance or duck typing.
 
   TYPES = [
-           :development,
-           :runtime,
-          ]
+    :development,
+    :runtime,
+  ]
 
   ##
   # Dependency name or regular expression.

data/lib/rubygems/doctor.rb

@@ -0,0 +1,125 @@
+require 'rubygems'
+require 'rubygems/user_interaction'
+require 'pathname'
+
+##
+# Cleans up after a partially-failed uninstall or for an invalid
+# Gem::Specification.
+#
+# If a specification was removed by hand this will remove any remaining files.
+#
+# If a corrupt specification was installed this will clean up warnings by
+# removing the bogus specification.
+
+class Gem::Doctor
+
+  include Gem::UserInteraction
+
+  ##
+  # Maps a gem subdirectory to the files that are expected to exist in the
+  # subdirectory.
+
+  REPOSITORY_EXTENSION_MAP = [ # :nodoc:
+    ['specifications', '.gemspec'],
+    ['build_info',     '.info'],
+    ['cache',          '.gem'],
+    ['doc',            ''],
+    ['gems',           ''],
+  ]
+
+  raise 'Update REPOSITORY_EXTENSION_MAP' unless
+    Gem::REPOSITORY_SUBDIRECTORIES.sort ==
+      REPOSITORY_EXTENSION_MAP.map { |(k,_)| k }.sort
+
+  ##
+  # Creates a new Gem::Doctor that will clean up +gem_repository+.  Only one
+  # gem repository may be cleaned at a time.
+  #
+  # If +dry_run+ is true no files or directories will be removed.
+
+  def initialize gem_repository, dry_run = false
+    @gem_repository = Pathname(gem_repository)
+    @dry_run        = dry_run
+
+    @installed_specs = nil
+  end
+
+  ##
+  # Specs installed in this gem repository
+
+  def installed_specs # :nodoc:
+    @installed_specs ||= Gem::Specification.map { |s| s.full_name }
+  end
+
+  ##
+  # Are we doctoring a gem repository?
+
+  def gem_repository?
+    not installed_specs.empty?
+  end
+
+  ##
+  # Cleans up uninstalled files and invalid gem specifications
+
+  def doctor
+    @orig_home = Gem.dir
+    @orig_path = Gem.path
+
+    say "Checking #{@gem_repository}"
+
+    Gem.use_paths @gem_repository.to_s
+
+    unless gem_repository? then
+      say 'This directory does not appear to be a RubyGems repository, ' +
+          'skipping'
+      say
+      return
+    end
+
+    doctor_children
+
+    say
+  ensure
+    Gem.use_paths @orig_home, *@orig_path
+  end
+
+  ##
+  # Cleans up children of this gem repository
+
+  def doctor_children # :nodoc:
+    REPOSITORY_EXTENSION_MAP.each do |sub_directory, extension|
+      doctor_child sub_directory, extension
+    end
+  end
+
+  ##
+  # Removes files in +sub_directory+ with +extension+
+
+  def doctor_child sub_directory, extension # :nodoc:
+    directory = @gem_repository + sub_directory
+
+    directory.children.sort.each do |child|
+      next unless child.exist?
+
+      basename = child.basename(extension).to_s
+      next if installed_specs.include? basename
+      next if /^rubygems-\d/ =~ basename
+      next if 'specifications' == sub_directory and 'default' == basename
+
+      type = child.directory? ? 'directory' : 'file'
+
+      action = if @dry_run then
+                 'Extra'
+               else
+                 child.rmtree
+                 'Removed'
+               end
+
+      say "#{action} #{type} #{sub_directory}/#{child.basename}"
+    end
+  rescue Errno::ENOENT
+    # ignore
+  end
+
+end
+

data/lib/rubygems/installer.rb

@@ -202,47 +202,24 @@ class Gem::Installer
   #     specifications/<gem-version>.gemspec #=> the Gem::Specification
 
   def install
-    verify_gem_home(options[:unpack])
-
-    # If we're forcing the install then disable security unless the security
-    # policy says that we only install signed gems.
-    @security_policy = nil if @force and @security_policy and
-                              not @security_policy.only_signed
-
-    unless @force
-      ensure_required_ruby_version_met
-      ensure_required_rubygems_version_met
-      ensure_dependencies_met unless @ignore_dependencies
-    end
+    pre_install_checks
 
     run_pre_install_hooks
 
-    Gem.ensure_gem_subdirectories gem_home
-
     # Completely remove any previous gem files
-    FileUtils.rm_rf(gem_dir)
+    FileUtils.rm_rf gem_dir
 
     FileUtils.mkdir_p gem_dir
 
     extract_files
-    build_extensions
 
+    build_extensions
+    write_build_info_file
     run_post_build_hooks
 
     generate_bin
     write_spec
-
-    unless @build_args.empty?
-      File.open spec.build_info_file, "w" do |f|
-        @build_args.each { |a| f.puts a }
-      end
-    end
-
-    # TODO should be always cache the file? Other classes have options
-    # to controls if caching is done.
-    cache_file = File.join(gem_home, "cache", "#{spec.full_name}.gem")
-
-    FileUtils.cp gem, cache_file unless File.exist? cache_file
+    write_cache_file
 
     say spec.post_install_message unless spec.post_install_message.nil?
 
@@ -255,7 +232,7 @@ class Gem::Installer
     spec
 
   # TODO This rescue is in the wrong place. What is raising this exception?
-  # move this rescue to arround the code that actually might raise it.
+  # move this rescue to around the code that actually might raise it.
   rescue Zlib::GzipFile::Error
     raise Gem::InstallError, "gzip error installing #{gem}"
   end
@@ -506,6 +483,22 @@ class Gem::Installer
     end
   end
 
+  ##
+  # Ensures the Gem::Specification written out for this gem is loadable upon
+  # installation.
+
+  def ensure_loadable_spec
+    ruby = spec.to_ruby_for_cache
+    ruby.untaint
+
+    begin
+      eval ruby
+    rescue StandardError, SyntaxError => e
+      raise Gem::InstallError,
+            "The specification for #{spec.full_name} is corrupt (#{e.class})"
+    end
+  end
+
   # DOC: Missing docs or :nodoc:.
   def ensure_required_ruby_version_met
     if rrv = spec.required_ruby_version then
@@ -736,5 +729,59 @@ EOF
   def dir
     gem_dir.to_s
   end
+
+  ##
+  # Performs various checks before installing the gem such as the install
+  # repository is writable and its directories exist, required ruby and
+  # rubygems versions are met and that dependencies are installed.
+  #
+  # Version and dependency checks are skipped if this install is forced.
+  #
+  # The dependent check will be skipped this install is ignoring dependencies.
+
+  def pre_install_checks
+    verify_gem_home options[:unpack]
+
+    # If we're forcing the install then disable security unless the security
+    # policy says that we only install signed gems.
+    @security_policy = nil if
+      @force and @security_policy and not @security_policy.only_signed
+
+    ensure_loadable_spec
+
+    Gem.ensure_gem_subdirectories gem_home
+
+    return true if @force
+
+    ensure_required_ruby_version_met
+    ensure_required_rubygems_version_met
+    ensure_dependencies_met unless @ignore_dependencies
+
+    true
+  end
+
+  ##
+  # Writes the file containing the arguments for building this gem's
+  # extensions.
+
+  def write_build_info_file
+    return if @build_args.empty?
+
+    open spec.build_info_file, 'w' do |io|
+      @build_args.each do |arg|
+        io.puts arg
+      end
+    end
+  end
+
+  ##
+  # Writes the .gem file to the cache directory
+
+  def write_cache_file
+    cache_file = File.join gem_home, 'cache', spec.file_name
+
+    FileUtils.cp @gem, cache_file unless File.exist? cache_file
+  end
+
 end
 

data/lib/rubygems/specification.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -621,7 +622,6 @@ class Gem::Specification
       File.join(Gem.default_dir, "specifications", "default")
     end
 
-    private
     def each_spec(search_dirs) # :nodoc:
       search_dirs.each { |dir|
         Dir[File.join(dir, "*.gemspec")].each { |path|
@@ -2048,7 +2048,9 @@ class Gem::Specification
     when Numeric           then obj.inspect
     when true, false, nil  then obj.inspect
     when Gem::Platform     then "Gem::Platform.new(#{obj.to_a.inspect})"
-    when Gem::Requirement  then "Gem::Requirement.new(#{obj.to_s.inspect})"
+    when Gem::Requirement  then
+      list = obj.as_list
+      "Gem::Requirement.new(#{ruby_code(list.size == 1 ? obj.to_s : list)})"
     else raise Gem::Exception, "ruby_code case not handled: #{obj.class}"
     end
   end

data/lib/rubygems/test_case.rb

@@ -465,6 +465,19 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     Gem.searcher = nil
   end
 
+  ##
+  # Installs the provided default specs including writing the spec file
+
+  def install_default_gems(*specs)
+    install_default_specs(*specs)
+
+    specs.each do |spec|
+      open spec.loaded_from, 'w' do |io|
+        io.write spec.to_ruby_for_cache
+      end
+    end
+  end
+
   ##
   # Install the provided default specs
 
@@ -572,7 +585,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
       block = proc do |s|
         # Since Hash#each is unordered in 1.8, sort
         # the keys and iterate that way so the tests are
-        # deteriminstic on all implementations.
+        # deterministic on all implementations.
         deps.keys.sort.each do |n|
           s.add_dependency n, (deps[n] || '>= 0')
         end

data/lib/rubygems/uninstaller.rb

@@ -72,7 +72,19 @@ class Gem::Uninstaller
   # directory, and the cached .gem file.
 
   def uninstall
-    list = Gem::Specification.find_all_by_name(@gem, @version)
+    dependency = Gem::Dependency.new @gem, @version
+
+    list = []
+
+    dirs =
+      Gem::Specification.dirs +
+      [Gem::Specification.default_specifications_dir]
+
+    Gem::Specification.each_spec dirs do |spec|
+      next unless dependency.matches_spec? spec
+
+      list << spec
+    end
 
     default_specs, list = list.partition do |spec|
       spec.default_gem?
@@ -80,7 +92,7 @@ class Gem::Uninstaller
 
     list, other_repo_specs = list.partition do |spec|
       @gem_home == spec.base_dir or
-      (@user_install and spec.base_dir == Gem.user_dir)
+        (@user_install and spec.base_dir == Gem.user_dir)
     end
 
     if list.empty? then

data/lib/rubygems/validator.rb

@@ -58,13 +58,11 @@ class Gem::Validator
   public
 
   ErrorData = Struct.new :path, :problem do
-
     def <=> other
       return nil unless self.class === other
 
       [path, problem] <=> [other.path, other.problem]
     end
-
   end
 
   ##
@@ -121,7 +119,6 @@ class Gem::Validator
             File.readable? File.join(gem_directory, file_name)
           }
 
-          unreadable.map! { |entry, _| entry['path'] }
           unreadable.sort.each do |path|
             errors[gem_name][path] = "Unreadable file"
           end
@@ -153,7 +150,9 @@ class Gem::Validator
     end
 
     errors.each do |name, subhash|
-      errors[name] = subhash.map { |path, msg| ErrorData.new(path, msg) }.sort
+      errors[name] = subhash.map do |path, msg|
+        ErrorData.new path, msg
+      end.sort
     end
 
     errors

data/test/rubygems/test_gem.rb

@@ -774,6 +774,45 @@ class TestGem < Gem::TestCase
     assert_equal cwd, $LOAD_PATH.shift
   end
 
+  def test_self_latest_spec_for
+    a1  = quick_spec 'a', 1
+    a2  = quick_spec 'a', 2
+    a3a = quick_spec 'a', '3.a'
+
+    util_setup_fake_fetcher
+    util_setup_spec_fetcher a1, a2, a3a
+
+    spec = Gem.latest_spec_for 'a'
+
+    assert_equal a2, spec
+  end
+
+  def test_self_latest_rubygems_version
+    r1 = quick_spec 'rubygems-update', '1.8.23'
+    r2 = quick_spec 'rubygems-update', '1.8.24'
+    r3 = quick_spec 'rubygems-update', '2.0.0.preview3'
+
+    util_setup_fake_fetcher
+    util_setup_spec_fetcher r1, r2, r3
+
+    version = Gem.latest_rubygems_version
+
+    assert_equal Gem::Version.new('1.8.24'), version
+  end
+
+  def test_self_latest_version_for
+    a1  = quick_spec 'a', 1
+    a2  = quick_spec 'a', 2
+    a3a = quick_spec 'a', '3.a'
+
+    util_setup_fake_fetcher
+    util_setup_spec_fetcher a1, a2, a3a
+
+    version = Gem.latest_version_for 'a'
+
+    assert_equal Gem::Version.new(2), version
+  end
+
   def test_self_loaded_specs
     foo = quick_spec 'foo'
     install_gem foo