Make config location relative to the current working directory

Rakefile

@@ -6,7 +6,7 @@ require "rake/testtask"
 
 desc "Setup Rubygems dev environment"
 task :setup do
-  sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "install", "--gemfile=bundler/tool/bundler/dev_gems.rb"
+  sh({ "BUNDLE_PATH__SYSTEM" => "true" }, "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "install", "--gemfile=bundler/tool/bundler/dev_gems.rb")
   sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "lock", "--gemfile=bundler/tool/bundler/release_gems.rb"
   sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "lock", "--gemfile=bundler/tool/bundler/test_gems.rb"
   sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "lock", "--gemfile=bundler/tool/bundler/rubocop_gems.rb"
@@ -19,7 +19,7 @@ end
 
 desc "Update Rubygems dev environment"
 task :update do
-  sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", "--gemfile=bundler/tool/bundler/dev_gems.rb"
+  sh({ "BUNDLE_PATH__SYSTEM" => "true" }, "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", "--gemfile=bundler/tool/bundler/dev_gems.rb")
   sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "lock", "--update", "--gemfile=bundler/tool/bundler/release_gems.rb"
   sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "lock", "--update", "--gemfile=bundler/tool/bundler/test_gems.rb"
   sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "lock", "--update", "--gemfile=bundler/tool/bundler/rubocop_gems.rb"
@@ -32,7 +32,7 @@ end
 
 desc "Update the locked bundler version in dev environment"
 task :update_locked_bundler do |_, args|
-  sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", "--bundler", "--gemfile=bundler/tool/bundler/dev_gems.rb"
+  sh({ "BUNDLE_PATH__SYSTEM" => "true" }, "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", "--bundler", "--gemfile=bundler/tool/bundler/dev_gems.rb")
   sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", "--bundler", "--gemfile=bundler/tool/bundler/release_gems.rb"
   sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", "--bundler", "--gemfile=bundler/tool/bundler/test_gems.rb"
   sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", "--bundler", "--gemfile=bundler/tool/bundler/rubocop_gems.rb"
@@ -45,7 +45,7 @@ end
 
 desc "Update specific development dependencies"
 task :update_dev_dep do |_, args|
-  sh "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", *args, "--gemfile=bundler/tool/bundler/dev_gems.rb"
+  sh({ "BUNDLE_PATH__SYSTEM" => "true" }, "ruby", "-I", "lib", "bundler/spec/support/bundle.rb", "update", *args, "--gemfile=bundler/tool/bundler/dev_gems.rb")
 end
 
 desc "Setup git hooks"

bundler/lib/bundler.rb

@@ -227,13 +227,11 @@ def ruby_scope
     def user_home
       @user_home ||= begin
         home = Bundler.rubygems.user_home
-        bundle_home = home ? File.join(home, ".bundle") : nil
+        bundle_home = home.join(".bundle")
 
-        warning = if home.nil?
-          "Your home directory is not set."
-        elsif !File.directory?(home)
+        warning = if !home.directory?
           "`#{home}` is not a directory."
-        elsif !File.writable?(home) && (!File.directory?(bundle_home) || !File.writable?(bundle_home))
+        elsif !home.writable? && (!bundle_home.directory? || !bundle_home.writable?)
           "`#{home}` is not writable."
         end
 
@@ -243,7 +241,7 @@ def user_home
           Bundler.ui.warn "Bundler will use `#{user_home}' as your home directory temporarily.\n"
           user_home
         else
-          Pathname.new(home)
+          home
         end
       end
     end
@@ -283,27 +281,19 @@ def specs_path
     end
 
     def root
-      @root ||= begin
-                  SharedHelpers.root
-                rescue GemfileNotFound
-                  bundle_dir = default_bundle_dir
-                  raise GemfileNotFound, "Could not locate Gemfile or .bundle/ directory" unless bundle_dir
-                  Pathname.new(File.expand_path("..", bundle_dir))
-                end
+      @root ||= resolve_root
     end
 
     def app_config_path
       if app_config = ENV["BUNDLE_APP_CONFIG"]
         app_config_pathname = Pathname.new(app_config)
 
         if app_config_pathname.absolute?
-          app_config_pathname
-        else
-          app_config_pathname.expand_path(root)
+          return app_config_pathname
         end
-      else
-        root.join(".bundle")
       end
+
+      app_config_root.join(app_config || ".bundle")
     end
 
     def app_cache(custom_path = nil)
@@ -330,8 +320,6 @@ def rm_rf(path)
 
     def settings
       @settings ||= Settings.new(app_config_path)
-    rescue GemfileNotFound
-      @settings = Settings.new(Pathname.new(".bundle").expand_path)
     end
 
     # @return [Hash] Environment present before Bundler was activated
@@ -456,8 +444,14 @@ def default_lockfile
       SharedHelpers.default_lockfile
     end
 
-    def default_bundle_dir
-      SharedHelpers.default_bundle_dir
+    def default_bundle_dir(base = Pathname.pwd)
+      bundle_dir = SharedHelpers.find_directory(".bundle", :base => base)
+      return nil unless bundle_dir
+
+      global_bundle_dir = Bundler.rubygems.user_home.join(".bundle")
+      return nil if bundle_dir == global_bundle_dir
+
+      bundle_dir
     end
 
     def system_bindir
@@ -611,7 +605,8 @@ def reset!
       reset_rubygems!
     end
 
-    def reset_settings_and_root!
+    def reset_settings_and_root!(base)
+      @app_config_root = resolve_config_root(base)
       @settings = nil
       @root = nil
     end
@@ -625,6 +620,7 @@ def reset_paths!
       @definition = nil
       @load = nil
       @locked_gems = nil
+      @app_config_root = nil
       @root = nil
       @settings = nil
       @setup = nil
@@ -699,5 +695,22 @@ def with_env(env)
     ensure
       ENV.replace(backup)
     end
+
+    def app_config_root
+      @app_config_root ||= resolve_config_root
+    end
+
+    def resolve_config_root(base = Pathname.pwd)
+      bundle_dir = default_bundle_dir(base) || SharedHelpers.find_gemfile_if_empty(ENV["BUNDLE_GEMFILE"])
+
+      bundle_dir ? bundle_dir.parent : base
+    end
+
+    def resolve_root
+      bundle_dir = SharedHelpers.find_gemfile || default_bundle_dir
+      raise GemfileNotFound, "Could not locate Gemfile or .bundle/ directory" unless bundle_dir
+
+      bundle_dir.parent
+    end
   end
 end

bundler/lib/bundler/cli.rb

@@ -55,10 +55,20 @@ def self.aliases_for(command_name)
     def initialize(*args)
       super
 
-      custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
+      # At this point, settings have been already resolved, unfortunately,
+      # because some CLI help messages, flag aliases or even whole commands need
+      # to be defined according to some settings being activated or not. So once
+      # we know the `--gemfile` has been passed, we need to force a reload of
+      # everything. This logic seems buggy, since the settings we have used
+      # before this point might not be correct, but so far it has worked fine.
+      # The ideal solution would be to add some features to thor so that stuff
+      # can be defined via procs and lazily loaded, and thus we can be sure we
+      # haven't yet loaded settings at all at this point.
+      custom_gemfile = options[:gemfile]
       if custom_gemfile && !custom_gemfile.empty?
-        Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", File.expand_path(custom_gemfile)
-        Bundler.reset_settings_and_root!
+        expanded_custom_gemfile = Pathname.new(custom_gemfile).expand_path
+        Bundler.reset_settings_and_root!(expanded_custom_gemfile.parent)
+        Bundler.settings.temporary(:gemfile => expanded_custom_gemfile)
       end
 
       Bundler.self_manager.restart_with_locked_bundler_if_needed

bundler/lib/bundler/fetcher.rb

@@ -250,9 +250,7 @@ def connection
           con.cert_store = bundler_cert_store
         end
 
-        ssl_client_cert = Bundler.settings[:ssl_client_cert] ||
-          (Gem.configuration.ssl_client_cert if
-            Gem.configuration.respond_to?(:ssl_client_cert))
+        ssl_client_cert = Bundler.settings[:ssl_client_cert] || Gem.configuration.ssl_client_cert
         if ssl_client_cert
           pem = File.read(ssl_client_cert)
           con.cert = OpenSSL::X509::Certificate.new(pem)

bundler/lib/bundler/inline.rb

@@ -42,7 +42,7 @@ def gemfile(install = false, options = {}, &gemfile)
     bundler_module = class << Bundler; self; end
     bundler_module.send(:remove_method, :root)
     def Bundler.root
-      Bundler::SharedHelpers.pwd.expand_path
+      Bundler::SharedHelpers.pwd
     end
     old_gemfile = ENV["BUNDLE_GEMFILE"]
     Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", "Gemfile"

bundler/lib/bundler/rubygems_integration.rb

@@ -135,7 +135,7 @@ def gem_bindir
     end
 
     def user_home
-      Gem.user_home
+      Pathname.new(Gem.user_home)
     end
 
     def gem_path

bundler/lib/bundler/settings.rb

@@ -86,7 +86,7 @@ class Settings
       "BUNDLE_TIMEOUT" => 10,
     }.freeze
 
-    def initialize(root = nil)
+    def initialize(root)
       @root            = root
       @local_config    = load_config(local_config_file)
       @env_config      = ENV.to_h.select {|key, _value| key =~ /\ABUNDLE_.+/ }
@@ -116,8 +116,6 @@ def set_command_option_if_given(key, value)
     end
 
     def set_local(key, value)
-      local_config_file || raise(GemfileNotFound, "Could not locate Gemfile")
-
       set_key(key, value, @local_config, local_config_file)
     end
 
@@ -441,13 +439,13 @@ def global_config_file
         Pathname.new(ENV["BUNDLE_USER_CONFIG"])
       elsif ENV["BUNDLE_USER_HOME"] && !ENV["BUNDLE_USER_HOME"].empty?
         Pathname.new(ENV["BUNDLE_USER_HOME"]).join("config")
-      elsif Bundler.rubygems.user_home && !Bundler.rubygems.user_home.empty?
-        Pathname.new(Bundler.rubygems.user_home).join(".bundle/config")
+      else
+        Bundler.rubygems.user_home.join(".bundle/config")
       end
     end
 
     def local_config_file
-      Pathname.new(@root).join("config") if @root
+      @root.join("config")
     end
 
     def load_config(config_file)

bundler/lib/bundler/settings/validator.rb

@@ -86,7 +86,7 @@ def self.validate!(key, value, settings)
         root = begin
                  Bundler.root
                rescue GemfileNotFound
-                 Pathname.pwd.expand_path
+                 Pathname.pwd
                end
 
         path = begin