rubygems-update 0.9.4 → 0.9.5

data/README

@@ -58,7 +58,6 @@ RubyGems was originally developed at RubyConf 2003 by:
 * Ryan Davis -- 
 * Eric Hodel -- drbrain(at)segment7.net
 
-
 (If your name is missing, PLEASE let us know!)
 
 == Feedback

data/Rakefile

@@ -192,14 +192,9 @@ end
 
 # --------------------------------------------------------------------
 
-begin
+begin # rcov
   require 'rcov/rcovtask'
-  HAVE_RCOV = true
-rescue LoadError
-  HAVE_RCOV = false
-end
 
-if HAVE_RCOV
   Rcov::RcovTask.new do |t|
     t.libs << "test"
     t.rcov_opts = ['-xRakefile', '-xrakefile', '-xpublish.rf', '--text-report']
@@ -208,6 +203,7 @@ if HAVE_RCOV
     ]
     t.verbose = true
   end
+rescue LoadError
 end
 
 # --------------------------------------------------------------------
@@ -218,8 +214,9 @@ rd = Rake::RDocTask.new("rdoc") { |rdoc|
   rdoc.rdoc_dir = 'html'
   rdoc.title    = "RubyGems"
   rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  rdoc.rdoc_files.include('README', 'TODO', 'Releases', 'LICENSE.txt', 'GPL.txt')
+  rdoc.rdoc_files.include('README', 'TODO', 'LICENSE.txt', 'GPL.txt')
   rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include('doc/**/*.rdoc')
 #  rdoc.rdoc_files.include('test/**/*.rb')
 }
 
@@ -260,10 +257,9 @@ end
 # Package tasks
 
 PKG_FILES = FileList[
-  "Rakefile", "ChangeLog", "Releases", "TODO", "README", "LICENSE.txt",
+  "Rakefile", "ChangeLog", "TODO", "README", "LICENSE.txt",
   "GPL.txt",
   "setup.rb",
-  "post-install.rb",
   "bin/*",
   "doc/*.css", "doc/*.rb",
   "examples/**/*",
@@ -325,9 +321,7 @@ end
 
 desc "Install RubyGems"
 task :install do
-  ruby 'setup.rb config'
-  ruby 'setup.rb setup'
-  ruby 'setup.rb install'
+  ruby 'setup.rb'
 end
 
 # Run 'gem' (using local bin and lib directories).
@@ -373,3 +367,36 @@ task :rubyfiles do
 end
 
 task :rf => :rubyfiles
+
+# These tasks expect to have the following directory structure:
+#
+#   ruby/trunk # ruby subversion HEAD checkout
+#   rubygems/trunk # RubyGems subversion HEAD checkout
+#
+# If you don't have this directory structure, set RUBY_PATH.
+
+desc "Updates Ruby HEAD with the currently checked-out copy of RubyGems."
+task :update_ruby do
+  ruby_dir = ENV['RUBY_PATH'] || '../../ruby/trunk'
+
+  options = "-avP --exclude '*svn*' --exclude '*swp'"
+
+  sh "rsync #{options} bin/gem #{ruby_dir}/bin/gem"
+  sh "rsync #{options} lib/ #{ruby_dir}/lib"
+  sh "rsync #{options} test/ #{ruby_dir}/test/rubygems"
+end
+
+desc "Diffs Ruby HEAD with the currently checked-out copy of RubyGems."
+task :diff_ruby do
+  ruby_dir = ENV['RUBY_PATH'] || '../../ruby/trunk'
+
+  options = "-urpN --exclude '*svn*' --exclude '*swp'"
+
+  sh "diff #{options} bin/gem #{ruby_dir}/bin/gem; true"
+  sh "diff #{options} lib/ubygems.rb #{ruby_dir}/lib/ubygems.rb; true"
+  sh "diff #{options} lib/rubygems.rb #{ruby_dir}/lib/rubygems.rb; true"
+  sh "diff #{options} lib/rubygems #{ruby_dir}/lib/rubygems; true"
+  sh "diff #{options} lib/rbconfig #{ruby_dir}/lib/rbconfig; true"
+  sh "diff #{options} test #{ruby_dir}/test/rubygems; true"
+end
+

data/TODO

@@ -1,6 +1 @@
-* support for installing binary (pre-compiled), platform-dependent gems.  This already works as long as you pick the right gem manually, but I'd like the remote installer to intelligently select the right one and for the installer to throw an error (or a warning) if you attempt o install (e.g.) a Windows gem on a linux system.  Requires a lot of data to be collected on platform dependency fulfillment.
-* syncing gem repositories
 * optional dependencies: "semitar can use REXML, but it works better if you have the ruby raptor library installed",  or not so optional as in: "you need Ruby/RSS > = 1.0 OR rss > 0.91 for this library to work"
-* Integration with platform-native packaging systems
-* MD5 summing stuff doesn't work right on the new format (0.8.0+)
-* Rethink testing strategy.  May need to write a document describing how to avoid doing things in unit tests that won't work outside of `pwd`

data/bin/gem

@@ -5,14 +5,13 @@
 # See LICENSE.txt for permissions.
 #++
 
-
 require 'rubygems'
-Gem.manage_gems
+require 'rubygems/gem_runner'
+
+required_version = Gem::Requirement.new ">= 1.8.2"
 
-required_version = Gem::Version::Requirement.new(">= 1.8.0")
-unless  required_version.satisfied_by?(Gem::Version.new(RUBY_VERSION))
-  puts "Expected Ruby Version #{required_version}, was #{RUBY_VERSION}"
-  exit(1)
+unless required_version.satisfied_by? Gem::Version.new(RUBY_VERSION) then
+  abort "Expected Ruby Version #{required_version}, was #{RUBY_VERSION}"
 end
 
 # We need to preserve the original ARGV to use for passing gem options
@@ -20,4 +19,5 @@ end
 # it...its for the source building process.
 args = !ARGV.include?("--") ? ARGV.clone : ARGV[0...ARGV.index("--")]
 
-Gem::GemRunner.new.run(args)
+Gem::GemRunner.new.run args
+

data/bin/update_rubygems

@@ -10,7 +10,7 @@ update_dir = $LOAD_PATH.find { |fn| fn =~ /rubygems-update/ }
 
 if update_dir.nil?
   puts "Error: Cannot find RubyGems Update Path!"
-  puts 
+  puts
   puts "RubyGems has already been updated."
   puts "The rubygems-update gem may now be uninstalled."
   puts "E.g.    gem uninstall rubygems-update"

data/examples/application/an-app.gemspec

@@ -24,7 +24,7 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end
 

data/gemspecs/cgikit-1.1.0.gemspec

@@ -1,5 +1,4 @@
 require 'rubygems'
-Gem::manage_gems
 
 spec = Gem::Specification.new do |s|
   s.name = 'cgikit'
@@ -13,6 +12,6 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'http://www.spice-of-life.net/download/cgikit/'
 end
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end

data/gemspecs/jabber4r.gemspec

@@ -21,6 +21,6 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end

data/gemspecs/linguistics.gemspec

@@ -16,7 +16,7 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end
 

data/gemspecs/ook.gemspec

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end
 

data/gemspecs/progressbar.gemspec

@@ -16,7 +16,7 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end
 

data/gemspecs/redcloth.gemspec

@@ -16,7 +16,7 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end
 

data/gemspecs/rublog.gemspec

@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end
 

data/gemspecs/ruby-doom.gemspec

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end
 

data/gemspecs/rubyjdwp.gemspec

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end
 

data/gemspecs/statistics.gemspec

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 end
 
 if $0==__FILE__
-  Gem::manage_gems
+  require 'rubygems/builder'
   Gem::Builder.new(spec).build
 end
 

data/lib/rubygems.rb

@@ -1,6 +1,4 @@
-#!/usr/bin/env ruby
 # -*- ruby -*-
-
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -8,6 +6,8 @@
 #++
 
 require 'rbconfig'
+require 'rubygems/rubygems_version'
+require 'thread'
 
 module Gem
   class LoadError < ::LoadError
@@ -38,13 +38,13 @@ module Kernel
   # gem:: [String or Gem::Dependency] The gem name or dependency
   #       instance.
   #
-  # version_requirement:: [default=">= 0.0.0"] The version
+  # version_requirement:: [default=">= 0"] The version
   #                       requirement.
   #
   # return:: [Boolean] true if the Gem is loaded, otherwise false.
   #
   # raises:: [Gem::LoadError] if Gem cannot be found, is listed in
-  #          GEM_SKIP, or version requirement not met. 
+  #          GEM_SKIP, or version requirement not met.
   #
   def gem(gem_name, *version_requirements)
     active_gem_with_options(gem_name, version_requirements)
@@ -81,54 +81,127 @@ end
 # Main module to hold all RubyGem classes/modules.
 #
 module Gem
-  require 'rubygems/rubygems_version.rb'
-  require 'thread'
 
   MUTEX = Mutex.new
 
-  class Exception < RuntimeError
+  RubyGemsPackageVersion = RubyGemsVersion
+
+  DIRECTORIES = %w[cache doc gems specifications]
+
+  @@source_index = nil
+  @@win_platform = nil
+
+  @configuration = nil
+  @loaded_specs = {}
+  @platforms = nil
+  @ruby = nil
+  @sources = []
+
+  # Reset the +dir+ and +path+ values.  The next time +dir+ or +path+
+  # is requested, the values will be calculated from scratch.  This is
+  # mainly used by the unit tests to provide test isolation.
+  #
+  def self.clear_paths
+    @gem_home = nil
+    @gem_path = nil
+    @@source_index = nil
+    MUTEX.synchronize do
+      @searcher = nil
+    end
+  end
+
+  # The version of the Marshal format for your Ruby.
+  def self.marshal_version
+    "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
+  end
+
+  ##
+  # The directory prefix this RubyGems was installed at.
+
+  def self.prefix
+    prefix = File.dirname File.expand_path(__FILE__)
+    if prefix == Config::CONFIG['sitelibdir'] then
+      nil
+    else
+      File.dirname prefix
+    end
   end
 
-  class OperationNotSupportedError < Gem::Exception
+  # Returns an Cache of specifications that are in the Gem.path
+  #
+  # return:: [Gem::SourceIndex] Index of installed Gem::Specifications
+  #
+  def self.source_index
+    @@source_index ||= SourceIndex.from_installed_gems
   end
 
-  RubyGemsPackageVersion = RubyGemsVersion 
+  ##
+  # An Array of Regexps that match windows ruby platforms.
 
-  DIRECTORIES = ['cache', 'doc', 'gems', 'specifications']
-  
-  @@source_index = nil  
+  WIN_PATTERNS = [
+    /bccwin/i,
+    /cygwin/i,
+    /djgpp/i,
+    /mingw/i,
+    /mswin/i,
+    /wince/i,
+  ]
+
+  ##
+  # Is this a windows platform?
+
+  def self.win_platform?
+    if @@win_platform.nil? then
+      @@win_platform = !!WIN_PATTERNS.find { |r| RUBY_PLATFORM =~ r }
+    end
+
+    @@win_platform
+  end
 
-  @configuration = nil
-  @loaded_specs = {}
-  
   class << self
 
     attr_reader :loaded_specs
-  
-    def manage_gems
-      require 'rubygems/user_interaction'
-      require 'rubygems/builder'
-      require 'rubygems/format'
-      require 'rubygems/remote_installer'
-      require 'rubygems/installer'
-      require 'rubygems/validator'
-      require 'rubygems/doc_manager'
-      require 'rubygems/command_manager'
-      require 'rubygems/gem_runner'
-      require 'rubygems/config_file'
+
+    # Quietly ensure the named Gem directory contains all the proper
+    # subdirectories.  If we can't create a directory due to a permission
+    # problem, then we will silently continue.
+    def ensure_gem_subdirectories(gemdir)
+      require 'fileutils'
+
+      Gem::DIRECTORIES.each do |filename|
+        fn = File.join gemdir, filename
+        FileUtils.mkdir_p fn rescue nil unless File.exist? fn
+      end
     end
-  
-    # Returns an Cache of specifications that are in the Gem.path
-    #
-    # return:: [Gem::SourceIndex] Index of installed Gem::Specifications
-    #
-    def source_index
-      @@source_index ||= SourceIndex.from_installed_gems
+
+    def platforms
+      @platforms ||= [Gem::Platform::RUBY, Gem::Platform.local]
+    end
+
+    # Returns an Array of sources to fetch remote gems from.  If the sources
+    # list is empty, attempts to load the "sources" gem, then uses
+    # default_sources if it is not installed.
+    def sources
+      if @sources.empty? then
+        begin
+          gem 'sources', '> 0.0.1'
+          require 'sources'
+        rescue LoadError
+          @sources = default_sources
+        end
+      end
+
+      @sources
+    end
+
+    # An Array of the default sources that come with RubyGems.
+    def default_sources
+      %w[http://gems.rubyforge.org]
     end
 
     # Provide an alias for the old name.
     alias cache source_index
-    
+
     # The directory path where Gems are to be installed.
     #
     # return:: [String] The directory path
@@ -138,15 +211,15 @@ module Gem
       set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
       @gem_home
     end
-    
+
     # The directory path where executables are to be installed.
     #
     def bindir(install_dir=Gem.dir)
-      return File.join(install_dir, 'bin') unless install_dir == Gem.default_dir
+      return File.join(install_dir, 'bin') unless
+        install_dir.to_s == Gem.default_dir
 
       if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
-        File.join(File.dirname(Config::CONFIG["sitedir"]),
-                  File.basename(Config::CONFIG["bindir"]))
+        '/usr/bin'
       else # generic install
         Config::CONFIG['bindir']
       end
@@ -158,7 +231,11 @@ module Gem
     #
     def path
       @gem_path ||= nil
-      set_paths(ENV['GEM_PATH']) unless @gem_path
+      unless @gem_path
+        paths = [ENV['GEM_PATH']]
+        paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
+        set_paths(paths.compact.join(File::PATH_SEPARATOR))
+      end
       @gem_path
     end
 
@@ -175,21 +252,8 @@ module Gem
     # The standard configuration object for gems.
     def configuration
       return @configuration if @configuration
-
-      @configuration = {}
-      class << @configuration
-        undef_method :verbose # HACK RakeFileUtils pollution
-      end if @configuration.respond_to? :verbose
-
-      def @configuration.method_missing(sym, *args, &block)
-        if args.empty?
-          self[sym]
-        else
-          super
-        end
-      end
-
-      @configuration
+      require 'rubygems/config_file'
+      @configuration = Gem::ConfigFile.new []
     end
 
     # Use the given configuration object (which implements the
@@ -206,7 +270,7 @@ module Gem
       File.join(spec.full_gem_path, 'data', gem_name)
     end
 
-    # Return the searcher object to search for matching gems.  
+    # Return the searcher object to search for matching gems.
     def searcher
       MUTEX.synchronize do
         @searcher ||= Gem::GemPathSearcher.new
@@ -215,7 +279,13 @@ module Gem
 
     # Return the Ruby command to use to execute the Ruby interpreter.
     def ruby
-      "ruby"
+      if @ruby.nil? then
+        @ruby = File.join(Config::CONFIG['bindir'],
+                          Config::CONFIG['ruby_install_name'])
+        @ruby << Config::CONFIG['EXEEXT']
+      end
+
+      @ruby
     end
 
     # Activate a gem (i.e. add it to the Ruby load path).  The gem
@@ -227,9 +297,10 @@ module Gem
     # already loaded, or an exception otherwise.
     #
     def activate(gem, autorequire, *version_requirements)
-      unless version_requirements.size > 0
-        version_requirements = [">= 0.0.0"]
+      if version_requirements.empty? then
+        version_requirements = Gem::Requirement.default
       end
+
       unless gem.respond_to?(:name) && gem.respond_to?(:version_requirements)
         gem = Gem::Dependency.new(gem, version_requirements)
       end
@@ -291,7 +362,8 @@ module Gem
     # are not gems of any version by the requested name.
     def report_activate_error(gem)
       matches = Gem.source_index.find_name(gem.name)
-      if matches.size==0
+
+      if matches.empty? then
         error = Gem::LoadError.new(
           "Could not find RubyGem #{gem.name} (#{gem.version_requirements})\n")
       else
@@ -299,22 +371,13 @@ module Gem
           "RubyGem version error: " +
           "#{gem.name}(#{matches.first.version} not #{gem.version_requirements})\n")
       end
+
       error.name = gem.name
       error.version_requirement = gem.version_requirements
       raise error
     end
     private :report_activate_error
 
-    # Reset the +dir+ and +path+ values.  The next time +dir+ or +path+
-    # is requested, the values will be calculated from scratch.  This is
-    # mainly used by the unit tests to provide test isolation.
-    #
-    def clear_paths
-      @gem_home = nil
-      @gem_path = nil
-      @@source_index = nil  
-    end
-    
     # Use the +home+ and (optional) +paths+ values for +dir+ and +path+.
     # Used mainly by the unit tests to provide environment isolation.
     #
@@ -323,7 +386,7 @@ module Gem
       set_home(home) if home
       set_paths(paths.join(File::PATH_SEPARATOR)) if paths
     end
-    
+
     # Return a list of all possible load paths for all versions for
     # all gems in the Gem installation.
     #
@@ -350,13 +413,13 @@ module Gem
     end
 
     def required_location(gemname, libfile, *version_constraints)
-      version_constraints = [">0"] if version_constraints.empty?
+      version_constraints = Gem::Requirement.default if version_constraints.empty?
       matches = Gem.source_index.find_name(gemname, version_constraints)
       return nil if matches.empty?
       spec = matches.last
       spec.require_paths.each do |path|
         result = File.join(spec.full_gem_path, path, libfile)
-        return result if File.exists?(result)
+        return result if File.exist?(result)
       end
       nil
     end
@@ -369,8 +432,14 @@ module Gem
       @suffix_pattern ||= "{#{suffixes.join(',')}}"
     end
 
+    # manage_gems is useless and deprecated.  Don't call it anymore.  This
+    # will warn in two releases.
+    def manage_gems
+      # do nothing
+    end
+
     private
-    
+
     # Return all the partial paths in the given +gemdir+.
     def all_partials(gemdir)
       Dir[File.join(gemdir, 'gems/*')]
@@ -381,11 +450,12 @@ module Gem
       latest = {}
       all_partials(gemdir).each do |gp|
         base = File.basename(gp)
-        matches = /(.*)-((\d+\.)*\d+)/.match(base)
-        name, version = [matches[1], matches[2]]
-        ver = Gem::Version.new(version)
-        if latest[name].nil? || ver > latest[name][0]
-          latest[name] = [ver, gp]
+        if base =~ /(.*)-((\d+\.)*\d+)/ then
+          name, version = $1, $2
+          ver = Gem::Version.new(version)
+          if latest[name].nil? || ver > latest[name][0]
+            latest[name] = [ver, gp]
+          end
         end
       end
       latest.collect { |k,v| v[1] }
@@ -393,7 +463,7 @@ module Gem
 
     # Expand each partial gem path with each of the required paths
     # specified in the Gem spec.  Each expanded path is yielded.
-    def each_load_path(partials) 
+    def each_load_path(partials)
       partials.each do |gp|
         base = File.basename(gp)
         specfn = File.join(dir, "specifications", base + ".gemspec")
@@ -414,7 +484,7 @@ module Gem
       @gem_home = home
       ensure_gem_subdirectories(@gem_home)
     end
-    
+
     # Set the Gem search path (as reported by +path+).
     def set_paths(gpaths)
       if gpaths
@@ -422,11 +492,11 @@ module Gem
         @gem_path << Gem.dir
       else
         @gem_path = [Gem.dir]
-      end      
+      end
       @gem_path.uniq!
       @gem_path.each do |gp| ensure_gem_subdirectories(gp) end
     end
-    
+
     # Some comments from the ruby-talk list regarding finding the home
     # directory:
     #
@@ -452,37 +522,22 @@ module Gem
         end
       end
     end
-    
+
     public
 
     # Default home directory path to be used if an alternate value is
     # not specified in the environment.
     def default_dir
       if defined? RUBY_FRAMEWORK_VERSION
-        return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems")
+        return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems", Config::CONFIG['ruby_version'])
       else
         File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
       end
     end
 
-    private 
-
-    # Quietly ensure the named Gem directory contains all the proper
-    # subdirectories.  If we can't create a directory due to a
-    # permission problem, then we will silently continue.
-    def ensure_gem_subdirectories(gemdir)
-      DIRECTORIES.each do |filename|
-        fn = File.join(gemdir, filename)
-        unless File.exist?(fn)
-          require 'fileutils'
-          FileUtils.mkdir_p(fn) rescue nil
-        end
-      end
-    end
-
   end
-end
 
+end
 
 # Modify the non-gem version of datadir to handle gem package names.
 
@@ -501,9 +556,16 @@ module Config # :nodoc:
   end
 end
 
-require 'rubygems/source_index'
-require 'rubygems/specification'
-require 'rubygems/security'
+require 'rubygems/exceptions'
 require 'rubygems/version'
-require 'rubygems/custom_require'
+require 'rubygems/requirement'
+require 'rubygems/dependency'
+require 'rubygems/gem_path_searcher'    # Needed for Kernel#gem
+require 'rubygems/source_index'         # Needed for Kernel#gem
+require 'rubygems/platform'
+require 'rubygems/builder'              # HACK: Needed for rake's package task.
+
+if RUBY_VERSION < '1.9' then
+  require 'rubygems/custom_require'
+end