rubygems-update 1.3.5 → 1.3.6

data/lib/rubygems/commands/query_command.rb

@@ -45,7 +45,7 @@ class Gem::Commands::QueryCommand < Gem::Command
       options[:all] = value
     end
 
-    add_option(      '--prerelease',
+    add_option(      '--[no-]prerelease',
                'Display prerelease versions') do |value, options|
       options[:prerelease] = value
     end
@@ -111,6 +111,9 @@ class Gem::Commands::QueryCommand < Gem::Command
       begin
         fetcher = Gem::SpecFetcher.fetcher
         spec_tuples = fetcher.find_matching dep, all, false, prerelease
+
+        spec_tuples += fetcher.find_matching dep, false, false, true if
+          prerelease and all
       rescue Gem::RemoteFetcher::FetchError => e
         if prerelease then
           raise Gem::OperationNotSupportedError,

data/lib/rubygems/commands/rdoc_command.rb

@@ -8,7 +8,7 @@ class Gem::Commands::RdocCommand < Gem::Command
   def initialize
     super 'rdoc', 'Generates RDoc for pre-installed gems',
           :version => Gem::Requirement.default,
-          :include_rdoc => true, :include_ri => true
+          :include_rdoc => true, :include_ri => true, :overwrite => false
 
     add_option('--all',
                'Generate RDoc/RI documentation for all',
@@ -17,15 +17,20 @@ class Gem::Commands::RdocCommand < Gem::Command
     end
 
     add_option('--[no-]rdoc',
-               'Include RDoc generated documents') do |value, options|
+               'Generate RDoc HTML') do |value, options|
       options[:include_rdoc] = value
     end
 
     add_option('--[no-]ri',
-               'Include RI generated documents') do |value, options|
+               'Generate RI data') do |value, options|
       options[:include_ri] = value
     end
 
+    add_option('--[no-]overwrite',
+               'Overwrite installed documents') do |value, options|
+      options[:overwrite] = value
+    end
+
     add_version_option
   end
 
@@ -34,7 +39,14 @@ class Gem::Commands::RdocCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--version '#{Gem::Requirement.default}' --rdoc --ri"
+    "--version '#{Gem::Requirement.default}' --rdoc --ri --no-overwrite"
+  end
+
+  def description # :nodoc:
+    <<-DESC
+The rdoc command builds RDoc and RI documentation for installed gems.  Use
+--overwrite to force rebuilding of documentation.
+    DESC
   end
 
   def usage # :nodoc:
@@ -53,24 +65,27 @@ class Gem::Commands::RdocCommand < Gem::Command
     end
 
     if specs.empty?
-      fail "Failed to find gem #{gem_name} to generate RDoc for #{options[:version]}"
+      raise "Failed to find gem #{gem_name} to generate RDoc for #{options[:version]}"
     end
 
     if options[:include_ri]
-      specs.each do |spec|
-        Gem::DocManager.new(spec).generate_ri
+      specs.sort.each do |spec|
+        doc = Gem::DocManager.new(spec)
+        doc.generate_ri if options[:overwrite] || !doc.ri_installed?
       end
 
       Gem::DocManager.update_ri_cache
     end
 
     if options[:include_rdoc]
-      specs.each do |spec|
-        Gem::DocManager.new(spec).generate_rdoc
+      specs.sort.each do |spec|
+        doc = Gem::DocManager.new(spec)
+        doc.generate_rdoc if options[:overwrite] || !doc.rdoc_installed?
       end
     end
 
     true
   end
+
 end
 

data/lib/rubygems/commands/server_command.rb

@@ -36,6 +36,12 @@ class Gem::Commands::ServerCommand < Gem::Command
     add_option '--[no-]daemon', 'run as a daemon' do |daemon, options|
       options[:daemon] = daemon
     end
+
+    add_option '-b', '--bind=HOST,HOST',
+               'addresses to bind', Array do |address, options|
+      options[:addresses] ||= []
+      options[:addresses].push(*address)
+    end
   end
 
   def defaults_str # :nodoc:

data/lib/rubygems/commands/setup_command.rb

@@ -2,7 +2,6 @@ require 'rubygems/command'
 require 'fileutils'
 require 'rbconfig'
 require 'tmpdir'
-require 'pathname'
 
 ##
 # Installs RubyGems itself.  This command is ordinarily only available from a
@@ -57,10 +56,10 @@ class Gem::Commands::SetupCommand < Gem::Command
   end
 
   def check_ruby_version
-    required_version = Gem::Version.new '1.8.3'
+    required_version = Gem::Requirement.new '>= 1.8.6'
 
-    unless Gem.ruby_version > required_version then
-      alert_error "Ruby version > #{required_version} required, is #{Gem.ruby_version}"
+    unless required_version.satisfied_by? Gem.ruby_version then
+      alert_error "Expected Ruby version #{required_version}, is #{Gem.ruby_version}"
       terminate_interaction 1
     end
   end
@@ -117,6 +116,8 @@ By default, this RubyGems will install gem as:
 
     say "RubyGems #{Gem::VERSION} installed"
 
+    uninstall_old_gemcutter
+
     install_rdoc
 
     say
@@ -359,5 +360,14 @@ abort "#{deprecation_message}"
     r.document args
   end
 
+  def uninstall_old_gemcutter
+    require 'rubygems/uninstaller'
+
+    ui = Gem::Uninstaller.new('gemcutter', :all => true, :ignore => true,
+                              :version => '< 0.4')
+    ui.uninstall
+  rescue Gem::InstallError
+  end
+
 end
 

data/lib/rubygems/commands/unpack_command.rb

@@ -41,7 +41,7 @@ class Gem::Commands::UnpackCommand < Gem::Command
       path = get_path name, options[:version]
 
       if path then
-        basename = File.basename(path).sub(/\.gem$/, '')
+        basename = File.basename(path, '.gem')
         target_dir = File.expand_path File.join(options[:target], basename)
         FileUtils.mkdir_p target_dir
         Gem::Installer.new(path, :unpack => true).unpack target_dir
@@ -79,7 +79,7 @@ class Gem::Commands::UnpackCommand < Gem::Command
     # We expect to find (basename).gem in the 'cache' directory.
     # Furthermore, the name match must be exact (ignoring case).
     if gemname =~ /^#{selected.name}$/i
-      filename = selected.full_name + '.gem'
+      filename = selected.file_name
       path = nil
 
       Gem.path.find do |gem_dir|

data/lib/rubygems/commands/update_command.rb

@@ -28,8 +28,8 @@ class Gem::Commands::UpdateCommand < Gem::Command
     end
 
     add_local_remote_options
-
     add_platform_option
+    add_prerelease_option "as update targets"
   end
 
   def arguments # :nodoc:
@@ -51,7 +51,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
       say "Updating RubyGems"
 
       unless options[:args].empty? then
-        fail "No gem names are allowed with the --system option"
+        raise "No gem names are allowed with the --system option"
       end
 
       rubygems_update = Gem::Specification.new

data/lib/rubygems/commands/which_command.rb

@@ -27,13 +27,11 @@ class Gem::Commands::WhichCommand < Gem::Command
     "--no-gems-first --no-all"
   end
 
-  def usage # :nodoc:
-    "#{program_name} FILE [FILE ...]"
-  end
-
   def execute
     searcher = Gem::GemPathSearcher.new
 
+    found = false
+
     options[:args].each do |arg|
       dirs = $LOAD_PATH
       spec = searcher.find arg
@@ -44,19 +42,19 @@ class Gem::Commands::WhichCommand < Gem::Command
         else
           dirs = $LOAD_PATH + gem_paths(spec)
         end
-
-        say "(checking gem #{spec.full_name} for #{arg})" if
-          Gem.configuration.verbose and $stdout.tty?
       end
 
       paths = find_paths arg, dirs
 
       if paths.empty? then
-        say "Can't find ruby library file or shared library #{arg}"
+        alert_error "Can't find ruby library file or shared library #{arg}"
       else
         say paths
+        found = true
       end
     end
+
+    terminate_interaction 1 unless found
   end
 
   def find_paths(package_name, dirs)
@@ -80,7 +78,7 @@ class Gem::Commands::WhichCommand < Gem::Command
   end
 
   def usage # :nodoc:
-    "#{program_name} FILE [...]"
+    "#{program_name} FILE [FILE ...]"
   end
 
 end

data/lib/rubygems/config_file.rb

@@ -4,10 +4,26 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'yaml'
-
-# Store the gem command options specified in the configuration file.  The
-# config file object acts much like a hash.
+##
+# Gem::ConfigFile RubyGems options and gem command options from ~/.gemrc.
+#
+# ~/.gemrc is a YAML file that uses strings to match gem command arguments and
+# symbols to match RubyGems options.
+#
+# Gem command arguments use a String key that matches the command name and
+# allow you to specify default arguments:
+#
+#   install: --no-rdoc --no-ri
+#   update: --no-rdoc --no-ri
+#
+# You can use <tt>gem:</tt> to set default arguments for all commands.
+#
+# RubyGems options use symbol keys.  Valid options are:
+#
+# +:backtrace+:: See #backtrace
+# +:benchmark+:: See #benchmark
+# +:sources+:: Sets Gem::sources
+# +:verbose+:: See #verbose
 
 class Gem::ConfigFile
 
@@ -52,49 +68,74 @@ class Gem::ConfigFile
 
   SYSTEM_WIDE_CONFIG_FILE = File.join system_config_path, 'gemrc'
 
+  ##
   # List of arguments supplied to the config file object.
+
   attr_reader :args
 
-  # Where to look for gems
+  ##
+  # Where to look for gems (deprecated)
+
   attr_accessor :path
 
+  ##
+  # Where to install gems (deprecated)
+
   attr_accessor :home
 
+  ##
   # True if we print backtraces on errors.
+
   attr_writer :backtrace
 
+  ##
   # True if we are benchmarking this run.
+
   attr_accessor :benchmark
 
-  # Bulk threshold value.  If the number of missing gems are above
-  # this threshold value, then a bulk download technique is used.
+  ##
+  # Bulk threshold value.  If the number of missing gems are above this
+  # threshold value, then a bulk download technique is used.  (deprecated)
+
   attr_accessor :bulk_threshold
 
+  ##
   # Verbose level of output:
   # * false -- No output
   # * true -- Normal output
   # * :loud -- Extra output
+
   attr_accessor :verbose
 
+  ##
   # True if we want to update the SourceInfoCache every time, false otherwise
+
   attr_accessor :update_sources
 
+  ##
+  # API key for RubyGems.org
+
+  attr_reader :rubygems_api_key
+
+  ##
   # Create the config file object.  +args+ is the list of arguments
   # from the command line.
   #
   # The following command line options are handled early here rather
   # than later at the time most command options are processed.
   #
-  # * --config-file and --config-file==NAME -- Obviously these need
-  #   to be handled by the ConfigFile object to ensure we get the
-  #   right config file.
-  #
-  # * --backtrace -- Backtrace needs to be turned on early so that
-  #   errors before normal option parsing can be properly handled.
+  # <tt>--config-file</tt>, <tt>--config-file==NAME</tt>::
+  #   Obviously these need to be handled by the ConfigFile object to ensure we
+  #   get the right config file.
   #
-  # * --debug -- Enable Ruby level debug messages.  Handled early
-  #   for the same reason as --backtrace.
+  # <tt>--backtrace</tt>::
+  #   Backtrace needs to be turned on early so that errors before normal
+  #   option parsing can be properly handled.
   #
+  # <tt>--debug</tt>::
+  #   Enable Ruby level debug messages.  Handled early for the same reason as
+  #   --backtrace.
+
   def initialize(arg_list)
     @config_file_name = nil
     need_config_file_name = false
@@ -131,21 +172,53 @@ class Gem::ConfigFile
     @hash = @hash.merge user_config
 
     # HACK these override command-line args, which is bad
-    @backtrace = @hash[:backtrace] if @hash.key? :backtrace
-    @benchmark = @hash[:benchmark] if @hash.key? :benchmark
-    @bulk_threshold = @hash[:bulk_threshold] if @hash.key? :bulk_threshold
-    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] if @hash.key? :gempath
-    @home = @hash[:gemhome] if @hash.key? :gemhome
+    @backtrace        = @hash[:backtrace]        if @hash.key? :backtrace
+    @benchmark        = @hash[:benchmark]        if @hash.key? :benchmark
+    @bulk_threshold   = @hash[:bulk_threshold]   if @hash.key? :bulk_threshold
+    @home             = @hash[:gemhome]          if @hash.key? :gemhome
+    @path             = @hash[:gempath]          if @hash.key? :gempath
+    @update_sources   = @hash[:update_sources]   if @hash.key? :update_sources
+    @verbose          = @hash[:verbose]          if @hash.key? :verbose
+
+    load_rubygems_api_key
 
+    Gem.sources = @hash[:sources] if @hash.key? :sources
     handle_arguments arg_list
   end
 
+  ##
+  # Location of RubyGems.org credentials
+
+  def credentials_path
+    File.join(Gem.user_home, '.gem', 'credentials')
+  end
+
+  def load_rubygems_api_key
+    api_key_hash = File.exists?(credentials_path) ? load_file(credentials_path) : @hash
+
+    @rubygems_api_key = api_key_hash[:rubygems_api_key] if api_key_hash.key? :rubygems_api_key
+  end
+
+  def rubygems_api_key=(api_key)
+    config = load_file(credentials_path).merge(:rubygems_api_key => api_key)
+
+    dirname = File.dirname(credentials_path)
+    Dir.mkdir(dirname) unless File.exists?(dirname)
+
+    require 'yaml'
+
+    File.open(credentials_path, 'w') do |f|
+      f.write config.to_yaml
+    end
+
+    @rubygems_api_key = api_key
+  end
+
   def load_file(filename)
+    return {} unless filename and File.exists?(filename)
     begin
-      YAML.load(File.read(filename)) if filename and File.exist?(filename)
+      require 'yaml'
+      YAML.load(File.read(filename))
     rescue ArgumentError
       warn "Failed to load #{config_file_name}"
     rescue Errno::EACCES
@@ -239,8 +312,9 @@ class Gem::ConfigFile
 
   # Writes out this config file, replacing its source.
   def write
-    File.open config_file_name, 'w' do |fp|
-      fp.write self.to_yaml
+    require 'yaml'
+    open config_file_name, 'w' do |io|
+      io.write to_yaml
     end
   end
 

data/lib/rubygems/defaults.rb

@@ -9,7 +9,7 @@ module Gem
   # An Array of the default sources that come with RubyGems
 
   def self.default_sources
-    %w[http://gems.rubyforge.org/]
+    %w[http://rubygems.org/]
   end
 
   ##

data/lib/rubygems/dependency.rb

@@ -1,14 +1,22 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
+require "rubygems/requirement"
 
 ##
-# The Dependency class holds a Gem name and a Gem::Requirement
+# The Dependency class holds a Gem name and a Gem::Requirement.
 
 class Gem::Dependency
 
+  # :stopdoc:
+  @warned_version_requirement = false
+
+  def self.warned_version_requirement
+    @warned_version_requirement
+  end
+
+  def self.warned_version_requirement= value
+    @warned_version_requirement = value
+  end
+  # :startdoc:
+
   ##
   # Valid dependency types.
   #--
@@ -16,9 +24,9 @@ class Gem::Dependency
   # Gem::Specification::CURRENT_SPECIFICATION_VERSION as well.
 
   TYPES = [
-    :development,
-    :runtime,
-  ]
+           :development,
+           :runtime,
+          ]
 
   ##
   # Dependency name or regular expression.
@@ -26,122 +34,172 @@ class Gem::Dependency
   attr_accessor :name
 
   ##
-  # Dependency type.
+  # Allows you to force this dependency to be a prerelease.
 
-  attr_reader :type
+  attr_writer :prerelease
 
   ##
-  # Dependent versions.
-
-  attr_writer :version_requirements
-
-  ##
-  # Orders dependencies by name only.
+  # Dependency type.
 
-  def <=>(other)
-    [@name] <=> [other.name]
-  end
+  attr_reader :type
 
   ##
-  # Constructs a dependency with +name+ and +requirements+.
+  # Constructs a dependency with +name+ and +requirements+. The last
+  # argument can optionally be the dependency type, which defaults to
+  # <tt>:runtime</tt>.
 
-  def initialize(name, version_requirements, type=:runtime)
-    @name = name
+  def initialize name, *requirements
+    type         = Symbol === requirements.last ? requirements.pop : :runtime
+    requirements = requirements.first if 1 == requirements.length # unpack
 
     unless TYPES.include? type
-      raise ArgumentError, "Valid types are #{TYPES.inspect}, not #{@type.inspect}"
+      raise ArgumentError, "Valid types are #{TYPES.inspect}, "
+        + "not #{@type.inspect}"
     end
 
-    @type = type
+    @name        = name
+    @requirement = Gem::Requirement.create requirements
+    @type        = type
+    @prerelease  = false
 
-    @version_requirements = Gem::Requirement.create version_requirements
-    @version_requirement = nil   # Avoid warnings.
-  end
+    # This is for Marshal backwards compatability. See the comments in
+    # +requirement+ for the dirty details.
 
-  def version_requirements
-    normalize if defined? @version_requirement and @version_requirement
-    @version_requirements
+    @version_requirements = @requirement
   end
 
-  def requirement_list
-    version_requirements.as_list
-  end
+  ##
+  # What does this dependency require?
 
-  alias requirements_list requirement_list
+  ##
+  # A dependency's hash is the XOR of the hashes of +name+, +type+,
+  # and +requirement+.
 
-  def normalize
-    ver = @version_requirement.instance_variable_get :@version
-    @version_requirements = Gem::Requirement.new([ver])
-    @version_requirement = nil
+  def hash # :nodoc:
+    name.hash ^ type.hash ^ requirement.hash
   end
 
-  def to_s # :nodoc:
-    "#{name} (#{version_requirements}, #{@type || :runtime})"
+  def inspect # :nodoc:
+    "<%s type=%p name=%p requirements=%p>" %
+      [self.class, @type, @name, requirement.to_s]
+  end
+
+  ##
+  # Does this dependency require a prerelease?
+
+  def prerelease?
+    @prerelease || requirement.prerelease?
   end
 
   def pretty_print(q) # :nodoc:
     q.group 1, 'Gem::Dependency.new(', ')' do
-      q.pp @name
+      q.pp name
       q.text ','
       q.breakable
 
-      q.pp @version_requirements
+      q.pp requirement
 
       q.text ','
       q.breakable
 
-      q.pp @type
+      q.pp type
     end
   end
 
-  def ==(other) # :nodoc:
-    self.class === other &&
-      self.name == other.name &&
-      self.type == other.type &&
-      self.version_requirements == other.version_requirements
+  def requirement
+    return @requirement if defined?(@requirement) and @requirement
+
+    # @version_requirements and @version_requirement are legacy ivar
+    # names, and supported here because older gems need to keep
+    # working and Dependency doesn't implement marshal_dump and
+    # marshal_load. In a happier world, this would be an
+    # attr_accessor. The horrifying instance_variable_get you see
+    # below is also the legacy of some old restructurings.
+    #
+    # Note also that because of backwards compatibility (loading new
+    # gems in an old RubyGems installation), we can't add explicit
+    # marshaling to this class until we want to make a big
+    # break. Maybe 2.0.
+    #
+    # Children, define explicit marshal and unmarshal behavior for
+    # public classes. Marshal formats are part of your public API.
+
+    if defined?(@version_requirement) && @version_requirement
+      version = @version_requirement.instance_variable_get :@version
+      @version_requirement  = nil
+      @version_requirements = Gem::Requirement.new version
+    end
+
+    @requirement = @version_requirements if defined?(@version_requirements)
   end
 
   ##
-  # Uses this dependency as a pattern to compare to +other+.  This dependency
-  # will match if the name matches the other's name, and other has only an
-  # equal version requirement that satisfies this dependency.
+  # Rails subclasses Gem::Dependency and uses this method, so we'll hack
+  # around it.
 
-  def =~(other)
-    other = if self.class === other then
-              other
-            else
-              return false unless other.respond_to? :name and
-                                  other.respond_to? :version
+  alias __requirement requirement # :nodoc:
 
-              Gem::Dependency.new other.name, other.version
-            end
+  def requirements_list
+    requirement.as_list
+  end
 
-    pattern = @name
-    pattern = /\A#{Regexp.escape @name}\Z/ unless Regexp === pattern
+  def to_s # :nodoc:
+    "#{name} (#{requirement}, #{type})"
+  end
 
-    return false unless pattern =~ other.name
+  def version_requirements # :nodoc:
+    unless Gem::Dependency.warned_version_requirement then
+      warn "#{Gem.location_of_caller.join ':'}:Warning: " \
+           "Gem::Dependency#version_requirements is deprecated " \
+           "and will be removed on or after August 2010.  " \
+           "Use #requirement"
 
-    reqs = other.version_requirements.requirements
+      Gem::Dependency.warned_version_requirement = true
+    end
 
-    return false unless reqs.length == 1
-    return false unless reqs.first.first == '='
+    __requirement
+  end
 
-    version = reqs.first.last
+  alias_method :version_requirement, :version_requirements
 
-    version_requirements.satisfied_by? version
+  def == other # :nodoc:
+    Gem::Dependency === other &&
+      self.name        == other.name &&
+      self.type        == other.type &&
+      self.requirement == other.requirement
   end
 
   ##
-  # A dependency's hash is the sum of the hash of the #name, #type and
-  # #version_requirements
+  # Dependencies are ordered by name.
 
-  def hash
-    name.hash + type.hash + version_requirements.hash
+  def <=> other
+    [@name] <=> [other.name]
   end
 
-  def inspect # :nodoc:
-    "<%s type=%p name=%p requirements=%p>" % [self.class, @type, @name,
-      version_requirements.to_s]
+  ##
+  # Uses this dependency as a pattern to compare to +other+. This
+  # dependency will match if the name matches the other's name, and
+  # other has only an equal version requirement that satisfies this
+  # dependency.
+
+  def =~ other
+    unless Gem::Dependency === other
+      other = Gem::Dependency.new other.name, other.version rescue return false
+    end
+
+    pattern = name
+    pattern = /\A#{Regexp.escape pattern}\Z/ unless Regexp === pattern
+
+    return false unless pattern =~ other.name
+
+    reqs = other.requirement.requirements
+
+    return false unless reqs.length == 1
+    return false unless reqs.first.first == '='
+
+    version = reqs.first.last
+
+    requirement.satisfied_by? version
   end
 
 end