drbrain	2012-11-30 15:20:34 +0900 (Fri, 30 Nov 2012)

  New Revision: 38038

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38038

  Log:
    * lib/rubygems/package.rb:  Load YAML for building gems.
    * test/rubygems/test_gem_commands_contents_command.rb:  Sort expected
      output of default gem contents.  Re-fixes r38004 and r38005.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/package.rb
    trunk/test/rubygems/test_gem_commands_contents_command.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38037)
+++ ChangeLog	(revision 38038)
@@ -1,3 +1,9 @@
+Fri Nov 30 15:20:12 2012  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems/package.rb:  Load YAML for building gems.
+	* test/rubygems/test_gem_commands_contents_command.rb:  Sort expected
+	  output of default gem contents.  Re-fixes r38004 and r38005.
+
 Fri Nov 30 15:15:00 2012  Zachary Scott  <zachary@z...>
 
 	* vm_trace.c (set_trace_func): Formatting of params and events
Index: lib/rubygems/package.rb
===================================================================
--- lib/rubygems/package.rb	(revision 38037)
+++ lib/rubygems/package.rb	(revision 38038)
@@ -217,6 +217,7 @@
   # Builds this package based on the specification set by #spec=
 
   def build skip_validation = false
+    Gem.load_yaml
     require 'rubygems/security'
 
     @spec.validate unless skip_validation
Index: test/rubygems/test_gem_commands_contents_command.rb
===================================================================
--- test/rubygems/test_gem_commands_contents_command.rb	(revision 38037)
+++ test/rubygems/test_gem_commands_contents_command.rb	(revision 38038)
@@ -140,13 +140,13 @@
       @cmd.execute
     end
 
-    expected = <<-EOF
-#{Gem::ConfigMap[:bindir]}/default_command
-#{Gem::ConfigMap[:rubylibdir]}/default/gem.rb
-#{Gem::ConfigMap[:archdir]}/default_gem.so
-    EOF
+    expected = %W[
+      #{Gem::ConfigMap[:bindir]}/default_command
+      #{Gem::ConfigMap[:rubylibdir]}/default/gem.rb
+      #{Gem::ConfigMap[:archdir]}/default_gem.so
+    ].sort.join "\n"
 
-    assert_equal expected, @ui.output
+    assert_equal expected, @ui.output.chomp
     assert_equal "", @ui.error
   end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/