aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-07-09 05:04:19 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-07-09 05:04:19 +0000
commit4bed0ab99d6f3ec49d41a6c862871e568a9225a8 (patch)
tree65fe547bf6af08f283e89af1cbc278e1d3016ba6 /railties
parent17041729c20f4735b9d174c9d2de24dad79db742 (diff)
downloadrails-4bed0ab99d6f3ec49d41a6c862871e568a9225a8.tar.gz
rails-4bed0ab99d6f3ec49d41a6c862871e568a9225a8.tar.bz2
rails-4bed0ab99d6f3ec49d41a6c862871e568a9225a8.zip
r2960@asus: jeremy | 2005-07-09 02:12:35 -0700
Ticket 1674 - Ruby version check r2961@asus: jeremy | 2005-07-09 02:50:54 -0700 Require RAILS_VERSION >= 1.8.2 and RAILS_RELEASE_DATE >= 2004-12-25. r2962@asus: jeremy | 2005-07-09 02:54:49 -0700 minimum_release -> min_release typo r2963@asus: jeremy | 2005-07-09 02:56:14 -0700 updated changelog git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1778 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rwxr-xr-xrailties/bin/rails11
2 files changed, 12 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index baa326703d..149c85e11d 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Extend Ruby version check to include RUBY_RELEASE_DATE >= '2005-12-25', the final Ruby 1.8.2 release. #1674 [court3nay@gmail.com]
+
* Improved documentation for environment config files. #1625 [court3nay@gmail.com]
*0.13.0*
diff --git a/railties/bin/rails b/railties/bin/rails
index 3fb61137a1..f094e4aac7 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -1,4 +1,13 @@
-abort "Rails requires Ruby 1.8.2" if RUBY_VERSION < "1.8.2"
+min_release = "1.8.2 (2004-12-25)"
+ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
+if ruby_release < min_release
+ abort <<-end_message
+
+ Rails requires Ruby version #{min_release} or later.
+ You're running #{ruby_release}; please upgrade to continue.
+
+ end_message
+end
Signal.trap("INT") { puts; exit }