@@ -8,6 +8,8 @@ file 'script/bundle', %{ #!/usr/bin/env ruby $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "gems/bundler/lib")) require 'rubygems' +require 'rubygems/command' +require 'bundler' require 'bundler/commands/bundle_command' Gem::Commands::BundleCommand.new.invoke(*ARGV) }.strip @@ -32,27 +34,23 @@ gems/* !gems/cache !gems/bundler} +run 'script/bundle' + append_file '/config/preinitializer.rb', %{ require File.expand_path(File.join(File.dirname(__FILE__), "..", "gems", "environment")) +} + +gsub_file 'config/environment.rb', "require File.join(File.dirname(__FILE__), 'boot')", %{ +require File.join(File.dirname(__FILE__), 'boot') # Hijack rails initializer to load the bundler gem environment before loading the rails environment. -class Rails::Boot - def run - load_initializer - hijack_initializer_to_require_bundler_env - Rails::Initializer.run(:set_load_path) - end - - def hijack_initializer_to_require_bundler_env - Rails::Initializer.module_eval do - alias load_environment_without_bundler load_environment - - def load_environment - Bundler.require_env configuration.environment - load_environment_without_bundler - end - end - end -end} -run 'script/bundle' \ No newline at end of file +Rails::Initializer.module_eval do + alias load_environment_without_bundler load_environment + + def load_environment + Bundler.require_env configuration.environment + load_environment_without_bundler + end +end +} \ No newline at end of file resources/rails/bundler.rb e26636f20c7eb38dd5095b3385f81c1f7f80aa87 Tom Ward tom@popdog.net http://github.com/tomafro/dotfiles/commit/c2a78a8ac71b53083be948c749516d07fab732f1 c2a78a8ac71b53083be948c749516d07fab732f1 2009-11-01T23:34:26-08:00 2009-11-01T23:34:26-08:00 Changed the bundler script yet again, this time to move the rails hijacking back into environment.rb so it's compatible with passenger 6db65b7c90e4fbe9e5949f6c808968b7916ca637 Tom Ward tom@popdog.net