refactor: Structural output orientations

Flank · May 11, 2021 · 3e10854 · 3e10854
1 parent 66e796c
commit 3e10854
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 20 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/domain/ListAndroidOrientations.kt b/test_runner/src/main/kotlin/ftl/domain/ListAndroidOrientations.kt
@@ -1,21 +1,18 @@
 package ftl.domain
 
-import flank.common.logLn
 import ftl.api.Platform
 import ftl.api.fetchOrientation
 import ftl.args.AndroidArgs
-import ftl.environment.common.toCliTable
+import ftl.presentation.Output
 import java.nio.file.Paths
 
-interface ListAndroidOrientations {
+interface ListAndroidOrientations : Output {
     val configPath: String
 }
 
 operator fun ListAndroidOrientations.invoke() {
-    logLn(
-        fetchOrientation(
-            AndroidArgs.loadOrDefault(Paths.get(configPath)).project,
-            Platform.ANDROID
-        ).toCliTable()
-    )
+    fetchOrientation(
+        AndroidArgs.loadOrDefault(Paths.get(configPath)).project,
+        Platform.ANDROID
+    ).out()
 }
diff --git a/test_runner/src/main/kotlin/ftl/domain/ListIosOrientations.kt b/test_runner/src/main/kotlin/ftl/domain/ListIosOrientations.kt
@@ -1,22 +1,18 @@
 package ftl.domain
 
-import flank.common.logLn
 import ftl.api.Platform
 import ftl.api.fetchOrientation
 import ftl.args.IosArgs
-import ftl.environment.common.toCliTable
+import ftl.presentation.Output
 import java.nio.file.Paths
 
-interface ListIosOrientations {
+interface ListIosOrientations : Output {
     var configPath: String
 }
 
 operator fun ListIosOrientations.invoke() {
-    // TODO move toCliTable() to presentation layer during refactor of presentation after #1728
-    logLn(
-        fetchOrientation(
-            IosArgs.loadOrDefault(Paths.get(configPath)).project,
-            Platform.IOS
-        ).toCliTable()
-    )
+    fetchOrientation(
+        IosArgs.loadOrDefault(Paths.get(configPath)).project,
+        Platform.IOS
+    ).out()
 }
diff --git a/...ftl/presentation/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt b/...ftl/presentation/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt
@@ -1,8 +1,12 @@
 package ftl.presentation.cli.firebase.test.android.orientations
 
+import ftl.api.Orientation
 import ftl.config.FtlConstants
 import ftl.domain.ListAndroidOrientations
 import ftl.domain.invoke
+import ftl.environment.common.toCliTable
+import ftl.presentation.outputLogger
+import ftl.presentation.throwUnknownType
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -34,4 +38,9 @@ class AndroidOrientationsListCommand :
     var usageHelpRequested: Boolean = false
 
     override fun run() = invoke()
+
+    override val out = outputLogger {
+        @Suppress("UNCHECKED_CAST")
+        (this as? List<Orientation>)?.toCliTable() ?: throwUnknownType()
+    }
 }
diff --git a/...tl/environment/common/ListOrientations.kt → .../android/orientations/ListOrientations.kt b/...tl/environment/common/ListOrientations.kt → .../android/orientations/ListOrientations.kt
@@ -1,4 +1,4 @@
-package ftl.environment.common
+package ftl.presentation.cli.firebase.test.android.orientations
 
 import ftl.api.Orientation
 import ftl.environment.TestEnvironmentInfo

diff --git a/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/environment/TestEnvironmentInfo.kt b/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/environment/TestEnvironmentInfo.kt
@@ -5,6 +5,7 @@ import ftl.environment.android.toCliTable
 import ftl.environment.common.toCliTable
 import ftl.environment.ios.toCliTable
 import ftl.environment.toCliTable
+import ftl.presentation.cli.firebase.test.android.orientations.toCliTable
 import ftl.presentation.cli.firebase.test.locale.toCliTable
 
 fun TestEnvironment.Android.prepareOutputString() = buildString {

diff --git a/.../kotlin/ftl/presentation/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt b/.../kotlin/ftl/presentation/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt
@@ -1,8 +1,12 @@
 package ftl.presentation.cli.firebase.test.ios.orientations
 
+import ftl.api.Orientation
 import ftl.config.FtlConstants
 import ftl.domain.ListIosOrientations
 import ftl.domain.invoke
+import ftl.presentation.cli.firebase.test.android.orientations.toCliTable
+import ftl.presentation.outputLogger
+import ftl.presentation.throwUnknownType
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -34,4 +38,9 @@ class IosOrientationsListCommand :
     var usageHelpRequested: Boolean = false
 
     override fun run() = invoke()
+
+    override val out = outputLogger {
+        @Suppress("UNCHECKED_CAST")
+        (this as? List<Orientation>)?.toCliTable() ?: throwUnknownType()
+    }
 }