* lib/rubygems: Import RubyGems 2.1

* test/rubygems:  Ditto.


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

1 files changed, 16 insertions, 5 deletions

diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb
index 40e71cf094..39d52e7f01 100644
--- a/lib/rubygems/commands/environment_command.rb
+++ b/lib/rubygems/commands/environment_command.rb
@@ -99,6 +99,8 @@ lib/rubygems/defaults/operating_system.rb
 
       out << "  - EXECUTABLE DIRECTORY: #{Gem.bindir}\n"
 
+      out << "  - SPEC CACHE DIRECTORY: #{Gem.spec_cache_dir}\n"
+
       out << "  - RUBYGEMS PLATFORMS:\n"
       Gem.platforms.each do |platform|
         out << "    - #{platform}\n"
@@ -107,11 +109,9 @@ lib/rubygems/defaults/operating_system.rb
       out << "  - GEM PATHS:\n"
       out << "     - #{Gem.dir}\n"
 
-      path = Gem.path.dup
-      path.delete Gem.dir
-      path.each do |p|
-        out << "     - #{p}\n"
-      end
+      gem_path = Gem.path.dup
+      gem_path.delete Gem.dir
+      add_path out, gem_path
 
       out << "  - GEM CONFIGURATION:\n"
       Gem.configuration.each do |name, value|
@@ -124,6 +124,11 @@ lib/rubygems/defaults/operating_system.rb
         out << "     - #{s}\n"
       end
 
+      out << "  - SHELL PATH:\n"
+
+      shell_path = ENV['PATH'].split(File::PATH_SEPARATOR)
+      add_path out, shell_path
+
     else
       raise Gem::CommandLineError, "Unknown environment option [#{arg}]"
     end
@@ -131,5 +136,11 @@ lib/rubygems/defaults/operating_system.rb
     true
   end
 
+  def add_path out, path
+    path.each do |component|
+      out << "     - #{component}\n"
+    end
+  end
+
 end