rubygems-update 1.4.2 → 1.5.0

data/{test/gem_installer_test_case.rb → lib/rubygems/installer_test_case.rb}

@@ -1,25 +1,64 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/installer'
 
 class Gem::Installer
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
   attr_accessor :gem_dir
 
+  ##
+  # Available through requiring rubygems/installer_test_case
+
   attr_writer :format
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
   attr_writer :gem_home
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
   attr_writer :env_shebang
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
   attr_writer :ignore_dependencies
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
   attr_writer :format_executable
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
   attr_writer :security_policy
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
   attr_writer :spec
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
   attr_writer :wrappers
 end
 
-class GemInstallerTestCase < RubyGemTestCase
+##
+# A test case for Gem::Installer.
+
+class Gem::InstallerTestCase < Gem::TestCase
 
   def setup
     super
 
     @spec = quick_gem 'a'
+
     @gem = File.join @tempdir, @spec.file_name
 
     @installer = util_installer @spec, @gem, @gemhome

data/{test/mockgemui.rb → lib/rubygems/mock_gem_ui.rb}

@@ -1,7 +1,11 @@
 require 'stringio'
 require 'rubygems/user_interaction'
 
-class MockGemUi < Gem::StreamUI
+##
+# This Gem::StreamUI subclass records input and output to StringIO for
+# retrieval during tests.
+
+class Gem::MockGemUi < Gem::StreamUI
   class TermError < RuntimeError; end
 
   module TTY
@@ -13,6 +17,9 @@ class MockGemUi < Gem::StreamUI
       @tty
     end
 
+    def noecho
+      yield self
+    end
   end
 
   def initialize(input = "")

data/lib/rubygems/old_format.rb

@@ -22,8 +22,9 @@ class Gem::OldFormat
 
   def initialize(gem_path)
     require 'fileutils'
-    require 'yaml'
     require 'zlib'
+    Gem.load_yaml
+
     @gem_path = gem_path
   end
 

data/lib/rubygems/package.rb

@@ -4,7 +4,6 @@
 # See LICENSE.txt for additional licensing information.
 #++
 
-require 'rubygems/security'
 require 'rubygems/specification'
 
 ##
@@ -40,7 +39,23 @@ module Gem::Package
   class ClosedIO < Error; end
   class BadCheckSum < Error; end
   class TooLongFileName < Error; end
-  class FormatError < Error; end
+  class FormatError < Error
+    attr_reader :path
+
+    def initialize message, path = nil
+      @path = path
+
+      message << " in #{path}" if path
+
+      super message
+    end
+
+  end
+
+  ##
+  # Raised when a tar file is corrupt
+
+  class TarInvalidError < Error; end
 
   def self.open(io, mode = "r", signer = nil, &block)
     tar_type = case mode

data/lib/rubygems/package/tar_input.rb

@@ -4,8 +4,8 @@
 # See LICENSE.txt for additional licensing information.
 #--
 
-require "yaml"
-require "zlib"
+require 'zlib'
+Gem.load_yaml
 
 class Gem::Package::TarInput
 
@@ -111,7 +111,11 @@ class Gem::Package::TarInput
     @tarreader.rewind
     @fileops = Gem::FileOperations.new
 
-    raise Gem::Package::FormatError, "No metadata found!" unless has_meta
+    unless has_meta then
+      path = io.path if io.respond_to? :path
+      error = Gem::Package::FormatError.new 'no metadata found', path
+      raise error
+    end
   end
 
   def close

data/lib/rubygems/package/tar_output.rb

@@ -79,6 +79,7 @@ class Gem::Package::TarOutput
       # if we have a signing key, then sign the data
       # digest and return the signature
       if @signer then
+        require 'rubygems/security'
         digest = Gem::Security::OPT[:dgst_algo].digest sio.string
         @data_signature = @signer.sign digest
         inner.write sio.string
@@ -107,6 +108,7 @@ class Gem::Package::TarOutput
         # if we have a signing key, then sign the metadata digest and return
         # the signature
         if @signer then
+          require 'rubygems/security'
           digest = Gem::Security::OPT[:dgst_algo].digest sio.string
           @meta_signature = @signer.sign digest
           io.write sio.string

data/lib/rubygems/package/tar_reader/entry.rb

@@ -67,6 +67,10 @@ class Gem::Package::TarReader::Entry
     else
       @header.name
     end
+  rescue ArgumentError => e
+    raise unless e.message == 'string contains null byte'
+    raise Gem::Package::TarInvalidError,
+          'tar is corrupt, name contains null byte'
   end
 
   ##

data/{test/gem_package_tar_test_case.rb → lib/rubygems/package/tar_test_case.rb}

@@ -1,7 +1,10 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/package'
 
-class TarTestCase < RubyGemTestCase
+##
+# A test case for Gem::Package::Tar* classes
+
+class Gem::Package::TarTestCase < Gem::TestCase
 
   def ASCIIZ(str, length)
     str + "\0" * (length - str.length)

data/lib/rubygems/package_task.rb

@@ -86,7 +86,7 @@ class Gem::PackageTask < Rake::PackageTask
   # Initialization tasks without the "yield self" or define operations.
 
   def init(gem)
-    super gem.name, gem.version
+    super gem.full_name, :noversion
     @gem_spec = gem
     @package_files += gem_spec.files if gem_spec.files
   end
@@ -114,11 +114,13 @@ class Gem::PackageTask < Rake::PackageTask
       chdir(gem_dir) do
         when_writing "Creating #{gem_spec.file_name}" do
           Gem::Builder.new(gem_spec).build
-          verbose(true) {
-            mv gem_file, ".."
-          }
+          verbose trace do
+            mv gem_file, '..'
+          end
         end
       end
     end
   end
+
 end
+

data/lib/rubygems/remote_fetcher.rb

@@ -195,12 +195,20 @@ class Gem::RemoteFetcher
 
   def escape(str)
     return unless str
-    URI.escape(str)
+    @uri_parser ||= uri_escaper
+    @uri_parser.escape str
   end
 
   def unescape(str)
     return unless str
-    URI.unescape(str)
+    @uri_parser ||= uri_escaper
+    @uri_parser.unescape str
+  end
+
+  def uri_escaper
+    URI::Parser.new
+  rescue NameError
+    URI
   end
 
   ##

data/lib/rubygems/require_paths_builder.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 
+# TODO: remove after 1.9.1 dropped
 module Gem::RequirePathsBuilder
   def write_require_paths_file_if_needed(spec = @spec, gem_home = @gem_home)
     return if spec.require_paths == ["lib"] &&
@@ -13,5 +14,5 @@ module Gem::RequirePathsBuilder
       file.puts spec.bindir if spec.bindir
     end
   end
-end
+end if Gem::QUICKLOADER_SUCKAGE
 

data/lib/rubygems/server.rb

@@ -1,5 +1,4 @@
 require 'webrick'
-require 'yaml'
 require 'zlib'
 require 'erb'
 
@@ -21,7 +20,6 @@ require 'rubygems/doc_manager'
 # * legacy indexes:
 #   * "/Marshal.#{Gem.marshal_version}" - Full SourceIndex dump of metadata
 #     for installed gems
-#   * "/yaml" - YAML dump of metadata for installed gems - deprecated
 #
 # == Usage
 #
@@ -554,19 +552,6 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     add_date res
 
     case req.request_uri.path
-    when '/quick/index' then
-      res.body << @source_index.map { |name,| name }.sort.join("\n")
-    when '/quick/index.rz' then
-      index = @source_index.map { |name,| name }.sort.join("\n")
-      res['content-type'] = 'application/x-deflate'
-      res.body << Gem.deflate(index)
-    when '/quick/latest_index' then
-      index = @source_index.latest_specs.map { |spec| spec.full_name }
-      res.body << index.sort.join("\n")
-    when '/quick/latest_index.rz' then
-      index = @source_index.latest_specs.map { |spec| spec.full_name }
-      res['content-type'] = 'application/x-deflate'
-      res.body << Gem.deflate(index.sort.join("\n"))
     when %r|^/quick/(Marshal.#{Regexp.escape Gem.marshal_version}/)?(.*?)-([0-9.]+)(-.*?)?\.gemspec\.rz$| then
       dep = Gem::Dependency.new $2, $3
       specs = @source_index.search dep
@@ -591,9 +576,6 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       elsif marshal_format then
         res['content-type'] = 'application/x-deflate'
         res.body << Gem.deflate(Marshal.dump(specs.first))
-      else # deprecated YAML format
-        res['content-type'] = 'application/x-deflate'
-        res.body << Gem.deflate(specs.first.to_yaml)
       end
     else
       raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
@@ -673,10 +655,12 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     template = ERB.new(DOC_TEMPLATE)
     res['content-type'] = 'text/html'
 
-    # this is used by binding, 1.9.3dev warns anyways
     values = { "gem_count" => specs.size.to_s, "specs" => specs,
                "total_file_count" => total_file_count.to_s }
 
+    # suppress 1.9.3dev warning about unused variable
+    values = values
+
     result = template.result binding
     res.body = result
   end
@@ -770,9 +754,6 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 
     WEBrick::Daemon.start if @daemon
 
-    @server.mount_proc "/yaml", method(:yaml)
-    @server.mount_proc "/yaml.Z", method(:yaml)
-
     @server.mount_proc "/Marshal.#{Gem.marshal_version}", method(:Marshal)
     @server.mount_proc "/Marshal.#{Gem.marshal_version}.Z", method(:Marshal)
 
@@ -837,28 +818,6 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     end
   end
 
-  def yaml(req, res)
-    @source_index.refresh!
-
-    add_date res
-
-    index = @source_index.to_yaml
-
-    if req.path =~ /Z$/ then
-      res['content-type'] = 'application/x-deflate'
-      index = Gem.deflate index
-    else
-      res['content-type'] = 'text/plain'
-    end
-
-    if req.request_method == 'HEAD' then
-      res['content-length'] = index.length
-      return
-    end
-
-    res.body << index
-  end
-  
   def launch
     listeners = @server.listeners.map{|l| l.addr[2] }
 

data/lib/rubygems/source_index.rb

@@ -4,7 +4,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'rubygems/user_interaction'
 require 'rubygems/specification'
 
 ##
@@ -22,8 +21,6 @@ class Gem::SourceIndex
 
   include Enumerable
 
-  include Gem::UserInteraction
-
   attr_reader :gems # :nodoc:
 
   ##
@@ -32,8 +29,6 @@ class Gem::SourceIndex
   attr_accessor :spec_dirs
 
   class << self
-    include Gem::UserInteraction
-
     ##
     # Factory method to construct a source index instance for a given
     # path.
@@ -322,19 +317,9 @@ class Gem::SourceIndex
     latest_specs.each do |local|
       dependency = Gem::Dependency.new local.name, ">= #{local.version}"
 
-      begin
-        fetcher = Gem::SpecFetcher.fetcher
-        remotes = fetcher.find_matching dependency
-        remotes = remotes.map { |(_, version, _), _| version }
-      rescue Gem::RemoteFetcher::FetchError => e
-        raise unless fetcher.warn_legacy e do
-          require 'rubygems/source_info_cache'
-
-          specs = Gem::SourceInfoCache.search_with_source dependency, true
-
-          remotes = specs.map { |spec,| spec.version }
-        end
-      end
+      fetcher = Gem::SpecFetcher.fetcher
+      remotes = fetcher.find_matching dependency
+      remotes = remotes.map { |(_, version, _), _| version }
 
       latest = remotes.sort.last
 
@@ -344,43 +329,6 @@ class Gem::SourceIndex
     outdateds
   end
 
-  ##
-  # Updates this SourceIndex from +source_uri+.  If +all+ is false, only the
-  # latest gems are fetched.
-
-  def update(source_uri, all)
-    source_uri = URI.parse source_uri unless URI::Generic === source_uri
-    source_uri.path += '/' unless source_uri.path =~ /\/$/
-
-    use_incremental = false
-
-    begin
-      gem_names = fetch_quick_index source_uri, all
-      remove_extra gem_names
-      missing_gems = find_missing gem_names
-
-      return false if missing_gems.size.zero?
-
-      say "Missing metadata for #{missing_gems.size} gems" if
-      missing_gems.size > 0 and Gem.configuration.really_verbose
-
-      use_incremental = missing_gems.size <= Gem.configuration.bulk_threshold
-    rescue Gem::OperationNotSupportedError => ex
-      alert_error "Falling back to bulk fetch: #{ex.message}" if
-      Gem.configuration.really_verbose
-      use_incremental = false
-    end
-
-    if use_incremental then
-      update_with_missing(source_uri, missing_gems)
-    else
-      new_index = fetch_bulk_index(source_uri)
-      @gems.replace(new_index.gems)
-    end
-
-    true
-  end
-
   def ==(other) # :nodoc:
     self.class === other and @gems == other.gems
   end
@@ -389,167 +337,6 @@ class Gem::SourceIndex
     Marshal.dump(self)
   end
 
-  private
-
-  def fetcher
-    require 'rubygems/remote_fetcher'
-
-    Gem::RemoteFetcher.fetcher
-  end
-
-  def fetch_index_from(source_uri)
-    @fetch_error = nil
-
-    indexes = %W[
-        Marshal.#{Gem.marshal_version}.Z
-        Marshal.#{Gem.marshal_version}
-        yaml.Z
-        yaml
-      ]
-
-    indexes.each do |name|
-      spec_data = nil
-      index = source_uri + name
-      begin
-        spec_data = fetcher.fetch_path index
-        spec_data = unzip(spec_data) if name =~ /\.Z$/
-
-        if name =~ /Marshal/ then
-          return Marshal.load(spec_data)
-        else
-          return YAML.load(spec_data)
-        end
-      rescue => e
-        if Gem.configuration.really_verbose then
-          alert_error "Unable to fetch #{name}: #{e.message}"
-        end
-
-        @fetch_error = e
-      end
-    end
-
-    nil
-  end
-
-  def fetch_bulk_index(source_uri)
-    say "Bulk updating Gem source index for: #{source_uri}" if
-      Gem.configuration.verbose
-
-    index = fetch_index_from(source_uri)
-    if index.nil? then
-      raise Gem::RemoteSourceException,
-              "Error fetching remote gem cache: #{@fetch_error}"
-    end
-    @fetch_error = nil
-    index
-  end
-
-  ##
-  # Get the quick index needed for incremental updates.
-
-  def fetch_quick_index(source_uri, all)
-    index = all ? 'index' : 'latest_index'
-
-    zipped_index = fetcher.fetch_path source_uri + "quick/#{index}.rz"
-
-    unzip(zipped_index).split("\n")
-  rescue ::Exception => e
-    unless all then
-      say "Latest index not found, using quick index" if
-        Gem.configuration.really_verbose
-
-      fetch_quick_index source_uri, true
-    else
-      raise Gem::OperationNotSupportedError,
-            "No quick index found: #{e.message}"
-    end
-  end
-
-  ##
-  # Make a list of full names for all the missing gemspecs.
-
-  def find_missing(spec_names)
-    unless defined? @originals then
-      @originals = {}
-      each do |full_name, spec|
-        @originals[spec.original_name] = spec
-      end
-    end
-
-    spec_names.find_all { |full_name|
-      @originals[full_name].nil?
-    }
-  end
-
-  def remove_extra(spec_names)
-    dictionary = {}
-    spec_names.each { |k| dictionary[k] = true }
-    each do |name, spec|
-      remove_spec name unless dictionary.include? spec.original_name
-    end
-  end
-
-  ##
-  # Unzip the given string.
-
-  def unzip(string)
-    require 'zlib'
-    Gem.inflate string
-  end
-
-  ##
-  # Tries to fetch Marshal representation first, then YAML
-
-  def fetch_single_spec(source_uri, spec_name)
-    @fetch_error = nil
-
-    begin
-      marshal_uri = source_uri + "quick/Marshal.#{Gem.marshal_version}/#{spec_name}.gemspec.rz"
-      zipped = fetcher.fetch_path marshal_uri
-      return Marshal.load(unzip(zipped))
-    rescue => ex
-      @fetch_error = ex
-
-      if Gem.configuration.really_verbose then
-        say "unable to fetch marshal gemspec #{marshal_uri}: #{ex.class} - #{ex}"
-      end
-    end
-
-    begin
-      yaml_uri = source_uri + "quick/#{spec_name}.gemspec.rz"
-      zipped = fetcher.fetch_path yaml_uri
-      return YAML.load(unzip(zipped))
-    rescue => ex
-      @fetch_error = ex
-      if Gem.configuration.really_verbose then
-        say "unable to fetch YAML gemspec #{yaml_uri}: #{ex.class} - #{ex}"
-      end
-    end
-
-    nil
-  end
-
-  ##
-  # Update the cached source index with the missing names.
-
-  def update_with_missing(source_uri, missing_names)
-    progress = ui.progress_reporter(missing_names.size,
-        "Updating metadata for #{missing_names.size} gems from #{source_uri}")
-    missing_names.each do |spec_name|
-      gemspec = fetch_single_spec(source_uri, spec_name)
-      if gemspec.nil? then
-        ui.say "Failed to download spec #{spec_name} from #{source_uri}:\n" \
-                 "\t#{@fetch_error.message}"
-      else
-        add_spec gemspec
-        progress.updated spec_name
-      end
-      @fetch_error = nil
-    end
-    progress.done
-    progress.count
-  end
-
 end
 
 # :stopdoc: