rubygems-update 0.8.8 → 0.8.10

data/ChangeLog

@@ -1,8 +1,63 @@
-2005-03-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
+2005-03-25  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_commands.rb
+	(Gem::UpdateCommand::do_rubygems_update): Update --system now runs
+	the ruby command directly rather than trying to load teh
+	update-rubygems command.  There were too many things to go wrong
+	with the old way.
+
+2005-03-24  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller::find_dependencies_not_installed): Fixed to
+	reload source index before attempting to detect dependencies.
+
+2005-03-23  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller::find_dependencies_not_installed): Switched
+	to using SourceIndex#find_name to detect missing dependencies,
+	avoiding a gem activation during an install.
+
+	* lib/rubygems/installer.rb (Gem::Installer::install): Removed
+	activate call from install step.  If we need to do something about
+	dependencies at this time, then we need a better way to do them.
+
+	* lib/rubygems.rb: Removed the require for rubygems/timer.
 
-	* lib/rubygems/installer.rb: Removed all code relating to library
-	stubs as we haven't generated them for ages.
+2005-03-16  Jim Weirich  <jim@weirichhouse.org>
 
+	* test/gemenvironment.rb (TestEnvironment::create): Added require
+	on gem/builder.
+
+	* lib/rubygems/source_index.rb (Gem::SourceIndex::initialize):
+	Allowing default argument to new to be an empty hash.
+	(Gem::SourceIndex::from_installed_gems): Refactored into a class
+	method that invokes a instance method.
+	(Gem::SourceIndex::refresh): Refresh now does a complete reload
+	from disk.  This should be more accurate that the earlier version.
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): removed
+	unneeded refresh!.
+
+	* lib/rubygems.rb (Gem::Exception::source_index): Removed
+	automatic refresh from Gem.source_index ... it wasn't reliable
+	when removing installed gems.
+	(Gem::Exception::activate): Added detection of previously loaded
+	gems.
+
+2005-03-15  Chad Fowler  <chad@chadfowler.com>
+
+	* bin/gem_server: (htonl) rdoc opens in existing browser window.
+
+2005-03-14  Jim Weirich  <jim@weirichhouse.org>
+
+	* Released 0.8.8
+	
+2005-03-14  Jim Weirich  <jim@weirichhouse.org>
+
+	* Released 0.8.7
+	
 2005-03-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* lib/rubygems/installer.rb (Gem::Installer#shebang): Refactored and

data/Rakefile

@@ -174,7 +174,7 @@ rd = Rake::RDocTask.new("rdoc") { |rdoc|
   rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
   rdoc.rdoc_files.include('README', 'TODO', 'Releases')
   rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include('test/**/*.rb')
+#  rdoc.rdoc_files.include('test/**/*.rb')
 }
 
 file "html/index.html" => [:rdoc]

data/bin/gem_server

@@ -42,7 +42,7 @@ IF:first_name_entry
 ENDIF:first_name_entry
 <b>%name% %version%</b>
 IF:rdoc_installed
-  <a href="%doc_path%" target="_blank">[rdoc]</a>
+  <a href="%doc_path%">[rdoc]</a>
 ENDIF:rdoc_installed
 IFNOT:rdoc_installed
   <span title="rdoc not installed">[rdoc]</span>

data/bin/generate_yaml_index.rb

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
-$:.unshift '~/rubygems'
+
+# Generate the yaml/yaml.Z index files for a gem server directory.
+#
+# Usage:  generate_yaml_index.rb --dir DIR [--verbose]
+
+$:.unshift '~/rubygems' if File.exist? "~/rubygems"
 
 require 'optparse'
 require 'rubygems'
@@ -7,28 +12,11 @@ require 'zlib'
 
 Gem.manage_gems
 
-options = {}
-ARGV.options do |opts|
-  opts.on_tail("--help", "show this message") {puts opts; exit}
-  opts.on('-d', '--dir=DIRNAME', "base directory with dir/gems", String) {|options[:directory]|}
-  opts.parse!
-end
-
-directory = options[:directory]
-unless directory
-  puts "Error, must specify directory name. Use --help"
-  exit
-else
-  unless File.exist?(directory) && File.directory?(directory)
-    puts "Error, unknown directory name #{directory}."
-    exit
-  end
-end
-
 class Indexer
 
-  def initialize(directory)
-    @directory = directory
+  def initialize(options)
+    @options = options
+    @directory = options[:directory]
   end
 
   def gem_file_list
@@ -36,18 +24,25 @@ class Indexer
   end
 
   def build_index
+    build_uncompressed_index
+    build_compressed_index
+  end
+  
+  def build_uncompressed_index
+    puts "Building yaml file" if @options[:verbose]
     File.open(File.join(@directory, "yaml"), "w") do |file|
       file.puts "--- !ruby/object:Gem::Cache"
       file.puts "gems:"
       gem_file_list.each do |gemfile|
         spec = Gem::Format.from_file_by_path(gemfile).spec
+	puts "   ... adding #{spec.full_name}" if @options[:verbose]
         file.puts "  #{spec.full_name}: #{spec.to_yaml.gsub(/\n/, "\n    ")[4..-1]}"
       end
     end
-    build_compressed_index
   end
-  
+
   def build_compressed_index
+    puts "Building yaml.Z file" if @options[:verbose]
     File.open(File.join(@directory, "yaml.Z"), "w") do |file|
       file.write(Zlib::Deflate.deflate(File.read(File.join(@directory, "yaml"))))
     end
@@ -55,4 +50,29 @@ class Indexer
 end
 
 
-Indexer.new(directory).build_index
+options = {
+  :directory => '.',
+  :verbose => false,
+}
+
+ARGV.options do |opts|
+  opts.on_tail("--help", "show this message") {puts opts; exit}
+  opts.on('-d', '--dir=DIRNAME', "base directory containing gems subdirectory", String) do |value|
+    options[:directory] = value
+  end
+  opts.on('-v', '--verbose', "show verbose output") do |value|
+    options[:verbose] = value
+  end
+  opts.parse!
+end
+
+if options[:directory].nil?
+  puts "Error, must specify directory name. Use --help"
+  exit
+elsif ! File.exist?(options[:directory]) ||
+    ! File.directory?(options[:directory])
+  puts "Error, unknown directory name #{directory}."
+  exit
+end
+
+Indexer.new(options).build_index

data/lib/rubygems.rb

@@ -1,4 +1,3 @@
-require 'rubygems/timer'
 require 'rbconfig'
 
 module Gem
@@ -78,7 +77,6 @@ module Gem
     #
     def source_index
       @@source_index ||= SourceIndex.from_installed_gems
-      @@source_index.refresh!
     end
 
     # Provide an alias for the old name.
@@ -126,25 +124,38 @@ module Gem
     # already loaded, or an exception otherwise.
     #
     def activate(gem, autorequire, *version_requirements)
+      @loaded_specs ||= Hash.new
       unless version_requirements.size > 0
         version_requirements = ["> 0.0.0"]
       end
       unless gem.respond_to?(:name) && gem.respond_to?(:version_requirements)
         gem = Gem::Dependency.new(gem, version_requirements)
       end
-      
+
       matches = Gem.source_index.find_name(gem.name, gem.version_requirements)
       report_activate_error(gem) if matches.empty?
 
-      # Get highest matching version
+      if @loaded_specs[gem.name]
+	# This gem is already loaded.  If the currently loaded gem is
+	# not in the list of candidate gems, then we have a version
+	# conflict.
+	existing_spec = @loaded_specs[gem.name]
+	if ! matches.any? { |spec| spec.version == existing_spec.version }
+	  fail Gem::Exception, "can't activate #{gem}, already activated #{existing_spec.full_name}]"
+	end
+	return false
+      end
+
+      # new load
       spec = matches.last
       if spec.loaded?
 	return false unless autorequire
 	result = spec.autorequire ? require(spec.autorequire) : false
 	return result || false 
       end
-      
+
       spec.loaded = true
+      @loaded_specs[spec.name] = spec
       
       # Load dependent gems first
       spec.dependencies.each do |dep_gem|

data/lib/rubygems/deployment.rb

@@ -1,5 +1,7 @@
 # The following is borrowed from setup.rb
 
+class File; end
+
 def File.binread(fname)
   open(fname, 'rb') {|f|
     return f.read
@@ -262,4 +264,4 @@ module Gem
     end
     
   end
-end
+end

data/lib/rubygems/gem_commands.rb

@@ -694,8 +694,9 @@ module Gem
         install_command.execute
       end
       if gems_to_update.include?("rubygems-update")
-	say "Updating version of RubyGems"
-	do_rubygems_update
+	latest_ruby_gem = remote_gemspecs.select { |s| s.name == 'rubygems-update' }.sort_by { |s| s.version }.last
+	say "Updating version of RubyGems to #{latest_ruby_gem.version}"
+	do_rubygems_update(latest_ruby_gem.version.to_s)
       end
       if(options[:system]) then
         say "RubyGems system software updated"
@@ -704,13 +705,12 @@ module Gem
       end
     end
 
-    def do_rubygems_update
-      # Need to clear out the argument list because the
-      # update_rubygems script expects to handle command line
-      # argument.
-      ARGV.clear		
-      require_gem 'rubygems-update'
-      load 'update_rubygems'  
+    def do_rubygems_update(version_string)
+      update_dir = File.join(Gem.dir, "gems", "rubygems-update-#{version_string}")
+      Dir.chdir(update_dir) do
+	puts "Installing RubyGems #{version_string}"
+	system "ruby setup.rb"
+      end
     end
 
     def which_to_update(highest_installed_gems, remote_gemspecs)

data/lib/rubygems/installer.rb

@@ -54,12 +54,15 @@ module Gem
           end
         end
         # Check the dependent gems.
-	unless @options[:ignore_dependencies]
-	  spec.dependencies.each do |dep_gem|
-	    # TODO: Does this take account of *versions*?
-	    require_gem_with_options(dep_gem, [], :auto_require=>false)
-	  end
-	end
+	# NOTE: THe dependent gem check is disabled.  WE SHOULD NOT
+	# REQUIRE GEMS DURING INSTALLTION.  If we need to check
+	# dependencies, we need a different way. 
+# 	unless @options[:ignore_dependencies]
+# 	  spec.dependencies.each do |dep_gem|
+# 	    # TODO: Does this take account of *versions*?
+# 	    require_gem_with_options(dep_gem, [], :auto_require=>false)
+# 	  end
+# 	end
       end
       
       raise Gem::FilePermissionError.new(install_dir) unless File.writable?(install_dir)
@@ -286,9 +289,8 @@ TEXT
     #
     def uninstall
       require 'fileutils'
-      Gem.source_index.refresh!
       list = Gem.source_index.search(@gem, @version)
-      if list.size == 0 
+      if list.empty?
         raise "Unknown RubyGem: #{@gem} (#{@version})"
       elsif list.size > 1 && @force_all
 	remove_all(list.dup) 

data/lib/rubygems/remote_installer.rb

@@ -461,14 +461,9 @@ module Gem
     def find_dependencies_not_installed(dependencies)
       to_install = []
       dependencies.each do |dependency|
-        begin
-          require_gem_with_options(
-	    dependency.name,
-	    dependency.requirement_list,
-	    :auto_require=>false)
-        rescue LoadError => e
-          to_install.push dependency
-        end
+	srcindex = Gem::SourceIndex.from_installed_gems
+	matches = srcindex.find_name(dependency.name, dependency.requirement_list)
+	to_install.push dependency if matches.empty?
       end
       to_install
     end

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.8'
+  RubyGemsVersion = '0.8.10'
 end

data/lib/rubygems/source_index.rb

@@ -28,10 +28,26 @@ module Gem
     # specifications::
     #   [Hash] hash of [Gem name, Gem::Specification] pairs
     #
-    def initialize(specifications)
+    def initialize(specifications={})
       @gems = specifications
     end
     
+    # Reconstruct this source index from the list of source
+    # directories.  If the list is empty, then use the directories in
+    # Gem.path.
+    #
+    def from_installed_gems(*spec_dirs)
+      @gems.clear
+      if spec_dirs.empty?
+        spec_dirs = Gem.path.collect { |dir| File.join(dir, "specifications") }
+      end
+      Dir.glob("{#{spec_dirs.join(',')}}/*.gemspec").each do |file_name|
+        gemspec = self.class.load_specification(file_name)
+        @gems[gemspec.full_name] = gemspec if gemspec
+      end
+      self
+    end
+
     # Factory method to construct a source index instance for a given
     # path.
     # 
@@ -44,15 +60,7 @@ module Gem
     #   SourceIndex instance
     #
     def self.from_installed_gems(*spec_dirs)
-      gems = {}
-      if spec_dirs.empty?
-        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)
-        gems[gemspec.full_name] = gemspec if gemspec
-      end
-      self.new(gems)
+      self.new.from_installed_gems(*spec_dirs)
     end
 
     # Load a specification from a file (eval'd Ruby code)
@@ -124,15 +132,7 @@ module Gem
     # return:: Returns a pointer to itself.
     #
     def refresh!
-      spec_dirs = Gem.path.collect {|dir| File.join(dir, "specifications")}
-      files = Dir.glob("{#{spec_dirs.join(',')}}/*.gemspec")
-      current_loaded_files = @gems.values.collect {|spec| spec.loaded_from}
-      (files - current_loaded_files).each do |spec_file|
-        gemspec = Gem::SourceIndex.load_specification(spec_file)
-
-        @gems[gemspec.full_name] = gemspec if gemspec
-      end
-      self
+      from_installed_gems
     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-03-25}
+  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-03-25}
+  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-03-25}
+  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-03-25}
+  s.summary = %q{summary}
+  s.description = %q{desc}
+  s.files = ["lib/code.rb"]
+end

data/test/gemenvironment.rb

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'rubygems/installer'
+require 'rubygems/builder'
 require 'test/mockgemui'
 require 'rake'
 
@@ -10,7 +11,7 @@ module TestEnvironment
 
   # Create a testing environment for gems.
   def create
-    return if File.exist? "test/data/gemhome/gems/a-0.0.1"
+#    return if File.exist? "test/data/gemhome/gems/a-0.0.1"
     Dir.chdir("test/data") do
       mkdir "lib" unless File.exists? "lib"
       open("lib/code.rb", "w") do |f| f.puts "CODE = 1" end unless

data/test/test_require_gem.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'test/gemenvironment'
+
+class TestRequireGem < Test::Unit::TestCase
+  def setup
+    TestEnvironment.create
+    Gem.use_paths("test/data/gemhome")
+    Gem.source_index.refresh!
+    @old_path = $:.dup
+    Gem.instance_eval { @loaded_specs.clear if @loaded_specs }
+  end
+
+  def teardown
+    $:.replace(@old_path)
+  end
+
+  def test_require
+    assert require_gem('a', '= 0.0.1'), "Should load"
+    assert $:.any? { |p| %r{a-0.0.1/lib} =~ p }
+    assert $:.any? { |p| %r{a-0.0.1/bin} =~ p }
+  end
+
+  def test_redundent_requires
+    assert require_gem('a', '= 0.0.1'), "Should load"
+    assert ! require_gem('a', '= 0.0.1'), "Should not load"
+    assert_equal 1, $:.select { |p| %r{a-0.0.1/lib} =~ p }.size
+    assert_equal 1, $:.select { |p| %r{a-0.0.1/bin} =~ p }.size
+  end
+
+  def test_overlapping_requires
+    assert require_gem('a', '= 0.0.1'), "Should load"
+    assert ! require_gem('a', '>= 0.0.1'), "Should not load"
+    assert_equal 1, $:.select { |p| %r{a-0.0.1/lib} =~ p }.size
+    assert_equal 1, $:.select { |p| %r{a-0.0.1/bin} =~ p }.size
+  end
+
+  def test_conflicting_requires
+    assert require_gem('a', '= 0.0.1'), "Should load"
+    ex = assert_raises(Gem::Exception) { 
+      require_gem 'a', '= 0.0.2'
+    }
+    assert_match /activate a \(= 0\.0\.2\)/, ex.message
+    assert_match /activated a-0\.0\.1/, ex.message
+    assert $:.any? { |p| %r{a-0.0.1/lib} =~ p }
+    assert $:.any? { |p| %r{a-0.0.1/bin} =~ p }
+    assert ! $:.any? { |p| %r{a-0.0.2/lib} =~ p }
+    assert ! $:.any? { |p| %r{a-0.0.2/bin} =~ p }
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.7.1
+rubygems_version: 0.8.9.2
 specification_version: 1
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  version: 0.8.8
-date: 2005-03-14
+  version: 0.8.10
+date: 2005-03-25
 summary: RubyGems Update GEM
 require_paths: 
   - lib
@@ -83,8 +83,8 @@ files:
   - lib/rubygems/user_interaction.rb
   - lib/rubygems/validator.rb
   - lib/rubygems/version.rb
-  - lib/rubygems/dependency_list.rb
   - lib/rubygems/gem_commands.rb
+  - lib/rubygems/dependency_list.rb
   - pkgs/sources
   - pkgs/sources/lib
   - pkgs/sources/sources.gemspec
@@ -128,18 +128,49 @@ files:
   - test/yaml_data.rb
   - test/test_dependency_list.rb
   - test/test_deployment.rb
+  - test/test_require_gem.rb
   - test/data/gems
   - test/data/one
   - test/data/legacy
   - test/data/lib
+  - test/data/gemhome
+  - 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/one/lib
   - test/data/one/README.one
   - test/data/one/one.gemspec
   - test/data/one/one.yaml
+  - test/data/one/one-0.0.1.gem
   - 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/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/mock/gems
   - test/mock/gems/cache
   - test/mock/gems/doc