0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Correct RAILS_GEM_VERSION regexp. Use =version gem requirement instead of ~>version so you don't get surprised by a beta gem in production. This change means upgrading to 1.2.5 will require a boot.rb upgrade.  [Jeremy Kemper]
0
+
0
 * Move custom inflections example so available before route generation.  #6829 [dcmanges, Nate, piotrb]
0
 
0
 

0
@@ -8,20 +8,23 @@ unless defined?(Rails::Initializer)
0
   else
0
     require 'rubygems'
0
 
0
-    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
0
-    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
0
-    rails_gem_version = $1
0
+    rails_gem_version =
0
+      if defined? RAILS_GEM_VERSION
0
+        RAILS_GEM_VERSION
0
+      else
0
+        File.read("#{File.dirname(__FILE__)}/environment.rb") =~ /^[^#]*RAILS_GEM_VERSION\s+=\s+'([\d.]+)'/
0
+        $1
0
+      end
0
 
0
-    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
0
-      # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
0
-      rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
0
+    if rails_gem_version
0
+      rails_gem = Gem.cache.search('rails', "=#{rails_gem_version}.0").sort_by { |g| g.version.version }.last
0
 
0
       if rails_gem
0
         gem "rails", "=#{rails_gem.version.version}"
0
         require rails_gem.full_gem_path + '/lib/initializer'
0
       else
0
-        STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
0
-    Install the missing gem with 'gem install -v=#{version} rails', or
0
+        STDERR.puts %(Cannot find gem for Rails =#{rails_gem_version}.0:
0
+    Install the missing gem with 'gem install -v=#{rails_gem_version} rails', or
0
     change environment.rb to define RAILS_GEM_VERSION with your desired version.
0
   )
0
         exit 1