diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-30 00:23:15 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-30 00:23:15 +0000 |
| commit | 82e6c75d145224eae63aab862c213b0ed8f0daf0 (patch) | |
| tree | 0d8ee6b8721757adc73d68442c667a4677899398 /lib | |
| parent | 09af9d7f7ffe1bde891040e0232038130266ccbc (diff) | |
* 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
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems/commands/contents_command.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/defaults.rb | 7 | ||||
| -rw-r--r-- | lib/rubygems/path_support.rb | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb index 404c6745bd..42c7fabd86 100644 --- a/lib/rubygems/commands/contents_command.rb +++ b/lib/rubygems/commands/contents_command.rb @@ -75,14 +75,14 @@ class Gem::Commands::ContentsCommand < Gem::Command 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] diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb index e32131b9d4..ea84e5c018 100644 --- a/lib/rubygems/defaults.rb +++ b/lib/rubygems/defaults.rb @@ -58,6 +58,13 @@ module Gem 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 diff --git a/lib/rubygems/path_support.rb b/lib/rubygems/path_support.rb index 059e372112..7195b322ef 100644 --- a/lib/rubygems/path_support.rb +++ b/lib/rubygems/path_support.rb @@ -54,7 +54,7 @@ class Gem::PathSupport 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 |