aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRyan Bigg <radarlistener@gmail.com>2008-10-01 21:38:16 +0930
committerRyan Bigg <radarlistener@gmail.com>2008-10-01 21:38:16 +0930
commitdbbd757edd896947e33fdf18ba870b8df5974d62 (patch)
treecc0428bee430a18200925acb830f3dc3946e31de /railties/lib
parent6aca4458e3a1712a4a675ee7bf2cd35701ff75c9 (diff)
parent8292c7dfce4b893588860053e50ef60ae9a0609a (diff)
downloadrails-dbbd757edd896947e33fdf18ba870b8df5974d62.tar.gz
rails-dbbd757edd896947e33fdf18ba870b8df5974d62.tar.bz2
rails-dbbd757edd896947e33fdf18ba870b8df5974d62.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/gem_dependency.rb4
-rw-r--r--railties/lib/rails/version.rb2
-rw-r--r--railties/lib/tasks/databases.rake12
3 files changed, 14 insertions, 4 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 471e03fa5f..d58ae450eb 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -120,7 +120,9 @@ module Rails
def unpack_command
cmd = %w(unpack) << @name
- cmd << "--version" << %("#{@requirement.to_s}") if @requirement
+ # We don't quote this requirement as it's run through GemRunner instead
+ # of shelling out to gem
+ cmd << "--version" << @requirement.to_s if @requirement
cmd
end
end
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 48d24da52e..a0986a2e05 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,7 +1,7 @@
module Rails
module VERSION #:nodoc:
MAJOR = 2
- MINOR = 1
+ MINOR = 2
TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')
diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake
index cc079b1d93..1431aa6944 100644
--- a/railties/lib/tasks/databases.rake
+++ b/railties/lib/tasks/databases.rake
@@ -113,8 +113,16 @@ namespace :db do
end
namespace :migrate do
- desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x'
- task :redo => [ 'db:rollback', 'db:migrate' ]
+ desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.'
+ task :redo => :environment do
+ if ENV["VERSION"]
+ Rake::Task["db:migrate:down"].invoke
+ Rake::Task["db:migrate:up"].invoke
+ else
+ Rake::Task["db:rollback"].invoke
+ Rake::Task["db:migrate"].invoke
+ end
+ end
desc 'Resets your database using your migrations for the current environment'
task :reset => ["db:drop", "db:create", "db:migrate"]