Update bundler spec paths to reflect restructured directory layout

Author: hsbt

spec/bundler/spec_helper.rb

@@ -48,8 +48,8 @@
 
   SimpleCov.start do
     command_name "bundler:#{Process.pid}"
-    root File.expand_path("../..", __dir__)
-    coverage_dir File.expand_path("../../coverage", __dir__)
+    root File.expand_path("../bundler", __dir__)
+    coverage_dir File.expand_path("../coverage", __dir__)
 
     add_filter "/spec/"
     add_filter "/test/"

spec/bundler/support/path.rb

@@ -10,7 +10,7 @@ module Path
     include Spec::Env
 
     def source_root
-      @source_root ||= Pathname.new(ruby_core? ? "../../.." : "../..").expand_path(__dir__)
+      @source_root ||= Pathname.new(ruby_core? ? "../../.." : "../../bundler").expand_path(__dir__)
     end
 
     def root
@@ -50,7 +50,7 @@ def dev_binstub
     end
 
     def bindir
-      @bindir ||= source_root.join(ruby_core? ? "spec/bin" : "bin")
+      @bindir ||= source_root.join(ruby_core? ? "spec/bin" : "../bin")
     end
 
     def exedir
@@ -76,7 +76,7 @@ def path
     end
 
     def spec_dir
-      @spec_dir ||= source_root.join(ruby_core? ? "spec/bundler" : "spec")
+      @spec_dir ||= source_root.join(ruby_core? ? "spec/bundler" : "../spec")
     end
 
     def man_dir
@@ -345,7 +345,7 @@ def git_ls_files(glob)
     end
 
     def tracked_files_glob
-      ruby_core? ? "libexec/bundle* lib/bundler lib/bundler.rb spec/bundler man/bundle*" : "lib exe spec CHANGELOG.md LICENSE.md README.md bundler.gemspec"
+      ruby_core? ? "libexec/bundle* lib/bundler lib/bundler.rb spec/bundler man/bundle*" : "lib exe CHANGELOG.md LICENSE.md README.md bundler.gemspec"
     end
 
     def lib_tracked_files_glob