diff options
| -rw-r--r-- | railties/CHANGELOG | 5 | ||||
| -rw-r--r-- | railties/lib/tasks/framework.rake | 20 |
2 files changed, 18 insertions, 7 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 8b47387284..f4e9efa8d4 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Update rails:freeze:gems to work with RubyGems 0.9.5. [Jeremy Kemper] + + *2.0.1* (December 7th, 2007) * Fixed Active Record bug diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake index 99b61c7d58..ebc24f46af 100644 --- a/railties/lib/tasks/framework.rake +++ b/railties/lib/tasks/framework.rake @@ -4,6 +4,7 @@ namespace :rails do task :gems do deps = %w(actionpack activerecord actionmailer activesupport activeresource) require 'rubygems' + require 'rubygems/gem_runner' Gem.manage_gems rails = (version = ENV['VERSION']) ? @@ -21,14 +22,19 @@ namespace :rails do rm_rf "vendor/rails" mkdir_p "vendor/rails" - chdir("vendor/rails") do - rails.dependencies.select { |g| deps.include? g.name }.each do |g| - Gem::GemRunner.new.run(["unpack", "-v", "#{g.version_requirements}", "#{g.name}"]) - mv(Dir.glob("#{g.name}*").first, g.name) - end + begin + chdir("vendor/rails") do + rails.dependencies.select { |g| deps.include? g.name }.each do |g| + Gem::GemRunner.new.run(["unpack", g.name, "--version", g.version_requirements.to_s]) + mv(Dir.glob("#{g.name}*").first, g.name) + end - Gem::GemRunner.new.run(["unpack", "-v", "=#{version}", "rails"]) - FileUtils.mv(Dir.glob("rails*").first, "railties") + Gem::GemRunner.new.run(["unpack", "rails", "--version", "=#{version}"]) + FileUtils.mv(Dir.glob("rails*").first, "railties") + end + rescue Exception + rm_rf "vendor/rails" + raise end end |