aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-07-06 22:40:02 +0200
committerXavier Noria <fxn@hashref.com>2013-07-06 22:42:24 +0200
commit374fd6693a5aacccb3f5af33c4c1524cf109dd3b (patch)
tree7403f6ade209003854f14f5a631e47899f3e1ece
parent7948d7890548a3e70d04dfed26497b391920b058 (diff)
downloadrails-374fd6693a5aacccb3f5af33c4c1524cf109dd3b.tar.gz
rails-374fd6693a5aacccb3f5af33c4c1524cf109dd3b.tar.bz2
rails-374fd6693a5aacccb3f5af33c4c1524cf109dd3b.zip
fixes Rails version for the stable API [ci skip]
-rw-r--r--Rakefile6
-rw-r--r--railties/lib/rails/api/task.rb8
2 files changed, 13 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index 3ca801cc66..242bd9a930 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 c829873da4..edd2283182 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]