From bb884ebe8b0300fbd1933fb533d54d2fce35533f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 12 Apr 2013 12:47:45 -0400
Subject: [PATCH] Allow -cp argument to 'apply' command to be quoted.  Fixes
 #724.

---
 main/command/BasicCommands.scala        | 8 +++-----
 sbt/src/sbt-test/actions/call/build.sbt | 2 +-
 sbt/src/sbt-test/actions/call/test      | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/main/command/BasicCommands.scala b/main/command/BasicCommands.scala
index 329b04eb9..617c6f7ae 100644
--- a/main/command/BasicCommands.scala
+++ b/main/command/BasicCommands.scala
@@ -96,11 +96,9 @@ object BasicCommands
 		token(base, compl)
 	}
 	private[this] def classpathOptionParser: Parser[Seq[String]] =
-		token( ("-cp" | "-classpath") ~> Space ) ~> rep1sep(classpathString, token(File.pathSeparatorChar)) <~ token(Space)
-	private[this] def classpathString: Parser[String] =
-		token(charClass(entryClass, "<classpath-entry>").+.string, "<classpath-entry>")
-	private[this] def entryClass(c: Char): Boolean = 
-		c != File.pathSeparatorChar && !java.lang.Character.isWhitespace(c)
+		token( ("-cp" | "-classpath") ~> Space ) ~> classpathStrings <~ token(Space)
+	private[this] def classpathStrings: Parser[Seq[String]] =
+		token(StringBasic.map(s => IO.pathSplit(s).toSeq), "<classpath>")
 
 	def exit = Command.command(TerminateAction, exitBrief, exitBrief ) ( _ exit true )
 
diff --git a/sbt/src/sbt-test/actions/call/build.sbt b/sbt/src/sbt-test/actions/call/build.sbt
index ec8a8853d..81be8cd5c 100644
--- a/sbt/src/sbt-test/actions/call/build.sbt
+++ b/sbt/src/sbt-test/actions/call/build.sbt
@@ -1,5 +1,5 @@
 sbtPlugin := true
 
 TaskKey[Unit]("copyOutputDir") <<= (classDirectory in Compile, baseDirectory) map { (cd, base) =>
-	IO.copyDirectory(cd, base / "out")
+	IO.copyDirectory(cd, base / "out spaced")
 }
diff --git a/sbt/src/sbt-test/actions/call/test b/sbt/src/sbt-test/actions/call/test
index 40f86f520..30bf3e1e8 100644
--- a/sbt/src/sbt-test/actions/call/test
+++ b/sbt/src/sbt-test/actions/call/test
@@ -1,11 +1,11 @@
 # compiles a new State => State instance
 > compile
-# puts the classes in a stable location (out/)
+# puts the classes in a stable location (out spaced/ to test escaping)
 > copyOutputDir
 
 # checks that `apply` can load from a specific classpath
-> apply -cp out demo.AddNewCommand
+> 'apply -cp """out spaced/""" demo.AddNewCommand'
 
 # check that AddNewCommand was actually run
 # If it was, it should have registered `newCommand`
-> newCommand
\ No newline at end of file
+> newCommand