rubygems-update 1.3.5 → 1.3.6

data/lib/rubygems/local_remote_options.rb

@@ -101,10 +101,9 @@ module Gem::LocalRemoteOptions
   end
 
   ##
-  # Add the --update-source option
+  # Add the --update-sources option
 
   def add_update_sources_option
-
     add_option(:"Local/Remote", '-u', '--[no-]update-sources',
                'Update local source cache') do |value, options|
       Gem.configuration.update_sources = value

data/lib/rubygems/package.rb

@@ -9,7 +9,6 @@ require 'stringio'
 require 'yaml'
 require 'zlib'
 
-require 'rubygems/digest/md5'
 require 'rubygems/security'
 require 'rubygems/specification'
 

data/lib/rubygems/package/tar_input.rb

@@ -1,3 +1,4 @@
+# -*- coding: iso-8859-1 -*-
 #++
 # Copyright (C) 2004 Mauricio Julio Fern�ndez Pradier
 # See LICENSE.txt for additional licensing information.
@@ -199,7 +200,8 @@ class Gem::Package::TarInput
   # times.  And that's the way it is.
 
   def zipped_stream(entry)
-    if defined? Rubinius then
+    if defined? Rubinius or defined? Maglev then
+      # these implementations have working Zlib
       zis = Zlib::GzipReader.new entry
       dis = zis.read
       is = StringIO.new(dis)

data/lib/rubygems/package_task.rb

@@ -97,22 +97,27 @@ class Gem::PackageTask < Rake::PackageTask
 
   def define
     super
+
     task :package => [:gem]
+
+    gem_file = gem_spec.file_name
+    gem_path = File.join package_dir, gem_file
+
     desc "Build the gem file #{gem_file}"
-    task :gem => ["#{package_dir}/#{gem_file}"]
-    file "#{package_dir}/#{gem_file}" => [package_dir] + @gem_spec.files do
-      when_writing("Creating #{gem_spec.full_name}.gem") {
+    task :gem => [gem_path]
+
+    trace = Rake.application.options.trace
+    Gem.configuration.verbose = trace
+
+    file gem_path => [package_dir] + @gem_spec.files do
+      when_writing "Creating #{gem_spec.file_name}" do
         Gem::Builder.new(gem_spec).build
-        verbose(true) {
-          mv gem_file, "#{package_dir}/#{gem_file}"
-        }
-      }
+        verbose trace do
+          mv gem_file, gem_path
+        end
+      end
     end
   end
 
-  def gem_file
-    "#{@gem_spec.full_name}.gem"
-  end
-
 end
 

data/lib/rubygems/remote_fetcher.rb

@@ -81,7 +81,7 @@ class Gem::RemoteFetcher
       cache_dir = File.join(Gem.user_dir, 'cache')
     end
 
-    gem_file_name = "#{spec.full_name}.gem"
+    gem_file_name = spec.file_name
     local_gem_path = File.join cache_dir, gem_file_name
 
     FileUtils.mkdir_p cache_dir rescue nil unless File.exist? cache_dir
@@ -138,12 +138,18 @@ class Gem::RemoteFetcher
       say "Using local gem #{local_gem_path}" if
         Gem.configuration.really_verbose
     when nil then # TODO test for local overriding cache
+      source_path = if Gem.win_platform? && source_uri.scheme &&
+                       !source_uri.path.include?(':') then
+                      "#{source_uri.scheme}:#{source_uri.path}"
+                    else
+                      source_uri.path
+                    end
+
+      source_path = URI.unescape source_path
+
       begin
-        if Gem.win_platform? && source_uri.scheme && !source_uri.path.include?(':')
-          FileUtils.cp URI.unescape(source_uri.scheme + ':' + source_uri.path), local_gem_path
-        else
-          FileUtils.cp URI.unescape(source_uri.path), local_gem_path
-        end
+        FileUtils.cp source_path, local_gem_path unless
+          File.expand_path(source_path) == File.expand_path(local_gem_path)
       rescue Errno::EACCES
         local_gem_path = source_uri.to_s
       end
@@ -317,6 +323,8 @@ class Gem::RemoteFetcher
       request.add_field 'If-Modified-Since', last_modified.rfc2822
     end
 
+    yield request if block_given?
+
     connection = connection_for uri
 
     retried = false
@@ -324,10 +332,16 @@ class Gem::RemoteFetcher
 
     begin
       @requests[connection.object_id] += 1
+
+      say "#{request.method} #{uri}" if
+        Gem.configuration.really_verbose
       response = connection.request request
-      say "#{request.method} #{response.code} #{response.message}: #{uri}" if
+      say "#{response.code} #{response.message}" if
         Gem.configuration.really_verbose
+
     rescue Net::HTTPBadResponse
+      say "bad response" if Gem.configuration.really_verbose
+
       reset connection
 
       raise FetchError.new('too many bad responses', uri) if bad_response
@@ -337,7 +351,7 @@ class Gem::RemoteFetcher
     # HACK work around EOFError bug in Net::HTTP
     # NOTE Errno::ECONNABORTED raised a lot on Windows, and make impossible
     # to install gems.
-    rescue EOFError, Errno::ECONNABORTED, Errno::ECONNRESET
+    rescue EOFError, Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EPIPE
       requests = @requests[connection.object_id]
       say "connection reset after #{requests} requests, retrying" if
         Gem.configuration.really_verbose

data/lib/rubygems/requirement.rb

@@ -1,41 +1,33 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
+require "rubygems/version"
 
 ##
-# Requirement version includes a prefaced comparator in addition
-# to a version number.
-#
-# A Requirement object can actually contain multiple, er,
-# requirements, as in (> 1.2, < 2.0).
+# A Requirement is a set of one or more version restrictions. It supports a
+# few (<tt>=, !=, >, <, >=, <=, ~></tt>) different restriction operators.
 
 class Gem::Requirement
-
   include Comparable
 
-  attr_reader :requirements
-
-  OPS = {
+  OPS = { #:nodoc:
     "="  =>  lambda { |v, r| v == r },
     "!=" =>  lambda { |v, r| v != r },
-    ">"  =>  lambda { |v, r| v > r },
-    "<"  =>  lambda { |v, r| v < r },
+    ">"  =>  lambda { |v, r| v > r  },
+    "<"  =>  lambda { |v, r| v < r  },
     ">=" =>  lambda { |v, r| v >= r },
     "<=" =>  lambda { |v, r| v <= r },
     "~>" =>  lambda { |v, r| v = v.release; v >= r && v < r.bump }
   }
 
-  OP_RE = OPS.keys.map{ |k| Regexp.quote k }.join '|'
+  quoted  = OPS.keys.map { |k| Regexp.quote k }.join "|"
+  PATTERN = /\A\s*(#{quoted})?\s*(#{Gem::Version::VERSION_PATTERN})\s*\z/
 
   ##
-  # Factory method to create a Gem::Requirement object.  Input may be a
-  # Version, a String, or nil.  Intended to simplify client code.
+  # Factory method to create a Gem::Requirement object.  Input may be
+  # a Version, a String, or nil.  Intended to simplify client code.
   #
-  # If the input is "weird", the default version requirement is returned.
+  # If the input is "weird", the default version requirement is
+  # returned.
 
-  def self.create(input)
+  def self.create input
     case input
     when Gem::Requirement then
       input
@@ -43,9 +35,9 @@ class Gem::Requirement
       new input
     else
       if input.respond_to? :to_str then
-        self.new [input.to_str]
+        new [input.to_str]
       else
-        self.default
+        default
       end
     end
   end
@@ -58,113 +50,99 @@ class Gem::Requirement
   # "A default "version requirement" can surely _only_ be '> 0'."
 
   def self.default
-    self.new ['>= 0']
+    new '>= 0'
   end
 
   ##
-  # Constructs a Requirement from +requirements+ which can be a String, a
-  # Gem::Version, or an Array of those.  See #parse for details on the
-  # formatting of requirement strings.
-
-  def initialize(requirements)
-    @requirements = case requirements
-                    when Array then
-                      requirements.map do |requirement|
-                        parse(requirement)
-                      end
-                    else
-                      [parse(requirements)]
-                    end
-    @version = nil   # Avoid warnings.
-  end
+  # Parse +obj+, returning an <tt>[op, version]</tt> pair. +obj+ can
+  # be a String or a Gem::Version.
+  #
+  # If +obj+ is a String, it can be either a full requirement
+  # specification, like <tt>">= 1.2"</tt>, or a simple version number,
+  # like <tt>"1.2"</tt>.
+  #
+  #     parse("> 1.0")                 # => [">", "1.0"]
+  #     parse("1.0")                   # => ["=", "1.0"]
+  #     parse(Gem::Version.new("1.0")) # => ["=,  "1.0"]
 
-  ##
-  # Marshal raw requirements, rather than the full object
+  def self.parse obj
+    return ["=", obj] if Gem::Version === obj
 
-  def marshal_dump # :nodoc:
-    [@requirements]
+    unless PATTERN =~ obj.to_s
+      raise ArgumentError, "Illformed requirement [#{obj.inspect}]"
+    end
+
+    [$1 || "=", Gem::Version.new($2)]
   end
 
   ##
-  # Load custom marshal format
+  # An array of requirement pairs. The first element of the pair is
+  # the op, and the second is the Gem::Version.
 
-  def marshal_load(array) # :nodoc:
-    @requirements = array[0]
-    @version = nil
+  attr_reader :requirements #:nodoc:
+
+  ##
+  # Constructs a requirement from +requirements+. Requirements can be
+  # Strings, Gem::Versions, or Arrays of those. +nil+ and duplicate
+  # requirements are ignored. An empty set of +requirements+ is the
+  # same as <tt>">= 0"</tt>.
+
+  def initialize *requirements
+    requirements = requirements.flatten
+    requirements.compact!
+    requirements.uniq!
+
+    requirements << ">= 0" if requirements.empty?
+    @requirements = requirements.map! { |r| self.class.parse r }
   end
 
-  def to_s # :nodoc:
-    as_list.join(", ")
+  def as_list # :nodoc:
+    requirements.map { |op, version| "#{op} #{version}" }
   end
 
-  def pretty_print(q) # :nodoc:
-    q.group 1, 'Gem::Requirement.new(', ')' do
-      q.pp as_list
-    end
+  def hash # :nodoc:
+    requirements.hash
   end
 
-  def as_list
-    normalize
-    @requirements.map do |op, version| "#{op} #{version}" end
+  def marshal_dump # :nodoc:
+    [@requirements]
   end
 
-  def normalize
-    return if not defined? @version or @version.nil?
-    @requirements = [parse(@version)]
-    @nums = nil
-    @version = nil
-    @op = nil
+  def marshal_load array # :nodoc:
+    @requirements = array[0]
   end
 
-  ##
-  # True if this requirement satisfied by the Gem::Version +version+.
+  def prerelease?
+    requirements.any? { |r| r.last.prerelease? }
+  end
 
-  def satisfied_by?(version)
-    normalize
-    @requirements.all? { |op, rv| satisfy?(op, version, rv) }
+  def pretty_print q # :nodoc:
+    q.group 1, 'Gem::Requirement.new(', ')' do
+      q.pp as_list
+    end
   end
 
   ##
-  # Is "+version+ +op+ +required_version+" satisfied?
+  # True if +version+ satisfies this Requirement.
 
-  def satisfy?(op, version, required_version)
-    OPS[op].call(version, required_version)
-  end
-
-  def prerelease?
-    # TODO: why is @requirements a nested array?
-    @requirements.any?{ |r| r[1].prerelease? }
+  def satisfied_by? version
+    requirements.all? { |op, rv| OPS[op].call version, rv }
   end
 
-  ##
-  # Parse the version requirement obj returning the operator and version.
-  #
-  # The requirement can be a String or a Gem::Version.  A String can be an
-  # operator (<, <=, =, >=, >, !=, ~>), a version number, or both, operator
-  # first.
-
-  def parse(obj)
-    case obj
-    when /^\s*(#{OP_RE})\s*(#{Gem::Version::VERSION_PATTERN})\s*$/o then
-      [$1, Gem::Version.new($2)]
-    when /^\s*(#{Gem::Version::VERSION_PATTERN})\s*$/o then
-      ['=', Gem::Version.new($1)]
-    when /^\s*(#{OP_RE})\s*$/o then
-      [$1, Gem::Version.new('0')]
-    when Gem::Version then
-      ['=', obj]
-    else
-      fail ArgumentError, "Illformed requirement [#{obj.inspect}]"
-    end
+  def to_s # :nodoc:
+    as_list.join ", "
   end
 
-  def <=>(other) # :nodoc:
+  def <=> other # :nodoc:
     to_s <=> other.to_s
   end
+end
 
-  def hash # :nodoc:
-    to_s.hash
-  end
+# :stopdoc:
+# Gem::Version::Requirement is used in a lot of old YAML specs. It's aliased
+# here for backwards compatibility. I'd like to remove this, maybe in RubyGems
+# 2.0.
 
-end
+::Gem::Version::Requirement = ::Gem::Requirement
+# :startdoc:
 

data/lib/rubygems/server.rb

@@ -39,9 +39,9 @@ class Gem::Server
   SEARCH = <<-SEARCH
       <form class="headerSearch" name="headerSearchForm" method="get" action="/rdoc">
         <div id="search" style="float:right">
-          <span>Filter/Search</span>
-          <input id="q" type="text" style="width:10em" name="q"/>
-          <button type="submit" style="display:none" />
+          <label for="q">Filter/Search</label>
+          <input id="q" type="text" style="width:10em" name="q">
+          <button type="submit" style="display:none"></button>
         </div>
       </form>
   SEARCH
@@ -426,15 +426,17 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
   RDOC_SEARCH
 
   def self.run(options)
-    new(options[:gemdir], options[:port], options[:daemon]).run
+    new(options[:gemdir], options[:port], options[:daemon],
+        options[:addresses]).run
   end
 
-  def initialize(gem_dir, port, daemon)
+  def initialize(gem_dir, port, daemon, addresses = nil)
     Socket.do_not_reverse_lookup = true
 
     @gem_dir = gem_dir
     @port = port
     @daemon = daemon
+    @addresses = addresses
     logger = WEBrick::Log.new nil, WEBrick::BasicLog::FATAL
     @server = WEBrick::HTTPServer.new :DoNotListen => true, :Logger => logger
 
@@ -498,6 +500,37 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     end
   end
 
+  ##
+  # Creates server sockets based on the addresses option.  If no addresses
+  # were given a server socket for all interfaces is created.
+
+  def listen addresses = @addresses
+    addresses = [nil] unless addresses
+
+    listeners = 0
+
+    addresses.each do |address|
+      begin
+        @server.listen address, @port
+        @server.listeners[listeners..-1].each do |listener|
+          host, port = listener.addr.values_at 2, 1
+          host = "[#{host}]" if host =~ /:/ # we don't reverse lookup
+          say "Server started at http://#{host}:#{port}"
+        end
+
+        listeners = @server.listeners.length
+      rescue SystemCallError
+        next
+      end
+    end
+
+    if @server.listeners.empty? then
+      say "Unable to start a server."
+      say "Check for running servers or your --bind and --port arguments"
+      terminate_interaction 1
+    end
+  end
+
   def quick(req, res)
     @source_index.refresh!
 
@@ -566,7 +599,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       deps = spec.dependencies.map do |dep|
         { "name"    => dep.name,
           "type"    => dep.type,
-          "version" => dep.version_requirements.to_s, }
+          "version" => dep.requirement.to_s, }
       end
 
       deps = deps.sort_by { |dep| [dep["name"].downcase, dep["version"]] }
@@ -602,7 +635,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       "only_one_executable" => true,
       "full_name" => "rubygems-#{Gem::RubyGemsVersion}",
       "has_deps" => false,
-      "homepage" => "http://rubygems.org/",
+      "homepage" => "http://docs.rubygems.org/",
       "name" => 'rubygems',
       "rdoc_installed" => true,
       "summary" => "RubyGems itself",
@@ -716,9 +749,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
   end
 
   def run
-    @server.listen nil, @port
-
-    say "Starting gem server on http://localhost:#{@port}/"
+    listen
 
     WEBrick::Daemon.start if @daemon