rubygems-update 1.3.0 → 1.3.1

data/ChangeLog

@@ -1,5 +1,36 @@
 # -*- coding: utf-8 -*-
 
+2008-10-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb, lib/rubygems/custom_require.rb:  Make kernel
+	methods private.  Patch #20801 by Stefan Rusterholz.  Expose
+	our kernel extensions to RDoc.  Make Gem::location_of_caller behave on
+	Windows.  Patch by Daniel Berger.
+	* doc/release_notes/rel_1_3_1.rdoc:  Final release notes for 1.3.1.
+	* lib/rubygems/rubygems_version.rb:  1.3.1.
+
+2008-10-10  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/unpack_command.rb:  Silence PATH warning.
+
+2008-10-09  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Fix requires for inflate, deflate, etc.
+	* test/*:  Convert to minitest/unit.
+	* lib/rubygems/validator.rb:  Fix for MiniTest instead of test/unit
+	classic in 1.9.
+
+2008-10-03  Phil Hagelberg <technomancy@gmail.com>
+
+	* lib/rubygems.rb: Make Gem.dir respect :gemhome value from config.
+	* lib/rubygems/config_file.rb: Expose :gemhome value.
+
+2008-09-26  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems.rb:  Disregard ownership of ~ under Windows while
+	creating ~/.gem.  Fixes issues related to no uid support under
+	Windows.
+
 2008-09-24  Eric Hodel  <drbrain@segment7.net>
 
 	* doc/release_notes/rel_1_3_0.rdoc:  Final release notes for 1.3.0.

data/doc/release_notes/rel_1_3_1.rdoc

@@ -0,0 +1,75 @@
+= Announce: RubyGems Release 1.3.0
+
+NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
+rubygems-update installed.  You will need to follow the second set of update
+instructions if you see "Nothing to update".
+
+Release 1.3.0 fixes some bugs.
+
+Bugs fixed:
+
+* Disregard ownership of ~ under Windows while creating ~/.gem.  Fixes
+  issues related to no uid support under Windows.
+* Fix requires for Gem::inflate, Gem::deflate, etc.
+* Make Gem.dir respect :gemhome value from config.  (Note: this feature may be
+  removed since it is hard to implement on 1.9.)
+* Kernel methods are now private.  Patch #20801 by Stefan Rusterholz.
+* Gem::location_of_caller now behaves on Windows.  Patch by Daniel Berger.
+* Silence PATH warning.
+
+Deprecation Notices:
+
+* Gem::manage_gems will be removed on or after March 2009.
+
+For a full list of changes to RubyGems and the contributor for each change, see
+the ChangeLog file.
+
+Special thanks to Chad Wooley for backwards compatibility testing and Luis
+Lavena for continuing windows support.
+
+== How can I get RubyGems?
+
+NOTE:  If you have installed RubyGems using a package system you may want to
+install a new RubyGems through the same packaging system.
+
+If you have a recent version of RubyGems (0.8.5 or later), then all
+you need to do is:
+
+  $ gem update --system   (you might need to be admin/root)
+
+NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
+rubygems-update installed.  You will need to follow the second set of update
+instructions if you see "Nothing to update".
+
+NOTE: You may have to run the command twice if you have any previosly
+installed rubygems-update gems.
+
+If you have an older version of RubyGems installed, then you can still
+do it in two steps:
+
+  $ gem install rubygems-update  (again, might need to be admin/root)
+  $ update_rubygems              (... here too)
+
+If you don't have any gems install, there is still the pre-gem
+approach to getting software ... doing it manually:
+
+1. DOWNLOAD FROM: http://rubyforge.org/frs/?group_id=126
+2. UNPACK INTO A DIRECTORY AND CD THERE
+3. INSTALL WITH:  ruby setup.rb  (you may need admin/root privilege)
+
+== To File Bugs
+
+The RubyGems bug tracker can be found on RubyForge at:
+http://rubyforge.org/tracker/?func=add&group_id=126&atid=575
+
+When filing a bug, `gem env` output will be helpful in diagnosing the issue.
+
+If you find a bug where RubyGems crashes, please provide debug output. You can
+do that with `gem --debug the_command`.
+
+== Thanks
+
+Keep those gems coming!
+
+-- Jim & Chad & Eric (for the RubyGems team)
+

data/lib/rubygems.rb

@@ -43,12 +43,14 @@ module Kernel
   #
   #   GEM_SKIP=libA:libB ruby -I../libA -I../libB ./mycode.rb
 
-  def gem(gem_name, *version_requirements)
+  def gem(gem_name, *version_requirements) # :doc:
     skip_list = (ENV['GEM_SKIP'] || "").split(/:/)
     raise Gem::LoadError, "skipping #{gem_name}" if skip_list.include? gem_name
     Gem.activate(gem_name, *version_requirements)
   end
 
+  private :gem
+
 end
 
 ##
@@ -104,10 +106,10 @@ module Gem
   @ruby = nil
   @sources = []
 
-  @post_install_hooks = []
-  @post_uninstall_hooks = []
-  @pre_uninstall_hooks = []
-  @pre_install_hooks = []
+  @post_install_hooks   ||= []
+  @post_uninstall_hooks ||= []
+  @pre_uninstall_hooks  ||= []
+  @pre_install_hooks    ||= []
 
   ##
   # Activates an installed gem matching +gem+.  The gem must satisfy
@@ -294,6 +296,7 @@ module Gem
   # A Zlib::Deflate.deflate wrapper
 
   def self.deflate(data)
+    require 'zlib'
     Zlib::Deflate.deflate data
   end
 
@@ -302,7 +305,7 @@ module Gem
 
   def self.dir
     @gem_home ||= nil
-    set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
+    set_home(ENV['GEM_HOME'] || Gem.configuration.home || default_dir) unless @gem_home
     @gem_home
   end
 
@@ -395,6 +398,8 @@ module Gem
   # Zlib::GzipReader wrapper that unzips +data+.
 
   def self.gunzip(data)
+    require 'stringio'
+    require 'zlib'
     data = StringIO.new data
 
     Zlib::GzipReader.new(data).read
@@ -404,6 +409,8 @@ module Gem
   # Zlib::GzipWriter wrapper that zips +data+.
 
   def self.gzip(data)
+    require 'stringio'
+    require 'zlib'
     zipped = StringIO.new
 
     Zlib::GzipWriter.wrap zipped do |io| io.write data end
@@ -415,6 +422,7 @@ module Gem
   # A Zlib::Inflate#inflate wrapper
 
   def self.inflate(data)
+    require 'zlib'
     Zlib::Inflate.inflate data
   end
 
@@ -479,13 +487,13 @@ module Gem
   # The file name and line number of the caller of the caller of this method.
 
   def self.location_of_caller
-    file, lineno = caller[1].split(':')
-    lineno = lineno.to_i
+    caller[1] =~ /(.*?):(\d+)$/i
+    file = $1
+    lineno = $2.to_i
+
     [file, lineno]
   end
 
-  private_class_method :location_of_caller
-
   ##
   # manage_gems is useless and deprecated.  Don't call it anymore.
 
@@ -709,9 +717,11 @@ module Gem
 
     @gem_path.uniq!
     @gem_path.each do |path|
-      if 0 == File.expand_path(path).index(Gem.user_home) and
-         Etc.getpwuid.uid != File::Stat.new(Gem.user_home).uid then
-        next # only create by matching user
+      if 0 == File.expand_path(path).index(Gem.user_home)
+        unless win_platform? then
+          # only create by matching user
+          next if Etc.getpwuid.uid != File::Stat.new(Gem.user_home).uid
+        end
       end
       ensure_gem_subdirectories path
     end

data/lib/rubygems/commands/check_command.rb

@@ -31,7 +31,8 @@ class Gem::Commands::CheckCommand < Gem::Command
   def execute
     if options[:test]
       version = options[:version] || Gem::Requirement.default
-      gem_spec = Gem::SourceIndex.from_installed_gems.search(get_one_gem_name, version).first
+      dep = Gem::Dependency.new get_one_gem_name, version
+      gem_spec = Gem::SourceIndex.from_installed_gems.search(dep).first
       Gem::Validator.new.unit_test(gem_spec)
     end
 

data/lib/rubygems/commands/unpack_command.rb

@@ -43,7 +43,7 @@ class Gem::Commands::UnpackCommand < Gem::Command
       basename = File.basename(path).sub(/\.gem$/, '')
       target_dir = File.expand_path File.join(options[:target], basename)
       FileUtils.mkdir_p target_dir
-      Gem::Installer.new(path).unpack target_dir
+      Gem::Installer.new(path, :unpack => true).unpack target_dir
       say "Unpacked gem: '#{target_dir}'"
     else
       alert_error "Gem '#{gemname}' not installed."

data/lib/rubygems/commands/update_command.rb

@@ -54,11 +54,10 @@ class Gem::Commands::UpdateCommand < Gem::Command
         fail "No gem names are allowed with the --system option"
       end
 
-      spec = Gem::Specification.new
-      spec.name = 'rubygems-update'
-      spec.version = Gem::Version.new Gem::RubyGemsVersion
-      spec.version = Gem::Version.new '1.1.1'
-      hig['rubygems-update'] = spec
+      rubygems_update = Gem::Specification.new
+      rubygems_update.name = 'rubygems-update'
+      rubygems_update.version = Gem::Version.new Gem::RubyGemsVersion
+      hig['rubygems-update'] = rubygems_update
 
       options[:user_install] = false
     else

data/lib/rubygems/config_file.rb

@@ -52,6 +52,8 @@ class Gem::ConfigFile
   # Where to look for gems
   attr_accessor :path
 
+  attr_accessor :home
+
   # True if we print backtraces on errors.
   attr_writer :backtrace
 
@@ -129,7 +131,8 @@ class Gem::ConfigFile
     Gem.sources = @hash[:sources] if @hash.key? :sources
     @verbose = @hash[:verbose] if @hash.key? :verbose
     @update_sources = @hash[:update_sources] if @hash.key? :update_sources
-    @path = @hash[:gempath]
+    @path = @hash[:gempath] if @hash.key? :gempath
+    @home = @hash[:gemhome] if @hash.key? :gemhome
 
     handle_arguments arg_list
   end

data/lib/rubygems/custom_require.rb

@@ -7,11 +7,15 @@
 require 'rubygems'
 
 module Kernel
-  alias gem_original_require require # :nodoc:
 
-  #
-  # We replace Ruby's require with our own, which is capable of
-  # loading gems on demand.
+  ##
+  # The Kernel#require from before RubyGems was loaded.
+
+  alias gem_original_require require
+
+  ##
+  # When RubyGems is required, Kernel#require is replaced 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
@@ -22,8 +26,8 @@ module Kernel
   #
   # The normal <tt>require</tt> functionality of returning false if
   # that file has already been loaded is preserved.
-  #
-  def require(path) # :nodoc:
+
+  def require(path) # :doc:
     gem_original_require path
   rescue LoadError => load_error
     if load_error.message =~ /#{Regexp.escape path}\z/ and
@@ -34,5 +38,9 @@ module Kernel
       raise load_error
     end
   end
-end  # module Kernel
+
+  private :require
+  private :gem_original_require
+
+end
 

data/lib/rubygems/defaults.rb

@@ -1,5 +1,10 @@
 module Gem
 
+  @post_install_hooks   ||= []
+  @post_uninstall_hooks ||= []
+  @pre_uninstall_hooks  ||= []
+  @pre_install_hooks    ||= []
+
   ##
   # An Array of the default sources that come with RubyGems
 

data/lib/rubygems/installer.rb

@@ -137,7 +137,7 @@ class Gem::Installer
       options[:user_install] = true
     end
 
-    if options[:user_install] then
+    if options[:user_install] and not options[:unpack] then
       @gem_home = Gem.user_dir
 
       user_bin_dir = File.join(@gem_home, 'bin')

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 = '1.3.0'
+  RubyGemsVersion = '1.3.1'
 end

data/lib/rubygems/source_index.rb

@@ -257,8 +257,7 @@ class Gem::SourceIndex
 
     # TODO - Remove support and warning for legacy arguments after 2008/11
     unless Gem::Dependency === gem_pattern
-      warn "Gem::SourceIndex#search support for #{gem_pattern.class} patterns is deprecated"
-      warn "#{caller[0]} is outdated" 
+      warn "#{Gem.location_of_caller.join ':'}:Warning: Gem::SourceIndex#search support for #{gem_pattern.class} patterns is deprecated"
     end
 
     case gem_pattern

data/lib/rubygems/validator.rb

@@ -10,118 +10,130 @@ require 'rubygems/digest/md5'
 require 'rubygems/format'
 require 'rubygems/installer'
 
-module Gem
+##
+# Validator performs various gem file and gem database validation
+
+class Gem::Validator
+
+  include Gem::UserInteraction
 
   ##
-  # Validator performs various gem file and gem database validation
-  class Validator
-    include UserInteraction
-
-    ##
-    # Given a gem file's contents, validates against its own MD5 checksum
-    # gem_data:: [String] Contents of the gem file
-    def verify_gem(gem_data)
-      raise VerificationError, 'empty gem file' if gem_data.size == 0
-
-      unless gem_data =~ /MD5SUM/ then
-        return # Don't worry about it...this sucks.  Need to fix MD5 stuff for
-               # new format
-               # FIXME
-      end
+  # Given a gem file's contents, validates against its own MD5 checksum
+  # gem_data:: [String] Contents of the gem file
 
-      sum_data = gem_data.gsub(/MD5SUM = "([a-z0-9]+)"/,
-                               "MD5SUM = \"#{"F" * 32}\"")
+  def verify_gem(gem_data)
+    raise Gem::VerificationError, 'empty gem file' if gem_data.size == 0
 
-      unless Gem::MD5.hexdigest(sum_data) == $1.to_s then
-        raise VerificationError, 'invalid checksum for gem file'
-      end
+    unless gem_data =~ /MD5SUM/ then
+      return # Don't worry about it...this sucks.  Need to fix MD5 stuff for
+      # new format
+      # FIXME
     end
 
-    ##
-    # Given the path to a gem file, validates against its own MD5 checksum
-    # 
-    # gem_path:: [String] Path to gem file
-    def verify_gem_file(gem_path)
-      open gem_path, Gem.binary_mode do |file|
-        gem_data = file.read
-        verify_gem gem_data
-      end
-    rescue Errno::ENOENT
-      raise Gem::VerificationError.new("missing gem file #{gem_path}")
+    sum_data = gem_data.gsub(/MD5SUM = "([a-z0-9]+)"/,
+                             "MD5SUM = \"#{"F" * 32}\"")
+
+    unless Gem::MD5.hexdigest(sum_data) == $1.to_s then
+      raise Gem::VerificationError, 'invalid checksum for gem file'
     end
+  end
 
-    private
-    def find_files_for_gem(gem_directory)
-      installed_files = []
-      Find.find(gem_directory) {|file_name|
-        fn = file_name.slice((gem_directory.size)..(file_name.size-1)).sub(/^\//, "")
-        if(!(fn =~ /CVS/ || File.directory?(fn) || fn == "")) then 
-          installed_files << fn
-        end
-        
-      }
-      installed_files
+  ##
+  # Given the path to a gem file, validates against its own MD5 checksum
+  #
+  # gem_path:: [String] Path to gem file
+
+  def verify_gem_file(gem_path)
+    open gem_path, Gem.binary_mode do |file|
+      gem_data = file.read
+      verify_gem gem_data
     end
- 
-
-    public 
-    ErrorData = Struct.new(:path, :problem)
-
-    ##
-    # Checks the gem directory for the following potential 
-    # inconsistencies/problems:
-    # * Checksum gem itself
-    # * For each file in each gem, check consistency of installed versions
-    # * Check for files that aren't part of the gem but are in the gems directory
-    # * 1 cache - 1 spec - 1 directory.  
-    # 
-    # returns a hash of ErrorData objects, keyed on the problem gem's name.
-    def alien
-      errors = {}
-      Gem::SourceIndex.from_installed_gems.each do |gem_name, gem_spec|
-        errors[gem_name] ||= []
-        gem_path = File.join(Gem.dir, "cache", gem_spec.full_name) + ".gem"
-        spec_path = File.join(Gem.dir, "specifications", gem_spec.full_name) + ".gemspec"
-        gem_directory = File.join(Gem.dir, "gems", gem_spec.full_name)
-        installed_files = find_files_for_gem(gem_directory)
-    
-        if(!File.exist?(spec_path)) then
-          errors[gem_name] << ErrorData.new(spec_path, "Spec file doesn't exist for installed gem")
-        end
-    
-        begin
-          verify_gem_file(gem_path)
-          open gem_path, Gem.binary_mode do |file|
-            format = Gem::Format.from_file_by_path(gem_path)
-            format.file_entries.each do |entry, data|
-              # Found this file.  Delete it from list
-              installed_files.delete remove_leading_dot_dir(entry['path'])
-
-              next unless data # HACK `gem check -a mkrf`
-
-              open File.join(gem_directory, entry['path']), Gem.binary_mode do |f|
-                unless Gem::MD5.hexdigest(f.read).to_s ==
-                       Gem::MD5.hexdigest(data).to_s then
-                  errors[gem_name] << ErrorData.new(entry['path'], "installed file doesn't match original from gem")
-                end
+  rescue Errno::ENOENT
+    raise Gem::VerificationError, "missing gem file #{gem_path}"
+  end
+
+  private
+
+  def find_files_for_gem(gem_directory)
+    installed_files = []
+    Find.find(gem_directory) {|file_name|
+      fn = file_name.slice((gem_directory.size)..(file_name.size-1)).sub(/^\//, "")
+      if(!(fn =~ /CVS/ || File.directory?(fn) || fn == "")) then
+        installed_files << fn
+      end
+
+    }
+    installed_files
+  end
+
+  public
+
+  ErrorData = Struct.new :path, :problem
+
+  ##
+  # Checks the gem directory for the following potential
+  # inconsistencies/problems:
+  #
+  # * Checksum gem itself
+  # * For each file in each gem, check consistency of installed versions
+  # * Check for files that aren't part of the gem but are in the gems directory
+  # * 1 cache - 1 spec - 1 directory.
+  #
+  # returns a hash of ErrorData objects, keyed on the problem gem's name.
+
+  def alien
+    errors = {}
+
+    Gem::SourceIndex.from_installed_gems.each do |gem_name, gem_spec|
+      errors[gem_name] ||= []
+
+      gem_path = File.join(Gem.dir, "cache", gem_spec.full_name) + ".gem"
+      spec_path = File.join(Gem.dir, "specifications", gem_spec.full_name) + ".gemspec"
+      gem_directory = File.join(Gem.dir, "gems", gem_spec.full_name)
+
+      installed_files = find_files_for_gem(gem_directory)
+
+      unless File.exist? spec_path then
+        errors[gem_name] << ErrorData.new(spec_path, "Spec file doesn't exist for installed gem")
+      end
+
+      begin
+        verify_gem_file(gem_path)
+
+        open gem_path, Gem.binary_mode do |file|
+          format = Gem::Format.from_file_by_path(gem_path)
+          format.file_entries.each do |entry, data|
+            # Found this file.  Delete it from list
+            installed_files.delete remove_leading_dot_dir(entry['path'])
+
+            next unless data # HACK `gem check -a mkrf`
+
+            open File.join(gem_directory, entry['path']), Gem.binary_mode do |f|
+              unless Gem::MD5.hexdigest(f.read).to_s ==
+                Gem::MD5.hexdigest(data).to_s then
+                errors[gem_name] << ErrorData.new(entry['path'], "installed file doesn't match original from gem")
               end
             end
           end
-        rescue VerificationError => e
-          errors[gem_name] << ErrorData.new(gem_path, e.message)
-        end
-        # Clean out directories that weren't explicitly included in the gemspec
-        # FIXME: This still allows arbitrary incorrect directories.
-        installed_files.delete_if {|potential_directory|        
-          File.directory?(File.join(gem_directory, potential_directory))
-        }
-        if(installed_files.size > 0) then
-          errors[gem_name] << ErrorData.new(gem_path, "Unmanaged files in gem: #{installed_files.inspect}")
         end
+      rescue Gem::VerificationError => e
+        errors[gem_name] << ErrorData.new(gem_path, e.message)
+      end
+
+      # Clean out directories that weren't explicitly included in the gemspec
+      # FIXME: This still allows arbitrary incorrect directories.
+      installed_files.delete_if {|potential_directory|
+        File.directory?(File.join(gem_directory, potential_directory))
+      }
+      if(installed_files.size > 0) then
+        errors[gem_name] << ErrorData.new(gem_path, "Unmanaged files in gem: #{installed_files.inspect}")
       end
-      errors
     end
 
+    errors
+  end
+
+  if RUBY_VERSION < '1.9' then
     class TestRunner
       def initialize(suite, ui)
         @suite = suite
@@ -147,40 +159,50 @@ module Gem
     end
 
     autoload :TestRunner, 'test/unit/ui/testrunnerutilities'
-   
-    ##
-    # Runs unit tests for a given gem specification
-    def unit_test(gem_spec)
-     start_dir = Dir.pwd
-     Dir.chdir(gem_spec.full_gem_path)
-      $: << File.join(Gem.dir, "gems", gem_spec.full_name)
-        # XXX: why do we need this gem_spec when we've already got 'spec'?
-      test_files = gem_spec.test_files
-      if test_files.empty?
-        say "There are no unit tests to run for #{gem_spec.full_name}"
-        require 'test/unit/ui/console/testrunner'
-        return Test::Unit::TestResult.new
-      end
-      gem gem_spec.name, "= #{gem_spec.version.version}"
-      test_files.each do |f| require f end
+  end
+
+  ##
+  # Runs unit tests for a given gem specification
+
+  def unit_test(gem_spec)
+    start_dir = Dir.pwd
+    Dir.chdir(gem_spec.full_gem_path)
+    $: << File.join(Gem.dir, "gems", gem_spec.full_name)
+    # XXX: why do we need this gem_spec when we've already got 'spec'?
+    test_files = gem_spec.test_files
+
+    if test_files.empty? then
+      say "There are no unit tests to run for #{gem_spec.full_name}"
+      return nil
+    end
+
+    gem gem_spec.name, "= #{gem_spec.version.version}"
+
+    test_files.each do |f| require f end
+
+    if RUBY_VERSION < '1.9' then
       suite = Test::Unit::TestSuite.new("#{gem_spec.name}-#{gem_spec.version}")
+
       ObjectSpace.each_object(Class) do |klass|
         suite << klass.suite if (klass < Test::Unit::TestCase)
       end
-      result = TestRunner.run(suite, ui())
-      unless result.passed?
-        alert_error(result.to_s)
-        #unless ask_yes_no(result.to_s + "...keep Gem?", true) then
-          #Gem::Uninstaller.new(gem_spec.name, gem_spec.version.version).uninstall
-        #end
-      end
-      result
-    ensure
-      Dir.chdir(start_dir)
-    end
 
-    def remove_leading_dot_dir(path)
-      path.sub(/^\.\//, "")
+      result = TestRunner.run suite, ui
+
+      alert_error result.to_s unless result.passed?
+    else
+      result = MiniTest::Unit.new
+      result.run
     end
+
+    result
+  ensure
+    Dir.chdir(start_dir)
+  end
+
+  def remove_leading_dot_dir(path)
+    path.sub(/^\.\//, "")
   end
+
 end
+