rubygems-update 0.8.6 → 0.8.8

data/ChangeLog

@@ -1,3 +1,137 @@
+2005-03-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/installer.rb: Removed all code relating to library
+	stubs as we haven't generated them for ages.
+
+2005-03-13  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/rubygems/installer.rb (Gem::Installer#shebang): Refactored and
+	stripped result to avoid ^M issues.
+
+2005-03-11  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/gem_commands.rb (Gem::DependencyCommand): Added a
+	new command "gem dependency" to show the dependencies of an
+	installed gem.
+
+	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::initialize):
+	Added DependencyCommand to the command manager registrar.
+
+	* lib/rubygems/version.rb (Gem::Requirement): Unnested Requirement
+	from the Version class.  There was no benefit to having it nested.
+	Gem::Version::Requirement is set to point to the new class so to
+	be compatible with old gems.
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::ask_if_ok): Changed
+	uninstaller confirm message to read 'Continue with uninstall'.
+	Its clearer that way.
+
+	* lib/rubygems.rb (Gem::Exception::required_location): Switch to
+	use SourceIndex#find_name rather than search.  Made sure a nil
+	value is returned with a path is not found.
+
+	* lib/rubygems/source_index.rb (Gem::SourceIndex::search): Changed
+	parameter name to gem_pattern to emphasize using Regex in search.
+	(Gem::SourceIndex::find_name): Added find_name to handle the
+	common case of searching for an exact match on the short name.
+
+	* lib/rubygems.rb (Gem::Exception::activate): Make sure that
+	activate more closely adheres to honoring the auto_require=>false
+	request.
+	(Gem::Exception::report_activate_error): Out of line error
+	reporting for activate.
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteInstaller::find_dependencies_not_installed): Found
+	another location that was using require_gem with auto_require.
+	Fixed to use :auto_require=>false.
+
+	* lib/rubygems/gem_commands.rb
+	(Gem::InstallUpdateOptions::add_install_update_options): Added
+	--ignore-dependencies option.  Still needs to be wired to logic.
+
+	* lib/rubygems/installer.rb (Gem::Installer::install): Added call
+	to require_gem_with_options.
+
+	* lib/rubygems.rb (Kernel::require_gem_with_options): Added to
+	allow easier specification of the autorequire flag for
+	Gem.activate.
+
+2005-03-10  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::RemoteSourceFetcher::normalize_uri): Normialize a URI to
+	start with http:// if it does not already.
+
+	* test/test_deployment.rb (TestDeployment::xtest_deploy_sources):
+	Disabled this test.  It is part of the new deployment software and
+	is not working yet.
+
+2005-03-09  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/gemconfigure.rb (Gem::self): Added to aid dynamic
+	versioning.
+
+	* lib/rubygems/command.rb (Gem::Command::command_manager): Moved
+	command_manager to base class.
+
+	* lib/rubygems/gem_commands.rb (Gem::CleanupCommand::execute):
+	Both implicit and explicit gems now work with cleanup.  
+
+2005-03-08  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::ok_to_remove):
+	Fixed source index to be loaded from the installed gems when doing
+	an "OK TO REMOVE" dependency check.
+
+2005-03-06  Rich Kilmer <rich@infoether.com>
+	* lib/rubygems/deployment.rb: beginning of a deployment capability
+
+	* test/test_deployment.rb: first tests of new deployment system
+
+2005-03-04  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb: Small bugfix for the case when you
+	pass in a gem name (or more) to cleanup for the cleanup command.
+
+2005-03-04  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/installer.rb (Gem::Uninstaller::ok_to_remove):
+	Reworked logic in uninstall to be intelligent about dependencies.
+	We only complain about dependencies if removing a gem will cause a
+	dependency error.  The uninstaller now checks for :ignore, :all
+	and :executables options.
+
+	* lib/rubygems/cmd_manager.rb (Gem::CommandManager::initialize):
+	Registered Cleanup command.
+
+	* lib/rubygems/gem_commands.rb (Gem::CleanupCommand): Added
+	Cleanup command to gem.
+	(Gem::UninstallCommand::initialize): Added --all, --ignore and
+	--executables options to uninstall.  This helps to avoid excessive
+	YESes all the time.
+
+2005-02-28  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb
+	(Gem::LocalSourceInfoCache::write_cache): Open cache file in
+	binary mode.
+
+2005-02-28  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/config_file.rb: don't warn about not being able to
+	find config file.
+	* lib/rubygems/doc_manager.rb: (for DHH) don't install rdoc docs for
+	* lib/rubygems/gem_commands.rb: Print which gems are updated on 'gem
+	update'.  If --system is used, report that the rubygems system
+	software has been updated.
+	* lib/rubygems/installer.rb: Cleaned up the uninstall has_dependents
+	logic and output.  It was misleading and buggy before.
+
+2005-02-27  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/config_file.rb
+	(Gem::ConfigFile::default_config_file_name): Fixed bug in finding
+	home directory for the .gemrc file.
+
 2005-02-27  Chad Fowler  <chad@chadfowler.com>
 
 	* Released 0.8.6

data/Rakefile

@@ -7,8 +7,22 @@ require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
 
+def announce(msg='')
+  STDERR.puts msg
+end
+
 PKG_NAME = 'rubygems'
-PKG_VERSION = `ruby -Ilib bin/gem environment packageversion`.chomp
+def package_version
+  `ruby -Ilib bin/gem environment packageversion`.chomp
+end
+
+if ENV['REL']
+  PKG_VERSION = ENV['REL']
+  CURRENT_VERSION = package_version
+else
+  PKG_VERSION = package_version
+  CURRENT_VERSION = PKG_VERSION
+end
 
 CLEAN.include("COMMENTS")
 CLOBBER.include(
@@ -68,10 +82,6 @@ end
 # --------------------------------------------------------------------
 # Creating a release
 
-def announce(msg='')
-  STDERR.puts msg
-end
-
 desc "Make a new release"
 task :release => [
   :prerelease,
@@ -83,7 +93,7 @@ task :release => [
   
   announce 
   announce "**************************************************************"
-  announce "* Release #{ENV['REL']} Complete."
+  announce "* Release #{PKG_VERSION} Complete."
   announce "* Packages ready to upload."
   announce "**************************************************************"
   announce 
@@ -93,8 +103,8 @@ end
 task :prerelease do
   announce 
   announce "**************************************************************"
-  announce "* Making RubyGem Release #{ENV['REL']}"
-  announce "* (current version #{PKG_VERSION})"
+  announce "* Making RubyGem Release #{PKG_VERSION}"
+  announce "* (current version #{CURRENT_VERSION})"
   announce "**************************************************************"
   announce  
 
@@ -105,7 +115,7 @@ task :prerelease do
 
   # Is the release different than the current release.
   # (or is REUSE set?)
-  if PKG_VERSION == ENV['REL'] && ! ENV['REUSE']
+  if PKG_VERSION == CURRENT_VERSION && ! ENV['REUSE']
     fail "Current version is #{PKG_VERSION}, must specify REUSE=tag_suffix to reuse version"
   end
 
@@ -123,27 +133,35 @@ task :prerelease do
 end
 
 task :update_version => [:prerelease] do
-  if PKG_VERSION == ENV['REL']
+  if PKG_VERSION == CURRENT_VERSION
     announce "No version change ... skipping version update"
   else
-    announce "Updating RubyGem version to #{ENV['REL']}"
+    announce "Updating RubyGem version to #{PKG_VERSION}"
     open("lib/rubygems/rubygems_version.rb", "w") do |f|
       f.puts "# DO NOT EDIT"
       f.puts "# This file is auto-generated by build scripts."
       f.puts "# See:  rake update_version"
       f.puts "module Gem"
-      f.puts "  RubyGemsVersion = '#{ENV['REL']}'"
+      f.puts "  RubyGemsVersion = '#{PKG_VERSION}'"
       f.puts "end"
     end
-    sh %{cvs commit -m "Updated to version #{ENV['REL']}" lib/rubygems/rubygems_version.rb}
+    if ENV['RELTEST']
+      announce "Release Task Testing, skipping commiting of new version"
+    else
+      sh %{cvs commit -m "Updated to version #{PKG_VERSION}" lib/rubygems/rubygems_version.rb}
+    end
   end
 end
 
 task :tag => [:prerelease] do
-  reltag = "REL_#{ENV['REL'].gsub(/\./, '_')}"
+  reltag = "REL_#{PKG_VERSION.gsub(/\./, '_')}"
   reltag << ENV['REUSE'].gsub(/\./, '_') if ENV['REUSE']
   announce "Tagging CVS with [#{reltag}]"
-  sh %{cvs tag #{reltag}}
+  if ENV['RELTEST']
+    announce "Release Task Testing, skipping CVS tagging"
+  else
+    sh %{cvs tag #{reltag}}
+  end
 end
 
 # --------------------------------------------------------------------
@@ -214,7 +232,7 @@ Rake::PackageTask.new("package") do |p|
   p.package_files = PKG_FILES
 end
 
-spec = Gem::Specification.new do |s|
+Spec = Gem::Specification.new do |s|
   s.name = PKG_NAME + "-update"  
   s.version = PKG_VERSION
   s.summary = "RubyGems Update GEM"
@@ -232,7 +250,13 @@ installation of RubyGems before this update can be applied.
   s.executables = ["update_rubygems"]
 end
 
-Rake::GemPackageTask.new(spec) do |p| end
+Rake::GemPackageTask.new(Spec) do |p| end
+
+desc "Build the Gem spec file for the rubygems-update package"
+task :gemspec => "pkg/rubygems-update.gemspec"
+file "pkg/rubygems-update.gemspec" => ["pkg", "Rakefile"] do |t|
+  open(t.name, "w") do |f| f.puts Spec.to_yaml end
+end
 
 # Install RubyGems
 

data/bin/gemwhich

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'optparse'
+
+EXT = %w( .rb .rbw .so .dll )
+
+options = OptionParser.new
+options.banner = "gemwhich -- Find the location of a library module."
+options.separator("")
+options.separator("Usage: gemwhich [options] libname...")
+options.on_tail('-v', '--verbose',
+  "Enable verbose output"
+  ) do |value|
+  $verbose = value
+end
+options.on_tail('-h', '--help',
+  "Display this help message"
+  ) do |value|
+  puts options
+  exit
+end
+ARGV << '-h' if ARGV.empty?
+
+begin
+  options.parse!(ARGV)
+rescue OptionParser::InvalidOption => ex
+  puts "Error: #{ex.message}"
+  exit
+end
+
+def find_path(package_name, dirs)
+  dirs.each do |dir|
+    EXT.each do |ext|
+      full_path = File.join(dir, "#{package_name}#{ext}")
+      if File.exist?(full_path)
+	return full_path
+      end
+    end
+  end
+  nil
+end
+
+searcher = Gem::GemPathSearcher.new
+ARGV.each do |arg|
+  dirs = $LOAD_PATH
+  spec = searcher.find(arg)
+  if spec
+    dirs =
+      spec.require_paths.collect { |d|
+      File.join(spec.full_gem_path,d)
+    } + $LOAD_PATH
+    puts "(checking gem #{spec.full_name} for #{arg})" if $verbose
+  end
+  path = find_path(arg, dirs)
+  if path
+    puts path
+  else
+    puts "Can't find #{arg}"
+  end
+end

data/examples/application/an-app.gemspec

@@ -13,6 +13,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.autorequire = 'somefunctionality'
   s.executables = ["myapp"]
+  s.has_rdoc = false
   #s.extra_rdoc_files = ["README", "Changes.rdoc"]
   #s.default_executable = "myapp"
   s.bindir = "bin"

data/lib/gemconfigure.rb

@@ -0,0 +1,18 @@
+module Gem
+
+  # Activate the gems specfied by the gem_pairs list.
+  #
+  # gem_pairs ::
+  #   List of gem/version pairs.
+  #   Eg.  [['rake', '= 0.8.15'], ['RedCloth', '~> 3.0']]
+  # options ::
+  #   options[:verbose] => print gems as they are required.
+  #
+  def self.configure(gem_pairs, options={})
+    gem_pairs.each do |name, version|
+      require 'rubygems' 
+      puts "Requiring gem #{name} (version #{version})" if options[:verbose]
+      require_gem name, version
+    end
+  end
+end

data/lib/rubygems.rb

@@ -29,9 +29,13 @@ module Kernel
   # raises:: [Gem::LoadError] if Gem cannot be found, is listed in GEM_SKIP, or version requirement not met.
   #
   def require_gem(gem, *version_requirements)
+    require_gem_with_options(gem, version_requirements, :auto_require=>true)
+  end
+  
+  def require_gem_with_options(gem, version_requirements, options={})
     skip_list = (ENV['GEM_SKIP'] || "").split(/:/)
     raise Gem::LoadError, "skipping #{gem}" if skip_list.include? gem
-    Gem.activate(gem, true, *version_requirements)
+    Gem.activate(gem, options[:auto_require], *version_requirements)
   end
 end
 
@@ -64,12 +68,13 @@ module Gem
       require 'rubygems/cmd_manager'
       require 'rubygems/gem_runner'
       require 'rubygems/config_file'
+      require 'rubygems/deployment'
     end
   
     ##
     # Returns an Cache of specifications that are in the Gem.path
     #
-    # return:: [Gem::Cache] cache of Gem::Specifications
+    # return:: [Gem::SourceIndex] Index of installed Gem::Specifications
     #
     def source_index
       @@source_index ||= SourceIndex.from_installed_gems
@@ -105,13 +110,21 @@ module Gem
     def user_home
       @user_home ||= find_home
     end
-    
+
+    # Return the path to standard location of the users .gemrc file.
+    def config_file
+      File.join(Gem.user_home, '.gemrc')
+    end
+
     ##
     # Activate a gem (i.e. add it to the Ruby load path).  The gem
     # must satisfy all the specified version constraints.  If
     # +autorequire+ is true, then automatically require the specified
     # autorequire file in the gem spec.
     #
+    # Returns true if the gem is loaded by this call, false if it is
+    # already loaded, or an exception otherwise.
+    #
     def activate(gem, autorequire, *version_requirements)
       unless version_requirements.size > 0
         version_requirements = ["> 0.0.0"]
@@ -120,53 +133,57 @@ module Gem
         gem = Gem::Dependency.new(gem, version_requirements)
       end
       
-      gem_name_pattern = /^#{gem.name}$/
-      matches = Gem.source_index.search(gem_name_pattern, gem.version_requirements)
-      if matches.size==0
-        matches = Gem.source_index.search(gem_name_pattern)
-        if matches.size==0
-          error = Gem::LoadError.new("\nCould not find RubyGem #{gem.name} (#{gem.version_requirements})\n")
-          error.name = gem.name
-          error.version_requirement = gem.version_requirements
-          raise error
-        else
-          error = Gem::LoadError.new("\nRubyGem version error: #{gem.name}(#{matches.first.version} not #{gem.version_requirements})\n")
-          error.name = gem.name
-          error.version_requirement = gem.version_requirements
-          raise error
-        end
-      else
-        # Get highest matching version
-        spec = matches.last
-        if spec.loaded?
-          result = spec.autorequire ? require(spec.autorequire) : false
-          return result || false 
-        end
-        
-        spec.loaded = true
-        
-        # Load dependent gems first
-        spec.dependencies.each do |dep_gem|
-          activate(dep_gem, autorequire)
-        end
-        
-        # add bin dir to require_path
-        if(spec.bindir) then
-          spec.require_paths << spec.bindir
-        end
+      matches = Gem.source_index.find_name(gem.name, gem.version_requirements)
+      report_activate_error(gem) if matches.empty?
 
-        # Now add the require_paths to the LOAD_PATH
-        spec.require_paths.each do |path|
-          $:.unshift File.join(spec.full_gem_path, path)
-        end
-        
-        require spec.autorequire if autorequire && spec.autorequire
-        return true
+      # Get highest matching version
+      spec = matches.last
+      if spec.loaded?
+	return false unless autorequire
+	result = spec.autorequire ? require(spec.autorequire) : false
+	return result || false 
       end
-    
+      
+      spec.loaded = true
+      
+      # Load dependent gems first
+      spec.dependencies.each do |dep_gem|
+	activate(dep_gem, autorequire)
+      end
+      
+      # add bin dir to require_path
+      if(spec.bindir) then
+	spec.require_paths << spec.bindir
+      end
+      
+      # Now add the require_paths to the LOAD_PATH
+      spec.require_paths.each do |path|
+	$:.unshift File.join(spec.full_gem_path, path)
+      end
+      
+      require spec.autorequire if autorequire && spec.autorequire
+      return true
     end
     
-    ##
+    # Report a load error during activation.  The message of load
+    # error depends on whether it was a version mismatch or if there
+    # 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
+	error = Gem::LoadError.new(
+	  "Could not find RubyGem #{gem.name} (#{gem.version_requirements})\n")
+      else
+	error = Gem::LoadError.new(
+	  "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.
@@ -213,13 +230,14 @@ module Gem
 
     def required_location(gemname, libfile, *version_constraints)
       version_constraints = [">0"] if version_constraints.empty?
-      matches = Gem.source_index.search(gemname, version_constraints)
+      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)
       end
+      nil
     end