From 958e9a36a9b5929f9cd28b15a4d50d6d3f821e18 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 23 Nov 2006 04:40:48 +0000 Subject: Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will 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 --- railties/CHANGELOG | 2 ++ railties/environments/boot.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'railties') diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 5ef12f839e..0033c7db37 100644 --- 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 index 9a094cbc6d..39339fd229 100644 --- a/railties/environments/boot.rb +++ b/railties/environments/boot.rb @@ -22,7 +22,8 @@ unless defined?(Rails::Initializer) 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}" -- cgit v1.2.3