From 374fd6693a5aacccb3f5af33c4c1524cf109dd3b Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sat, 6 Jul 2013 22:40:02 +0200 Subject: [PATCH] fixes Rails version for the stable API [ci skip] --- Rakefile | 6 +++++- railties/lib/rails/api/task.rb | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 3ca801cc667..242bd9a9306 100644 --- a/Rakefile +++ b/Rakefile @@ -47,7 +47,11 @@ task :install => :build do end desc "Generate documentation for the Rails framework" -Rails::API::RepoTask.new('rdoc') +if ENV['EDGE'] + Rails::API::EdgeTask.new('rdoc') +else + Rails::API::StableTask.new('rdoc') +end desc 'Bump all versions to match version.rb' task :update_versions do diff --git a/railties/lib/rails/api/task.rb b/railties/lib/rails/api/task.rb index c829873da4f..edd2283182f 100644 --- a/railties/lib/rails/api/task.rb +++ b/railties/lib/rails/api/task.rb @@ -135,12 +135,20 @@ module Rails def api_dir 'doc/rdoc' end + end + class EdgeTask < RepoTask def rails_version "master@#{`git rev-parse HEAD`[0, 7]}" end end + class StableTask < RepoTask + def rails_version + File.read('RAILS_VERSION').strip + end + end + class AppTask < Task def component_root_dir(gem_name) $:.grep(%r{#{gem_name}[\w.-]*/lib\z}).first[0..-5]