Changeset 98

Show
Ignore:
Timestamp:
08/10/06 19:10:59 (2 years ago)
Author:
jlong
Message:

* upgraded to Rails 1.1.6 in preparation for 0.5.2

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/radiant/CHANGELOG

    r95 r98  
    11= Change Log 
    22 
    3 === 0.5.1 
    4 * Upgraded Rails to 1.1.5 
     3=== 0.5.2 (August 10, 2006) 
     4* Upgraded Rails to 1.1.6 because of a security vulnerability in 1.1.5 
     5 
     6=== 0.5.1 (August 10, 2006) 
     7* Upgraded Rails to 1.1.5 because of a security vulnerability in 1.1.4 
    58* Added basic support for upgrades to the `radiant` command 
    69* Gem now includes the .htaccess file (this should make Apache users happier) 

  • trunk/radiant/bin/radiant

    r95 r98  
    106106        announce_already_upgraded 
    107107      else 
    108         announce "Upgrading Radiant to version #{ latest_version }..." do 
    109           @backups = @overwrite || ask_yes_or_no("Would you like to create backups of files that Radiant replaces", :no) if @backups.nil? 
    110           send "upgrade_#{ @application_type }_to_0_5_1" 
    111           change_radiant_gem_version_in_instance_config_to(latest_version) if @application_type == :instance  
     108        @backups = @overwrite || ask_yes_or_no("Would you like to create backups of files that Radiant replaces", :no) if @backups.nil? 
     109        versions = ['0.5.1', '0.5.2'] 
     110        index_of_current_version = versions.index(current_version) || -1 
     111        versions.each do |version| 
     112          if versions.index(version) > index_of_current_version 
     113            announce "Upgrading Radiant to version #{version}..." do 
     114              send "upgrade_#{ @application_type }_to_#{ version.gsub('.', '_') }" 
     115              if version == latest_version 
     116                change_rails_gem_version_in_environment_to '1.1.6' 
     117                change_radiant_gem_version_in_instance_config_to(latest_version) if @application_type == :instance 
     118              end 
     119            end 
     120          end 
    112121        end 
    113122        puts "Done." 
    …… 
    349358      } 
    350359      make_executable(File.join(@dirname, 'script/version')) 
    351       change_rails_gem_version_in_environment_to '1.1.5' 
    352360    end 
    353361     
    …… 
    397405      } 
    398406      make_executable(File.join(@dirname, 'script/version')) 
    399       change_rails_gem_version_in_environment_to '1.1.5' 
     407    end 
     408     
     409    def upgrade_instance_to_0_5_2 
     410      upgrade_files %{ 
     411        overwrite! CHANGELOG 
     412      } 
     413    end 
     414     
     415    def upgrade_application_to_0_5_2 
     416      upgrade_files %{ 
     417        overwrite  bin/radiant 
     418        overwrite! CHANGELOG 
     419        overwrite  lib/tasks/release.rake 
     420        overwrite  lib/radiant.rb 
     421      } 
    400422    end 
    401423end 

  • trunk/radiant/config/environment.rb

    r95 r98  
    22 
    33# Rails Gem Version 
    4 RAILS_GEM_VERSION = '1.1.5' 
     4RAILS_GEM_VERSION = '1.1.6' 
    55 
    66# Uncomment below to force Rails into production mode when  

  • trunk/radiant/lib/radiant.rb

    r94 r98  
    66      Major = '0' 
    77      Minor = '5' 
    8       Tiny  = '1' 
     8      Tiny  = '2' 
    99     
    1010      class << self 

  • trunk/radiant/lib/tasks/release.rake

    r95 r98  
    2828    s.platform = Gem::Platform::RUBY 
    2929    s.requirements << 'rails, redcloth, bluecloth, radius' 
    30     s.add_dependency 'rails',     '= 1.1.5' 
     30    s.add_dependency 'rails',     '= 1.1.6' 
    3131    s.add_dependency 'radius',    '>= 0.5.1', '< 0.6' 
    3232    s.add_dependency 'RedCloth',  '>= 3.0.3', '< 3.1'