@@ -50,19 +50,17 @@ if !File.exists?(preinitializer) cp(gem_preinitializer, preinitializer) end -main_env_file = File.join(config_base, "environment.rb") -env_contents = File.open(main_env_file).read -if !env_contents.include?("require File.join(File.dirname(__FILE__), 'postboot')") +boot_file = File.join(config_base, "boot.rb") +boot_contents = File.open(boot_file).read +if !boot_contents.include?("require File.join(File.dirname(__FILE__), 'postboot')") contents = <<-CONTENTS # Load postboot file to change Rails paths require File.join(File.dirname(__FILE__), 'postboot') - -Rails::Initializer.run do |config| CONTENTS - env_contents.sub!("Rails::Initializer.run do |config|", contents) - File.open(main_env_file, 'w') {|f| f.write(env_contents) } + boot_contents << contents + File.open(boot_file, 'w') {|f| f.write(boot_contents) } end if File.directory?(old_env_dir) bin/environmentalize @@ -16,8 +16,8 @@ class RailsVersionTest < Test::Unit::TestCase assert File.exists?(File.join(config_root, 'postboot.rb')) - env_rb = File.open(File.join(config_root, 'environment.rb')).read - assert env_rb.include?("require File.join(File.dirname(__FILE__), 'postboot')") + boot_rb = File.open(File.join(config_root, 'boot.rb')).read + assert boot_rb.include?("require File.join(File.dirname(__FILE__), 'postboot')") %w(development test demo staging production).each do |env| assert File.directory?(File.join(config_root, env)) test/rails_version_test.rb 4afb08b15b4bfd18e97f008fdff5bb0b81f0689f John Trupiano jtrupiano@gmail.com http://github.com/jtrupiano/environmentalist/commit/afde01e100ce0699606fdce823b71df8721cc649 afde01e100ce0699606fdce823b71df8721cc649 2009-04-04T12:34:46-07:00 2009-04-04T12:34:46-07:00 Move postboot inclusion to bottom of boot.rb instead of middle of environment.rb to support rake db:create db:drop in rails 2.3.2 2a18cfecdb7e837371fe7c3401a9c0e3cd546975 John Trupiano jtrupiano@gmail.com