From f221a6f19f4cee31e2d103ea9a1930f59223fc25 Mon Sep 17 00:00:00 2001
From: Bryan Helmkamp <bryan@brynary.com>
Date: Mon, 1 Mar 2010 23:36:54 -0500
Subject: Leverage VERSION constants from gemspecs to avoid tedious updates
 when releasing

---
 railties/Rakefile                           | 3 ---
 railties/lib/rails/tasks/documentation.rake | 2 +-
 railties/railties.gemspec                   | 9 ++++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'railties')

diff --git a/railties/Rakefile b/railties/Rakefile
index d62bfb71eb..fe049d565f 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -8,9 +8,6 @@ require 'rake/gempackagetask'
 require 'date'
 require 'rbconfig'
 
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
-require 'rails/version'
-
 task :default => :test
 task :test => 'test:isolated'
 
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index f7cc6ff4be..1f4067d29e 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -14,7 +14,7 @@ namespace :doc do
   desc 'Generate documentation for the Rails framework. Specify path with PATH="/path/to/rails"'
   Rake::RDocTask.new("rails") { |rdoc|
     path = ENV['RAILS_PATH'] || 'vendor/gems/gems'
-    version = '-3.0.0.beta1' unless ENV['RAILS_PATH']
+    version = "-#{Rails::VERSION::STRING}" unless ENV['RAILS_PATH']
     rdoc.rdoc_dir = 'doc/api'
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.title    = "Rails Framework Documentation"
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index c43bb7e1e9..e2758a84e5 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -1,7 +1,10 @@
+$:.unshift "lib"
+require "rails/version"
+
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'railties'
-  s.version     = '3.0.0.beta1'
+  s.version     = Rails::VERSION::STRING
   s.summary     = 'Controls boot-up, rake tasks and generators for the Rails framework.'
   s.description = 'Controls boot-up, rake tasks and generators for the Rails framework.'
   s.required_ruby_version = '>= 1.8.7'
@@ -22,6 +25,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency('rake',          '>= 0.8.3')
   s.add_dependency('thor',          '~> 0.13.4')
-  s.add_dependency('activesupport', '= 3.0.0.beta1')
-  s.add_dependency('actionpack',    '= 3.0.0.beta1')
+  s.add_dependency('activesupport', "= #{Rails::VERSION::STRING}")
+  s.add_dependency('actionpack',    "= #{Rails::VERSION::STRING}")
 end
-- 
cgit v1.2.3