Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 wi…

…ll give you 1.1.6.4520 if available [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Nov 23, 2006 · 958e9a3 · 958e9a3
1 parent 3805c12
commit 958e9a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available [DHH]
+
 * Update to Prototype and script.aculo.us [5579]. [Thomas Fuchs]
 
 * Made script/server work with -e and -d when using Mongrel [DHH]

diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb
@@ -22,7 +22,8 @@
     rails_gem_version = $1
 
     if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
-      rails_gem = Gem.cache.search('rails', "=#{version}").first
+      # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
+      rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
 
       if rails_gem
         require_gem "rails", "=#{version}"