Add more interactive options (#1040)

* Add more interactive options

Author: lwronski

modules/build/src/main/scala/scala/build/Build.scala

@@ -14,7 +14,6 @@ import scala.build.EitherCps.{either, value}
 import scala.build.Ops.*
 import scala.build.compiler.{ScalaCompiler, ScalaCompilerMaker}
 import scala.build.errors.*
-import scala.build.interactive.Interactive
 import scala.build.internal.{Constants, CustomCodeWrapper, MainClass, Util}
 import scala.build.options.*
 import scala.build.options.validation.ValidationException
@@ -63,18 +62,16 @@ object Build {
       def foundMainClass =
         if (foundMainClasses0.isEmpty) Left(new NoMainClassFoundError)
         else if (foundMainClasses0.length == 1) Right(foundMainClasses0.head)
-        else {
-          val msg = "Found several main classes. Which would you like to run?"
-          val fallbackError = new SeveralMainClassesFoundError(
-            ::(foundMainClasses0.head, foundMainClasses0.tail.toList),
-            Nil
-          )
-          Interactive(options).chooseOne(
-            msg,
-            foundMainClasses0.toList,
-            fallbackError
-          )
-        }
+        else
+          options.interactive.chooseOne(
+            "Found several main classes. Which would you like to run?",
+            foundMainClasses0.toList
+          ).toRight {
+            new SeveralMainClassesFoundError(
+              ::(foundMainClasses0.head, foundMainClasses0.tail.toList),
+              Nil
+            )
+          }
 
       defaultMainClassOpt match {
         case Some(cls) => Right(cls)

modules/build/src/main/scala/scala/build/interactive/Interactive.scala

@@ -101,9 +101,6 @@ final case class SharedOptions(
 
   @Hidden
     strictBloopJsonCheck: Option[Boolean] = None,
-  @HelpMessage("Interactive mode")
-  @Name("i")
-    interactive: Option[Boolean] = None
 )
   // format: on
 

modules/cli-options/src/main/scala/scala/cli/commands/SharedOptions.scala

@@ -9,7 +9,10 @@ final case class VerbosityOptions(
   @Group("Logging")
   @HelpMessage("Increase verbosity (can be specified multiple times)")
   @Name("v")
-    verbose: Int @@ Counter = Tag.of(0)
+    verbose: Int @@ Counter = Tag.of(0),
+  @HelpMessage("Interactive mode")
+  @Name("i")
+    interactive: Option[Boolean] = None
 ) {
   // format: on
 

modules/cli-options/src/main/scala/scala/cli/commands/VerbosityOptions.scala

@@ -9,6 +9,7 @@ import scala.build.EitherCps.{either, value}
 import scala.build._
 import scala.build.compiler.{ScalaCompilerMaker, SimpleScalaCompilerMaker}
 import scala.build.errors.BuildException
+import scala.build.interactive.InteractiveFileOps
 import scala.build.internal.Runner
 import scala.cli.CurrentParams
 import scala.cli.commands.util.SharedOptionsUtil._
@@ -78,11 +79,12 @@ object Doc extends ScalaCommand[DocOptions] {
 
     def alreadyExistsCheck(): Unit = {
       val alreadyExists = !force && os.exists(destPath)
-      if (alreadyExists) {
-        val msg = s"$printableDest already exists"
-        System.err.println(s"Error: $msg. Pass -f or --force to force erasing it.")
-        sys.exit(1)
-      }
+      if (alreadyExists)
+        InteractiveFileOps.erasingPath(build.options.interactive, printableDest, destPath) { () =>
+          val msg = s"$printableDest already exists"
+          System.err.println(s"Error: $msg. Pass -f or --force to force erasing it.")
+          sys.exit(1)
+        }
     }
 
     alreadyExistsCheck()

modules/cli/src/main/scala/scala/cli/commands/Doc.scala

@@ -2,11 +2,13 @@ package scala.cli.commands
 
 import caseapp._
 
+import scala.build.interactive.InteractiveFileOps
 import scala.build.internal.{Constants, CustomCodeWrapper, FetchExternalBinary, Runner}
 import scala.build.options.BuildOptions
 import scala.build.{CrossSources, Inputs, Logger, Sources}
 import scala.cli.CurrentParams
 import scala.cli.commands.util.SharedOptionsUtil._
+import scala.cli.commands.util.VerbosityOptionsUtil._
 import scala.util.Properties
 import scala.util.control.NonFatal
 
@@ -97,7 +99,8 @@ object Fmt extends ScalaCommand[FmtOptions] {
 
   def run(options: FmtOptions, args: RemainingArgs): Unit = {
     CurrentParams.verbosity = options.shared.logging.verbosity
-    val logger = options.shared.logger
+    val interactive = options.shared.logging.verbosityOptions.interactiveInstance
+    val logger      = options.shared.logger
 
     // TODO If no input is given, just pass '.' to scalafmt?
     val (sourceFiles, workspace, inputsOpt) =
@@ -112,16 +115,24 @@ object Fmt extends ScalaCommand[FmtOptions] {
         (s, i.workspace, Some(i))
       }
     CurrentParams.workspaceOpt = Some(workspace)
-    val (versionMaybe, confExists) = readVersionFromFile(workspace, logger)
-    val cache                      = options.shared.buildOptions().archiveCache
+    val (versionMaybe, confExists0) = readVersionFromFile(workspace, logger)
+    val cache                       = options.shared.buildOptions().archiveCache
+    val buildOptions                = options.buildOptions
 
-    val version = versionMaybe.getOrElse {
-      System.err.println(
+    val (version, confExists) = versionMaybe.map((_, confExists0)).getOrElse {
+      val errorMsg =
         s"""|Scalafmt requires explicitly specified version.
             |To configure the scalafmt version add the following line into .scalafmt.conf:
             |    version = ${Constants.defaultScalafmtVersion} """.stripMargin
-      )
-      sys.exit(1)
+      val msg = s"""|$errorMsg
+                    |Do you want to add Scalafmt version to .scalafmt.conf file?""".stripMargin
+      val scalafmtConfPath = workspace / ".scalafmt"
+      val entry = s"version = ${Constants.defaultScalafmtVersion}${System.lineSeparator()}"
+      InteractiveFileOps.appendToFile(interactive, msg, scalafmtConfPath, entry) { () =>
+        System.err.println(errorMsg)
+        sys.exit(1)
+      }
+      (Constants.defaultScalafmtVersion, true)
     }
 
     if (sourceFiles.isEmpty)
@@ -133,11 +144,11 @@ object Fmt extends ScalaCommand[FmtOptions] {
           CrossSources.forInputs(
             inputs,
             Sources.defaultPreprocessors(
-              options.buildOptions.scriptOptions.codeWrapper.getOrElse(CustomCodeWrapper)
+              buildOptions.scriptOptions.codeWrapper.getOrElse(CustomCodeWrapper)
             ),
             logger
           ).orExit(logger)
-        val sharedOptions = crossSources.sharedOptions(options.buildOptions)
+        val sharedOptions = crossSources.sharedOptions(buildOptions)
         sharedOptions
           .scalaParams
           .orExit(logger)

modules/cli/src/main/scala/scala/cli/commands/Fmt.scala

@@ -9,6 +9,7 @@ import java.util.Arrays
 
 import scala.cli.CurrentParams
 import scala.cli.commands.util.CommonOps._
+import scala.cli.commands.util.VerbosityOptionsUtil._
 import scala.cli.internal.{Argv0, ProfileFileUpdater}
 
 object InstallCompletions extends ScalaCommand[InstallCompletionsOptions] {
@@ -19,7 +20,7 @@ object InstallCompletions extends ScalaCommand[InstallCompletionsOptions] {
   private lazy val home = os.Path(sys.props("user.home"), os.pwd)
   def run(options: InstallCompletionsOptions, args: RemainingArgs): Unit = {
     CurrentParams.verbosity = options.logging.verbosity
-
+    val interactive = options.logging.verbosityOptions.interactiveInstance
     lazy val completionsDir =
       options.output
         .map(os.Path(_, os.pwd))
@@ -43,12 +44,15 @@ object InstallCompletions extends ScalaCommand[InstallCompletionsOptions] {
         }
       }
       .getOrElse {
-        System.err.println(
-          "Cannot determine current shell, pass the shell you use with --shell, like"
-        )
-        System.err.println(s"  $name install completions --shell zsh")
-        System.err.println(s"  $name install completions --shell bash")
-        sys.exit(1)
+        val msg = "Cannot determine current shell. Which would you like to use?"
+        interactive.chooseOne(msg, List("zsh", "bash")).getOrElse {
+          System.err.println(
+            "Cannot determine current shell, pass the shell you use with --shell, like"
+          )
+          System.err.println(s"  $name install completions --shell zsh")
+          System.err.println(s"  $name install completions --shell bash")
+          sys.exit(1)
+        }
       }
 
     val (rcScript, defaultRcFile) = format match {

modules/cli/src/main/scala/scala/cli/commands/InstallCompletions.scala

@@ -18,6 +18,7 @@ import java.util.zip.{ZipEntry, ZipOutputStream}
 import scala.build.EitherCps.{either, value}
 import scala.build._
 import scala.build.errors.{BuildException, MalformedCliInputError, ScalaNativeBuildError}
+import scala.build.interactive.InteractiveFileOps
 import scala.build.internal.{Runner, ScalaJsLinkerConfig}
 import scala.build.options.{PackageType, Platform}
 import scala.cli.CurrentParams
@@ -221,13 +222,14 @@ object Package extends ScalaCommand[PackageOptions] {
       val alreadyExists = !force &&
         os.exists(destPath) &&
         !expectedModifyEpochSecondOpt.contains(os.mtime(destPath))
-      if (alreadyExists) {
-        val msg =
-          if (expectedModifyEpochSecondOpt.isEmpty) s"$printableDest already exists"
-          else s"$printableDest was overwritten by another process"
-        System.err.println(s"Error: $msg. Pass -f or --force to force erasing it.")
-        sys.exit(1)
-      }
+      if (alreadyExists)
+        InteractiveFileOps.erasingPath(build.options.interactive, printableDest, destPath) { () =>
+          val errorMsg =
+            if (expectedModifyEpochSecondOpt.isEmpty) s"$printableDest already exists"
+            else s"$printableDest was overwritten by another process"
+          System.err.println(s"Error: $errorMsg. Pass -f or --force to force erasing it.")
+          sys.exit(1)
+        }
     }
 
     alreadyExistsCheck()

modules/cli/src/main/scala/scala/cli/commands/Package.scala

@@ -7,9 +7,9 @@ import com.github.plokhotnyuk.jsoniter_scala.macros._
 import scala.build.Logger
 import scala.build.internal.Constants.{ghName, ghOrg, version => scalaCliVersion}
 import scala.cli.CurrentParams
+import scala.cli.commands.util.VerbosityOptionsUtil._
 import scala.cli.internal.ProcUtil
 import scala.cli.signing.shared.Secret
-import scala.io.StdIn.readLine
 import scala.util.Properties
 import scala.util.control.NonFatal
 
@@ -59,19 +59,15 @@ object Update extends ScalaCommand[UpdateOptions] {
     )
 
   private def updateScalaCli(options: UpdateOptions, newVersion: String) = {
-    if (!options.force)
-      if (coursier.paths.Util.useAnsiOutput()) {
-        println(s"Do you want to update scala-cli to version $newVersion [Y/n]")
-        val response = readLine()
-        if (response.toLowerCase != "y") {
-          System.err.println("Abort")
-          sys.exit(1)
-        }
-      }
-      else {
+    val interactive = options.verbosity.interactiveInstance
+    if (!options.force) {
+      val fallbackAction = () => {
         System.err.println(s"To update scala-cli to $newVersion pass -f or --force")
         sys.exit(1)
       }
+      val msg = s"Do you want to update scala-cli to version $newVersion?"
+      interactive.confirmOperation(msg).getOrElse(fallbackAction())
+    }
 
     val installationScript =
       ProcUtil.downloadFile("https://virtuslab.github.io/scala-cli-packages/scala-setup.sh")

modules/cli/src/main/scala/scala/cli/commands/Update.scala

@@ -147,7 +147,7 @@ object SharedOptionsUtil {
           localRepository = LocalRepo.localRepo(directories.directories.localRepoDir),
           verbosity = Some(logging.verbosity),
           strictBloopJsonCheck = strictBloopJsonCheck,
-          interactive = interactive
+          interactive = logging.verbosityOptions.interactive
         ),
         notForBloopOptions = bo.PostBuildOptions(
           scalaJsLinkerOptions = linkerOptions(js)

modules/cli/src/main/scala/scala/cli/commands/util/SharedOptionsUtil.scala

@@ -0,0 +1,10 @@
+package scala.cli.commands
+package util
+
+import scala.build.interactive.Interactive._
+
+object VerbosityOptionsUtil {
+  implicit class VerbosityOptionsOps(v: VerbosityOptions) {
+    val interactiveInstance = if (v.interactive.getOrElse(false)) InteractiveAsk else InteractiveNop
+  }
+}