rubygems-update 1.3.7 → 1.4.0

data/.autotest

@@ -4,8 +4,9 @@ require 'autotest/restart'
 
 Autotest.add_hook :initialize do |at|
   at.order = :natural # I am a bad person - Eric Hodel
-  at.testlib = 'minitest/unit' if at.respond_to? :testlib=
+  at.testlib = 'minitest/autorun'
 
+  at.add_exception %r%/\.git/%
   at.add_exception %r%/\.svn/%
   at.add_exception %r%\.rbc$%
   at.add_exception %r%test/rubygems%
@@ -28,4 +29,6 @@ Autotest.add_hook :initialize do |at|
   # at.add_mapping %r%^test/support/(.*).rb$% do |_, m|
   #   files_matching %r%^test/test_(.*)\.rb%%
   # end
+
+  at.find_directories = ARGV unless ARGV.empty?
 end

data/ChangeLog

@@ -1,5 +1,28 @@
 # -*- coding: utf-8 -*-
 
+2010-12-29  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems/user_interaction.rb: Implemented SimpleDownloadReporter
+	  and VerboseDownloadReporter to provide a progress indicator during
+	  gem installation. Idea and patch by Ryan Melt (Pull #2)
+
+2010-12-10  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems/commands/server_command.rb: Added --launch option to
+	  automatically launch a browser window. Pull Request #11 by Gordon
+	  Thiesfeld.
+	* lib/rubygems/server.rb: ditto.
+
+2010-12-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/security.rb: Fixed indent, described how to manually
+	  verify signed gems.
+
+2010-07-10  Luis Lavena <luislavena@gmail.com>
+
+	* lib/rubygems.rb: Expand Windows user home canditates for Ruby 1.8
+	  Bug #28371
+
 2010-05-13  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems.rb:  1.3.7.

data/History.txt

@@ -1,4 +1,33 @@
-=== 1.3.7 / 2010-05-13
+=== 1.4.0 / 2010-12-31
+
+NOTE: In order to better maintain rubygems and to get it in sync with
+the world (eg, 1.9's 1.3.7 is different from our 1.3.7), rubygems is
+switching to a 4-6 week release schedule. This release is the
+precursor to that process and as such may be a bit on the wild side!
+You have been warned!
+
+NOTE: We've switched to git/github. See README.rdoc for details.
+
+New features:
+
+* Added --launch option to `gem server`. (gthiesfeld)
+* Added fuzzy name matching on install failures. (gstark/presidentbeef)
+* Allow searching w/ file extensions: gem which fileutils.rb
+* Progress indicator during download (Ryan Melton)
+* Speed up Gem::Version#<=> by 2-3x in common cases. (raggi)
+
+Bug fixes:
+
+* Dependency "~>"s now respect lower-bound prerelease versions.
+* Ensure the gem directories exist on download.
+* Expand Windows user home candidates for Ruby 1.8. Bug #28371 & #28494
+* Fix find_files to order by version.
+* Fix ivar typo. [Josh Peek]
+* Normalized requires and made many of them lazy.
+  Do not depend on rubygems to require stdlib stuff for you. (raggi/tmm1)
+* Treat 1.0.a10 like 1.0.a.10 for sorting, etc. Fixes #27903. (dchelimsky)
+
+=== 1.3.7 / 2010-05-13
 
 NOTE:
 

data/Manifest.txt

@@ -5,7 +5,7 @@ GPL.txt
 History.txt
 LICENSE.txt
 Manifest.txt
-README
+README.rdoc
 Rakefile
 bin/gem
 bin/update_rubygems

data/{README → README.rdoc}

@@ -1,9 +1,9 @@
 = RubyGems
 
-* http://rubygems.org/
-* http://docs.rubygems.org/
-* http://rubygems.rubyforge.org/
-* http://rubyforge.org/projects/rubygems
+* http://rubygems.org
+* http://docs.rubygems.org
+* http://help.rubygems.org
+* http://github.com/rubygems
 
 == DESCRIPTION
 

data/Rakefile

@@ -7,13 +7,15 @@ require 'rubygems/package_task'
 
 require 'hoe'
 
+Hoe::RUBY_FLAGS << " --disable-gems" if RUBY_VERSION > "1.9"
+
 Hoe.plugin :minitest
 
 hoe = Hoe.spec 'rubygems-update' do
   self.rubyforge_name = 'rubygems'
   self.author         = ['Jim Weirich', 'Chad Fowler', 'Eric Hodel']
   self.email          = %w[rubygems-developers@rubyforge.org]
-  self.readme_file    = 'README'
+  self.readme_file    = 'README.rdoc'
   self.need_zip       = false
   self.need_tar       = false
 
@@ -36,6 +38,8 @@ hoe = Hoe.spec 'rubygems-update' do
   extra_dev_deps << ['minitest', '~> 1.4']
   extra_dev_deps << ['session', '~> 2.4']
 
+  self.extra_rdoc_files = Dir["*.rdoc"]
+
   spec_extras['rdoc_options'] = proc do |rdoc_options|
     rdoc_options << "--title=RubyGems #{self.version} Documentation"
   end
@@ -68,21 +72,9 @@ task :prerelease => [:clobber, :sanity_check, :test, :test_functional]
 
 task :postrelease => [:tag, :publish_docs]
 
-Rake::Task[:release_to_rubyforge].clear_actions
-
-task :release_to_rubyforge do
-  files = Dir["pkg/rubygems-update*.gem"]
-  rf = RubyForge.new.configure
-  rf.login
-  rf.add_file hoe.rubyforge_name, hoe.rubyforge_name, hoe.version, files.first
-end
-
 pkg_dir_path = "pkg/rubygems-update-#{hoe.version}"
-task pkg_dir_path do
+task :package do
   mv pkg_dir_path, "pkg/rubygems-#{hoe.version}"
-end
-
-task :package => [pkg_dir_path] do
   Dir.chdir 'pkg' do
     sh "tar -czf rubygems-#{hoe.version}.tgz rubygems-#{hoe.version}"
     sh "zip -q -r rubygems-#{hoe.version}.zip rubygems-#{hoe.version}"
@@ -94,52 +86,11 @@ task :sanity_check do
 end
 
 task :tag => :sanity_check do
-  reltag = "REL_#{Gem::VERSION.gsub(/\./, '_')}"
-  svn_url = "svn+ssh://rubyforge.org/var/svn/rubygems"
-  sh %{svn copy #{svn_url}/trunk #{svn_url}/tags/#{reltag}}
+  raise "need a git version of rake tag written"
 end
 
 # Misc Tasks ---------------------------------------------------------
 
-# Git mirror support. You probably don't need to care about
-# these. Don't run 'em unless you have a John-style git-svn setup
-# pointed at a valid, pushable Git remote called "origin".
-
-namespace :git do
-  namespace :svn do
-    task(:fetch) { sh "git svn fetch" }
-  end
-
-  task :sync => %w(svn:fetch sync:branches sync:tags)
-
-  namespace :sync do
-    task :branches do
-      {
-        "trunk" => "master",
-      }.each do |svn, git|
-        sh "git push origin svn/#{svn}:#{git}"
-      end
-    end
-
-    task :tags do
-      old    = `git tag`
-      tags   = `git for-each-ref refs/remotes/svn/tags`.split "\n"
-      tagged = false
-
-      tags.each do |tag|
-        next unless /(REL_.*)$/ =~ tag
-        name, sha, _, sym = $1, *tag.split(/\s/)
-
-        next if /#{name}/ =~ old
-        sh "git tag -f '#{name}' #{sha}"
-        tagged = true
-      end
-
-      sh "git push --tags" if tagged
-    end
-  end
-end
-
 # These tasks expect to have the following directory structure:
 #
 #   git/git.rubini.us/code # Rubinius git HEAD checkout

data/lib/rbconfig/datadir.rb

@@ -4,17 +4,10 @@
 # See LICENSE.txt for permissions.
 #++
 
-module RbConfig
-
-  ##
-  # Return the path to the data directory associated with the given package
-  # name.  Normally this is just
-  # "#{RbConfig::CONFIG['datadir']}/#{package_name}", but may be modified by
-  # packages like RubyGems to handle versioned data directories.
-
-  def self.datadir(package_name)
-    File.join(CONFIG['datadir'], package_name)
-  end unless RbConfig.respond_to?(:datadir)
-
-end
+# N.B. This file is used by Config.datadir in rubygems.rb, and must not be
+# removed before that require is removed. I require to avoid warning more than
+# once.
 
+warn 'rbconfig/datadir.rb and {Rb}Config.datadir is being deprecated from '\
+ 'RubyGems. It will be removed completely on or after January 2011. If you '\
+ 'wish to rely on a datadir, please use Gem.datadir.'

data/lib/rubygems.rb

@@ -8,8 +8,8 @@
 gem_disabled = !defined? Gem
 
 require 'rubygems/defaults'
-require 'thread'
-require 'etc'
+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
@@ -100,7 +100,7 @@ require 'etc'
 # -The RubyGems Team
 
 module Gem
-  RubyGemsVersion = VERSION = '1.3.7'
+  RubyGemsVersion = VERSION = '1.4.0'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -112,40 +112,49 @@ module Gem
     attr_accessor :name
 
     # Version requirement of gem
-    attr_accessor :version_requirement
-  end
+    attr_accessor :requirement
 
-  ##
-  # Configuration settings from ::RbConfig
+    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."
 
-  ConfigMap = {} unless defined?(ConfigMap)
+      requirement
+    end
 
-  require 'rbconfig'
+    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."
 
-  ConfigMap.merge!(
-    :EXEEXT            => RbConfig::CONFIG["EXEEXT"],
-    :RUBY_SO_NAME      => RbConfig::CONFIG["RUBY_SO_NAME"],
-    :arch              => RbConfig::CONFIG["arch"],
-    :bindir            => RbConfig::CONFIG["bindir"],
-    :datadir           => RbConfig::CONFIG["datadir"],
-    :libdir            => RbConfig::CONFIG["libdir"],
-    :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
-    :ruby_version      => RbConfig::CONFIG["ruby_version"],
-    :rubylibprefix     => RbConfig::CONFIG["rubylibprefix"],
-    :sitedir           => RbConfig::CONFIG["sitedir"],
-    :sitelibdir        => RbConfig::CONFIG["sitelibdir"],
-    :vendordir         => RbConfig::CONFIG["vendordir"] ,
-    :vendorlibdir      => RbConfig::CONFIG["vendorlibdir"]
-  )
+      self.requirement = requirement
+    end
+  end
+
+  RbConfigPriorities = %w[
+    EXEEXT RUBY_SO_NAME arch bindir datadir libdir ruby_install_name
+    ruby_version rubylibprefix sitedir sitelibdir vendordir vendorlibdir
+  ]
+
+  unless defined?(ConfigMap)
+    ##
+    # Configuration settings from ::RbConfig
+    ConfigMap = Hash.new do |cm, key|
+      cm[key] = RbConfig::CONFIG[key.to_s]
+    end
+  else
+    RbConfigPriorities.each do |key|
+      ConfigMap[key.to_sym] = RbConfig::CONFIG[key]
+    end
+  end
 
   ##
   # Default directories in a gem repository
 
   DIRECTORIES = %w[cache doc gems specifications] unless defined?(DIRECTORIES)
 
-  # :stopdoc:
-  MUTEX = Mutex.new
-
   RubyGemsPackageVersion = VERSION
   # :startdoc:
 
@@ -178,7 +187,7 @@ module Gem
 
   ##
   # Activates an installed gem matching +gem+.  The gem must satisfy
-  # +version_requirements+.
+  # +requirements+.
   #
   # Returns true if the gem is activated, false if it is already
   # loaded, or an exception otherwise.
@@ -192,22 +201,22 @@ module Gem
   # More information on version requirements can be found in the
   # Gem::Requirement and Gem::Version documentation.
 
-  def self.activate(gem, *version_requirements)
-    if version_requirements.last.is_a?(Hash)
-      options = version_requirements.pop
+  def self.activate(gem, *requirements)
+    if requirements.last.is_a?(Hash)
+      options = requirements.pop
     else
       options = {}
     end
 
     sources = options[:sources] || []
 
-    if version_requirements.empty? then
-      version_requirements = Gem::Requirement.default
+    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, version_requirements)
+      gem = Gem::Dependency.new(gem, requirements)
     end
 
     matches = Gem.source_index.find_name(gem.name, gem.requirement)
@@ -228,7 +237,7 @@ module Gem
 
          e = Gem::LoadError.new msg
          e.name = gem.name
-         e.version_requirement = gem.requirement
+         e.requirement = gem.requirement
 
          raise e
       end
@@ -312,26 +321,30 @@ module Gem
   ##
   # Find the full path to the executable for gem +name+.  If the +exec_name+
   # is not given, the gem's default_executable is chosen, otherwise the
-  # specified executable's path is returned.  +version_requirements+ allows
+  # specified executable's path is returned.  +requirements+ allows
   # you to specify specific gem versions.
 
-  def self.bin_path(name, exec_name = nil, *version_requirements)
-    version_requirements = Gem::Requirement.default if
-      version_requirements.empty?
-    spec = Gem.source_index.find_name(name, version_requirements).last
+  def self.bin_path(name, exec_name = nil, *requirements)
+    requirements = Gem::Requirement.default if
+      requirements.empty?
+    specs = Gem.source_index.find_name(name, requirements)
 
     raise Gem::GemNotFoundException,
-          "can't find gem #{name} (#{version_requirements})" unless spec
+          "can't find gem #{name} (#{requirements})" if specs.empty?
 
-    exec_name ||= spec.default_executable
+    specs = specs.find_all do |spec|
+      spec.executables.include?(exec_name)
+    end if exec_name
 
-    unless exec_name
-      msg = "no default executable for #{spec.full_name}"
-      raise Gem::Exception, msg
+    unless spec = specs.last
+      msg = "can't find gem #{name} (#{requirements}) with executable #{exec_name}"
+      raise Gem::GemNotFoundException, msg
     end
 
-    unless spec.executables.include? exec_name
-      msg = "can't find executable #{exec_name} for #{spec.full_name}"
+    exec_name ||= spec.default_executable
+
+    unless exec_name
+      msg = "no default executable for #{spec.full_name} and none given"
       raise Gem::Exception, msg
     end
 
@@ -366,9 +379,7 @@ module Gem
 
     @@source_index = nil
 
-    MUTEX.synchronize do
-      @searcher = nil
-    end
+    @searcher = nil
   end
 
   ##
@@ -462,27 +473,36 @@ module Gem
   #
   #   Gem.find_files('rdoc/discover').each do |path| load path end
   #
-  # find_files search $LOAD_PATH for files as well as gems.
+  # if +check_load_path+ is true (the default), then find_files also searches
+  # $LOAD_PATH for files as well as gems.
   #
   # Note that find_files will return all files even if they are from different
   # versions of the same gem.
 
-  def self.find_files(path)
-    load_path_files = $LOAD_PATH.map do |load_path|
-      files = Dir["#{File.expand_path path, load_path}#{Gem.suffix_pattern}"]
+  def self.find_files(path, check_load_path=true)
+    files = []
 
-      files.select do |load_path_file|
-        File.file? load_path_file.untaint
+    if check_load_path
+      $LOAD_PATH.each do |load_path|
+        globbed = Dir["#{File.expand_path path, load_path}#{Gem.suffix_pattern}"]
+
+        globbed.each do |load_path_file|
+          files << load_path_file if File.file?(load_path_file.untaint)
+        end
       end
-    end.flatten
+    end
 
-    specs = searcher.find_all path
+    specs = searcher.find_all_dot_rb path
 
-    specs_files = specs.map do |spec|
-      searcher.matching_files spec, path
-    end.flatten
+    specs.each do |spec|
+      files.concat searcher.matching_files(spec, path)
+    end
+
+    # $LOAD_PATH might contain duplicate entries or reference
+    # the spec dirs directly, so we prune.
+    files.uniq! if check_load_path
 
-    (load_path_files + specs_files).flatten.uniq
+    return files
   end
 
   ##
@@ -499,18 +519,19 @@ module Gem
   def self.find_home
     unless RUBY_VERSION > '1.9' then
       ['HOME', 'USERPROFILE'].each do |homekey|
-        return ENV[homekey] if ENV[homekey]
+        return File.expand_path(ENV[homekey]) if ENV[homekey]
       end
 
       if ENV['HOMEDRIVE'] && ENV['HOMEPATH'] then
-        return "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}"
+        return File.expand_path("#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}")
       end
     end
 
     File.expand_path "~"
   rescue
     if File::ALT_SEPARATOR then
-      "C:/"
+      drive = ENV['HOMEDRIVE'] || ENV['SystemDrive']
+      File.join(drive.to_s, '/')
     else
       "/"
     end
@@ -550,6 +571,20 @@ module Gem
     Zlib::Inflate.inflate data
   end
 
+  ##
+  # Get the default RubyGems API host. This is normally
+  # <tt>https://rubygems.org</tt>.
+
+  def self.host
+    @host ||= "https://rubygems.org"
+  end
+
+  ## Set the default RubyGems API host.
+
+  def self.host= host
+    @host = host
+  end
+
   ##
   # Return a list of all possible load paths for the latest version for all
   # gems in the Gem installation.
@@ -745,9 +780,7 @@ module Gem
   def self.refresh
     source_index.refresh!
 
-    MUTEX.synchronize do
-      @searcher = nil
-    end
+    @searcher = nil
   end
 
   ##
@@ -775,7 +808,7 @@ module Gem
     end
 
     error.name = gem.name
-    error.version_requirement = gem.requirement
+    error.requirement = gem.requirement
     raise error
   end
 
@@ -837,9 +870,7 @@ module Gem
   # The GemPathSearcher object used to search for matching installed gems.
 
   def self.searcher
-    MUTEX.synchronize do
-      @searcher ||= Gem::GemPathSearcher.new
-    end
+    @searcher ||= Gem::GemPathSearcher.new
   end
 
   ##
@@ -977,11 +1008,9 @@ module Gem
   end
 
   ##
-  # Find all 'rubygems_plugin' files and load them
-
-  def self.load_plugins
-    plugins = Gem.find_files 'rubygems_plugin'
+  # Load +plugins+ as ruby files
 
+  def self.load_plugin_files(plugins)
     plugins.each do |plugin|
 
       # Skip older versions of the GemCutter plugin: Its commands are in
@@ -998,6 +1027,31 @@ module Gem
     end
   end
 
+  ##
+  # Find all 'rubygems_plugin' files in installed gems and load them
+
+  def self.load_plugins
+    load_plugin_files find_files('rubygems_plugin', false)
+  end
+
+  ##
+  # Find all 'rubygems_plugin' files in $LOAD_PATH and load them
+
+  def self.load_env_plugins
+    path = "rubygems_plugin"
+
+    files = []
+    $LOAD_PATH.each do |load_path|
+      globbed = Dir["#{File.expand_path path, load_path}#{Gem.suffix_pattern}"]
+
+      globbed.each do |load_path_file|
+        files << load_path_file if File.file?(load_path_file.untaint)
+      end
+    end
+
+    load_plugin_files files
+  end
+
   class << self
 
     ##
@@ -1044,6 +1098,16 @@ module Gem
 
   YAML_SPEC_DIR = 'quick/'
 
+  autoload :Version, 'rubygems/version'
+  autoload :Requirement, 'rubygems/requirement'
+  autoload :Dependency, 'rubygems/dependency'
+  autoload :GemPathSearcher, 'rubygems/gem_path_searcher'
+  autoload :SpecFetcher, 'rubygems/spec_fetcher'
+  autoload :Specification, 'rubygems/specification'
+  autoload :Cache, 'rubygems/source_index'
+  autoload :SourceIndex, 'rubygems/source_index'
+  autoload :Platform, 'rubygems/platform'
+  autoload :Builder, 'rubygems/builder'
 end
 
 module Kernel
@@ -1053,7 +1117,7 @@ module Kernel
   ##
   # Use Kernel#gem to activate a specific version of +gem_name+.
   #
-  # +version_requirements+ is a list of version requirements that the
+  # +requirements+ is a list of version requirements that the
   # specified gem must match, most commonly "= example.version.number".  See
   # Gem::Requirement for how to specify a version requirement.
   #
@@ -1076,10 +1140,10 @@ module Kernel
   #
   #   GEM_SKIP=libA:libB ruby -I../libA -I../libB ./mycode.rb
 
-  def gem(gem_name, *version_requirements) # :doc:
+  def gem(gem_name, *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)
+    Gem.activate(gem_name, *requirements)
   end
 
   private :gem
@@ -1093,18 +1157,12 @@ end
 # "#{ConfigMap[:datadir]}/#{package_name}".
 
 def RbConfig.datadir(package_name)
+  require 'rbconfig/datadir' # TODO Deprecate after January 2010.
   Gem.datadir(package_name) ||
     File.join(Gem::ConfigMap[:datadir], package_name)
 end
 
 require 'rubygems/exceptions'
-require 'rubygems/version'
-require 'rubygems/requirement'
-require 'rubygems/dependency'
-require 'rubygems/gem_path_searcher'    # Needed for Kernel#gem
-require 'rubygems/source_index'         # Needed for Kernel#gem
-require 'rubygems/platform'
-require 'rubygems/builder'              # HACK: Needed for rake's package task.
 
 begin
   ##
@@ -1135,6 +1193,3 @@ require 'rubygems/config_file'
 require 'rubygems/custom_require' if gem_disabled or RUBY_VERSION < '1.9'
 
 Gem.clear_paths
-
-Gem.load_plugins
-