update demo-project

Author: mpollmeier

README.md

@@ -22,6 +22,27 @@ libraryDependencies += "com.michaelpollmeier" % "scala-repl-pp_3.6.4" % "<versio
 * `srp` is published with the full scala version suffix (e.g. `_3.6.4` instead of just `_3`) because the stock Scala REPL often has binary incompatible changes between minor version changes - different Scala patch versions typically work though, e.g. if your build uses Scala 3.6.3 you can use `scala-repl-pp_3.6.4`
 * `srp` has only one direct dependency: the scala3-compiler[(*)](#fineprint)
 
+As an example take a look at the demo project ["string calculator"](src/test/resources/demo-project) in this repository:
+```bash
+cd core/src/test/resources/demo-project
+sbt stage
+./stringcalc
+
+Welcome to the magical world of string calculation!
+Type `help` for help
+
+stringcalc> add(One, Two)
+val res0: stringcalc.Number = Number(3)
+
+stringcalc> :exit  // or press Ctrl-D
+
+
+./stringcalc --script plus.sc
+executing plus.sc
+Number(3)
+```
+
+
 ## Table of contents
 <!-- generated with:
 markdown-toc --maxdepth 3 README.md|tail -n +5 
@@ -499,20 +520,6 @@ Server-specific configuration options as per `srp --help`:
 --server-auth-password <value> Basic auth password for the REPL server
 ```
 
-## Embed into your own project
-Try out the working [string calculator example](src/test/resources/demo-project) in this repo:
-```bash
-cd core/src/test/resources/demo-project
-sbt stage
-./stringcalc
-
-Welcome to the magical world of string calculation!
-Type `help` for help
-
-stringcalc> add(One, Two)
-val res0: stringcalc.Number = Number(3)
-```
-
 ## Verbose mode
 If verbose mode is enabled, you'll get additional information about classpaths and complete scripts etc. 
 To enable it, you can either pass `--verbose` or set the environment variable `SCALA_REPL_PP_VERBOSE=true`.

core/src/main/scala/replpp/Config.scala

@@ -292,7 +292,7 @@ object Config {
    * equality etc. differently, which breaks common case class conventions.
    */
   case class ForClasspath(additionalClasspathEntries: Seq[String] = Seq.empty,
-                          inheritClasspath: Boolean = false,
+                          inheritClasspath: Boolean = true,
                           inheritClasspathIncludes: Seq[String] = ForClasspath.DefaultInheritClasspathIncludes,
                           inheritClasspathExcludes: Seq[String] = Seq.empty,
                           dependencies: Seq[String] = Seq.empty,

core/src/main/scala/replpp/JLineTerminal.scala

@@ -17,14 +17,12 @@ import org.jline.terminal.Terminal
 import org.jline.terminal.Terminal.Signal
 import org.jline.terminal.TerminalBuilder
 import org.jline.utils.AttributedString
-import org.slf4j.LoggerFactory
 
 import scala.util.Try
 
 /** Based on https://github.com/lampepfl/dotty/blob/3.4.1/compiler/src/dotty/tools/repl/JLineTerminal.scala
   * and adapted for our needs */
 class JLineTerminal extends java.io.Closeable {
-  private val logger = LoggerFactory.getLogger(getClass)
 
   // MP: adapted here
   // if env var TERM=dumb is defined, instantiate as 'dumb' straight away, otherwise try to instantiate as a

core/src/main/scala/replpp/Main.scala

@@ -3,11 +3,12 @@ package replpp
 import replpp.scripting.ScriptRunner
 
 object Main {
-  def main(args: Array[String]): Unit = {
-    val config = Config.parse(args)
+  def main(args: Array[String]): Unit =
+    run(Config.parse(args))
 
+  def run(config: Config): Unit = {
     if (config.scriptFile.isDefined) {
-      ScriptRunner.main(args)
+      ScriptRunner.exec(config).get
     } else {
       InteractiveShell.run(config)
     }

core/src/test/resources/demo-project/build.sbt

@@ -1,9 +1,11 @@
 name := "stringcalc"
 
-scalaVersion := "3.3.0"
+scalaVersion := "3.6.4"
+val srpVersion = "0.5.4"
 
 libraryDependencies ++= Seq(
-  "com.michaelpollmeier" %% "scala-repl-pp" % "0.1.56"
+  "com.michaelpollmeier" % "scala-repl-pp" % srpVersion cross CrossVersion.full,
+  "com.github.scopt" %% "scopt" % "4.1.0",
 )
 
 enablePlugins(JavaAppPackaging)

core/src/test/resources/demo-project/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.10.11

core/src/test/resources/demo-project/src/main/scala/stringcalc/Domain.scala

@@ -7,6 +7,7 @@ object One   extends Number(1)
 object Two   extends Number(2)
 object Three extends Number(3)
 
+
 object StringCalculator {
   def add(number1: Number, number2: Number): Number =
     (number1, number2) match {

core/src/test/resources/demo-project/src/main/scala/stringcalc/Main.scala

@@ -1,26 +1,48 @@
 package stringcalc
 
-import java.nio.file.Files
-import replpp.{Config, InteractiveShell}
+import java.nio.file.{Files, Path}
+import scopt.OParser
 
-object Main {
-  @main def startRepl(): Unit = {
-    val predefFileTmp = Files.createTempFile("scala-repl-pp-demo-project-predef", ".sc")
-    Files.writeString(
-      predefFileTmp,
-      s"""import stringcalc._
-         |import StringCalculator._
-         |
-         |def help: Unit = println("try this: `add(One, Two)`")
-      """.stripMargin
-    )
-
-    InteractiveShell.run(
-      Config(
-        prompt = Some("stringcalc"),
-        greeting = "Welcome to the magical world of string calculation! \nType `help` for help",
-        predefFiles = Seq(predefFileTmp),
+def main(args: Array[String]) = {
+  Config.parse(args) match {
+    case Some(config) =>
+      replpp.Main.run(
+        replpp.Config(
+          scriptFile = config.scriptFile,
+          prompt = Some("stringcalc"),
+          greeting = Some("Welcome to the magical world of string calculation! \nType `help` for help"),
+          verbose = config.verbose,
+          runBefore = Seq(
+            "import stringcalc.*",
+            "import StringCalculator.*",
+            """def help: Unit = println("try this: `add(One, Two)`")"""
+          )
+        )
       )
+    case None => System.exit(1)
+  }
+}
+
+case class Config(verbose: Boolean = false, scriptFile: Option[Path] = None)
+object Config {
+  def parse(args: Array[String]): Option[Config] =
+    OParser.parse(parser, args, Config())
+
+  private val builder = OParser.builder[Config]
+  private val parser = {
+    import builder._
+    OParser.sequence(
+      programName("stringcalc"),
+      opt[Boolean]('v', "verbose")
+        .action((x, c) => c.copy(verbose = x))
+        .text("enable verbose mode"),
+      opt[Path]("script")
+        .action((x, c) => c.copy(scriptFile = Option(x)))
+        .text("path to script file")
+        .validate(path =>
+          if (Files.exists(path)) success
+          else failure(s"script file $path does not exist")
+        )
     )
   }
 }