raise BundlerError and expand error messsage

2 files changed, 16 insertions, 23 deletions

diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index a189b8dc21..06087449ab 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -205,10 +205,13 @@ module Bundler
 
     def validate_bundle_path
       return unless Bundler.bundle_path.to_s.match(File::PATH_SEPARATOR)
-      puts "WARNING: Your bundle path contains a '#{File::PATH_SEPARATOR}', " \
-        "which is the path separator for your system."
-      puts "Please change your bundle path path to not include '#{File::PATH_SEPARATOR}'."
-      exit(1)
+      message = "WARNING: Your bundle path contains a '#{File::PATH_SEPARATOR}', " \
+                "which is the path separator for your system. Bundler cannot " \
+                "function correctly when the Bundle path contains the " \
+                "system's PATH separator. Please change your " \
+                "bundle path to not include '#{File::PATH_SEPARATOR}'." \
+                "\nYour current bundle path is '#{Bundler.bundle_path}'."
+      raise Bundler::BundlerError, message
     end
 
     def find_gemfile(order_matters = false)
diff --git a/spec/bundler/shared_helpers_spec.rb b/spec/bundler/shared_helpers_spec.rb
index 59e304c5e7..88ff06a380 100644
--- a/spec/bundler/shared_helpers_spec.rb
+++ b/spec/bundler/shared_helpers_spec.rb
@@ -264,25 +264,15 @@ RSpec.describe Bundler::SharedHelpers do
     it "exits if bundle path contains the path seperator" do
       stub_const("File::PATH_SEPARATOR", ":".freeze)
       allow(Bundler).to receive(:bundle_path) { "so:me/dir/bin" }
-      begin
-        expect(subject.send(:validate_bundle_path)).to raise_exception(SystemExit).
-          and output("WARNING: Your bundle path contains a ':', which is the" \
-                     " path separator for your system. Please change your" \
-                     " bundle path path to not include ':'.")
-      rescue SystemExit => e
-        expect(e.status).to eq(1)
-      end
-
-      stub_const("File::PATH_SEPARATOR", "^".freeze)
-      allow(Bundler).to receive(:bundle_path) { "so^me/dir/bin" }
-      begin
-        expect(subject.send(:validate_bundle_path)).to raise_exception(SystemExit).
-          and output("WARNING: Your bundle path contains a '^', which is the" \
-                     " path separator for your system. Please change your" \
-                     " bundle path path to not include '^'.")
-      rescue SystemExit => e
-        expect(e.status).to eq(1)
-      end
+      expect { subject.send(:validate_bundle_path) }.to raise_error(
+        Bundler::BundlerError,
+        "WARNING: Your bundle path contains a ':', which is the " \
+        "path separator for your system. Bundler cannot " \
+        "function correctly when the Bundle path contains the " \
+        "system's PATH separator. Please change your " \
+        "bundle path to not include ':'.\nYour current bundle " \
+        "path is '#{Bundler.bundle_path}'."
+      )
     end
 
     context "ENV['PATH'] does not exist" do