dependencies for server mode (#130)

Author: mpollmeier

README.md

@@ -415,7 +415,16 @@ curl -XPOST http://localhost:8080/query-sync -d '{"query":"val baz = foo + 1"}'
 # {"success":true,"stdout":"val baz: Int = 100\n",...}
 ```
 
-There's also has an asynchronous mode:
+Adding dependencies:
+```
+echo '//> using dep com.michaelpollmeier:versionsort:1.0.7' > foo.sc
+./srp-server --predef foo.sc
+
+curl http://localhost:8080/query-sync -X POST -d '{"query": "versionsort.VersionHelper.compare(\"1.0\", \"0.9\")"}'
+# {"success":true,"stdout":"val res0: Int = 1\n",...}%
+```
+
+srp-server can be used in an asynchronous mode:
 ```
 ./srp-server
 

core/src/main/scala/replpp/InteractiveShell.scala

@@ -1,10 +1,7 @@
 package replpp
 
-import dotty.tools.Settings
-import dotty.tools.io.{ClassPath, Directory, PlainDirectory}
 import dotty.tools.repl.State
 
-import java.lang.System.lineSeparator
 import scala.util.control.NoStackTrace
 
 object InteractiveShell {

server/src/it/scala/replpp/server/EmbeddedReplTests.scala

@@ -13,7 +13,7 @@ import scala.concurrent.duration.Duration
 class EmbeddedReplTests extends AnyWordSpec with Matchers {
 
   "execute commands synchronously" in {
-    val repl = new EmbeddedRepl()
+    val repl = new EmbeddedRepl(defaultCompilerArgs)
 
     repl.query("val x = 0").output.trim shouldBe "val x: Int = 0"
     repl.query("x + 1").output.trim     shouldBe "val res0: Int = 1"
@@ -22,11 +22,21 @@ class EmbeddedReplTests extends AnyWordSpec with Matchers {
   }
 
   "execute a command asynchronously" in {
-    val repl = new EmbeddedRepl()
+    val repl = new EmbeddedRepl(defaultCompilerArgs)
     val (uuid, futureResult) = repl.queryAsync("val x = 0")
     val result = Await.result(futureResult, Duration.Inf)
     result.trim shouldBe "val x: Int = 0"
     repl.shutdown()
   }
 
+  val defaultCompilerArgs = {
+    val inheritedClasspath = System.getProperty("java.class.path")
+    Array(
+      "-classpath", inheritedClasspath,
+      "-explain", // verbose scalac error messages
+      "-deprecation",
+      "-color", "never"
+    )
+  }
+
 }

server/src/main/scala/replpp/server/Config.scala

@@ -52,7 +52,7 @@ object Config {
       help("help").text("Print this help text"),
     )
 
-    OParser.parse(parser, args, Config(replpp.Config()))
+    OParser.parse(parser, args, Config(replpp.Config(nocolors = true)))
       .getOrElse(throw new AssertionError("error while parsing commandline args - see errors above"))
   }
 }

server/src/main/scala/replpp/server/EmbeddedRepl.scala

@@ -1,34 +1,24 @@
 package replpp.server
 
-import dotty.tools.dotc.config.Printers.config
 import dotty.tools.repl.State
 import org.slf4j.{Logger, LoggerFactory}
 import replpp.Colors.BlackWhite
-import replpp.{Config, ReplDriverBase, pwd}
+import replpp.{ReplDriverBase, pwd}
 
 import java.io.*
 import java.nio.charset.StandardCharsets
 import java.util.UUID
-import java.util.concurrent.{BlockingQueue, Executors, LinkedBlockingQueue, Semaphore}
+import java.util.concurrent.Executors
 import scala.concurrent.duration.Duration
-import scala.concurrent.impl.Promise
 import scala.concurrent.{Await, ExecutionContext, ExecutionContextExecutorService, Future}
-import scala.util.{Failure, Success}
 
-class EmbeddedRepl(predefLines: IterableOnce[String] = Seq.empty) {
+class EmbeddedRepl(compilerArgs: Array[String], predefLines: IterableOnce[String] = Seq.empty) {
   private val logger: Logger = LoggerFactory.getLogger(getClass)
 
   /** repl and compiler output ends up in this replOutputStream */
   private val replOutputStream = new ByteArrayOutputStream()
 
   private val replDriver: ReplDriver = {
-    val inheritedClasspath = System.getProperty("java.class.path")
-    val compilerArgs = Array(
-      "-classpath", inheritedClasspath,
-      "-explain", // verbose scalac error messages
-      "-deprecation",
-      "-color", "never"
-    )
     new ReplDriver(compilerArgs, new PrintStream(replOutputStream), classLoader = None)
   }
 

server/src/main/scala/replpp/server/ReplServer.scala

@@ -21,7 +21,9 @@ object ReplServer {
       password <- config.serverAuthPassword
     } yield UsernamePasswordAuth(username, password)
 
-    val embeddedRepl = new EmbeddedRepl(allPredefLines(config.baseConfig))
+    val predefLines = replpp.allPredefLines(config.baseConfig)
+    val compilerArgs = replpp.compilerArgs(config.baseConfig)
+    val embeddedRepl = new EmbeddedRepl(compilerArgs, predefLines)
     Runtime.getRuntime.addShutdownHook(new Thread(() => {
       logger.info("Shutting down server...")
       embeddedRepl.shutdown()

server/src/test/scala/replpp/server/ReplServerTests.scala

@@ -4,7 +4,6 @@ import cask.util.Logger.Console.*
 import castor.Context.Simple.global
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import replpp.Config
 import requests.RequestFailedException
 import ujson.Value.Value
 
@@ -371,9 +370,18 @@ class ReplServerTests extends AnyWordSpec with Matchers {
 }
 
 object Fixture {
+  val defaultCompilerArgs = {
+    val inheritedClasspath = System.getProperty("java.class.path")
+    Array(
+      "-classpath", inheritedClasspath,
+      "-explain", // verbose scalac error messages
+      "-deprecation",
+      "-color", "never"
+    )
+  }
 
   def apply[T](predefCode: String = "")(urlToResult: String => T): T = {
-    val embeddedRepl = new EmbeddedRepl(predefLines = predefCode.linesIterator)
+    val embeddedRepl = new EmbeddedRepl(defaultCompilerArgs, predefLines = predefCode.linesIterator)
 
     val host = "localhost"
     val port = 8081