lib/bundler.rb in bundler-1.3.0.pre.5 vs lib/bundler.rb in bundler-1.3.0.pre.6

@@ -15,10 +15,11 @@
   autoload :DepProxy,              'bundler/dep_proxy'
   autoload :Deprecate,             'bundler/deprecate'
   autoload :Dsl,                   'bundler/dsl'
   autoload :EndpointSpecification, 'bundler/endpoint_specification'
   autoload :Environment,           'bundler/environment'
+  autoload :Env,                   'bundler/env'
   autoload :Fetcher,               'bundler/fetcher'
   autoload :GemHelper,             'bundler/gem_helper'
   autoload :GemHelpers,            'bundler/gem_helpers'
   autoload :GemInstaller,          'bundler/gem_installer'
   autoload :Graph,                 'bundler/graph'
@@ -186,10 +187,14 @@
     def tmp
       user_bundle_path.join("tmp", Process.pid.to_s)
     end
 
     def settings
-      @settings ||= Settings.new(app_config_path)
+      @settings ||= begin
+        Settings.new(app_config_path)
+      rescue GemfileNotFound
+        Settings.new
+      end
     end
 
     def with_original_env
       bundled_env = ENV.to_hash
       ENV.replace(ORIGINAL_ENV)