Remove rescue as it was clobbering the real error.

This commit is contained in:
José Valim 2011-04-15 18:13:17 +02:00
parent 7dea4b57a4
commit ae13cb1523
1 changed files with 8 additions and 31 deletions

View File

@ -1,32 +1,9 @@
begin
require File.expand_path('../.bundle/environment', __FILE__)
rescue LoadError
begin
# bust gem prelude
if defined? Gem
Gem.source_index
gem 'bundler'
else
require 'rubygems'
end
require 'bundler'
Bundler.setup
rescue LoadError
module Bundler
def self.require(*args, &block); end
def self.method_missing(*args, &block); end
end
%w(
actionmailer
actionpack
activemodel
activerecord
activeresource
activesupport
railties
).each do |framework|
$:.unshift File.expand_path("../#{framework}/lib", __FILE__)
end
end
# bust gem prelude
if defined? Gem
Gem.source_index
gem 'bundler'
else
require 'rubygems'
end
require 'bundler'
Bundler.setup