rubygems-update 1.1.1 → 1.2.0

data/lib/rubygems/validator.rb

@@ -42,7 +42,7 @@ module Gem
     # 
     # gem_path:: [String] Path to gem file
     def verify_gem_file(gem_path)
-      File.open gem_path, 'rb' do |file|
+      open gem_path, Gem.binary_mode do |file|
         gem_data = file.read
         verify_gem gem_data
       end
@@ -91,7 +91,7 @@ module Gem
     
         begin
           verify_gem_file(gem_path)
-          File.open(gem_path, 'rb') do |file|
+          open gem_path, Gem.binary_mode do |file|
             format = Gem::Format.from_file_by_path(gem_path)
             format.file_entries.each do |entry, data|
               # Found this file.  Delete it from list
@@ -99,7 +99,7 @@ module Gem
 
               next unless data # HACK `gem check -a mkrf`
 
-              File.open(File.join(gem_directory, entry['path']), 'rb') do |f|
+              open File.join(gem_directory, entry['path']), Gem.binary_mode do |f|
                 unless Gem::MD5.hexdigest(f.read).to_s ==
                        Gem::MD5.hexdigest(data).to_s then
                   errors[gem_name] << ErrorData.new(entry['path'], "installed file doesn't match original from gem")

data/lib/rubygems/version.rb

@@ -8,6 +8,7 @@ require 'rubygems'
 
 ##
 # The Version class processes string versions into comparable values
+
 class Gem::Version
 
   include Comparable
@@ -17,11 +18,8 @@ class Gem::Version
   attr_reader :version
 
   ##
-  # Checks if version string is valid format
-  #
-  # str:: [String] the version string
-  # return:: [Boolean] true if the string format is correct, otherwise false
-  #
+  # Returns true if +version+ is a valid version string.
+
   def self.correct?(version)
     case version
     when Integer, /\A\s*(\d+(\.\d+)*)*\s*\z/ then true
@@ -36,7 +34,7 @@ class Gem::Version
   #   ver1 = Version.create('1.3.17')   # -> (Version object)
   #   ver2 = Version.create(ver1)       # -> (ver1)
   #   ver3 = Version.create(nil)        # -> nil
-  #
+
   def self.create(input)
     if input.respond_to? :version then
       input
@@ -48,10 +46,9 @@ class Gem::Version
   end
 
   ##
-  # Constructs a version from the supplied string
-  #
-  # version:: [String] The version string.  Format is digit.digit...
-  #
+  # Constructs a Version from the +version+ string.  A version string is a
+  # series of digits separated by dots.
+
   def initialize(version)
     raise ArgumentError, "Malformed version number string #{version}" unless
       self.class.correct?(version)
@@ -73,7 +70,9 @@ class Gem::Version
     self.version = array[0]
   end
 
+  ##
   # Strip ignored trailing zeros.
+
   def normalize
     @ints = build_array_from_version_string
 
@@ -94,10 +93,8 @@ class Gem::Version
   end
 
   ##
-  # Convert version to integer array
-  #
-  # return:: [Array] list of integers
-  #
+  # Returns an integer array representation of this Version.
+
   def to_ints
     normalize unless @ints
     @ints
@@ -117,20 +114,25 @@ class Gem::Version
   end
 
   ##
-  # Compares two versions
-  #
-  # other:: [Version or .ints] other version to compare to
-  # return:: [Fixnum] -1, 0, 1
-  #
+  # Compares this version with +other+ returning -1, 0, or 1 if the other
+  # version is larger, the same, or smaller than this one.
+
   def <=>(other)
+    return nil unless self.class === other
     return 1 unless other
     @ints <=> other.ints
   end
 
-  alias eql? == # :nodoc:
+  ##
+  # A Version is only eql? to another version if it has the same version
+  # string.  "1.0" is not the same version as "1".
+
+  def eql?(other)
+    self.class === other and @version == other.version
+  end
 
   def hash # :nodoc:
-    to_ints.inject { |hash_code, n| hash_code + n }
+    @version.hash
   end
 
   # Return a new version object where the next to the last revision

data/setup.rb

@@ -20,35 +20,83 @@ end
 
 $:.unshift 'lib'
 require 'rubygems'
+require 'getoptlong'
+
+opts = GetoptLong.new(
+    [ '--help',                   '-h', GetoptLong::NO_ARGUMENT ],
+    [ '--prefix',                       GetoptLong::REQUIRED_ARGUMENT ],
+    [ '--no-format-executable',         GetoptLong::NO_ARGUMENT ],
+    [ '--no-rdoc',                      GetoptLong::NO_ARGUMENT ],
+    [ '--no-ri',                        GetoptLong::NO_ARGUMENT ],
+    [ '--vendor',                       GetoptLong::NO_ARGUMENT ],
+    [ '--destdir',                      GetoptLong::REQUIRED_ARGUMENT ]
+)
+
+prefix = ''
+format_executable = true
+rdoc = true
+ri = true
+site_or_vendor = :sitelibdir
+install_destdir = ''
+
+opts.each do | opt, arg |
+  case opt
+  when '--help'
+    puts <<HELP
+ruby setup.rb [options]:
+
+RubyGems will install the gem command with a name matching ruby's
+prefix and suffix.  If ruby was installed as `ruby18`, gem will be
+installed as `gem18`.
+
+By default, this RubyGems will install gem as:
+  #{Gem.default_exec_format % 'gem'}
+
+Options:
+  --help                 Print this message
+  --prefix=DIR           Prefix path for installing RubyGems
+                         Will not affect gem repository location
+  --no-format-executable Force installation as `gem`
+  --no-rdoc              Don't build RDoc for RubyGems
+  --no-ri                Don't build ri for RubyGems
+  --vendor               Install into vendorlibdir not sitelibdir
+                         (Requires Ruby 1.8.7)
+  --destdir              Root directory to install rubygems into
+                         Used mainly for packaging RubyGems
+HELP
+    exit 0
+
+  when '--no-rdoc'
+    rdoc = false
+
+  when '--no-ri'
+    ri = false
+
+  when '--no-format-executable'
+    format_executable = false
+
+  when '--prefix'
+    prefix = File.expand_path(arg)
+
+  when '--vendor'
+    vendor_dir_version = Gem::Version::Requirement.create('>= 1.8.7')
+    unless vendor_dir_version.satisfied_by? Gem.ruby_version then
+      abort "To use --vendor you need ruby #{vendor_dir_version}, current #{Gem.ruby_version}"
+    end
+    site_or_vendor = :vendorlibdir
+
+  when '--destdir'
+    install_destdir = File.expand_path(arg)
+  end
+end
 
-if ARGV.include? '--help' or ARGV.include? '-h' then
-  puts "ruby setup.rb [options]:"
-  puts
-  puts "RubyGems will install the gem command with a name matching ruby's"
-  puts "prefix and suffix.  If ruby was installed as `ruby18`, gem will be"
-  puts "installed as `gem18`."
-  puts
-  puts "By default, this RubyGems will install gem as:"
-  puts
-  puts "  #{Gem.default_exec_format % 'gem'}"
-  puts
-  puts "Options:"
-  puts
-  puts "  --prefix=DIR           Prefix path for installing RubyGems"
-  puts "                         Will not affect gem repository location"
-  puts
-  puts "  --no-format-executable Force installation as `gem`"
-  puts
-  puts "  --no-rdoc              Don't build RDoc for RubyGems"
-  puts
-  puts "  --no-ri                Don't build ri for RubyGems"
-
-  exit
+unless install_destdir.empty? then
+  ENV['GEM_HOME'] ||= File.join(install_destdir,
+                                Gem.default_dir.sub(/\A[a-z]:/i, ''))
 end
 
 require 'fileutils'
 require 'rbconfig'
-require 'rdoc/rdoc'
 require 'tmpdir'
 
 include FileUtils::Verbose
@@ -66,42 +114,33 @@ end
 lib_dir = nil
 bin_dir = nil
 
-if ARGV.grep(/^--prefix/).empty? then
-  lib_dir = Gem::ConfigMap[:sitelibdir]
+if prefix.empty?
+  lib_dir = Gem::ConfigMap[site_or_vendor]
   bin_dir = Gem::ConfigMap[:bindir]
 else
-  prefix = nil
-
-  prefix_arg = ARGV.grep(/^--prefix=/).first
-  if prefix_arg =~ /^--prefix=(.*)/ then
-    prefix = $1
-  else
-    path_index = ARGV.index '--prefix'
-    prefix = ARGV[path_index + 1]
-  end
-
-  prefix = File.expand_path prefix
-
-  raise "invalid --prefix #{prefix.inspect}" if prefix.nil?
-
   # Apple installed RubyGems into libdir, and RubyGems <= 1.1.0 gets confused
-  # about installation location, so switch back to sitelibdir.
+  # about installation location, so switch back to sitelibdir/vendorlibdir.
   if defined?(APPLE_GEM_HOME) and
       # just in case Apple and RubyGems don't get this patched up proper.
      (prefix == Gem::ConfigMap[:libdir] or
       # this one is important
       prefix == File.join(Gem::ConfigMap[:libdir], 'ruby')) then
-    lib_dir = Gem::ConfigMap[:sitelibdir]
+    lib_dir = Gem::ConfigMap[site_or_vendor]
     bin_dir = Gem::ConfigMap[:bindir]
   else
     lib_dir = File.join prefix, 'lib'
     bin_dir = File.join prefix, 'bin'
-
-    mkdir_p lib_dir
-    mkdir_p bin_dir
   end
 end
 
+unless install_destdir.empty?
+  lib_dir = File.join install_destdir, lib_dir
+  bin_dir = File.join install_destdir, bin_dir
+end
+
+mkdir_p lib_dir
+mkdir_p bin_dir
+
 Dir.chdir 'lib' do
   lib_files = Dir[File.join('**', '*rb')]
 
@@ -122,10 +161,10 @@ Dir.chdir 'bin' do
   bin_files.delete 'update_rubygems'
 
   bin_files.each do |bin_file|
-    bin_file_formatted = if ARGV.include? '--no-format-executable' then
-                           bin_file
-                         else
+    bin_file_formatted = if format_executable then
                            Gem.default_exec_format % bin_file
+                         else
+                           bin_file
                          end
 
     dest_file = File.join bin_dir, bin_file_formatted
@@ -202,14 +241,17 @@ abort "#{deprecation_message}"
 end
 
 # Remove source caches
+if install_destdir.empty?
+  require 'rubygems/source_info_cache'
 
-require 'rubygems/source_info_cache'
-
-user_cache_file = Gem::SourceInfoCache.user_cache_file
-system_cache_file = Gem::SourceInfoCache.system_cache_file
+  user_cache_file = File.join(install_destdir,
+                              Gem::SourceInfoCache.user_cache_file)
+  system_cache_file = File.join(install_destdir,
+                                Gem::SourceInfoCache.system_cache_file)
 
-rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
-rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
+  rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
+  rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
+end
 
 # install RDoc
 
@@ -226,6 +268,13 @@ if File.writable? gem_doc_dir and
   end
 
   def run_rdoc(*args)
+    begin
+      gem 'rdoc'
+    rescue Gem::LoadError
+    end
+
+    require 'rdoc/rdoc'
+
     args << '--quiet'
     args << '--main' << 'README'
     args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
@@ -234,13 +283,13 @@ if File.writable? gem_doc_dir and
     r.document args
   end
 
-  unless ARGV.include? '--no-ri' then
+  if ri then
     ri_dir = File.join rubygems_doc_dir, 'ri'
     puts "Installing #{rubygems_name} ri into #{ri_dir}"
     run_rdoc '--ri', '--op', ri_dir
   end
 
-  unless ARGV.include? '--no-rdoc' then
+  if rdoc then
     rdoc_dir = File.join rubygems_doc_dir, 'rdoc'
     puts "Installing #{rubygems_name} rdoc into #{rdoc_dir}"
     run_rdoc '--op', rdoc_dir
@@ -250,50 +299,6 @@ else
   puts "Set the GEM_HOME environment variable if you want RDoc generated"
 end
 
-# Remove stubs
-
-def stub?(path)
-  return unless File.readable? path
-  File.read(path, 40) =~ /^# This file was generated by RubyGems/ and
-  File.readlines(path).size < 20
-end
-
-puts "As of RubyGems 0.8.0, library stubs are no longer needed."
-puts "Searching $LOAD_PATH for stubs to optionally delete (may take a while)"
-
-gemfiles = Dir[File.join("{#{($LOAD_PATH).join(',')}}", '**', '*.rb')]
-gemfiles = gemfiles.map { |file| File.expand_path file }.uniq
-
-puts "...done."
-
-seen_stub = false
-
-gemfiles.each do |file|
-  next if File.directory? file
-  next unless stub? file
-
-  unless seen_stub then
-    puts "\nRubyGems has detected stubs that can be removed.  Confirm their removal:"
-  end
-  seen_stub = true
-
-  print "  * remove #{file}? [y/n] "
-  answer = gets
-
-  if answer =~ /y/i then
-    unlink file
-    puts "        (removed)"
-  else
-    puts "        (skipping)"
-  end
-end
-
-if seen_stub then
-  puts "Finished with library stubs."
-else
-  puts "No library stubs found."
-end
-
 puts
 puts "-" * 78
 puts

data/test/gemutilities.rb

@@ -10,10 +10,9 @@ at_exit { $SAFE = 1 }
 require 'fileutils'
 require 'test/unit'
 require 'tmpdir'
-require 'tempfile'
 require 'uri'
-require 'rubygems/source_info_cache'
 require 'rubygems/package'
+require 'rubygems/test_utilities'
 
 require File.join(File.expand_path(File.dirname(__FILE__)), 'mockgemui')
 
@@ -27,54 +26,6 @@ module Gem
   end
 end
 
-class FakeFetcher
-
-  attr_reader :data
-  attr_accessor :uri
-  attr_accessor :paths
-
-  def initialize
-    @data = {}
-    @paths = []
-    @uri = nil
-  end
-
-  def fetch_path(path)
-    path = path.to_s
-    @paths << path
-    raise ArgumentError, 'need full URI' unless path =~ %r'^http://'
-    data = @data[path]
-    raise Gem::RemoteFetcher::FetchError, "no data for #{path}" if data.nil?
-    data.respond_to?(:call) ? data.call : data
-  end
-
-  def fetch_size(path)
-    path = path.to_s
-    @paths << path
-    raise ArgumentError, 'need full URI' unless path =~ %r'^http://'
-    data = @data[path]
-    raise Gem::RemoteFetcher::FetchError, "no data for #{path}" if data.nil?
-    data.respond_to?(:call) ? data.call : data.length
-  end
-
-  def download spec, source_uri, install_dir = Gem.dir
-    name = "#{spec.full_name}.gem"
-    path = File.join(install_dir, 'cache', name)
-
-    Gem.ensure_gem_subdirectories install_dir
-
-    if source_uri =~ /^http/ then
-      File.open(path, "wb") do |f|
-        f.write fetch_path(File.join(source_uri, "gems", name))
-      end
-    else
-      FileUtils.cp source_uri, path
-    end
-
-    path
-  end
-end
-
 class RubyGemTestCase < Test::Unit::TestCase
 
   include Gem::DefaultUserInteraction
@@ -94,8 +45,13 @@ class RubyGemTestCase < Test::Unit::TestCase
     @gemcache = File.join(@gemhome, "source_cache")
     @usrcache = File.join(@gemhome, ".gem", "user_cache")
     @latest_usrcache = File.join(@gemhome, ".gem", "latest_user_cache")
+    @userhome = File.join @tempdir, 'userhome'
+
+    ENV['HOME'] = @userhome
+    Gem.instance_variable_set :@user_home, nil
 
     FileUtils.mkdir_p @gemhome
+    FileUtils.mkdir_p @userhome
 
     ENV['GEMCACHE'] = @usrcache
     Gem.use_paths(@gemhome)
@@ -104,9 +60,12 @@ class RubyGemTestCase < Test::Unit::TestCase
     Gem.configuration.verbose = true
     Gem.configuration.update_sources = true
 
-    @gem_repo = "http://gems.example.com"
+    @gem_repo = "http://gems.example.com/"
+    @uri = URI.parse @gem_repo
     Gem.sources.replace [@gem_repo]
 
+    Gem::SpecFetcher.fetcher = nil
+
     @orig_BASERUBY = Gem::ConfigMap[:BASERUBY]
     Gem::ConfigMap[:BASERUBY] = Gem::ConfigMap[:RUBY_INSTALL_NAME]
 
@@ -131,7 +90,7 @@ class RubyGemTestCase < Test::Unit::TestCase
     Gem::ConfigMap[:arch] = @orig_arch
 
     if defined? Gem::RemoteFetcher then
-      Gem::RemoteFetcher.instance_variable_set :@fetcher, nil
+      Gem::RemoteFetcher.fetcher = nil
     end
 
     FileUtils.rm_rf @tempdir
@@ -141,7 +100,6 @@ class RubyGemTestCase < Test::Unit::TestCase
     ENV.delete 'GEM_PATH'
 
     Gem.clear_paths
-    Gem::SourceInfoCache.instance_variable_set :@cache, nil
   end
 
   def install_gem gem
@@ -154,7 +112,7 @@ class RubyGemTestCase < Test::Unit::TestCase
     end
 
     gem = File.join(@tempdir, "#{gem.full_name}.gem").untaint
-    Gem::Installer.new(gem).install
+    Gem::Installer.new(gem, :wrappers => true).install
   end
 
   def prep_cache_files(lc)
@@ -231,6 +189,8 @@ class RubyGemTestCase < Test::Unit::TestCase
 
     spec.loaded_from = written_path
 
+    Gem.source_index.add_spec spec
+
     return spec
   end
 
@@ -254,6 +214,12 @@ class RubyGemTestCase < Test::Unit::TestCase
     end
   end
 
+  def util_clear_gems
+    FileUtils.rm_r File.join(@gemhome, 'gems')
+    FileUtils.rm_r File.join(@gemhome, 'specifications')
+    Gem.source_index.refresh!
+  end
+
   def util_gem(name, version, &block)
     spec = quick_gem(name, version, &block)
 
@@ -271,6 +237,16 @@ class RubyGemTestCase < Test::Unit::TestCase
     [spec, cache_file]
   end
 
+  def util_gzip(data)
+    out = StringIO.new
+
+    Zlib::GzipWriter.wrap out do |io|
+      io.write data
+    end
+
+    out.string
+  end
+
   def util_make_gems
     init = proc do |s|
       s.files = %w[lib/code.rb]
@@ -303,7 +279,7 @@ class RubyGemTestCase < Test::Unit::TestCase
   end
 
   ##
-  # Set the platform to +cpu+ and +os+
+  # Set the platform to +arch+
 
   def util_set_arch(arch)
     Gem::ConfigMap[:arch] = arch
@@ -320,9 +296,7 @@ class RubyGemTestCase < Test::Unit::TestCase
     require 'socket'
     require 'rubygems/remote_fetcher'
 
-    @uri = URI.parse @gem_repo
-    @fetcher = FakeFetcher.new
-    @fetcher.uri = @uri
+    @fetcher = Gem::FakeFetcher.new
 
     util_make_gems
 
@@ -338,10 +312,11 @@ class RubyGemTestCase < Test::Unit::TestCase
     @source_index.add_spec @a_evil9
     @source_index.add_spec @c1_2
 
-    Gem::RemoteFetcher.instance_variable_set :@fetcher, @fetcher
+    Gem::RemoteFetcher.fetcher = @fetcher
   end
 
   def util_setup_source_info_cache(*specs)
+    require 'rubygems/source_info_cache'
     require 'rubygems/source_info_cache_entry'
 
     specs = Hash[*specs.map { |spec| [spec.full_name, spec] }.flatten]
@@ -356,6 +331,35 @@ class RubyGemTestCase < Test::Unit::TestCase
     sic.reset_cache_data
 
     Gem::SourceInfoCache.instance_variable_set :@cache, sic
+
+    si
+  end
+
+  def util_setup_spec_fetcher(*specs)
+    specs = Hash[*specs.map { |spec| [spec.full_name, spec] }.flatten]
+    si = Gem::SourceIndex.new specs
+
+    spec_fetcher = Gem::SpecFetcher.fetcher
+
+    spec_fetcher.specs[@uri] = []
+    si.gems.sort_by { |_, spec| spec }.each do |_, spec|
+      spec_tuple = [spec.name, spec.version, spec.original_platform]
+      spec_fetcher.specs[@uri] << spec_tuple
+    end
+
+    spec_fetcher.latest_specs[@uri] = []
+    si.latest_specs.sort.each do |spec|
+      spec_tuple = [spec.name, spec.version, spec.original_platform]
+      spec_fetcher.latest_specs[@uri] << spec_tuple
+    end
+
+    si.gems.sort_by { |_,spec| spec }.each do |_, spec|
+      path = "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{spec.original_name}.gemspec.rz"
+      data = Marshal.dump spec
+      data_deflate = Zlib::Deflate.deflate data
+      @fetcher.data[path] = data_deflate
+    end
+
     si
   end
 
@@ -384,30 +388,3 @@ class RubyGemTestCase < Test::Unit::TestCase
 
 end
 
-class TempIO
-
-  @@count = 0
-
-  def initialize(string = '')
-    @tempfile = Tempfile.new "TempIO-#{@@count ++ 1}"
-    @tempfile.binmode
-    @tempfile.write string
-    @tempfile.rewind
-  end
-
-  def method_missing(meth, *args, &block)
-    @tempfile.send(meth, *args, &block)
-  end
-
-  def respond_to?(meth)
-    @tempfile.respond_to? meth
-  end
-
-  def string
-    @tempfile.flush
-
-    Gem.read_binary @tempfile.path
-  end
-
-end
-