Add a test for positional arguments and fix formatting

Author: jchyb

cli/src/main/scala/scala/scalanative/cli/ScalaNativeCli.scala

@@ -11,7 +11,7 @@ import caseapp.core.RemainingArgs
 object ScalaNativeCli extends CaseApp[CliOptions] {
 
   def run(options: CliOptions, args: RemainingArgs) = {
-    val positionalArgs = args.all 
+    val positionalArgs = args.all
     val buildOptionsMaybe = ConfigConverter.convert(options, positionalArgs)
 
     buildOptionsMaybe.map { buildOptions =>

cli/src/main/scala/scala/scalanative/cli/options/CliOptions.scala

@@ -4,7 +4,7 @@ import caseapp._
 
 @AppName("ScalaNativeCli")
 @ProgName("scala-native-cli")
-@ArgsName("main] [nir-files")
+@ArgsName("main-class] [nir-sources")
 case class CliOptions(
     @Recurse
     config: ConfigOptions,

cli/src/main/scala/scala/scalanative/cli/utils/ConfigConverter.scala

@@ -15,14 +15,25 @@ case class BuildOptions(
 
 object ConfigConverter {
 
-  def convert(options: CliOptions, positionalArgs: Seq[String]): Either[Throwable, BuildOptions] = {
-    val main = positionalArgs.head
-    val classpath = positionalArgs.tail
-    generateConfig(options, main, classpath).flatMap(config =>
-      Try(Paths.get(options.config.outpath)).toEither.map(outpath =>
-        BuildOptions(config, outpath)
+  def convert(
+      options: CliOptions,
+      positionalArgs: Seq[String]
+  ): Either[Throwable, BuildOptions] = {
+    if (positionalArgs.size < 2) {
+      Left(
+        new IllegalArgumentException(
+          "Not enough positional arguments. Main and at least one source file need to be specified."
+        )
+      )
+    } else {
+      val main = positionalArgs.head
+      val classpath = positionalArgs.tail
+      generateConfig(options, main, classpath).flatMap(config =>
+        Try(Paths.get(options.config.outpath)).toEither.map(outpath =>
+          BuildOptions(config, outpath)
+        )
       )
-    )
+    }
   }
 
   private def generateNativeConfig(
@@ -61,7 +72,11 @@ object ConfigConverter {
     } yield maybeNativeConfig
   }
 
-  private def generateConfig(options: CliOptions, main: String, classPath: Seq[String]): Either[Throwable, Config] = {
+  private def generateConfig(
+      options: CliOptions,
+      main: String,
+      classPath: Seq[String]
+  ): Either[Throwable, Config] = {
     for {
       nativeConfig <- generateNativeConfig(options)
       classPath <- Try(parseClassPath(classPath)).toEither

cli/src/main/scala/scala/scalanative/cli/utils/NativeConfigParserImplicits.scala

@@ -42,4 +42,4 @@ object NativeConfigParserImplicits {
           caseapp.core.Error.UnrecognizedArgument(other)
         )
     }
-}
+}

cli/src/test/scala/scala/scalanative/cli/ConfigConverterTest.scala

@@ -17,7 +17,8 @@ class ConfigConverterTest extends AnyFlatSpec {
   val dummyNativeConfigOptions = NativeConfigOptions()
   val dummyConfigOptions = ConfigOptions()
 
-  val dummyArguments = Seq("$Main", "A.nir", "B.nir") // TODO incomplete arguments
+  val dummyArguments =
+    Seq("$Main", "A.nir", "B.nir")
 
   val dummyCliOptions: CliOptions = CliOptions(
     config = dummyConfigOptions,
@@ -30,28 +31,33 @@ class ConfigConverterTest extends AnyFlatSpec {
     assert(config.isRight)
   }
 
-  //TODO incomplete arguments check reporting
-
-  // it should "return default nativeConfig which lines up with empty nativeConfig" in {
-  //   val withInternallyDiscovered = 
-  //     CliOptions(
-  //       dummyConfigOptions,
-  //       NativeConfigOptions(clang = Some(""), clangPP = Some("")),
-  //       logger = dummyLoggerOptions
-  //     )
-  //   val result = ConfigConverter.convert(withInternallyDiscovered, dummyArguments)
-  //   assert(result.right.get.config.compilerConfig == NativeConfig.empty)
-  // }
+  // TODO incomplete arguments check reporting
+  it should "report incomplete arguments" in {
+    val noArgs = Seq()
+    val noArgsResult = ConfigConverter.convert(dummyCliOptions, noArgs)
+    assert(noArgsResult.isLeft)
+    assert(noArgsResult.left.get.isInstanceOf[IllegalArgumentException])
+
+    val mainOnly = Seq("Main$")
+    val mainOnlyResult = ConfigConverter.convert(dummyCliOptions, mainOnly)
+    assert(mainOnlyResult.isLeft)
+    assert(mainOnlyResult.left.get.isInstanceOf[IllegalArgumentException])
+  }
 
   it should "parse classpath strings correctly" in {
-    val classPathStrings = Seq("/home/dir/file", "/home/dirfile2", "/home/dir/with spaces/") // check case app passing with spaces
+    val classPathStrings = Seq(
+      "/home/dir/file",
+      "/home/dirfile2",
+      "/home/dir/with spaces/"
+    ) // check case app passing with spaces
     val expected = Seq(
       Paths.get("/home/dir/file"),
       Paths.get("/home/dirfile2"),
       Paths.get("/home/dir/with spaces/")
     )
 
-    val config = ConfigConverter.convert(dummyCliOptions, Seq("$Main") ++ classPathStrings)
+    val config =
+      ConfigConverter.convert(dummyCliOptions, Seq("$Main") ++ classPathStrings)
 
     assert(config != None)
     assert(config.right.get.config.classPath.sameElements(expected))
@@ -61,10 +67,13 @@ class ConfigConverterTest extends AnyFlatSpec {
     def gcAssertion(gcString: String, expectedGC: GC) = {
       val options = CliOptions(
         dummyConfigOptions,
-        NativeConfigOptions(gc = NativeConfigParserImplicits.gcParser(None, gcString).right.get),
+        NativeConfigOptions(gc =
+          NativeConfigParserImplicits.gcParser(None, gcString).right.get
+        ),
         dummyLoggerOptions
       )
-      val config = ConfigConverter.convert(options, dummyArguments).right.get.config
+      val config =
+        ConfigConverter.convert(options, dummyArguments).right.get.config
       assert(config.compilerConfig.gc == expectedGC)
     }
     gcAssertion("immix", GC.immix)
@@ -77,10 +86,13 @@ class ConfigConverterTest extends AnyFlatSpec {
     def modeAssertion(modeString: String, expectedMode: Mode) = {
       val options = CliOptions(
         dummyConfigOptions,
-        NativeConfigOptions(mode = NativeConfigParserImplicits.modeParser(None, modeString).right.get),
+        NativeConfigOptions(mode =
+          NativeConfigParserImplicits.modeParser(None, modeString).right.get
+        ),
         dummyLoggerOptions
       )
-      val config = ConfigConverter.convert(options, dummyArguments).right.get.config
+      val config =
+        ConfigConverter.convert(options, dummyArguments).right.get.config
       assert(config.compilerConfig.mode == expectedMode)
     }
     modeAssertion("debug", Mode.debug)
@@ -92,10 +104,13 @@ class ConfigConverterTest extends AnyFlatSpec {
     def ltoAssertion(ltoString: String, expectedLto: LTO) = {
       val options = CliOptions(
         dummyConfigOptions,
-        NativeConfigOptions(lto = NativeConfigParserImplicits.ltoParser(None, ltoString).right.get),
+        NativeConfigOptions(lto =
+          NativeConfigParserImplicits.ltoParser(None, ltoString).right.get
+        ),
         dummyLoggerOptions
       )
-      val config = ConfigConverter.convert(options, dummyArguments).right.get.config
+      val config =
+        ConfigConverter.convert(options, dummyArguments).right.get.config
       assert(config.compilerConfig.lto == expectedLto)
     }
     ltoAssertion("none", LTO.none)
@@ -160,12 +175,16 @@ class ConfigConverterTest extends AnyFlatSpec {
     val expectedClangPPPath = Paths.get(clangPPString)
 
     val options = CliOptions(
-      dummyConfigOptions, 
-      NativeConfigOptions(clang=Some(clangString), clangPP = Some(clangPPString)),
+      dummyConfigOptions,
+      NativeConfigOptions(
+        clang = Some(clangString),
+        clangPP = Some(clangPPString)
+      ),
       dummyLoggerOptions
     )
 
-    val nativeConfig = ConfigConverter.convert(options, dummyArguments).right.get
+    val nativeConfig =
+      ConfigConverter.convert(options, dummyArguments).right.get
 
     assert(nativeConfig.config.compilerConfig.clang == expectedClangPath)
     assert(nativeConfig.config.compilerConfig.clangPP == expectedClangPPPath)