drbrain	2012-11-30 09:23:15 +0900 (Fri, 30 Nov 2012)

  New Revision: 38014

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

  Log:
    * lib/rubygems/commands/contents_command.rb:  Sort output from command.
      Replaces r38004, r38005
    * test/rubygems/test_gem_commands_contents_command.rb:  ditto.
    
    * lib/rubygems/defaults.rb:  Use Gem.path_separator for jruby support.
    * lib/rubygems/path_support.rb:  ditto

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/commands/contents_command.rb
    trunk/lib/rubygems/defaults.rb
    trunk/lib/rubygems/path_support.rb
    trunk/test/rubygems/test_gem_commands_contents_command.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38013)
+++ ChangeLog	(revision 38014)
@@ -1,3 +1,12 @@
+Fri Nov 30 09:22:52 2012  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems/commands/contents_command.rb:  Sort output from command.
+	  Replaces r38004, r38005
+	* test/rubygems/test_gem_commands_contents_command.rb:  ditto.
+
+	* lib/rubygems/defaults.rb:  Use Gem.path_separator for jruby support.
+	* lib/rubygems/path_support.rb:  ditto
+
 Fri Nov 30 08:34:03 2012  Eric Hodel  <drbrain@s...>
 
 	* lib/rdoc/generator/darkfish.rb:  Silenced warning
Index: lib/rubygems/path_support.rb
===================================================================
--- lib/rubygems/path_support.rb	(revision 38013)
+++ lib/rubygems/path_support.rb	(revision 38014)
@@ -54,7 +54,7 @@
       if gpaths.kind_of?(Array)
         gem_path = gpaths.dup
       else
-        gem_path = gpaths.split(File::PATH_SEPARATOR)
+        gem_path = gpaths.split(Gem.path_separator)
       end
 
       if File::ALT_SEPARATOR then
Index: lib/rubygems/commands/contents_command.rb
===================================================================
--- lib/rubygems/commands/contents_command.rb	(revision 38013)
+++ lib/rubygems/commands/contents_command.rb	(revision 38014)
@@ -75,14 +75,14 @@
 
         if Gem.configuration.verbose then
           say "\nDirectories searched:"
-          spec_dirs.each { |dir| say dir }
+          spec_dirs.sort.each { |dir| say dir }
         end
 
         terminate_interaction 1 if gem_names.length == 1
       end
 
       if spec.default_gem?
-        files = spec.files.map do |file|
+        files = spec.files.sort.map do |file|
           case file
           when /\A#{spec.bindir}\//
             [Gem::ConfigMap[:bindir], $POSTMATCH]
Index: lib/rubygems/defaults.rb
===================================================================
--- lib/rubygems/defaults.rb	(revision 38013)
+++ lib/rubygems/defaults.rb	(revision 38014)
@@ -58,6 +58,13 @@
   end
 
   ##
+  # How String Gem paths should be split.  Overridable for esoteric platforms.
+
+  def self.path_separator
+    File::PATH_SEPARATOR
+  end
+
+  ##
   # Default gem load path
 
   def self.default_path
Index: test/rubygems/test_gem_commands_contents_command.rb
===================================================================
--- test/rubygems/test_gem_commands_contents_command.rb	(revision 38013)
+++ test/rubygems/test_gem_commands_contents_command.rb	(revision 38014)
@@ -146,7 +146,7 @@
 #{Gem::ConfigMap[:archdir]}/default_gem.so
     EOF
 
-    assert_equal expected.lines.sort, @ui.output.lines.sort
+    assert_equal expected, @ui.output
     assert_equal "", @ui.error
   end
 

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