Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8337

Show
Ignore:
Timestamp:
12/09/07 01:55:44 (10 months ago)
Author:
bitsweat
Message:

Merge [8336] from trunk: update rails:freeze:gems to work with RubyGems 0.9.5.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1-2-stable/railties/CHANGELOG

    r8196 r8337  
     1*SVN* 
     2 
     3* Update rails:freeze:gems to work with RubyGems 0.9.5.  [Jeremy Kemper] 
     4 
     5 
    16*1.2.6* (November 24th, 2007) 
    27 
     
    49 
    510* Fix regression where the association would not construct new finder SQL on save causing bogus queries for "WHERE owner_id = NULL" even after owner was saved.  
     11 
    612 
    713*1.2.5* (October 12th, 2007) 
  • branches/1-2-stable/railties/lib/tasks/framework.rake

    r7277 r8337  
    55      deps = %w(actionpack activerecord actionmailer activesupport actionwebservice) 
    66      require 'rubygems' 
     7      require 'rubygems/gem_runner' 
    78      Gem.manage_gems 
    89 
     
    2223      mkdir_p "vendor/rails" 
    2324 
    24       chdir("vendor/rails") do 
    25         rails.dependencies.select { |g| deps.include? g.name }.each do |g| 
    26           Gem::GemRunner.new.run(["unpack", "-v", "#{g.version_requirements}", "#{g.name}"]) 
    27           mv(Dir.glob("#{g.name}*").first, g.name) 
     25      begin 
     26        chdir("vendor/rails") do 
     27          rails.dependencies.select { |g| deps.include? g.name }.each do |g| 
     28            Gem::GemRunner.new.run(["unpack", g.name, "--version", g.version_requirements.to_s]) 
     29            mv(Dir.glob("#{g.name}*").first, g.name) 
     30          end 
     31 
     32          Gem::GemRunner.new.run(["unpack", "rails", "--version", "=#{version}"]) 
     33          FileUtils.mv(Dir.glob("rails*").first, "railties") 
    2834        end 
    29  
    30         Gem::GemRunner.new.run(["unpack", "-v", "=#{version}", "rails"]) 
    31         FileUtils.mv(Dir.glob("rails*").first, "railties") 
     35      rescue Exception 
     36        rm_rf "vendor/rails" 
     37        raise 
    3238      end 
    3339    end