Remove rescue as it was clobbering the real error.

kushkella · Apr 15, 2011 · ae13cb1 · ae13cb1
1 parent 7dea4b5
commit ae13cb1
Showing 1 changed file with 8 additions and 31 deletions.
diff --git a/load_paths.rb b/load_paths.rb
@@ -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