aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2010-11-16 16:30:53 -0800
committerCarl Lerche <me@carllerche.com>2010-11-16 17:19:47 -0800
commitc3dd1238c50424231bac682f08b43fc4a318a148 (patch)
tree59614b9853c53f8cae33456f1a40a2e2ad0aa24f
parentdf5fe4d83c068bc2b87404d7e98ea7366d1fb000 (diff)
downloadrails-c3dd1238c50424231bac682f08b43fc4a318a148.tar.gz
rails-c3dd1238c50424231bac682f08b43fc4a318a148.tar.bz2
rails-c3dd1238c50424231bac682f08b43fc4a318a148.zip
Small cleanup of the release task
-rw-r--r--Rakefile2
-rw-r--r--tasks/release.rb14
2 files changed, 7 insertions, 9 deletions
diff --git a/Rakefile b/Rakefile
index 9da84ee49b..7dc884f27b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,7 +12,7 @@ desc "Build gem files for all projects"
task :build => "all:build"
desc "Release all gems to gemcutter and create a tag"
-task :release => ["all:release", "git:tag"]
+task :release => "all:release"
# RDoc skips some files in the Rails tree due to its binary? predicate. This is a quick
# hack for edge docs, until we decide which is the correct way to address this issue.
diff --git a/tasks/release.rb b/tasks/release.rb
index c520b93111..67b467d041 100644
--- a/tasks/release.rb
+++ b/tasks/release.rb
@@ -61,7 +61,11 @@ directory "dist"
end
end
-namespace :release do
+namespace :all do
+ task :build => FRAMEWORKS.map { |f| "#{f}:build" } + ['rails:build']
+ task :install => FRAMEWORKS.map { |f| "#{f}:install" } + ['rails:install']
+ task :push => FRAMEWORKS.map { |f| "#{f}:push" } + ['rails:push']
+
task :ensure_clean_state do
unless `git status -s | grep -v RAILS_VERSION`.strip.empty?
abort "[ABORTING] `git status` reports a dirty tree. Make sure all changes are committed"
@@ -88,11 +92,5 @@ namespace :release do
sh "git tag #{tag}"
end
- task :full => %w(ensure_clean_state all:build commit tag all:push)
-end
-
-namespace :all do
- task :build => FRAMEWORKS.map { |f| "#{f}:build" } + ['rails:build']
- task :install => FRAMEWORKS.map { |f| "#{f}:install" } + ['rails:install']
- task :push => FRAMEWORKS.map { |f| "#{f}:push" } + ['rails:push']
+ task :release => %w(ensure_clean_state build commit tag push)
end