Merge fix for gem server, bump RubyGems version to 1.3.7

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

ChangeLog

@@ -1,3 +1,7 @@
+Sat May  1 14:08:29 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/server.rb:  Fix bug when serving gems.
+
 Sat May  1 14:05:36 2010  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc:  Upgrade to RDoc 2.5.8.

NEWS

@@ -213,6 +213,10 @@ with all sufficient information, see the ChangeLog file.
 
   * Updated to RDoc 2.5.8
 
+* RubyGems
+
+  * Updated to RubyGems 1.3.7
+
 * logger
 
   * imported upstream version (logger/1.2.7)

lib/rubygems.rb

@@ -100,7 +100,7 @@ require 'etc'
 # -The RubyGems Team
 
 module Gem
-  RubyGemsVersion = VERSION = '1.3.6.1'
+  RubyGemsVersion = VERSION = '1.3.7'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the

lib/rubygems/server.rb

@@ -797,7 +797,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     paths = { "/gems" => "/cache/", "/doc_root" => "/doc/" }
     paths.each do |mount_point, mount_dir|
       @server.mount(mount_point, WEBrick::HTTPServlet::FileHandler,
-                    File.join(@gem_dir.first, mount_dir), true)
+                    File.join(@gem_dirs.first, mount_dir), true)
     end
 
     trap("INT") { @server.shutdown; exit! }