rubygems-update 1.5.0 → 1.5.2

data/.autotest

@@ -4,6 +4,7 @@ require 'autotest/restart'
 
 Autotest.add_hook :initialize do |at|
   at.testlib = 'minitest/autorun'
+  at.unit_diff = "cat -u"
 
   at.add_exception %r%/\.git/%
   at.add_exception %r%/\.svn/%
@@ -25,9 +26,12 @@ Autotest.add_hook :initialize do |at|
     at.files_matching %r%^test/rubygems/test_(.*)\.rb$%
   end
 
-  # at.add_mapping %r%^test/support/(.*).rb$% do |_, m|
-  #   files_matching %r%^test/test_(.*)\.rb%%
-  # end
-
   at.find_directories = ARGV unless ARGV.empty?
 end
+
+class Autotest
+  alias :old_path_to_classname :path_to_classname
+  def path_to_classname s
+    old_path_to_classname(s.sub(/test.rubygems.test_/, ""))
+  end
+end

data/History.txt

@@ -1,4 +1,33 @@
-=== 1.5.0 / 2011-01-31
+=== 1.5.2 / 2011-02-10
+
+NOTE:  RubyGems 1.5.0 and 1.5.1 have a broken <tt>gem update --system</tt>.
+
+To upgrade you'll need to use the manual upgrade recipe.  Using sudo/su as
+appropriate:
+
+  $ gem install rubygems-update
+  $ update_rubygems
+
+Bug Fixes:
+
+* Fixed <tt>gem update --system</tt>.  RubyGems can now update itself again.
+
+=== 1.5.1 / 2011-02-09
+
+Minor Enhancement:
+
+* Added ability to do gem update --system X.Y.Z.
+
+Bug Fixes:
+
+* Scrub !!null YAML from 1.9.2 (install and build).
+* Added missing requires for user_interaction.
+* Wrote option processing tests for gem update.
+* Updated upgrading doco for new gem update --system option.
+* Fixed SilentUI for cygwin; try /dev/null first then fall back to NUL.
+* RubyGems now enforces ruby 1.8.7 or newer.
+
+=== 1.5.0 / 2011-01-31
 
 Major Enhancements:
 

data/Manifest.txt

@@ -178,6 +178,7 @@ test/rubygems/test_gem_remote_fetcher.rb
 test/rubygems/test_gem_requirement.rb
 test/rubygems/test_gem_security.rb
 test/rubygems/test_gem_server.rb
+test/rubygems/test_gem_silent_ui.rb
 test/rubygems/test_gem_source_index.rb
 test/rubygems/test_gem_spec_fetcher.rb
 test/rubygems/test_gem_specification.rb

data/README.rdoc

@@ -23,22 +23,6 @@ See UPGRADING.rdoc for more details and alternative instructions.
 
 -----
 
-NOTE: Ruby 1.9 ships with rubygems and contains a very buggy
-"gem-prelude". It is a gem loading system that can interfere with
-updating rubygems itself. We do NOT recommend you update to rubygems
-1.4 if you're running ruby 1.9.x until we get that sorted out in a
-future ruby release.
-
-If you absolutely hate kittens and you _must_ upgrade, you're going to
-have to do something really hokey like:
-
-% alias ruby19="ruby19 --disable-gems"
-% alias gem19="ruby19 --disable-gems -S gem"
-
-Even deleting the stock rubygems in 1.9 doesn't fix this situation.
-
------
-
 If you don't have any RubyGems install, there is still the pre-gem approach to
 getting software, doing it manually:
 

data/Rakefile

@@ -29,7 +29,7 @@ hoe = Hoe.spec 'rubygems-update' do
   self.readme_file    = 'README.rdoc'
 
   spec_extras[:required_rubygems_version] = Gem::Requirement.default
-  spec_extras[:required_ruby_version]     = Gem::Requirement.new '> 1.8.3'
+  spec_extras[:required_ruby_version]     = Gem::Requirement.new '>= 1.8.7'
   spec_extras[:executables]               = ['update_rubygems']
 
   clean_globs.push('**/debug.log',
@@ -82,9 +82,9 @@ end
 # --------------------------------------------------------------------
 # Creating a release
 
-task :prerelease => [:clobber, :sanity_check, :test, :test_functional]
+task :prerelease => [:clobber, :check_manifest, :test, :test_functional]
 
-task :postrelease => [:tag, :publish_docs]
+task :postrelease => :publish_docs
 
 pkg_dir_path = "pkg/rubygems-update-#{hoe.version}"
 task :package do
@@ -95,14 +95,6 @@ task :package do
   end
 end
 
-task :sanity_check do
-  abort "svn status dirty. commit or revert them" unless `svn st`.empty?
-end
-
-task :tag => :sanity_check do
-  raise "need a git version of rake tag written"
-end
-
 # Misc Tasks ---------------------------------------------------------
 
 # These tasks expect to have the following directory structure:
@@ -179,27 +171,3 @@ task "rcov:for", [:test] do |task, args|
   ruby "#{flags.join ' '} #{rcov} #{rflags.join ' '} #{args[:test]}"
 end
 
-task :graph do
-  $: << File.expand_path("~/Work/p4/zss/src/graph/dev/lib")
-  require 'graph'
-  deps = Graph.new
-  deps.rotate
-
-  current = nil
-  `rake -P -s`.each_line do |line|
-    case line
-    when /^rake (.+)/
-      current = $1
-      deps[current] if current # force the node to exist, in case of a leaf
-    when /^\s+(.+)/
-      deps[current] << $1 if current
-    else
-      warn "unparsed: #{line.chomp}"
-    end
-  end
-
-
-  deps.boxes
-  deps.save "graph", nil
-end
-

data/UPGRADING.rdoc

@@ -1,5 +1,10 @@
 = How to upgrade/downgrade Rubygems:
 
+== For RubyGems 1.5.0 and 1.5.1:
+
+RubyGems 1.5.0 and 1.5.1 shipped with a broken <tt>gem update --system</tt>.
+You will need to use the Manual Upgrade Recipe below.
+
 == On Ruby 1.9.x:
 
 === From stock ruby shipping with 1.9:
@@ -28,10 +33,16 @@ Use the Normal Upgrade Recipe below.
 
 === Normal Downgrade
 
+==== With rubygems 1.5.2 and higher:
+
+    $ gem update --system 1.3.7
+
+==== With rubygems 1.5.1 and lower:
+
 Use sudo/su as appropriate:
 
     $ gem install rubygems-update -v 1.3.7
-    $ update_rubygems
+    $ update_rubygems _1.3.7_
 
 Replace 1.3.7 with whatever version you want to downgrade to. This
 recipe can also be used to upgrade to a specific version instead of

data/bin/gem

@@ -9,7 +9,7 @@ require 'rubygems'
 require 'rubygems/gem_runner'
 require 'rubygems/exceptions'
 
-required_version = Gem::Requirement.new ">= 1.8.6"
+required_version = Gem::Requirement.new ">= 1.8.7"
 
 unless required_version.satisfied_by? Gem.ruby_version then
   abort "Expected Ruby Version #{required_version}, is #{Gem.ruby_version}"

data/cruise_config.rb

@@ -11,7 +11,9 @@ Project.configure do |project|
   if Socket.gethostname =~ /cibuilder.pivotallabs.com/
     # explicitly enable dev list notification only for interpreters which should be green
     interpreters_with_enabled_notification = [
-      '1.8.7-p302'
+      '1.8.7-p330',
+      '1.9.1-p378',
+      '1.9.2-p136'
     ]
     if interpreters_with_enabled_notification.include?(interpreter)
       project.email_notifier.emails = ['rubygems-developers@rubyforge.org']

data/lib/rubygems.rb

@@ -118,7 +118,7 @@ require 'thread' # HACK: remove me for 1.5 - this is here just for rails
 # -The RubyGems Team
 
 module Gem
-  RubyGemsVersion = VERSION = '1.5.0'
+  RubyGemsVersion = VERSION = '1.5.2'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the

data/lib/rubygems/commands/setup_command.rb

@@ -27,13 +27,7 @@ class Gem::Commands::SetupCommand < Gem::Command
     end
 
     add_option '--[no-]vendor',
-               'Install into vendorlibdir not sitelibdir',
-               '(Requires Ruby 1.8.7)' do |vendor, options|
-      if vendor and Gem.ruby_version < Gem::Version.new('1.8.7') then
-        raise OptionParser::InvalidOption,
-              "requires ruby 1.8.7+ (you have #{Gem.ruby_version})"
-      end
-
+               'Install into vendorlibdir not sitelibdir' do |vendor, options|
       options[:site_or_vendor] = vendor ? :vendorlibdir : :sitelibdir
     end
 
@@ -55,7 +49,7 @@ class Gem::Commands::SetupCommand < Gem::Command
   end
 
   def check_ruby_version
-    required_version = Gem::Requirement.new '>= 1.8.6'
+    required_version = Gem::Requirement.new '>= 1.8.7'
 
     unless required_version.satisfied_by? Gem.ruby_version then
       alert_error "Expected Ruby version #{required_version}, is #{Gem.ruby_version}"

data/lib/rubygems/commands/update_command.rb

@@ -21,8 +21,16 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
     add_install_update_options
 
-    add_option('--system',
+    OptionParser.accept Gem::Version do |value|
+      Gem::Version.new value
+
+      value
+    end
+
+    add_option('--system [VERSION]', Gem::Version,
                'Update the RubyGems system software') do |value, options|
+      value = true unless value
+
       options[:system] = value
     end
 
@@ -44,33 +52,13 @@ class Gem::Commands::UpdateCommand < Gem::Command
   end
 
   def execute
+    @installer = Gem::DependencyInstaller.new options
+    @updated   = []
+
     hig = {}
 
     if options[:system] then
-      say "Updating RubyGems"
-
-      unless options[:args].empty? then
-        raise "No gem names are allowed with the --system option"
-      end
-
-      rubygems_update = Gem::Specification.new
-      rubygems_update.name = 'rubygems-update'
-      rubygems_update.version = Gem::Version.new Gem::VERSION
-      hig['rubygems-update'] = rubygems_update
-
-      options[:user_install] = false
-
-      Gem.source_index.refresh!
-
-      update_gems = Gem.source_index.find_name 'rubygems-update'
-
-      latest_update_gem = update_gems.sort_by { |s| s.version }.last
-
-      say "Updating RubyGems to #{latest_update_gem.version}"
-      installed = do_rubygems_update latest_update_gem.version
-
-      say "RubyGems system software updated" if installed
-
+      update_rubygems
       return
     else
       say "Updating installed gems"
@@ -86,28 +74,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
     gems_to_update = which_to_update hig, options[:args]
 
-    updated = []
-
-    installer = Gem::DependencyInstaller.new options
-
-    gems_to_update.uniq.sort.each do |name|
-      next if updated.any? { |spec| spec.name == name }
-      success = false
-
-      say "Updating #{name}"
-      begin
-        installer.install name
-        success = true
-      rescue Gem::InstallError => e
-        alert_error "Error installing #{name}:\n\t#{e.message}"
-        success = false
-      end
-
-      installer.installed_gems.each do |spec|
-        updated << spec
-        say "Successfully installed #{spec.full_name}" if success
-      end
-    end
+    updated = update_gems gems_to_update
 
     if updated.empty? then
       say "Nothing to update"
@@ -130,12 +97,77 @@ class Gem::Commands::UpdateCommand < Gem::Command
     end
   end
 
+  def update_gem name, version = Gem::Requirement.default
+    return if @updated.any? { |spec| spec.name == name }
+    success = false
+
+    say "Updating #{name}"
+    begin
+      @installer.install name, version
+      success = true
+    rescue Gem::InstallError => e
+      alert_error "Error installing #{name}:\n\t#{e.message}"
+      success = false
+    end
+
+    @installer.installed_gems.each do |spec|
+      @updated << spec
+      say "Successfully installed #{spec.full_name}" if success
+    end
+  end
+
+  def update_gems gems_to_update
+    gems_to_update.uniq.sort.each do |name|
+      update_gem name
+    end
+
+    @updated
+  end
+
   ##
-  # Update the RubyGems software to +version+.
+  # Update RubyGems software to the latest version.
+
+  def update_rubygems
+    unless options[:args].empty? then
+      alert_error "Gem names are not allowed with the --system option"
+      terminate_interaction 1
+    end
+
+    options[:user_install] = false
+
+    version = options[:system]
+    if version == true then
+      version     = Gem::Version.new     Gem::VERSION
+      requirement = Gem::Requirement.new ">= #{Gem::VERSION}"
+    else
+      version     = Gem::Version.new     version
+      requirement = Gem::Requirement.new version
+    end
+
+    rubygems_update         = Gem::Specification.new
+    rubygems_update.name    = 'rubygems-update'
+    rubygems_update.version = version
+
+    hig = {
+      'rubygems-update' => rubygems_update
+    }
+
+    gems_to_update = which_to_update hig, options[:args]
+
+    if gems_to_update.empty? then
+      say "Latest version currently installed. Aborting."
+      terminate_interaction
+    end
+
+    update_gem gems_to_update.first, requirement
+
+    Gem.source_index.refresh!
+
+    installed_gems = Gem.source_index.find_name 'rubygems-update', requirement
+    version        = installed_gems.last.version
 
-  def do_rubygems_update(version)
     args = []
-    args.push '--prefix', Gem.prefix unless Gem.prefix.nil?
+    args << '--prefix' << Gem.prefix if Gem.prefix
     args << '--no-rdoc' unless options[:generate_rdoc]
     args << '--no-ri' unless options[:generate_ri]
     args << '--no-format-executable' if options[:no_format_executable]
@@ -148,8 +180,9 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
       # Make sure old rubygems isn't loaded
       old = ENV["RUBYOPT"]
-      ENV.delete("RUBYOPT")
-      system setup_cmd
+      ENV.delete("RUBYOPT") if old
+      installed = system setup_cmd
+      say "RubyGems system software updated" if installed
       ENV["RUBYOPT"] = old if old
     end
   end

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

@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
 #++
-# Copyright (C) 2004 Mauricio Julio Fern�ndez Pradier
+# Copyright (C) 2004 Mauricio Julio Fernández Pradier
 # See LICENSE.txt for additional licensing information.
 #--
 

data/lib/rubygems/spec_fetcher.rb

@@ -173,7 +173,7 @@ class Gem::SpecFetcher
   def suggest_gems_from_name gem_name
     gem_name        = gem_name.downcase
     max             = gem_name.size / 2
-    specs           = list.values.flatten(1) # flatten(1) is 1.8.7 and up
+    specs           = list.values.flatten 1
 
     matches = specs.map { |name, version, platform|
       next unless Gem::Platform.match platform

data/lib/rubygems/specification.rb

@@ -536,8 +536,8 @@ class Gem::Specification
 
   def self.normalize_yaml_input(input)
     result = input.respond_to?(:read) ? input.read : input
-    result = "--- " + result unless result =~ /^--- /
-    result
+    result = "--- " + result unless result =~ /\A--- /
+    result.gsub(/ !!null \n/, " \n")
   end
 
   ##
@@ -720,11 +720,13 @@ class Gem::Specification
   end
 
   def to_yaml(opts = {}) # :nodoc:
-    return super if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
-
-    YAML.quick_emit object_id, opts do |out|
-      out.map taguri, to_yaml_style do |map|
-        encode_with map
+    if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck? then
+      super.gsub(/ !!null \n/, " \n")
+    else
+      YAML.quick_emit object_id, opts do |out|
+        out.map taguri, to_yaml_style do |map|
+          encode_with map
+        end
       end
     end
   end
@@ -829,6 +831,7 @@ class Gem::Specification
   # checks..
 
   def validate
+    require 'rubygems/user_interaction'
     extend Gem::UserInteraction
     normalize
 

data/lib/rubygems/test_case.rb

@@ -18,13 +18,8 @@ require 'uri'
 require 'rubygems/package'
 require 'rubygems/test_utilities'
 require 'pp'
-require 'yaml'
 require 'zlib'
-
-begin
-  YAML::ENGINE.yamler = 'psych'
-rescue LoadError
-end if YAML.const_defined? :ENGINE
+Gem.load_yaml
 
 begin
   gem 'rdoc'
@@ -430,6 +425,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   # Additional +prerelease+ gems may also be created:
   #
   # +@a2_pre+:: gem a version 2.a
+  # TODO: nuke this and fix tests. this should speed up a lot
 
   def util_make_gems(prerelease = false)
     @a1 = quick_gem 'a', '1' do |s|
@@ -453,11 +449,12 @@ Also, a list:
       s.require_paths = %w[lib]
     end
 
-    @a2 = quick_gem('a', '2', &init)
-    @a3a = quick_gem('a', '3.a', &init)
+    @a2      = quick_gem('a', '2',      &init)
+    @a3a     = quick_gem('a', '3.a',    &init)
     @a_evil9 = quick_gem('a_evil', '9', &init)
-    @b2 = quick_gem('b', '2', &init)
-    @c1_2   = quick_gem('c', '1.2',   &init)
+    @b2      = quick_gem('b', '2',      &init)
+    @c1_2    = quick_gem('c', '1.2',    &init)
+
     @pl1     = quick_gem 'pl', '1' do |s| # l for legacy
       s.files = %w[lib/code.rb]
       s.require_paths = %w[lib]
@@ -471,12 +468,12 @@ Also, a list:
       util_build_gem @a2_pre
     end
 
-    write_file File.join(*%W[gems #{@a1.original_name} lib code.rb])
-    write_file File.join(*%W[gems #{@a2.original_name} lib code.rb])
-    write_file File.join(*%W[gems #{@a3a.original_name} lib code.rb])
-    write_file File.join(*%W[gems #{@b2.original_name} lib code.rb])
+    write_file File.join(*%W[gems #{@a1.original_name}   lib code.rb])
+    write_file File.join(*%W[gems #{@a2.original_name}   lib code.rb])
+    write_file File.join(*%W[gems #{@a3a.original_name}  lib code.rb])
+    write_file File.join(*%W[gems #{@b2.original_name}   lib code.rb])
     write_file File.join(*%W[gems #{@c1_2.original_name} lib code.rb])
-    write_file File.join(*%W[gems #{@pl1.original_name} lib code.rb])
+    write_file File.join(*%W[gems #{@pl1.original_name}  lib code.rb])
 
     [@a1, @a2, @a3a, @a_evil9, @b2, @c1_2, @pl1].each do |spec|
       util_build_gem spec

data/lib/rubygems/user_interaction.rb

@@ -530,15 +530,16 @@ class Gem::SilentUI < Gem::StreamUI
 
     reader, writer = nil, nil
 
-    if Gem.win_platform?
-      reader = File.open('nul', 'r')
-      writer = File.open('nul', 'w')
-    else
+    begin
       reader = File.open('/dev/null', 'r')
       writer = File.open('/dev/null', 'w')
+    rescue Errno::ENOENT
+      reader = File.open('nul', 'r')
+      writer = File.open('nul', 'w')
     end
 
     super reader, writer, writer
   end
+
 end
 

data/test/rubygems/test_gem_commands_update_command.rb

@@ -48,6 +48,150 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_empty out
   end
 
+  def util_setup_rubygem version
+    gem = quick_gem('rubygems-update', version.to_s) do |s|
+      s.files = %w[setup.rb]
+    end
+    write_file File.join(*%W[gems #{gem.original_name} setup.rb])
+    util_build_gem gem
+    util_setup_spec_fetcher gem
+    gem
+  end
+
+  def util_setup_rubygem8
+    @rubygem8 = util_setup_rubygem 8
+  end
+
+  def util_setup_rubygem9
+    @rubygem9 = util_setup_rubygem 9
+  end
+
+  def util_setup_rubygem_current
+    @rubygem_current = util_setup_rubygem Gem::VERSION
+  end
+
+  def util_add_to_fetcher *specs
+    specs.each do |spec|
+      gem_file = File.join @gemhome, 'cache', spec.file_name
+
+      @fetcher.data["http://gems.example.com/gems/#{spec.file_name}"] =
+        Gem.read_binary gem_file
+    end
+  end
+
+  def test_execute_system
+    util_setup_rubygem9
+    util_setup_spec_fetcher @rubygem9
+    util_add_to_fetcher @rubygem9
+    util_clear_gems
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = true
+    @cmd.options[:generate_rdoc] = false
+    @cmd.options[:generate_ri]   = false
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating rubygems-update", out.shift
+    assert_equal "Successfully installed rubygems-update-9", out.shift
+    assert_equal "Installing RubyGems 9", out.shift
+    assert_equal "RubyGems system software updated", out.shift
+
+    assert_empty out
+  end
+
+  def test_execute_system_at_latest
+    util_setup_rubygem_current
+    util_setup_spec_fetcher @rubygem_current
+    util_add_to_fetcher @rubygem_current
+    util_clear_gems
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = true
+    @cmd.options[:generate_rdoc] = false
+    @cmd.options[:generate_ri]   = false
+
+    assert_raises Gem::SystemExitException do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Latest version currently installed. Aborting.", out.shift
+    assert_empty out
+  end
+
+  def test_execute_system_multiple
+    util_setup_rubygem9
+    util_setup_rubygem8
+    util_setup_spec_fetcher @rubygem8, @rubygem9
+    util_add_to_fetcher @rubygem8, @rubygem9
+    util_clear_gems
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = true
+    @cmd.options[:generate_rdoc] = false
+    @cmd.options[:generate_ri]   = false
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating rubygems-update", out.shift
+    assert_equal "Successfully installed rubygems-update-9", out.shift
+    assert_equal "Installing RubyGems 9", out.shift
+    assert_equal "RubyGems system software updated", out.shift
+
+    assert_empty out
+  end
+
+  def test_execute_system_specific
+    util_clear_gems
+    util_setup_rubygem9
+    util_setup_rubygem8
+    util_setup_spec_fetcher @rubygem8, @rubygem9
+    util_add_to_fetcher @rubygem8, @rubygem9
+
+    @cmd.options[:args]          = []
+    @cmd.options[:system]        = "8"
+    @cmd.options[:generate_rdoc] = false
+    @cmd.options[:generate_ri]   = false
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating rubygems-update", out.shift
+    assert_equal "Successfully installed rubygems-update-8", out.shift
+    assert_equal "Installing RubyGems 8", out.shift
+    assert_equal "RubyGems system software updated", out.shift
+
+    assert_empty out
+  end
+
+  def test_execute_system_with_gems
+    @cmd.options[:args]          = %w[gem]
+    @cmd.options[:system]        = true
+    @cmd.options[:generate_rdoc] = false
+    @cmd.options[:generate_ri]   = false
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.execute
+      end
+    end
+
+    assert_empty @ui.output
+    assert_equal "ERROR:  Gem names are not allowed with the --system option\n",
+                 @ui.error
+  end
+
   # before:
   #   a1 -> c1.2
   # after:
@@ -65,9 +209,9 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     @a2.add_dependency 'c', '2'
     @a2.add_dependency 'b', '2'
 
-    @b2_path = File.join @gemhome, 'cache', @b2.file_name
+    @b2_path   = File.join @gemhome, 'cache', @b2.file_name
     @c1_2_path = File.join @gemhome, 'cache', @c1_2.file_name
-    @c2_path = File.join @gemhome, 'cache', @c2.file_name
+    @c2_path   = File.join @gemhome, 'cache', @c2.file_name
 
     @source_index = Gem::SourceIndex.new
     @source_index.add_spec @a1
@@ -166,4 +310,39 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
 
     assert_empty out
   end
+
+  def test_handle_options_system
+    @cmd.handle_options %w[--system]
+
+    expected = {
+      :generate_ri   => true,
+      :system        => true,
+      :force         => false,
+      :args          => [],
+      :generate_rdoc => true,
+    }
+
+    assert_equal expected, @cmd.options
+  end
+
+  def test_handle_options_system_non_version
+    assert_raises ArgumentError do
+      @cmd.handle_options %w[--system non-version]
+    end
+  end
+
+  def test_handle_options_system_specific
+    @cmd.handle_options %w[--system 1.3.7]
+
+    expected = {
+      :generate_ri   => true,
+      :system        => "1.3.7",
+      :force         => false,
+      :args          => [],
+      :generate_rdoc => true,
+    }
+
+    assert_equal expected, @cmd.options
+  end
+
 end

data/test/rubygems/test_gem_silent_ui.rb

@@ -88,7 +88,6 @@ class TestGemSilentUI < Gem::TestCase
   end
 
   def test_progress_reporter
-    value = nil
     out, err = capture_io do
       use_ui @sui do
         @sui.progress_reporter 10, 'hi'
@@ -100,7 +99,6 @@ class TestGemSilentUI < Gem::TestCase
   end
 
   def test_download_reporter
-    value = nil
     out, err = capture_io do
       use_ui @sui do
         @sui.download_reporter.fetch 'a.gem', 1024

data/test/rubygems/test_gem_specification.rb

@@ -161,6 +161,13 @@ end
       Gem::Specification.normalize_yaml_input(StringIO.new(input))
   end
 
+  def test_self_normalize_yaml_input_with_192_yaml
+    input = "--- !ruby/object:Gem::Specification \nblah: !!null \n"
+    expected = "--- !ruby/object:Gem::Specification \nblah: \n"
+
+    assert_equal expected, Gem::Specification.normalize_yaml_input(input)
+  end
+
   def test_initialize
     spec = Gem::Specification.new do |s|
       s.name = "blah"
@@ -878,6 +885,9 @@ end
 
   def test_to_yaml
     yaml_str = @a1.to_yaml
+
+    refute_match '!!null', yaml_str
+
     same_spec = YAML.load(yaml_str)
 
     assert_equal @a1, same_spec

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Jim Weirich
@@ -38,7 +38,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-01-31 00:00:00 -08:00
+date: 2011-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,22 +150,6 @@ description: |-
   
   -----
   
-  NOTE: Ruby 1.9 ships with rubygems and contains a very buggy
-  "gem-prelude". It is a gem loading system that can interfere with
-  updating rubygems itself. We do NOT recommend you update to rubygems
-  1.4 if you're running ruby 1.9.x until we get that sorted out in a
-  future ruby release.
-  
-  If you absolutely hate kittens and you _must_ upgrade, you're going to
-  have to do something really hokey like:
-  
-  % alias ruby19="ruby19 --disable-gems"
-  % alias gem19="ruby19 --disable-gems -S gem"
-  
-  Even deleting the stock rubygems in 1.9 doesn't fix this situation.
-  
-  -----
-  
   If you don't have any RubyGems install, there is still the pre-gem approach to
   getting software, doing it manually:
   
@@ -371,6 +355,7 @@ files:
 - test/rubygems/test_gem_requirement.rb
 - test/rubygems/test_gem_security.rb
 - test/rubygems/test_gem_server.rb
+- test/rubygems/test_gem_silent_ui.rb
 - test/rubygems/test_gem_source_index.rb
 - test/rubygems/test_gem_spec_fetcher.rb
 - test/rubygems/test_gem_specification.rb
@@ -383,7 +368,6 @@ files:
 - test/rubygems/test_kernel.rb
 - util/CL2notes
 - util/gem_prelude.rb
-- test/rubygems/test_gem_silent_ui.rb
 - .gemtest
 has_rdoc: true
 homepage: http://rubygems.org
@@ -393,20 +377,20 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.5.0 Documentation
+- --title=RubyGems 1.5.2 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 49
+      hash: 57
       segments: 
       - 1
       - 8
-      - 3
-      version: 1.8.3
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -419,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.4.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby