aboutsummaryrefslogtreecommitdiffstats
path: root/load_paths.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-03-27 12:06:27 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-27 12:06:27 -0700
commit4384a95b517ae98370dcca5f0aba4205b38527e6 (patch)
tree7929f01312a2c258c38b7533f2ca019867541d80 /load_paths.rb
parenta98db7c6ef7384d60a1c7f02d43ee601e2647eea (diff)
downloadrails-4384a95b517ae98370dcca5f0aba4205b38527e6.tar.gz
rails-4384a95b517ae98370dcca5f0aba4205b38527e6.tar.bz2
rails-4384a95b517ae98370dcca5f0aba4205b38527e6.zip
Bust gem prelude to ensure bundler's in the load path. Not sure what's broken here.
Diffstat (limited to 'load_paths.rb')
-rw-r--r--load_paths.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/load_paths.rb b/load_paths.rb
index b87e0d7235..873315f978 100644
--- a/load_paths.rb
+++ b/load_paths.rb
@@ -2,7 +2,13 @@ begin
require File.expand_path('../.bundle/environment', __FILE__)
rescue LoadError
begin
- require 'rubygems'
+ # bust gem prelude
+ if defined? Gem
+ Gem.cache
+ gem 'bundler'
+ else
+ require 'rubygems'
+ end
require 'bundler'
Bundler.setup
rescue LoadError