Move cli to presentation

test_runner/src/main/kotlin/ftl/Main.kt

@@ -1,6 +1,6 @@
 package ftl
 
-import ftl.cli.MainCommand
+import ftl.presentation.cli.MainCommand
 import ftl.run.exception.withGlobalExceptionHandling
 import picocli.CommandLine
 

test_runner/src/main/kotlin/ftl/args/AndroidArgsCompanion.kt

@@ -2,14 +2,14 @@ package ftl.args
 
 import com.google.common.annotations.VisibleForTesting
 import ftl.args.yml.mergeYmlKeys
-import ftl.cli.firebase.test.android.AndroidRunCommand
 import ftl.config.android.AndroidFlankConfig
 import ftl.config.android.AndroidGcloudConfig
 import ftl.config.common.CommonFlankConfig
 import ftl.config.common.CommonGcloudConfig
 import ftl.config.defaultAndroidConfig
 import ftl.config.loadAndroidConfig
 import ftl.config.plus
+import ftl.presentation.cli.firebase.test.android.AndroidRunCommand
 import ftl.util.loadFile
 import java.io.Reader
 import java.nio.file.Files

test_runner/src/main/kotlin/ftl/args/IosArgsCompanion.kt

@@ -2,14 +2,14 @@ package ftl.args
 
 import com.google.common.annotations.VisibleForTesting
 import ftl.args.yml.mergeYmlKeys
-import ftl.cli.firebase.test.ios.IosRunCommand
 import ftl.config.common.CommonFlankConfig
 import ftl.config.common.CommonGcloudConfig
 import ftl.config.defaultIosConfig
 import ftl.config.ios.IosFlankConfig
 import ftl.config.ios.IosGcloudConfig
 import ftl.config.loadIosConfig
 import ftl.config.plus
+import ftl.presentation.cli.firebase.test.ios.IosRunCommand
 import ftl.util.loadFile
 import java.io.Reader
 import java.nio.file.Files

test_runner/src/main/kotlin/ftl/config/Create.kt

@@ -1,13 +1,13 @@
 package ftl.config
 
-import ftl.cli.firebase.test.android.AndroidRunCommand
-import ftl.cli.firebase.test.ios.IosRunCommand
 import ftl.config.android.AndroidFlankConfig
 import ftl.config.android.AndroidGcloudConfig
 import ftl.config.common.CommonFlankConfig
 import ftl.config.common.CommonGcloudConfig
 import ftl.config.ios.IosFlankConfig
 import ftl.config.ios.IosGcloudConfig
+import ftl.presentation.cli.firebase.test.android.AndroidRunCommand
+import ftl.presentation.cli.firebase.test.ios.IosRunCommand
 import kotlin.properties.ReadOnlyProperty
 
 fun defaultAndroidConfig() = AndroidConfig(

test_runner/src/main/kotlin/ftl/domain/RunDoctorAndroid.kt

@@ -1,8 +1,8 @@
 package ftl.domain
 
 import ftl.args.AndroidArgs
-import ftl.cli.firebase.test.processValidation
 import ftl.doctor.validateYaml
+import ftl.presentation.cli.firebase.test.processValidation
 import java.nio.file.Paths
 
 interface RunDoctorAndroid {

test_runner/src/main/kotlin/ftl/domain/RunDoctorIos.kt

@@ -1,8 +1,8 @@
 package ftl.domain
 
 import ftl.args.IosArgs
-import ftl.cli.firebase.test.processValidation
 import ftl.doctor.validateYaml
+import ftl.presentation.cli.firebase.test.processValidation
 import java.nio.file.Paths
 
 interface RunDoctorIos {

test_runner/src/main/kotlin/ftl/cli/AuthCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/AuthCommand.kt

@@ -1,6 +1,5 @@
-package ftl.cli
+package ftl.presentation.cli
 
-import ftl.cli.auth.LoginCommand
 import ftl.util.PrintHelp
 import picocli.CommandLine.Command
 
@@ -9,7 +8,7 @@ import picocli.CommandLine.Command
     synopsisHeading = "%n",
     header = ["Manage oauth2 credentials for Google Cloud"],
     subcommands = [
-        LoginCommand::class
+        ftl.presentation.cli.auth.LoginCommand::class
     ],
     usageHelpAutoWidth = true
 )

test_runner/src/main/kotlin/ftl/cli/FirebaseCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/FirebaseCommand.kt

@@ -1,8 +1,8 @@
-package ftl.cli
+package ftl.presentation.cli
 
-import ftl.cli.firebase.CancelCommand
-import ftl.cli.firebase.RefreshCommand
-import ftl.cli.firebase.TestCommand
+import ftl.presentation.cli.firebase.CancelCommand
+import ftl.presentation.cli.firebase.RefreshCommand
+import ftl.presentation.cli.firebase.TestCommand
 import ftl.util.PrintHelp
 import picocli.CommandLine.Command
 

test_runner/src/main/kotlin/ftl/cli/MainCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/MainCommand.kt

@@ -1,13 +1,13 @@
-package ftl.cli
+package ftl.presentation.cli
 
-import ftl.cli.firebase.CancelCommand
-import ftl.cli.firebase.RefreshCommand
-import ftl.cli.firebase.test.AndroidCommand
-import ftl.cli.firebase.test.IPBlocksCommand
-import ftl.cli.firebase.test.IosCommand
-import ftl.cli.firebase.test.NetworkProfilesCommand
-import ftl.cli.firebase.test.ProvidedSoftwareCommand
 import ftl.log.setDebugLogging
+import ftl.presentation.cli.firebase.CancelCommand
+import ftl.presentation.cli.firebase.RefreshCommand
+import ftl.presentation.cli.firebase.test.AndroidCommand
+import ftl.presentation.cli.firebase.test.IPBlocksCommand
+import ftl.presentation.cli.firebase.test.IosCommand
+import ftl.presentation.cli.firebase.test.NetworkProfilesCommand
+import ftl.presentation.cli.firebase.test.ProvidedSoftwareCommand
 import ftl.util.printVersionInfo
 import picocli.CommandLine
 

test_runner/src/main/kotlin/ftl/cli/auth/LoginCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/auth/LoginCommand.kt

@@ -1,4 +1,4 @@
-package ftl.cli.auth
+package ftl.presentation.cli.auth
 
 import ftl.domain.LoginGoogleAccount
 import ftl.domain.invoke

test_runner/src/main/kotlin/ftl/cli/firebase/CancelCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/CancelCommand.kt

@@ -1,4 +1,4 @@
-package ftl.cli.firebase
+package ftl.presentation.cli.firebase
 
 import ftl.domain.CancelLastRun
 import ftl.domain.invoke

test_runner/src/main/kotlin/ftl/cli/firebase/RefreshCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/RefreshCommand.kt

@@ -1,4 +1,4 @@
-package ftl.cli.firebase
+package ftl.presentation.cli.firebase
 
 import ftl.domain.RefreshLastRun
 import ftl.domain.invoke

test_runner/src/main/kotlin/ftl/presentation/cli/firebase/TestCommand.kt

@@ -0,0 +1,22 @@
+package ftl.presentation.cli.firebase
+
+import ftl.presentation.cli.firebase.test.IPBlocksCommand
+import ftl.presentation.cli.firebase.test.IosCommand
+import ftl.presentation.cli.firebase.test.NetworkProfilesCommand
+import ftl.presentation.cli.firebase.test.ProvidedSoftwareCommand
+import ftl.util.PrintHelp
+import picocli.CommandLine.Command
+
+@Command(
+    name = "test",
+    synopsisHeading = "",
+    subcommands = [
+        ftl.presentation.cli.firebase.test.AndroidCommand::class,
+        IosCommand::class,
+        NetworkProfilesCommand::class,
+        ProvidedSoftwareCommand::class,
+        IPBlocksCommand::class
+    ],
+    usageHelpAutoWidth = true
+)
+class TestCommand : PrintHelp

test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/AndroidCommand.kt

@@ -0,0 +1,27 @@
+package ftl.presentation.cli.firebase.test
+
+import ftl.presentation.cli.firebase.test.android.AndroidDoctorCommand
+import ftl.presentation.cli.firebase.test.android.AndroidLocalesCommand
+import ftl.presentation.cli.firebase.test.android.AndroidModelsCommand
+import ftl.presentation.cli.firebase.test.android.AndroidOrientationsCommand
+import ftl.presentation.cli.firebase.test.android.AndroidRunCommand
+import ftl.presentation.cli.firebase.test.android.AndroidTestEnvironmentCommand
+import ftl.presentation.cli.firebase.test.android.AndroidVersionsCommand
+import ftl.util.PrintHelp
+import picocli.CommandLine.Command
+
+@Command(
+    name = "android",
+    synopsisHeading = "",
+    subcommands = [
+        AndroidRunCommand::class,
+        AndroidDoctorCommand::class,
+        AndroidModelsCommand::class,
+        AndroidVersionsCommand::class,
+        AndroidOrientationsCommand::class,
+        AndroidLocalesCommand::class,
+        AndroidTestEnvironmentCommand::class
+    ],
+    usageHelpAutoWidth = true
+)
+class AndroidCommand : PrintHelp

test_runner/src/main/kotlin/ftl/cli/firebase/test/CommandUtil.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/CommandUtil.kt

@@ -1,4 +1,4 @@
-package ftl.cli.firebase.test
+package ftl.presentation.cli.firebase.test
 
 import flank.common.logLn
 import ftl.args.yml.YamlDeprecated

test_runner/src/main/kotlin/ftl/cli/firebase/test/CommonRunCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/CommonRunCommand.kt

@@ -1,4 +1,4 @@
-package ftl.cli.firebase.test
+package ftl.presentation.cli.firebase.test
 
 import ftl.config.Config
 import ftl.config.android.AndroidGcloudConfig

test_runner/src/main/kotlin/ftl/cli/firebase/test/IPBlocksCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/IPBlocksCommand.kt

@@ -1,6 +1,6 @@
-package ftl.cli.firebase.test
+package ftl.presentation.cli.firebase.test
 
-import ftl.cli.firebase.test.ipblocks.IPBlocksListCommand
+import ftl.presentation.cli.firebase.test.ipblocks.IPBlocksListCommand
 import ftl.util.PrintHelp
 import picocli.CommandLine
 

test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/IosCommand.kt

@@ -0,0 +1,27 @@
+package ftl.presentation.cli.firebase.test
+
+import ftl.presentation.cli.firebase.test.ios.IosDoctorCommand
+import ftl.presentation.cli.firebase.test.ios.IosLocalesCommand
+import ftl.presentation.cli.firebase.test.ios.IosModelsCommand
+import ftl.presentation.cli.firebase.test.ios.IosOrientationsCommand
+import ftl.presentation.cli.firebase.test.ios.IosRunCommand
+import ftl.presentation.cli.firebase.test.ios.IosTestEnvironmentCommand
+import ftl.presentation.cli.firebase.test.ios.IosVersionsCommand
+import ftl.util.PrintHelp
+import picocli.CommandLine.Command
+
+@Command(
+    name = "ios",
+    synopsisHeading = "",
+    subcommands = [
+        IosRunCommand::class,
+        IosDoctorCommand::class,
+        IosModelsCommand::class,
+        IosVersionsCommand::class,
+        IosLocalesCommand::class,
+        IosTestEnvironmentCommand::class,
+        IosOrientationsCommand::class
+    ],
+    usageHelpAutoWidth = true
+)
+class IosCommand : PrintHelp

test_runner/src/main/kotlin/ftl/cli/firebase/test/NetworkProfilesCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/NetworkProfilesCommand.kt

@@ -1,7 +1,7 @@
-package ftl.cli.firebase.test
+package ftl.presentation.cli.firebase.test
 
-import ftl.cli.firebase.test.networkprofiles.NetworkProfilesDescribeCommand
-import ftl.cli.firebase.test.networkprofiles.NetworkProfilesListCommand
+import ftl.presentation.cli.firebase.test.networkprofiles.NetworkProfilesDescribeCommand
+import ftl.presentation.cli.firebase.test.networkprofiles.NetworkProfilesListCommand
 import ftl.util.PrintHelp
 import picocli.CommandLine
 

test_runner/src/main/kotlin/ftl/cli/firebase/test/ProvidedSoftwareCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ProvidedSoftwareCommand.kt

@@ -1,6 +1,6 @@
-package ftl.cli.firebase.test
+package ftl.presentation.cli.firebase.test
 
-import ftl.cli.firebase.test.providedsoftware.ProvidedSoftwareListCommand
+import ftl.presentation.cli.firebase.test.providedsoftware.ProvidedSoftwareListCommand
 import ftl.util.PrintHelp
 import picocli.CommandLine
 

test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidDoctorCommand.kt

@@ -1,4 +1,4 @@
-package ftl.cli.firebase.test.android
+package ftl.presentation.cli.firebase.test.android
 
 import ftl.config.FtlConstants
 import ftl.domain.RunDoctorAndroid

test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidLocalesCommand.kt

@@ -1,7 +1,7 @@
-package ftl.cli.firebase.test.android
+package ftl.presentation.cli.firebase.test.android
 
-import ftl.cli.firebase.test.android.locales.AndroidLocalesDescribeCommand
-import ftl.cli.firebase.test.android.locales.AndroidLocalesListCommand
+import ftl.presentation.cli.firebase.test.android.locales.AndroidLocalesDescribeCommand
+import ftl.presentation.cli.firebase.test.android.locales.AndroidLocalesListCommand
 import ftl.util.PrintHelp
 import picocli.CommandLine
 

test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidModelsCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidModelsCommand.kt

@@ -1,7 +1,7 @@
-package ftl.cli.firebase.test.android
+package ftl.presentation.cli.firebase.test.android
 
-import ftl.cli.firebase.test.android.models.AndroidModelDescribeCommand
-import ftl.cli.firebase.test.android.models.AndroidModelsListCommand
+import ftl.presentation.cli.firebase.test.android.models.AndroidModelDescribeCommand
+import ftl.presentation.cli.firebase.test.android.models.AndroidModelsListCommand
 import ftl.util.PrintHelp
 import picocli.CommandLine
 

test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidOrientationsCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidOrientationsCommand.kt

@@ -1,6 +1,6 @@
-package ftl.cli.firebase.test.android
+package ftl.presentation.cli.firebase.test.android
 
-import ftl.cli.firebase.test.android.orientations.AndroidOrientationsListCommand
+import ftl.presentation.cli.firebase.test.android.orientations.AndroidOrientationsListCommand
 import ftl.util.PrintHelp
 import picocli.CommandLine
 

test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt → test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidRunCommand.kt

@@ -1,12 +1,12 @@
-package ftl.cli.firebase.test.android
+package ftl.presentation.cli.firebase.test.android
 
-import ftl.cli.firebase.test.CommonRunCommand
 import ftl.config.FtlConstants
 import ftl.config.android.AndroidFlankConfig
 import ftl.config.android.AndroidGcloudConfig
 import ftl.config.createConfiguration
 import ftl.domain.RunTestAndroid
 import ftl.domain.invoke
+import ftl.presentation.cli.firebase.test.CommonRunCommand
 import ftl.run.ANDROID_SHARD_FILE
 import picocli.CommandLine
 import picocli.CommandLine.Command