rubygems-update 0.9.4 → 0.9.5

data/lib/rubygems/digest/md5.rb

@@ -7,6 +7,7 @@
 
 require 'digest/md5'
 
+# :stopdoc:
 module Gem
   if RUBY_VERSION >= '1.8.6'
     MD5 = Digest::MD5
@@ -17,4 +18,6 @@ module Gem
       self.hexdigest(string)
     end
   end
-end
+end
+# :startdoc:
+

data/lib/rubygems/digest/sha2.rb

@@ -14,4 +14,4 @@ module Gem
     require 'rubygems/digest/digest_adapter'
     SHA256 = DigestAdapter.new(Digest::SHA256)
   end
-end
+end

data/lib/rubygems/doc_manager.rb

@@ -4,10 +4,10 @@
 # See LICENSE.txt for permissions.
 #++
 
+require 'fileutils'
+
 module Gem
 
-  class DocumentError < Gem::Exception; end
-  
   class DocManager
   
     include UserInteraction
@@ -20,7 +20,6 @@ module Gem
     def initialize(spec, rdoc_args="")
       @spec = spec
       @doc_dir = File.join(spec.installation_path, "doc", spec.full_name)
-      Gem::FilePermissionError.new(spec.installation_path) unless File.writable?(spec.installation_path)
       @rdoc_args = rdoc_args.nil? ? [] : rdoc_args.split
     end
     
@@ -35,8 +34,6 @@ module Gem
     # same process, the RI docs should be done first (a likely bug in
     # RDoc will cause RI docs generation to fail if run after RDoc).
     def generate_ri
-      require 'fileutils'
-
       if @spec.has_rdoc then
         load_rdoc
         install_ri # RDoc bug, ri goes first
@@ -51,8 +48,6 @@ module Gem
     # same process, the RI docs should be done first (a likely bug in
     # RDoc will cause RI docs generation to fail if run after RDoc).
     def generate_rdoc
-      require 'fileutils'
-
       if @spec.has_rdoc then
         load_rdoc
         install_rdoc
@@ -63,26 +58,36 @@ module Gem
 
     # Load the RDoc documentation generator library.
     def load_rdoc
-      if File.exist?(@doc_dir) && !File.writable?(@doc_dir)
-        Gem::FilePermissionError.new(@doc_dir)
+      if File.exist?(@doc_dir) && !File.writable?(@doc_dir) then
+        raise Gem::FilePermissionError.new(@doc_dir)
       end
+
       FileUtils.mkdir_p @doc_dir unless File.exist?(@doc_dir)
+
       begin
         require 'rdoc/rdoc'
       rescue LoadError => e
-        raise DocumentError, 
+        raise Gem::DocumentError,
           "ERROR: RDoc documentation generator not installed!"
       end
     end
 
     def install_rdoc
+      rdoc_dir = File.join @doc_dir, 'rdoc'
+
+      FileUtils.rm_rf rdoc_dir
+
       say "Installing RDoc documentation for #{@spec.full_name}..."
-      run_rdoc '--op', File.join(@doc_dir, 'rdoc')
+      run_rdoc '--op', rdoc_dir
     end
 
     def install_ri
+      ri_dir = File.join @doc_dir, 'ri'
+
+      FileUtils.rm_rf ri_dir
+
       say "Installing ri documentation for #{@spec.full_name}..."
-      run_rdoc '--ri', '--op', File.join(@doc_dir, 'ri')
+      run_rdoc '--ri', '--op', ri_dir
     end
 
     def run_rdoc(*args)
@@ -103,20 +108,37 @@ module Gem
         dirname = File.dirname e.message.split("-")[1].strip
         raise Gem::FilePermissionError.new(dirname)
       rescue RuntimeError => ex
-        STDERR.puts "While generating documentation for #{@spec.full_name}"
-        STDERR.puts "... MESSAGE:   #{ex}"
-        STDERR.puts "... RDOC args: #{args.join(' ')}"
-        STDERR.puts ex.backtrace if Gem.configuration.backtrace
-        STDERR.puts "(continuing with the rest of the installation)"
+        alert_error "While generating documentation for #{@spec.full_name}"
+        ui.errs.puts "... MESSAGE:   #{ex}"
+        ui.errs.puts "... RDOC args: #{args.join(' ')}"
+        ui.errs.puts "\t#{ex.backtrace.join "\n\t"}" if
+          Gem.configuration.backtrace
+        ui.errs.puts "(continuing with the rest of the installation)"
       ensure
         Dir.chdir(old_pwd)
       end
     end
 
     def uninstall_doc
-      doc_dir = File.join(@spec.installation_path, "doc", @spec.full_name)
+      raise Gem::FilePermissionError.new(@spec.installation_path) unless
+        File.writable? @spec.installation_path
+
+      original_name = [
+        @spec.name, @spec.version, @spec.original_platform].join '-'
+
+      doc_dir = File.join @spec.installation_path, 'doc', @spec.full_name
+      unless File.directory? doc_dir then
+        doc_dir = File.join @spec.installation_path, 'doc', original_name
+      end
+
       FileUtils.rm_rf doc_dir
-      ri_dir = File.join(@spec.installation_path, "ri", @spec.full_name)
+
+      ri_dir = File.join @spec.installation_path, 'ri', @spec.full_name
+
+      unless File.directory? ri_dir then
+        ri_dir = File.join @spec.installation_path, 'ri', original_name
+      end
+
       FileUtils.rm_rf ri_dir
     end
 

data/lib/rubygems/exceptions.rb

@@ -0,0 +1,63 @@
+require 'rubygems'
+
+##
+# Base exception class for RubyGems.  All exception raised by RubyGems are a
+# subclass of this one.
+class Gem::Exception < RuntimeError; end
+
+class Gem::CommandLineError < Gem::Exception; end
+
+class Gem::DependencyError < Gem::Exception; end
+
+class Gem::DependencyRemovalException < Gem::Exception; end
+
+class Gem::DocumentError < Gem::Exception; end
+  
+##
+# Potentially raised when a specification is validated.
+class Gem::EndOfYAMLException < Gem::Exception; end
+
+##
+# Signals that a file permission error is preventing the user from
+# installing in the requested directories.
+class Gem::FilePermissionError < Gem::Exception
+  def initialize(path)
+    super("You don't have write permissions into the #{path} directory.")
+  end
+end
+
+##
+# Used to raise parsing and loading errors
+class Gem::FormatException < Gem::Exception
+  attr_accessor :file_path
+end
+
+class Gem::GemNotFoundException < Gem::Exception; end
+
+class Gem::InstallError < Gem::Exception; end
+
+##
+# Potentially raised when a specification is validated.
+class Gem::InvalidSpecificationException < Gem::Exception; end
+
+class Gem::OperationNotSupportedError < Gem::Exception; end
+
+##
+# Signals that a remote operation cannot be conducted, probably due to not
+# being connected (or just not finding host).
+#--
+# TODO: create a method that tests connection to the preferred gems server.
+# All code dealing with remote operations will want this.  Failure in that
+# method should raise this error.
+class Gem::RemoteError < Gem::Exception; end
+
+class Gem::RemoteInstallationCancelled < Gem::Exception; end
+
+class Gem::RemoteInstallationSkipped < Gem::Exception; end
+
+##
+# Represents an error communicating via HTTP.
+class Gem::RemoteSourceException < Gem::Exception; end
+
+class Gem::VerificationError < Gem::Exception; end
+

data/lib/rubygems/ext.rb

@@ -0,0 +1,18 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems'
+
+##
+# Classes for building C extensions live here.
+
+module Gem::Ext; end
+
+require 'rubygems/ext/builder'
+require 'rubygems/ext/configure_builder'
+require 'rubygems/ext/ext_conf_builder'
+require 'rubygems/ext/rake_builder'
+

data/lib/rubygems/ext/builder.rb

@@ -0,0 +1,56 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems/ext'
+
+class Gem::Ext::Builder
+
+  def self.class_name
+    name =~ /Ext::(.*)Builder/
+    $1.downcase
+  end
+
+  def self.make(dest_path, results)
+    unless File.exist? 'Makefile' then
+      raise Gem::InstallError, "Makefile not found:\n\n#{results.join "\n"}" 
+    end
+
+    mf = File.read('Makefile')
+    mf = mf.gsub(/^RUBYARCHDIR\s*=\s*\$[^$]*/, "RUBYARCHDIR = #{dest_path}")
+    mf = mf.gsub(/^RUBYLIBDIR\s*=\s*\$[^$]*/, "RUBYLIBDIR = #{dest_path}")
+
+    File.open('Makefile', 'wb') {|f| f.print mf}
+
+    make_program = ENV['make']
+    unless make_program then
+      make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
+    end
+
+    ['', ' install'].each do |target|
+      cmd = "#{make_program}#{target}"
+      results << cmd
+      results << `#{cmd} #{redirector}`
+
+      raise Gem::InstallError, "make#{target} failed:\n\n#{results}" unless
+        $?.exitstatus.zero?
+    end
+  end
+
+  def self.redirector
+    '2>&1'
+  end
+
+  def self.run(command, results)
+    results << command
+    results << `#{command} #{redirector}`
+
+    unless $?.exitstatus.zero? then
+      raise Gem::InstallError, "#{class_name} failed:\n\n#{results.join "\n"}"
+    end
+  end
+
+end
+

data/lib/rubygems/ext/configure_builder.rb

@@ -0,0 +1,24 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems/ext/builder'
+
+class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
+
+  def self.build(extension, directory, dest_path, results)
+    unless File.exist?('Makefile') then
+      cmd = "sh ./configure --prefix=#{dest_path}"
+
+      run cmd, results
+    end
+
+    make dest_path, results
+
+    results
+  end
+
+end
+

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -0,0 +1,23 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems/ext/builder'
+
+class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
+
+  def self.build(extension, directory, dest_path, results)
+    cmd = "#{Gem.ruby} #{File.basename extension}"
+    cmd << " #{ARGV.join ' '}" unless ARGV.empty?
+
+    run cmd, results
+
+    make dest_path, results
+
+    results
+  end
+
+end
+

data/lib/rubygems/ext/rake_builder.rb

@@ -0,0 +1,27 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems/ext/builder'
+
+class Gem::Ext::RakeBuilder < Gem::Ext::Builder
+
+  def self.build(extension, directory, dest_path, results)
+    if File.basename(extension) =~ /mkrf_conf/i then
+      cmd = "#{Gem.ruby} #{File.basename extension}"
+      cmd << " #{ARGV.join " "}" unless ARGV.empty?
+      run cmd, results
+    end
+
+    cmd = ENV['rake'] || 'rake'
+    cmd << " RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}"
+
+    run cmd, results
+
+    results
+  end
+
+end
+

data/lib/rubygems/format.rb

@@ -4,6 +4,8 @@
 # See LICENSE.txt for permissions.
 #++
 
+require 'fileutils'
+
 require 'rubygems/package'
 
 module Gem
@@ -33,19 +35,27 @@ module Gem
     # file_path:: [String] Path to the gem file
     #
     def self.from_file_by_path(file_path, security_policy = nil)
+      format = nil
+
       unless File.exist?(file_path)
         raise Gem::Exception, "Cannot load gem at [#{file_path}] in #{Dir.pwd}"
       end
-      require 'fileutils'
+
       # check for old version gem
       if File.read(file_path, 20).include?("MD5SUM =")
         #alert_warning "Gem #{file_path} is in old format."
         require 'rubygems/old_format'
-        return OldFormat.from_file_by_path(file_path)
+        format = OldFormat.from_file_by_path(file_path)
       else
-        f = File.open(file_path, 'rb')
-        return from_io(f, file_path, security_policy)
+        begin
+          f = File.open(file_path, 'rb')
+          format = from_io(f, file_path, security_policy)
+        ensure
+          f.close unless f.closed?
+        end
       end
+
+      return format
     end
 
     ##
@@ -60,8 +70,8 @@ module Gem
         format.spec = pkg.metadata
         format.file_entries = []
         pkg.each do |entry|
-          format.file_entries << [{"size", entry.size, "mode", entry.mode,
-              "path", entry.full_name}, entry.read]
+          format.file_entries << [{"size" => entry.size, "mode" => entry.mode,
+              "path" => entry.full_name}, entry.read]
         end
       end
       format

data/lib/rubygems/gem_openssl.rb

@@ -4,7 +4,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-
 # Some system might not have OpenSSL installed, therefore the core
 # library file openssl might not be available.  We localize testing
 # for the presence of OpenSSL in this file.
@@ -17,10 +16,10 @@ module Gem
       require 'rubygems/gem_openssl'
       @ssl_available
     end
-    
+
     # Set the value of the ssl_avilable flag.
     attr_writer :ssl_available
-    
+
     # Ensure that SSL is available.  Throw an exception if it is not.
     def ensure_ssl_available
       unless ssl_available?
@@ -39,8 +38,46 @@ begin
   dummy = OpenSSL::Digest::SHA1
 
   Gem.ssl_available = true
-rescue LoadError
-  Gem.ssl_available = false
-rescue
+
+  class OpenSSL::X509::Certificate # :nodoc:
+    # Check the validity of this certificate.
+    def check_validity(issuer_cert = nil, time = Time.now)
+      ret = if @not_before && @not_before > time
+              [false, :expired, "not valid before '#@not_before'"]
+            elsif @not_after && @not_after < time
+              [false, :expired, "not valid after '#@not_after'"]
+            elsif issuer_cert && !verify(issuer_cert.public_key)
+              [false, :issuer, "#{issuer_cert.subject} is not issuer"]
+            else
+              [true, :ok, 'Valid certificate']
+            end
+
+      # return hash
+      { :is_valid => ret[0], :error => ret[1], :desc => ret[2] }
+    end
+  end
+
+rescue LoadError, StandardError
   Gem.ssl_available = false
 end
+
+module Gem::SSL
+
+  # We make our own versions of the constants here.  This allows us
+  # to reference the constants, even though some systems might not
+  # have SSL installed in the Ruby core package.
+  #
+  # These constants are only used during load time.  At runtime, any
+  # method that makes a direct reference to SSL software must be
+  # protected with a Gem.ensure_ssl_available call.
+  #
+  if Gem.ssl_available? then
+    PKEY_RSA = OpenSSL::PKey::RSA
+    DIGEST_SHA1 = OpenSSL::Digest::SHA1
+  else
+    PKEY_RSA = :rsa
+    DIGEST_SHA1 = :sha1
+  end
+
+end
+