rubygems-update 1.5.3 → 1.6.0

data.tar.gz.sig

@@ -1 +1,2 @@
-N4�ar�N�

����d�!M�D���Z�����.u���ŒI������J쑆�;�1���z��"Ib���«V���hJ���µ�(��U��zQ�(�G$���Y����4:�_�Z�)�>9O
+�Ѣ�X�;����vYṛ*�-N���j��|��q�Q6�c�����)8�R2�;��+H6KVQ,�PKɶ	5^���f:�]��Dw��1�';�`�O���
+P��!��RB�s�!��Q.hO0�ƨy3m��ϚJ��g8"V�����8A'(#�ҥ!��1�(��怤:�v���v��y�AP�MAׁ�9r*O:!3}U���t6�����U�5�e;;�p��Xd�n؅�>�n�������S�읃�aE҂E;:^

data/History.txt

@@ -1,12 +1,59 @@
-=== 1.5.3 / 2011-02-26
-
-NOTE:  RubyGems 1.5.0 and 1.5.1 have a broken <tt>gem update --system</tt>.
-
-To upgrade you'll need to use the manual upgrade recipe.  Using sudo/su as
-appropriate:
-
-  $ gem install rubygems-update
-  $ update_rubygems
+=== 1.6.0 / 2011-02-29
+
+4 Deprecations:
+
+* RubyGems no longer requires 'thread'.  Rails < 3 will need to add require
+  'thread' to their applications.
+* Gem.cache is deprecated.  Use Gem.source_index.
+* RbConfig.datadir is deprecated.  Use Gem.datadir.
+* Gem::LoadError#version_requirements has been removed.  Use
+  Gem::LoadError#requirement.
+
+2 Major Enhancements:
+
+* Rewrote how Gem::activate (gem and require) resolves dependencies.
+* Gem::LoadError#version_requirement has been removed. Use
+  Gem::LoadError#requirement.
+
+17 Minor Enhancments:
+
+* Added --key to `gem push` for setting alternate API keys.
+* Added --format-executable support to gem uninstall.
+* Added Gem::DependencyList#clear.
+* Added Gem::DependencyList#remove_specs_unsatisfied_by
+* Added Gem.latest_spec_for, latest_version_for, and latest_rubygems_version.
+* Added Gem::Dependency#merge which merges requirements for two
+  dependencies.
+* Added Gem::TestCase#util_spec for faster tests.
+* Added Gem::Specification#dependent_specs.
+* Added Gem::TestCase#new_spec and Gem::TestCase#install_specs.
+* Added flag to include prerelease gems in Gem::SourceIndex#latest_specs.
+* Gem.cache_dir always references the proper cache dir. 
+  Pass true to support a user path.
+* Gem.cache_gem, given a filename always references the cache gem.
+  Pass true to support a user path.
+* Added Gem::Specification#conflicts
+* Removed rdoc gem/require from test_case.rb.
+* Rubygems will no longer let you push if you're using beta or unreleased
+  rubygems.
+* Save RAM / GC churn by removing spec.files and rdoc options from
+  locally cached gem specifications.
+* SpecFetcher.fetch_spec can now take a string source_uri.
+
+10 Bug Fixes:
+
+* Added missing require of Gem::RemoteFetcher to the unpack command.
+* RubyGems now completely removes a previous install when reinstalling.
+* Fixed Gem::Installer#generate_bin to only chmod files that exist.
+* Fixed handling of Windows style file:/// uris.
+* Fixed requires in tests. (shota)
+* Fixed script generation on Windows.
+* Fixed test issues if you have older rubygems installed.
+* Gem::DependencyInstaller tests use Gem::Security, add the missing require.
+* Gem::Security used FileUtils but didn't require it.  Reported by Elia Schito.
+* Gem::Uninstaller now respects --format-executable.
+
+=== 1.5.3 / 2011-02-26
 
 Bug Fixes:
 
@@ -21,6 +68,8 @@ Bug Fixes:
 
 === 1.5.1 / 2011-02-09
 
+==== NOTE: `gem update --system` is broken. See UPGRADING.rdoc.
+
 Minor Enhancement:
 
 * Added ability to do gem update --system X.Y.Z.
@@ -36,6 +85,8 @@ Bug Fixes:
 
 === 1.5.0 / 2011-01-31
 
+==== NOTE: `gem update --system` is broken. See UPGRADING.rdoc.
+
 Major Enhancements:
 
 * Finally fixed all known 1.9.x issues. Upgrading is now possible!

data/Manifest.txt

@@ -1,6 +1,5 @@
 .autotest
 .document
-ChangeLog
 GPL.txt
 History.txt
 LICENSE.txt
@@ -109,6 +108,7 @@ test/rubygems/bogussources.rb
 test/rubygems/data/gem-private_key.pem
 test/rubygems/data/gem-public_cert.pem
 test/rubygems/fake_certlib/openssl.rb
+test/rubygems/fix_openssl_warnings.rb
 test/rubygems/foo/discover.rb
 test/rubygems/functional.rb
 test/rubygems/insure_session.rb

data/Rakefile

@@ -1,7 +1,5 @@
 # -*- ruby -*-
 
-$:.unshift 'lib'
-
 require 'rubygems'
 require 'rubygems/package_task'
 

data/lib/rubygems.rb

@@ -26,8 +26,8 @@ if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
 end
 
 require 'rubygems/defaults'
+require "rubygems/dependency_list"
 require 'rbconfig'
-require 'thread' # HACK: remove me for 1.5 - this is here just for rails
 
 ##
 # RubyGems is the Ruby standard for publishing and managing third party
@@ -118,7 +118,7 @@ require 'thread' # HACK: remove me for 1.5 - this is here just for rails
 # -The RubyGems Team
 
 module Gem
-  RubyGemsVersion = VERSION = '1.5.3'
+  VERSION = '1.6.0'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -131,25 +131,11 @@ module Gem
 
     # Version requirement of gem
     attr_accessor :requirement
+  end
 
-    def version_requirement
-      warn "#{Gem.location_of_caller.join ':'}:Warning: " \
-        "Gem::LoadError#version_requirement is deprecated " \
-        "and will be removed on or after January 2011. " \
-        "Use #requirement."
-
-      requirement
-    end
-
-    def version_requirement= requirement
-      warn "#{Gem.location_of_caller.join ':'}:Warning: " \
-        "Gem::LoadError#version_requirement= is deprecated " \
-        "and will be removed on or after January 2011. " \
-        "Use #requirement."
+  # :stopdoc:
 
-      self.requirement = requirement
-    end
-  end
+  RubyGemsVersion = VERSION
 
   RbConfigPriorities = %w[
     EXEEXT RUBY_SO_NAME arch bindir datadir libdir ruby_install_name
@@ -174,6 +160,9 @@ module Gem
   DIRECTORIES = %w[cache doc gems specifications] unless defined?(DIRECTORIES)
 
   RubyGemsPackageVersion = VERSION
+
+  RUBYGEMS_DIR = File.dirname File.expand_path(__FILE__)
+
   # :startdoc:
 
   ##
@@ -210,21 +199,30 @@ module Gem
   # activated. Returns false if it can't find the path in a gem.
 
   def self.try_activate path
+    # finds the _latest_ version... regardless of loaded specs and their deps
+
+    # TODO: use find_all and bork if ambiguous
+
     spec = Gem.searcher.find path
     return false unless spec
 
-    Gem.activate spec.name, "= #{spec.version}"
+    begin
+      Gem.activate spec.name, "= #{spec.version}"
+    rescue Gem::LoadError # this could fail due to gem dep collisions, go lax
+      Gem.activate spec.name
+    end
+
     return true
   end
 
   ##
-  # Activates an installed gem matching +gem+.  The gem must satisfy
+  # Activates an installed gem matching +dep+.  The gem must satisfy
   # +requirements+.
   #
   # Returns true if the gem is activated, false if it is already
   # loaded, or an exception otherwise.
   #
-  # Gem#activate adds the library paths in +gem+ to $LOAD_PATH.  Before a Gem
+  # Gem#activate adds the library paths in +dep+ to $LOAD_PATH.  Before a Gem
   # is activated its required Gems are activated.  If the version information
   # is omitted, the highest version Gem of the supplied name is loaded.  If a
   # Gem is not found that meets the version requirements or a required Gem is
@@ -233,63 +231,78 @@ module Gem
   # More information on version requirements can be found in the
   # Gem::Requirement and Gem::Version documentation.
 
-  def self.activate(gem, *requirements)
+  def self.activate(dep, *requirements)
+    # TODO: remove options entirely
     if requirements.last.is_a?(Hash)
       options = requirements.pop
     else
       options = {}
     end
 
-    sources = options[:sources] || []
-
-    if requirements.empty? then
-      requirements = Gem::Requirement.default
-    end
-
-    unless gem.respond_to?(:name) and
-           gem.respond_to?(:requirement) then
-      gem = Gem::Dependency.new(gem, requirements)
-    end
+    requirements = Gem::Requirement.default if requirements.empty?
+    dep = Gem::Dependency.new(dep, requirements) unless Gem::Dependency === dep
 
-    matches = Gem.source_index.find_name(gem.name, gem.requirement)
-    report_activate_error(gem) if matches.empty?
+    # TODO: remove sources entirely
+    sources = options[:sources] || []
+    matches = Gem.source_index.search dep, true
+    report_activate_error(dep) if matches.empty?
 
-    if @loaded_specs[gem.name] then
+    if @loaded_specs[dep.name] then
       # 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]
+      existing_spec = @loaded_specs[dep.name]
 
       unless matches.any? { |spec| spec.version == existing_spec.version } then
-         sources_message = sources.map { |spec| spec.full_name }
-         stack_message = @loaded_stacks[gem.name].map { |spec| spec.full_name }
+        sources_message = sources.map { |spec| spec.full_name }
+        stack_message = @loaded_stacks[dep.name].map { |spec| spec.full_name }
 
-         msg = "can't activate #{gem} for #{sources_message.inspect}, "
-         msg << "already activated #{existing_spec.full_name} for "
-         msg << "#{stack_message.inspect}"
+        msg = "can't activate #{dep} for #{sources_message.inspect}, "
+        msg << "already activated #{existing_spec.full_name} for "
+        msg << "#{stack_message.inspect}"
 
-         e = Gem::LoadError.new msg
-         e.name = gem.name
-         e.requirement = gem.requirement
+        e = Gem::LoadError.new msg
+        e.name = dep.name
+        e.requirement = dep.requirement
 
-         raise e
+        raise e
       end
 
       return false
     end
 
-    # new load
     spec = matches.last
+
+    conf = spec.conflicts
+    unless conf.empty? then
+      why = conf.map { |act,con|
+        "#{act.full_name} conflicts with #{con.join(", ")}"
+      }.join ", "
+
+      # TODO: improve message by saying who activated `con`
+
+      raise LoadError, "Unable to activate #{spec.full_name}, because #{why}"
+    end
+
     return false if spec.loaded?
 
     spec.loaded = true
-    @loaded_specs[spec.name] = spec
+    @loaded_specs[spec.name]  = spec
     @loaded_stacks[spec.name] = sources.dup
 
-    # Load dependent gems first
-    spec.runtime_dependencies.each do |dep_gem|
-      activate dep_gem, :sources => [spec, *sources]
+    spec.runtime_dependencies.each do |spec_dep|
+      next if Gem.loaded_specs.include? spec_dep.name
+      specs = Gem.source_index.search spec_dep, true
+
+      if specs.size == 1 then
+        self.activate spec_dep
+      else
+        name = spec_dep.name
+        unresolved_deps[name] = unresolved_deps[name].merge spec_dep
+      end
     end
 
+    unresolved_deps.delete spec.name
+
     require_paths = spec.require_paths.map do |path|
       File.join spec.full_gem_path, path
     end
@@ -308,6 +321,10 @@ module Gem
     return true
   end
 
+  def self.unresolved_deps
+    @unresolved_deps ||= Hash.new { |h, n| h[n] = Gem::Dependency.new n }
+  end
+
   ##
   # An Array of all possible load paths for all versions of all gems in the
   # Gem installation.
@@ -540,6 +557,7 @@ module Gem
   #   to be depending on HOME in those code samples. I propose that
   #   it should fallback to USERPROFILE and HOMEDRIVE + HOMEPATH (at
   #   least on Win32).
+  #++
 
   def self.find_home
     unless RUBY_VERSION > '1.9' then
@@ -716,6 +734,27 @@ module Gem
     @gem_path
   end
 
+  ##
+  # Get the appropriate cache path.
+  #
+  # Pass a string to use a different base path, or nil/false (default) for
+  # Gem.dir.
+  #
+
+  def self.cache_dir(custom_dir=false)
+    File.join(custom_dir ? custom_dir : Gem.dir, 'cache')
+  end
+
+  ##
+  # Given a gem path, find the gem in cache.
+  #
+  # Pass a string as the second argument to use a different base path, or
+  # nil/false (default) for Gem.dir.
+
+  def self.cache_gem(filename, user_dir=false)
+    File.join(cache_dir(user_dir), filename)
+  end
+
   ##
   # Set array of platforms this RubyGems supports (primarily for testing).
 
@@ -781,17 +820,16 @@ module Gem
   end
 
   ##
-  # The directory prefix this RubyGems was installed at.
+  # The directory prefix this RubyGems was installed at. If your
+  # prefix is in a standard location (ie, rubygems is installed where
+  # you'd expect it to be), then prefix returns nil.
 
   def self.prefix
-    dir = File.dirname File.expand_path(__FILE__)
-    prefix = File.dirname dir
+    prefix = File.dirname RUBYGEMS_DIR
 
-    if prefix == File.expand_path(ConfigMap[:sitelibdir]) or
-       prefix == File.expand_path(ConfigMap[:libdir]) or
-       'lib' != File.basename(dir) then
-      nil
-    else
+    if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
+       prefix != File.expand_path(ConfigMap[:libdir]) and
+       'lib' == File.basename(RUBYGEMS_DIR) then
       prefix
     end
   end
@@ -899,6 +937,29 @@ module Gem
     @ruby
   end
 
+  def self.latest_spec_for name
+    dependency  = Gem::Dependency.new name
+    fetcher     = Gem::SpecFetcher.fetcher
+    spec_tuples = fetcher.find_matching dependency
+
+    match = spec_tuples.select { |(n, _, p), _|
+      n == name and Gem::Platform.match p
+    }.sort_by { |(_, version, _), _|
+      version
+    }.last
+
+    match and fetcher.fetch_spec(*match)
+  end
+
+  def self.latest_version_for name
+    spec = latest_spec_for name
+    spec and spec.version
+  end
+
+  def self.latest_rubygems_version
+    latest_version_for "rubygems-update"
+  end
+
   ##
   # A Gem::Version for the currently running ruby.
 
@@ -996,6 +1057,13 @@ module Gem
     @suffix_pattern ||= "{#{suffixes.join(',')}}"
   end
 
+  def self.loaded_path? path
+    # TODO: ruby needs a feature to let us query what's loaded in 1.8 and 1.9
+    $LOADED_FEATURES.find { |s|
+      s =~ /(^|\/)#{Regexp.escape path}#{Regexp.union(*Gem.suffixes)}$/
+    }
+  end
+
   ##
   # Suffixes for require-able paths.
 
@@ -1142,12 +1210,15 @@ module Gem
 
     attr_reader :pre_uninstall_hooks
 
-    # :stopdoc:
-
-    alias cache source_index # an alias for the old name
+  end
 
-    # :startdoc:
+  def self.cache # :nodoc:
+    warn "#{Gem.location_of_caller.join ':'}:Warning: " \
+      "Gem::cache is deprecated and will be removed on or after " \
+      "August 2011.  " \
+      "Use Gem::source_index."
 
+    source_index
   end
 
   ##
@@ -1215,7 +1286,13 @@ end
 # "#{ConfigMap[:datadir]}/#{package_name}".
 
 def RbConfig.datadir(package_name)
-  require 'rbconfig/datadir' # TODO Deprecate after June 2010.
+  warn "#{Gem.location_of_caller.join ':'}:Warning: " \
+    "RbConfig.datadir is deprecated and will be removed on or after " \
+    "August 2011.  " \
+    "Use Gem::datadir."
+
+  require 'rbconfig/datadir'
+
   Gem.datadir(package_name) ||
     File.join(Gem::ConfigMap[:datadir], package_name)
 end
@@ -1246,7 +1323,7 @@ end
 ##
 # Enables the require hook for RubyGems.
 
-require 'rubygems/custom_require' unless Gem::GEM_PRELUDE_SUCKAGE
+require 'rubygems/custom_require'
 
 Gem.clear_paths