* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 6 deletions

diff --git a/test/rubygems/test_gem_commands_contents_command.rb b/test/rubygems/test_gem_commands_contents_command.rb
index 42e6053b21..60df53f53b 100644
--- a/test/rubygems/test_gem_commands_contents_command.rb
+++ b/test/rubygems/test_gem_commands_contents_command.rb
@@ -140,13 +140,13 @@ lib/foo.rb
       @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