Update Ammonite to 3.0.0-M0-14-c12b6a59 (#1074)

almond-sh · Apr 10, 2023 · 858b157 · 858b157
1 parent 53ef1f0
commit 858b157
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 9 deletions.
diff --git a/.../scala/scala-interpreter/src/main/scala-2/almond/amm/AlmondCompilerLifecycleManager.scala b/.../scala/scala-interpreter/src/main/scala-2/almond/amm/AlmondCompilerLifecycleManager.scala
@@ -15,13 +15,15 @@ class AlmondCompilerLifecycleManager(
   autoUpdateLazyVals: Boolean,
   autoUpdateVars: Boolean,
   variableInspectorEnabled: () => Boolean,
+  outputDir: Option[Path],
   logCtx: LoggerContext
 ) extends CompilerLifecycleManager(
       rtCacheDir,
       headFrame,
       dependencyCompleteOpt,
       classPathWhitelist,
-      initialClassLoader
+      initialClassLoader,
+      outputDir
     ) {
   override def preprocess(fileName: String): Preprocessor =
     synchronized {

diff --git a/.../scala/scala-interpreter/src/main/scala-3/almond/amm/AlmondCompilerLifecycleManager.scala b/.../scala/scala-interpreter/src/main/scala-3/almond/amm/AlmondCompilerLifecycleManager.scala
@@ -16,13 +16,15 @@ class AlmondCompilerLifecycleManager(
   autoUpdateLazyVals: Boolean,
   autoUpdateVars: Boolean,
   variableInspectorEnabled: () => Boolean,
+  outputDir: Option[Path],
   logCtx: LoggerContext
 ) extends CompilerLifecycleManager(
       rtCacheDir,
       headFrame,
       dependencyCompleteOpt,
       classPathWhitelist,
-      initialClassLoader
+      initialClassLoader,
+      outputDir
     ) {
 
   override def preprocess(fileName: String): Preprocessor = synchronized {

diff --git a/modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreter.scala b/modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreter.scala
@@ -105,7 +105,8 @@ final class ScalaInterpreter(
       params.autoUpdateVars,
       params.initialClassLoader,
       logCtx,
-      jupyterApi.VariableInspector.enabled
+      jupyterApi.VariableInspector.enabled,
+      outputDir = params.outputDir
     )
   }
 

diff --git a/modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreterParams.scala b/modules/scala/scala-interpreter/src/main/scala/almond/ScalaInterpreterParams.scala
@@ -33,5 +33,6 @@ final case class ScalaInterpreterParams(
   autoUpdateLazyVals: Boolean = true,
   autoUpdateVars: Boolean = true,
   allowVariableInspector: Option[Boolean] = None,
-  useThreadInterrupt: Boolean = false
+  useThreadInterrupt: Boolean = false,
+  outputDir: Either[os.Path, Boolean] = Right(true)
 )
diff --git a/modules/scala/scala-interpreter/src/main/scala/almond/amm/AmmInterpreter.scala b/modules/scala/scala-interpreter/src/main/scala/almond/amm/AmmInterpreter.scala
@@ -73,7 +73,8 @@ object AmmInterpreter {
     autoUpdateVars: Boolean,
     initialClassLoader: ClassLoader,
     logCtx: LoggerContext,
-    variableInspectorEnabled: () => Boolean
+    variableInspectorEnabled: () => Boolean,
+    outputDir: Either[os.Path, Boolean]
   ): ammonite.interp.Interpreter = {
 
     val automaticDependenciesMatchers = automaticDependencies
@@ -115,9 +116,16 @@ object AmmInterpreter {
         alreadyLoadedDependencies =
           ammonite.main.Defaults.alreadyLoadedDependencies("almond/almond-user-dependencies.txt")
       )
+      val outputDir0 = outputDir match {
+        case Left(path)   => Some(path.toNIO)
+        case Right(true)  => Some(os.temp.dir(prefix = "almond-output").toNIO)
+        case Right(false) => None
+      }
       val ammInterp0: ammonite.interp.Interpreter =
         new ammonite.interp.Interpreter(
-          ammonite.compiler.CompilerBuilder,
+          ammonite.compiler.CompilerBuilder(
+            outputDir = outputDir0
+          ),
           () => ammonite.compiler.Parsers,
           getFrame = () => frames0().head,
           createFrame = () => {
@@ -136,6 +144,7 @@ object AmmInterpreter {
             autoUpdateLazyVals,
             autoUpdateVars,
             variableInspectorEnabled,
+            outputDir0,
             logCtx
           )
         }

diff --git a/modules/scala/scala-kernel/src/main/scala/almond/Options.scala b/modules/scala/scala-kernel/src/main/scala/almond/Options.scala
@@ -14,6 +14,7 @@ import coursier.parse.{DependencyParser, ModuleParser}
 import scala.collection.compat._
 import scala.jdk.CollectionConverters._
 
+// format: off
 @ProgName("almond")
 final case class Options(
   install: Boolean = false,
@@ -66,8 +67,14 @@ final case class Options(
   @HelpMessage(
     "Whether to use 'Thread.interrupt' method or deprecated 'Thread.stop' method (default) when interrupting kernel."
   )
-  useThreadInterrupt: Boolean = false
+  useThreadInterrupt: Boolean = false,
+
+  @ExtraName("outputDir")
+    outputDirectory: Option[String] = None,
+  @ExtraName("tmpOutputDir")
+    tmpOutputDirectory: Option[Boolean] = None
 ) {
+  // format: on
 
   private lazy val sbv = scala.util.Properties.versionNumberString.split('.').take(2).mkString(".")
 

diff --git a/modules/scala/scala-kernel/src/main/scala/almond/ScalaKernel.scala b/modules/scala/scala-kernel/src/main/scala/almond/ScalaKernel.scala
@@ -124,7 +124,14 @@ object ScalaKernel extends CaseApp[Options] {
         autoUpdateLazyVals = options.autoUpdateLazyVals,
         autoUpdateVars = options.autoUpdateVars,
         allowVariableInspector = options.variableInspector,
-        useThreadInterrupt = options.useThreadInterrupt
+        useThreadInterrupt = options.useThreadInterrupt,
+        outputDir = options.outputDirectory
+          .filter(_.trim.nonEmpty)
+          .map(os.Path(_, os.pwd))
+          .toLeft {
+            options.tmpOutputDirectory
+              .getOrElse(true) // Create tmp output dir by default
+          }
       ),
       logCtx = logCtx
     )

diff --git a/project/deps.sc b/project/deps.sc
@@ -2,7 +2,7 @@ import mill._
 import mill.scalalib._
 
 object Versions {
-  def ammonite      = "3.0.0-M0-10-addf882b"
+  def ammonite      = "3.0.0-M0-14-c12b6a59"
   def caseApp       = "2.0.6"
   def jsoniterScala = "2.13.5"
   def scalafmt      = "2.7.5"