Merge pull request #154 from alexarchambault/remove-cli

Remove cli

.gitignore

@@ -2,3 +2,4 @@ target/
 .bsp/
 metals.sbt
 .vscode/
+.bloop/

README.md

@@ -30,7 +30,7 @@ val command = AmmoniteFetcher(versions)
 
 val proc: Process = command
   .withArgs(Seq(file.getAbsolutePath))
-  .runBg()
+  .run()
 
 val retCode: Int = proc.waitFor()
 ```

build.sbt

@@ -1,3 +1,4 @@
+import scala.util.Properties
 
 inThisBuild(List(
   organization := "io.github.alexarchambault.ammonite",
@@ -21,12 +22,11 @@ lazy val isAtLeastScala213 = Def.setting {
 
 val scala213 = "2.13.8"
 val scala212 = "2.12.16"
-val scala211 = "2.11.12"
 
 lazy val shared = Def.settings(
   sonatypeProfileName := "io.github.alexarchambault",
   scalaVersion := scala213,
-  crossScalaVersions := Seq(scala213, scala212, scala211),
+  crossScalaVersions := Seq(scala213, scala212),
   libraryDependencies ++= {
     if (isAtLeastScala213.value) Nil
     else Seq(compilerPlugin(Deps.macroParadise))
@@ -47,10 +47,13 @@ lazy val core = project
       Deps.coursierInterface,
       Deps.coursierLauncher,
       Deps.dataClass % Provided,
-      Deps.svm % Provided,
-      Deps.utest.value % Test
+      Deps.osLib % Test,
+      Deps.utest % Test
     ),
     testFrameworks += new TestFramework("utest.runner.Framework"),
+    mimaPreviousArtifacts := {
+      mimaPreviousArtifacts.value.filter(!_.revision.startsWith("0.3."))
+    },
     mimaBinaryIssueFilters ++= {
       import com.typesafe.tools.mima.core._
       Seq(
@@ -61,36 +64,6 @@ lazy val core = project
     }
   )
 
-lazy val cli = project
-  .dependsOn(core)
-  // .enablePlugins(GraalVMNativeImagePlugin)
-  .enablePlugins(PackPlugin)
-  .disablePlugins(MimaPlugin)
-  .settings(
-    name := "ammonite-runner-cli",
-    shared,
-    crossScalaVersions := crossScalaVersions.value.filter(!_.startsWith("2.11.")),
-    libraryDependencies ++= Seq(
-      Deps.caseApp,
-      Deps.utest.value % Test
-    ),
-    testFrameworks += new TestFramework("utest.runner.Framework"),
-    Test / fork := true,
-    Test / javaOptions += {
-      val isWindows = System.getProperty("os.name")
-        .toLowerCase(java.util.Locale.ROOT)
-        .contains("windows")
-      val ext = if (isWindows) ".bat" else ""
-      val launcher = (Compile / pack)
-        .value
-        .getAbsoluteFile
-        ./("bin/amm-runner" + ext)
-        .toString
-      s"-Dammrunner.launcher=$launcher"
-    },
-    // graalVMNativeImageOptions += "--no-server"
-  )
-
 shared
 publish / skip := true
 disablePlugins(MimaPlugin)

core/src/main/scala/ammrunner/AmmRunner.scala

@@ -0,0 +1,41 @@
+package ammrunner.cli
+
+import java.io.File
+
+import ammrunner.{AmmoniteFetcher, Command, Versions, VersionsOption}
+
+object AmmRunner {
+
+  def command(
+    ammVersion: Option[String],
+    scalaVersion: Option[String],
+    args: Seq[String]
+  ): Command = {
+
+    val scriptPathOpt = args
+      .iterator
+      .filter(!_.startsWith("-"))
+      .filter(_.endsWith(".sc"))
+      .map(new File(_))
+      .filter(_.isFile)
+      .toStream
+      .headOption
+
+    val versionsOpt = VersionsOption(ammVersion, scalaVersion)
+    val versions = scriptPathOpt match {
+      case None =>
+        versionsOpt.getOrElse(Versions.default())
+
+      case Some(script) =>
+        versionsOpt
+          .orElse(VersionsOption.fromScript(script))
+          .getOrElse(Versions.default())
+    }
+    val command = AmmoniteFetcher(versions).command() match {
+      case Left(e) => throw new Exception("Error getting Ammonite class path", e)
+      case Right(cmd) => cmd
+    }
+
+    command.withArgs(args)
+  }
+}