rubygems-update 0.8.3 → 0.8.4

data/ChangeLog

@@ -1,3 +1,73 @@
+2005-01-01  Chad Fowler  <chad@chadfowler.com>
+	* Released 0.8.4
+
+2004-12-31  Jim Weirich  <jim@weirichhouse.org>
+
+	* Rakefile: Switch to standard Rake test tasks.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteSourceFetcher::read_data): Added a retry to try a
+	lower case gem name if the open failed.  This fixes a problem
+	where case differences are preventing some gems from installing.
+
+2004-12-29  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_commands.rb (Gem::InstallCommand::execute):
+	Changed the RemoteInstaller to take an options hash rather than
+	individual options.  This will leave the interface more resilient
+	to changes as more options are added
+	(e.g. --install_dependencies).
+
+	* lib/rubygems/specification.rb (Gem::Specification): Marked array
+	attributes explicitly.  This allows for explicit conversion to
+	arrays when assigned.
+
+	* test/test_specification.rb
+	(TestSimpleSpecification::test_array_attributes): Added test for
+	array_attributes forcing values to arrays.
+
+2004-12-28  Jim Weirich  <jim@tardis>
+
+	* lib/rubygems.rb (Gem::Exception::ensure_gem_subdirectories):
+	Fixed the Ryan Davis patch to work correctly when directories are
+	not writable.
+	
+2004-12-18  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/version.rb: Erik Veenstra's sort patch.
+	* lib/rubygems.rb: Ryan Davis's installation bug fix.
+
+2004-12-14  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* test/test_loadmanager.rb: invalidated it as a unit test; it's
+	incompatible with custom_require.rb.
+
+2004-12-12  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/custom_require.rb: simple bug fix.
+
+2004-12-12  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/custom_require.rb: new file to replace
+	loadpath_manager.rb and speed up the custom require functionality.
+
+	* lib/rubygems/timer.rb: new file; simple benchmarking tool that's
+	useful at the moment but needn't stay in RubyGems permanently.
+
+	* lib/rubygems/source_index.rb: include Enumerable and implement #size
+	and #length.
+
+	* lib/rubygems/specification.rb: removed lazy initialisation of
+	attributes to reduce #copy_of invocations; folded
+	Specification.copy_of into Specification#copy_of.
+
+	* lib/rubygems.rb: require 'rubygems/custom_require' instead of
+	'rubygems/loadpath_manager'; removed out of date documentation; added
+	"require 'rubygems/timer'" to temporarily assist with benchmarks.
+
+2004-12-07  Jim Weirich  <jim@weirichhouse.org>
+
+	* Released 0.8.3
+
 2004-12-06  Jim Weirich  <jim@weirichhouse.org>
 
 	* test/test_specification.rb
@@ -26,7 +96,7 @@
 	(Gem::LocalSourceInfoCache::read_cache): Fixed initialization of
 	cache.
 
-	* lib/rubygems.rb: Updated version to 1.8.2.
+	* lib/rubygems.rb: Updated version to 0.8.2.
 
 2004-12-04  Jim Weirich  <jim@weirichhouse.org>
 
@@ -256,6 +326,8 @@
 	by Rich).
 	* lib/rubygems.rb:  Fixed small bug in #latest_load_paths
 
+	(NOTE: It looks like 0.8.0/0.8.1 was released in this timeframe)
+	
 2004-09-14  Chad Fowler  <chad@chadfowler.com>
 	* lib/rubygems.rb: Fixed bug in require_gem (thanks Jamis Buck!)
 	that would require a gem based on an inexact search of its name

data/Rakefile

@@ -26,22 +26,16 @@ CLOBBER.include(
 
 task :default => [:test]
 
-desc "Run unit tests"
-task :test do
-  test_name = ENV['TEST'] || 'test/test*.rb'
-  ruby %{-Ilib -rscripts/runtest -e 'run_tests("#{test_name}", true)'}
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList['test/test*.rb']
 end
 
-desc "Run Functional Tests"
-task :functional do
-  test_name = ENV['TEST'] || 'test/functional.rb'
-  ruby %{-Ilib -rscripts/runtest -e 'run_tests("#{test_name}", true)'}
+Rake::TestTask.new(:functional) do |t|
+  t.test_files = FileList['test/functional*.rb']
 end
 
-desc "Run All Tests"
-task :alltests do
-  test_name = ENV['TEST'] || 'test/{test,functional}*.rb'
-  ruby %{-Ilib -rscripts/runtest -e 'run_tests("#{test_name}", true)'}
+Rake::TestTask.new(:alltests) do |t|
+  t.test_files = FileList['test/{test,functional}*.rb']
 end
 
 desc "Run the tests for a build"
@@ -147,7 +141,7 @@ end
 
 task :tag => [:prerelease] do
   reltag = "REL_#{ENV['REL'].gsub(/\./, '_')}"
-  reltag << ENV['REUSE'] if ENV['REUSE']
+  reltag << ENV['REUSE'].gsub(/\./, '_') if ENV['REUSE']
   announce "Tagging CVS with [#{reltag}]"
   sh %{cvs tag #{reltag}}
 end
@@ -158,9 +152,6 @@ end
 desc "Create the RDOC html files"
 rd = Rake::RDocTask.new("rdoc") { |rdoc|
   rdoc.rdoc_dir = 'html'
-#  rdoc.template = 'kilmer'
-#  rdoc.template = 'css2'
-  rdoc.template = 'jamis'
   rdoc.title    = "RubyGems"
   rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
   rdoc.rdoc_files.include('README', 'TODO', 'Releases')

data/Releases

@@ -1,5 +1,34 @@
 = RubyGems Release History
 
+== Release 0.8.3: Dec 7, 2004
+
+* Added workaround for the null byte in Dir string issue. (see
+  http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/121702).
+  (Thanks to Mauricio Fern�ndez for the quick response on this one).
+
+* Added workaround for old version of Zlib on windows that caused
+  Ruwiki to fail to install. (see
+  http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/121770)
+
+* Added workaround for large YAML file issues.  (We dynamically cut
+  down the size of the source index YAML file and seem to have worked
+  around immediate issues.
+
+* A user specific source index cache can be used when the site-wide
+  cache is unwritable (i.e. because you are running as a non-admin).
+  This *greatly* speeds up gem commands run in non-admin mode when the
+  site-wide cache is out of date.
+
+* The gem command now used an HTTP HEAD command to detect if the
+  server's source index needs to be downloaed.
+
+* gem check gemname --test will run unit tests on installed gems that
+  have unit tests.
+
+== Release 0.8.1: Sep 14, 2004
+
+* Quick release to capture some bug fixes.
+
 == Release 0.8.0: Sep 12, 2004
 
 * Remove need for library stubs.  Set the RUBYOPT environment variable

data/lib/rubygems.rb

@@ -1,3 +1,6 @@
+require 'rubygems/timer'
+require 'rbconfig'
+
 module Gem
   class LoadError < ::LoadError
     attr_accessor :name, :version_requirement
@@ -14,22 +17,11 @@ module Kernel
   # a required Gem is not found, a Gem::LoadError is raised. More information on 
   # version requirements can be found in the Gem::Version documentation.
   #
-  # As a shortcut, the +gem+ parameter can be a _path_, for example:
-  #
-  #   require_gem 'rake/packagetask'
-  #
-  # This is strictly short for
-  #
-  #   require_gem 'rake'
-  #   require 'rake/packagetask' 
+  # You can define the environment variable GEM_SKIP as a way to not
+  # load specified gems.  you might do this to test out changes that haven't 
+  # been intsalled yet.  Example:
   #
-  #  You can define the environment variable GEM_SKIP as a way to not
-  #  load specified gems.  you might do this to test out changes that haven't 
-  #  been intsalled yet.  Example:
-  #
-  #  GEM_SKIP=libA:libB ruby-I../libA -I../libB ./mycode.rb
-  #
-  # <i>This is an experimental feature added after versoin 0.7, on 2004-07-13. </i>
+  #   GEM_SKIP=libA:libB ruby-I../libA -I../libB ./mycode.rb
   #
   # gem:: [String or Gem::Dependency] The gem name or dependency instance.
   # version_requirement:: [default="> 0.0.0"] The version requirement.
@@ -200,9 +192,9 @@ module Gem
     def all_load_paths
       result = []
       Gem.path.each do |gemdir|
-	each_load_path(all_partials(gemdir)) do |load_path|
-	  result << load_path
-	end
+        each_load_path(all_partials(gemdir)) do |load_path|
+          result << load_path
+        end
       end
       result
     end
@@ -212,9 +204,9 @@ module Gem
     def latest_load_paths
       result = []
       Gem.path.each do |gemdir|
-	each_load_path(latest_partials(gemdir)) do |load_path|
-	  result << load_path
-	end
+        each_load_path(latest_partials(gemdir)) do |load_path|
+          result << load_path
+        end
       end
       result
     end
@@ -225,8 +217,8 @@ module Gem
       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)
+        result = File.join(spec.full_gem_path, path, libfile)
+        return result if File.exists?(result)
       end
     end
 
@@ -242,13 +234,13 @@ module Gem
     def latest_partials(gemdir)
       latest = {}
       all_partials(gemdir).each do |gp|
-	base = File.basename(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]
-	end
+        name, version = [matches[1], matches[2]]
+        ver = Gem::Version.new(version)
+        if latest[name].nil? || ver > latest[name][0]
+          latest[name] = [ver, gp]
+        end
       end
       latest.collect { |k,v| v[1] }
     end
@@ -257,17 +249,17 @@ module Gem
     # specified in the Gem spec.  Each expanded path is yielded.
     def each_load_path(partials) 
       partials.each do |gp|
-	base = File.basename(gp)
-	specfn = File.join(dir, "specifications", base + ".gemspec")
-	if File.exist?(specfn)
-	  spec = eval(File.read(specfn))
-	  spec.require_paths.each do |rp|
-	    yield(File.join(gp, rp))
-	  end
-	else
-	  filename = File.join(gp, 'lib')
-	  yield(filename) if File.exist?(filename)
-	end
+        base = File.basename(gp)
+        specfn = File.join(dir, "specifications", base + ".gemspec")
+        if File.exist?(specfn)
+          spec = eval(File.read(specfn))
+          spec.require_paths.each do |rp|
+            yield(File.join(gp, rp))
+          end
+        else
+          filename = File.join(gp, 'lib')
+          yield(filename) if File.exist?(filename)
+        end
       end
     end
 
@@ -299,19 +291,19 @@ module Gem
     #
     def find_home
       ['HOME', 'USERPROFILE'].each do |homekey|
-	return ENV[homekey] if ENV[homekey]
+        return ENV[homekey] if ENV[homekey]
       end
       if ENV['HOMEDRIVE'] && ENV['HOMEPATH']
-	return "#{ENV['HOMEDRIVE']}:#{ENV['HOMEPATH']}"
+        return "#{ENV['HOMEDRIVE']}:#{ENV['HOMEPATH']}"
       end
       begin
-	File.expand_path("~")
+        File.expand_path("~")
       rescue Exception => ex
-	if File::ALT_SEPARATOR
-	  "C:/"
-	else
-	  "/"
-	end
+        if File::ALT_SEPARATOR
+          "C:/"
+        else
+          "/"
+        end
       end
     end
     
@@ -320,12 +312,22 @@ module Gem
     # Default home directory path to be used if an alternate value is
     # not specified in the environment.
     def default_dir
-      #rbconfig = Dir.glob("{#{($LOAD_PATH).join(',')}}/rbconfig.rb").first
-      #if rbconfig
-      #  module_eval File.read(rbconfig) unless const_defined?("Config")
-      #else
-        require 'rbconfig'
-      #end
+      ## rbconfig = Dir.glob("{#{($LOAD_PATH).join(',')}}/rbconfig.rb").first
+      ## if rbconfig
+      ##   module_eval File.read(rbconfig) unless const_defined?("Config")
+      ## else
+      ##   require 'rbconfig'
+      ## end
+      #
+      # Note on above code: we have an issue if a Config class is
+      # already defined and we load 'rbconfig'.  The above code is
+      # supposed to work around that but it's been commented out.  In
+      # any case, I moved "require 'rbconfig'" to the top of this
+      # file, because there was a circular dependency between this
+      # method and our custom require.  In any case, rbconfig is a
+      # fundamental RubyGems dependency, so it might as well be up the
+      # top.  -- Gavin Sinclair, 2004-12-12
+      #
       File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
     end
 
@@ -337,9 +339,9 @@ module Gem
     def ensure_gem_subdirectories(gemdir)
       DIRECTORIES.each do |filename|
         fn = File.join(gemdir, filename)
-        if ! File.exists?(fn) && File.writable?(fn)
+        unless File.exists?(fn)
           require 'fileutils'
-	  FileUtils.mkdir_p(fn)
+          FileUtils.mkdir_p(fn) rescue nil
         end
       end
     end
@@ -350,4 +352,6 @@ end
 require 'rubygems/source_index'
 require 'rubygems/specification'
 require 'rubygems/version'
-require 'rubygems/loadpath_manager'
+#require 'rubygems/loadpath_manager'    # custom_require replaces this
+require 'rubygems/custom_require'
+

data/lib/rubygems/custom_require.rb

@@ -0,0 +1,109 @@
+require 'rubygems/source_index'
+
+module Kernel
+  alias require__ require
+
+  #
+  # We replace Ruby's require with our own, which is capable of loading gems on demand.
+  #
+  # When you call <tt>require 'x'</tt>, this is what happens:
+  # * If the file can be loaded from the existing Ruby loadpath, it is.
+  # * Otherwise, installed gems are searched for a file that matches.  If it's found in gem
+  #   'y', that gem is activated (added to the loadpath).
+  #
+  # The normal <tt>require</tt> functionality of returning false if that file has already been
+  # loaded is preserved.
+  #
+  def require(path)
+    require__ path
+  rescue LoadError
+    begin
+      @gempath_searcher ||= Gem::GemPathSearcher.new
+      if spec = @gempath_searcher.find(path)
+        Gem.activate(spec.name, true, "= #{spec.version}")
+        require__ path
+      else
+        raise LoadError, "No such file to load -- #{path}"
+      end
+    end
+  end
+end  # module Kernel
+
+
+module Gem
+
+  #
+  # GemPathSearcher has the capability to find loadable files inside gems.  It generates data
+  # up front to speed up searches later.
+  #
+  class GemPathSearcher
+    
+    #
+    # Initialise the data we need to make searches later.
+    #
+    def initialize
+      # We want a record of all the installed gemspecs, in the order we wish to examine them.
+      @gemspecs = init_gemspecs
+      # Map gem spec to glob of full require_path directories.  Preparing this information may
+      # speed up searches later.
+      @lib_dirs = {}
+      @gemspecs.each do |spec|
+        @lib_dirs[spec.object_id] = lib_dirs(spec)
+      end
+    end
+
+    # 
+    # Look in all the installed gems until a matching _path_ is found.  Return the _gemspec_
+    # of the gem where it was found.  If no match is found, return nil.
+    #
+    # The gems are searched in alphabetical order, and in reverse version order.
+    #
+    # For example:
+    #
+    #   find('log4r')              # -> (log4r-1.1 spec)
+    #   find('log4r.rb')           # -> (log4r-1.1 spec)
+    #   find('rake/rdoctask')      # -> (rake-0.4.12 spec)
+    #   find('foobarbaz')          # -> nil
+    #
+    # Matching paths can have various suffixes ('.rb', '.so', and others), which may or may
+    # not already be attached to _file_.  This method doesn't care about the full filename
+    # that matches; only that there is a match.
+    # 
+    def find(path)
+      @gemspecs.each do |spec|
+        return spec if matching_file(spec, path)
+      end
+      nil
+    end
+
+    private
+
+    SUFFIX_PATTERN = "{,.rb,.so,.bundle,.dll,.sl}"
+
+    #
+    # Attempts to find a matching path using the require_paths of the given _spec_.
+    #
+    # Some of the intermediate results are cached in @lib_dirs for speed.
+    #
+    def matching_file(spec, path)  # :doc:
+      glob = "#{@lib_dirs[spec.object_id]}/#{path}#{SUFFIX_PATTERN}"
+      return true unless Dir[glob].select { |f| File.file?(f) }.empty?
+    end
+
+    # Return a list of all installed gemspecs, sorted by alphabetical order and in reverse
+    # version order.
+    def init_gemspecs
+      Gem.source_index.map { |_, spec| spec }.sort_by { |spec|
+        [spec.name, spec.version.to_ints.map { |n| -n } ]
+      }
+    end
+
+    # Returns library directories glob for a gemspec.  For example,
+    #   '/usr/local/lib/ruby/gems/1.8/gems/foobar-1.0/{lib,ext}'
+    def lib_dirs(spec)
+      "#{spec.full_gem_path}/#{spec.require_paths.join(',')}"
+    end
+
+  end  # class Gem::GemPathLoader
+
+end  # module Gem

data/lib/rubygems/gem_commands.rb

@@ -160,7 +160,7 @@ module Gem
         
         if remote? && installed_gems.nil?
           say "Attempting remote installation of '#{gem_name}'"
-          installer = Gem::RemoteInstaller.new(options[:http_proxy])
+          installer = Gem::RemoteInstaller.new(options)
           installed_gems = installer.install(gem_name, options[:version], options[:force], options[:install_dir])
           say "Successfully installed #{installed_gems[0].name}, version #{installed_gems[0].version}" if installed_gems
         end
@@ -373,7 +373,7 @@ module Gem
         say
         say "*** REMOTE GEMS ***"
         begin
-          output_query_results(Gem::RemoteInstaller.new(options[:http_proxy]).search(options[:name]))
+          output_query_results(Gem::RemoteInstaller.new(options).search(options[:name]))
         rescue Gem::RemoteSourceException => e
           alert_error e.to_s
         end
@@ -521,7 +521,7 @@ module Gem
           hig[spec.name] = spec
         end
       end
-      remote_gemspecs = Gem::RemoteInstaller.new(options[:http_proxy]).search(//)
+      remote_gemspecs = Gem::RemoteInstaller.new(options).search(//)
       # For some reason, this is an array of arrays.  The actual list of specifications is
       # the first and only element.  If there were more remote sources, perhaps there would be
       # more.

data/lib/rubygems/remote_installer.rb

@@ -93,11 +93,18 @@ module Gem
     # Read the data from the (source based) URI.
     def read_data(uri)
       require 'rubygems/open-uri'
-      open(uri,
-	"User-Agent" => "RubyGems/#{Gem::RubyGemsVersion}",
-	:proxy => @http_proxy
-	) do |input|
-        input.read
+      begin
+	open(uri,
+	  "User-Agent" => "RubyGems/#{Gem::RubyGemsVersion}",
+	  :proxy => @http_proxy
+	  ) do |input|
+	  input.read
+	end
+      rescue
+	old_uri = uri
+	uri = uri.downcase
+	retry if old_uri != uri
+	raise
       end
     end
 
@@ -317,10 +324,11 @@ module Gem
     # * <tt>:no_proxy</tt>: ignore environment variables and _don't_
     #   use a proxy
     #
-    def initialize(http_proxy=nil)
+    def initialize(options={})
       # Ensure http_proxy env vars are used if no proxy explicitly supplied.
+      @options = options
       @http_proxy =
-        case http_proxy
+        case @options[:http_proxy]
         when :no_proxy
           false
         when nil
@@ -457,14 +465,7 @@ module Gem
       installed_gems = []
       dependencies.each do |dependency|
         if ask_yes_no("Install required dependency #{dependency.name}?", true)
-          remote_installer =  RemoteInstaller.new(
-            if @http_proxy == false
-              :no_proxy
-            elsif @http_proxy == true
-            else
-              @http_proxy
-            end
-          )
+          remote_installer =  RemoteInstaller.new(@options)
           installed_gems << remote_installer.install(
 	    dependency.name,
 	    dependency.version_requirements,

data/lib/rubygems/rubygems_version.rb

@@ -2,5 +2,5 @@
 # This file is auto-generated by build scripts.
 # See:  rake update_version
 module Gem
-  RubyGemsVersion = '0.8.3'
+  RubyGemsVersion = '0.8.4'
 end

data/lib/rubygems/source_index.rb

@@ -1,4 +1,7 @@
 require 'rubygems/user_interaction'
+
+require 'forwardable'
+
 module Gem
 
   # The SourceIndex object indexes all the gems available from a
@@ -12,6 +15,9 @@ module Gem
   #        old YAMLized source index objects to load properly.
   #
   class SourceIndex
+    extend Forwardable
+    include Enumerable
+
     class << self
       include Gem::UserInteraction
     end
@@ -40,7 +46,7 @@ module Gem
     def self.from_installed_gems(*spec_dirs)
       gems = {}
       if spec_dirs.empty?
-	spec_dirs = Gem.path.collect {|dir| File.join(dir, "specifications")}
+        spec_dirs = Gem.path.collect { |dir| File.join(dir, "specifications") }
       end
       Dir.glob("{#{spec_dirs.join(',')}}/*.gemspec").each do |file_name|
         gemspec = load_specification(file_name)
@@ -48,7 +54,7 @@ module Gem
       end
       self.new(gems)
     end
-    
+
     # Load a specification from a file (eval'd Ruby code)
     # 
     # file_name:: [String] The .gemspec file
@@ -81,6 +87,8 @@ module Gem
       @gems.each(&block)
     end
 
+    def_delegators :@gems, :size, :length
+
     # Search for a gem by name and optional version
     #
     # gem_name::

data/lib/rubygems/specification.rb

@@ -21,7 +21,7 @@ module Gem
   # Potentially raised when a specification is validated.
   class InvalidSpecificationException < Gem::Exception; end
   class EndOfYAMLException < Gem::Exception; end
-  
+
   ##
   # == Gem::Specification
   #
@@ -124,11 +124,21 @@ module Gem
     def self.attribute(name, default=nil)
       @@attributes << [name, default]
       @@default_value[name] = default
-      attr_writer(name)
-      class_eval %{
+      attr_accessor(name)
+    end
+
+    # Same as :attribute, but ensures that values assigned to the
+    # attribute are array values by applying :to_a to the value.
+    def self.array_attribute(name)
+      @@attributes << [name, []]
+      @@default_value[name] = []
+      module_eval %{
         def #{name}
-          @#{name} ||= copy_of(@@default_value[:#{name}])
-        end
+	  @#{name} ||= []
+	end
+        def #{name}=(value)
+	  @#{name} = value.to_a
+	end
       }
     end
 
@@ -212,15 +222,15 @@ module Gem
     attribute :has_rdoc,               false
     attribute :required_ruby_version,  Gem::Version::Requirement.default
     attribute :platform,               Gem::Platform::RUBY
-    attribute :authors,                []
-    attribute :files,                  []
-    attribute :test_files,             []
-    attribute :rdoc_options,           []
-    attribute :extra_rdoc_files,       []
-    attribute :executables,            []
-    attribute :extensions,             []
-    attribute :requirements,           []
-    attribute :dependencies,           []
+    array_attribute :authors
+    array_attribute :files
+    array_attribute :test_files
+    array_attribute :rdoc_options
+    array_attribute :extra_rdoc_files
+    array_attribute :executables
+    array_attribute :extensions
+    array_attribute :requirements
+    array_attribute :dependencies
 
     read_only :dependencies
 
@@ -582,18 +592,13 @@ module Gem
     end
 
     # Duplicate an object unless it's an immediate value.
-    def self.copy_of(obj)
+    def copy_of(obj)
       case obj
       when Numeric, Symbol, true, false, nil then obj
       else obj.dup
       end
     end
 
-    # Duplicate an object unless it's an immediate value.
-    def copy_of(obj)
-      self.class.copy_of(obj)
-    end
-
     # Return a string containing a Ruby code representation of the given object.
     def ruby_code(obj)
       case obj
@@ -609,5 +614,6 @@ module Gem
     end
 
   end  # class Specification
+
 end  # module Gem
 

data/lib/rubygems/timer.rb

@@ -0,0 +1,19 @@
+#
+# This file defines a $log variable for logging, and a time() method for recording timing
+# information.
+#
+
+$log = Object.new
+def $log.debug(str)
+  STDERR.puts str
+end
+
+def time(msg, width=25)
+  t = Time.now
+  return_value = yield
+  elapsed = Time.now.to_f - t.to_f
+  elapsed = sprintf("%3.3f", elapsed)
+  $log.debug "#{msg.ljust(width)}: #{elapsed}s"
+  return_value
+end
+

data/lib/rubygems/version.rb

@@ -5,6 +5,10 @@ module Gem
   #
   class Dependency
     attr_accessor :name, :version_requirements
+
+    def <=>(other)
+      [@name] <=> [other.name]
+    end
     
     ##
     # Constructs the dependency

data/scripts/runtest.rb

@@ -15,3 +15,20 @@ def run_tests(pattern='test/test*.rb', log_enabled=false)
     end
   }
 end
+
+# You can run the unit tests by running this file directly, providing a pattern.  For example,
+#
+#   ruby scripts/runtests.rb spec
+#
+# will load just the "test/test_specification.rb" unit test (unless others match as well).
+
+if $0 == __FILE__
+  $:.unshift 'lib'   # Must run this from the root directory.
+  pattern = ARGV.shift
+  if pattern
+    pattern = "test/*#{pattern}*.rb"
+    run_tests(pattern, true)
+  else
+    run_tests
+  end
+end

data/test/data/gemhome/gems/a-0.0.1/lib/code.rb

@@ -0,0 +1 @@
+CODE = 1

data/test/data/gemhome/gems/a-0.0.2/lib/code.rb

@@ -0,0 +1 @@
+CODE = 1

data/test/data/gemhome/gems/b-0.0.2/lib/code.rb

@@ -0,0 +1 @@
+CODE = 1

data/test/data/gemhome/gems/c-1.2/lib/code.rb

@@ -0,0 +1 @@
+CODE = 1

data/test/data/gemhome/specifications/a-0.0.1.gemspec

@@ -0,0 +1,8 @@
+Gem::Specification.new do |s|
+  s.name = %q{a}
+  s.version = "0.0.1"
+  s.date = %q{2005-01-01}
+  s.summary = %q{summary}
+  s.description = %q{desc}
+  s.files = ["lib/code.rb"]
+end

data/test/data/gemhome/specifications/a-0.0.2.gemspec

@@ -0,0 +1,8 @@
+Gem::Specification.new do |s|
+  s.name = %q{a}
+  s.version = "0.0.2"
+  s.date = %q{2005-01-01}
+  s.summary = %q{summary}
+  s.description = %q{desc}
+  s.files = ["lib/code.rb"]
+end

data/test/data/gemhome/specifications/b-0.0.2.gemspec

@@ -0,0 +1,8 @@
+Gem::Specification.new do |s|
+  s.name = %q{b}
+  s.version = "0.0.2"
+  s.date = %q{2005-01-01}
+  s.summary = %q{summary}
+  s.description = %q{desc}
+  s.files = ["lib/code.rb"]
+end

data/test/data/gemhome/specifications/c-1.2.gemspec

@@ -0,0 +1,8 @@
+Gem::Specification.new do |s|
+  s.name = %q{c}
+  s.version = "1.2"
+  s.date = %q{2005-01-01}
+  s.summary = %q{summary}
+  s.description = %q{desc}
+  s.files = ["lib/code.rb"]
+end

data/test/test_gempaths.rb

@@ -91,6 +91,49 @@ class TestGemPaths < Test::Unit::TestCase
     end
   end
 
+  def test_ensure_gem_directories_new
+    FileUtils.rm_r("test/temp/gemdir")
+    Gem.use_paths("test/temp/gemdir")
+    Gem.send(:ensure_gem_subdirectories, "test/temp/gemdir")
+    assert File.exist?("test/temp/gemdir/cache")
+  end
+
+  def test_ensure_gem_directories_missing_parents
+    gemdir = "test/temp/a/b/c/gemdir"
+    FileUtils.rm_r("test/temp/a") rescue nil
+    Gem.use_paths(gemdir)
+    Gem.send(:ensure_gem_subdirectories, gemdir)
+    assert File.exist?("#{gemdir}/cache")
+  end
+
+  def test_ensure_gem_directories_write_protected
+    gemdir = "test/temp/egd"
+    FileUtils.rm_r gemdir rescue nil
+    FileUtils.mkdir_p gemdir
+    FileUtils.chmod 0400, gemdir
+    Gem.use_paths(gemdir)
+    Gem.send(:ensure_gem_subdirectories, gemdir)
+    assert ! File.exist?("#{gemdir}/cache")
+  ensure
+    FileUtils.chmod(0600, gemdir) rescue nil
+    FileUtils.rm_r gemdir rescue nil
+  end
+
+  def test_ensure_gem_directories_with_parents_write_protected
+    parent = "test/temp/egd"
+    gemdir = "#{parent}/a/b/c"
+    
+    FileUtils.rm_r parent rescue nil
+    FileUtils.mkdir_p parent
+    FileUtils.chmod 0400, parent
+    Gem.use_paths(gemdir)
+    Gem.send(:ensure_gem_subdirectories, gemdir)
+    assert ! File.exist?("#{gemdir}/cache")
+  ensure
+    FileUtils.chmod(0600, parent) rescue nil
+    FileUtils.rm_r parent rescue nil
+  end
+
   private
 
   def create_additional_gem_dirs

data/test/test_loadmanager.rb

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 
+# This test case disabled because it's incompatible with the new custom_require.rb.
+
 require 'test/unit'
-require 'rubygems/loadpath_manager'
+#require 'rubygems/loadpath_manager'
 require 'rubygems/builder'
 
 require 'test/gemenvironment'
 
-class TestLoadPathManager < Test::Unit::TestCase
+class TestLoadPathManager #< Test::Unit::TestCase
   def setup
     TestEnvironment.create
     Gem.clear_paths

data/test/test_remote_installer.rb

@@ -143,7 +143,7 @@ class RemoteInstallerTest < Test::Unit::TestCase
   FOO_GEM = '' # TODO
   CACHE_DIR = File.join(Gem.dir, 'cache')
 
-  # Disable this test for now.  We will come back to revisit this.
+  # TODO: Disable this test for now.  We will come back to revisit this.
   def disable_test_install
     Gem.use_paths("test/data/gemhome")
     result = @remote_installer.install('foo')

data/test/test_specification.rb

@@ -134,6 +134,11 @@ class TestSimpleSpecification < Test::Unit::TestCase
     end
   end
 
+  def test_array_attributes
+    @spec.files = (1..10)
+    assert_equal Array, @spec.files.class
+  end
+
   def test_equality
     same_spec = @spec.dup
     assert_equal @spec, same_spec

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
-date: 2004-12-07
+  version: 0.8.4
+date: 2005-01-01
 summary: RubyGems Update GEM
 require_paths: 
   - lib
@@ -41,17 +41,17 @@ files:
   - doc/doc.css
   - doc/makedoc.rb
   - examples/application
+  - examples/application/an-app.gemspec
   - examples/application/bin
   - examples/application/lib
-  - examples/application/an-app.gemspec
   - examples/application/bin/myapp
   - examples/application/lib/somefunctionality.rb
-  - gemspecs/ook.gemspec
-  - gemspecs/README
   - gemspecs/cgikit-1.1.0.gemspec
   - gemspecs/jabber4r.gemspec
   - gemspecs/linguistics.gemspec
+  - gemspecs/ook.gemspec
   - gemspecs/progressbar.gemspec
+  - gemspecs/README
   - gemspecs/redcloth.gemspec
   - gemspecs/rublog.gemspec
   - gemspecs/ruby-doom.gemspec
@@ -59,11 +59,11 @@ files:
   - gemspecs/statistics.gemspec
   - lib/rubygems.rb
   - lib/ubygems.rb
-  - lib/rubygems/specification.rb
   - lib/rubygems/builder.rb
   - lib/rubygems/cmd_manager.rb
   - lib/rubygems/command.rb
   - lib/rubygems/config_file.rb
+  - lib/rubygems/custom_require.rb
   - lib/rubygems/doc_manager.rb
   - lib/rubygems/format.rb
   - lib/rubygems/gem_commands.rb
@@ -74,11 +74,13 @@ files:
   - lib/rubygems/open-uri.rb
   - lib/rubygems/package.rb
   - lib/rubygems/remote_installer.rb
+  - lib/rubygems/rubygems_version.rb
   - lib/rubygems/source_index.rb
+  - lib/rubygems/specification.rb
+  - lib/rubygems/timer.rb
   - lib/rubygems/user_interaction.rb
   - lib/rubygems/validator.rb
   - lib/rubygems/version.rb
-  - lib/rubygems/rubygems_version.rb
   - pkgs/sources
   - pkgs/sources/lib
   - pkgs/sources/sources.gemspec
@@ -88,15 +90,18 @@ files:
   - scripts/gemdoc.rb
   - scripts/runtest.rb
   - scripts/specdoc.rb
-  - test/data
-  - test/mock
   - test/bogussources.rb
+  - test/data
   - test/functional.rb
   - test/gemenvironment.rb
+  - test/gemutilities.rb
   - test/insure_session.rb
+  - test/mock
   - test/mockgemui.rb
+  - test/onegem.rb
   - test/simple_gem.rb
   - test/test_builder.rb
+  - test/test_cached_fetcher.rb
   - test/test_check_command.rb
   - test/test_command.rb
   - test/test_configfile.rb
@@ -104,34 +109,61 @@ files:
   - test/test_gemloadpaths.rb
   - test/test_gempaths.rb
   - test/test_loadmanager.rb
+  - test/test_local_cache.rb
   - test/test_package.rb
   - test/test_parse_commands.rb
   - test/test_process_commands.rb
-  - test/yaml_data.rb
+  - test/test_remote_fetcher.rb
+  - test/test_remote_installer.rb
+  - test/test_source_index.rb
   - test/test_specification.rb
   - test/test_validator.rb
   - test/test_version_comparison.rb
   - test/testgem.rc
   - test/user_capture.rb
-  - test/onegem.rb
-  - test/test_cached_fetcher.rb
-  - test/test_remote_fetcher.rb
-  - test/test_source_index.rb
-  - test/test_local_cache.rb
-  - test/test_remote_installer.rb
-  - test/gemutilities.rb
+  - test/yaml_data.rb
+  - test/data/a-0.0.1.gem
+  - test/data/a-0.0.2.gem
+  - test/data/b-0.0.2.gem
+  - test/data/c-1.2.gem
+  - test/data/gemhome
   - test/data/gems
-  - test/data/one
   - test/data/legacy
   - test/data/lib
+  - test/data/one
+  - test/data/gemhome/cache
+  - test/data/gemhome/doc
+  - test/data/gemhome/gems
+  - test/data/gemhome/specifications
+  - test/data/gemhome/cache/a-0.0.1.gem
+  - test/data/gemhome/cache/a-0.0.2.gem
+  - test/data/gemhome/cache/b-0.0.2.gem
+  - test/data/gemhome/cache/c-1.2.gem
+  - test/data/gemhome/gems/a-0.0.1
+  - test/data/gemhome/gems/a-0.0.2
+  - test/data/gemhome/gems/b-0.0.2
+  - test/data/gemhome/gems/c-1.2
+  - test/data/gemhome/gems/a-0.0.1/lib
+  - test/data/gemhome/gems/a-0.0.1/lib/code.rb
+  - test/data/gemhome/gems/a-0.0.2/lib
+  - test/data/gemhome/gems/a-0.0.2/lib/code.rb
+  - test/data/gemhome/gems/b-0.0.2/lib
+  - test/data/gemhome/gems/b-0.0.2/lib/code.rb
+  - test/data/gemhome/gems/c-1.2/lib
+  - test/data/gemhome/gems/c-1.2/lib/code.rb
+  - test/data/gemhome/specifications/a-0.0.1.gemspec
+  - test/data/gemhome/specifications/a-0.0.2.gemspec
+  - test/data/gemhome/specifications/b-0.0.2.gemspec
+  - test/data/gemhome/specifications/c-1.2.gemspec
+  - test/data/legacy/keyedlist-0.4.0.ruby
+  - test/data/legacy/keyedlist-0.4.0.yaml
+  - test/data/lib/code.rb
   - test/data/one/lib
-  - test/data/one/README.one
+  - test/data/one/one-0.0.1.gem
   - test/data/one/one.gemspec
   - test/data/one/one.yaml
+  - test/data/one/README.one
   - test/data/one/lib/one.rb
-  - test/data/legacy/keyedlist-0.4.0.ruby
-  - test/data/legacy/keyedlist-0.4.0.yaml
-  - test/data/lib/code.rb
   - test/mock/gems
   - test/mock/gems/cache
   - test/mock/gems/doc