Merge pull request #108 from touchlab/kpg/info-command-15.3

Fix info command for 15.3
touchlab · Jun 11, 2024 · e2c52ba · e2c52ba
2 parents 595d5b0 + 22c40a7
commit e2c52ba
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/macosMain/kotlin/co/touchlab/xcode/cli/XcodeHelper.kt b/src/macosMain/kotlin/co/touchlab/xcode/cli/XcodeHelper.kt
@@ -1,15 +1,14 @@
 package co.touchlab.xcode.cli
 
 import co.touchlab.kermit.Logger
-import co.touchlab.xcode.cli.XcodeHelper.Defaults.nonApplePlugins
 import co.touchlab.xcode.cli.util.BackupHelper
 import co.touchlab.xcode.cli.util.Console
 import co.touchlab.xcode.cli.util.File
-import co.touchlab.xcode.cli.util.fromString
 import co.touchlab.xcode.cli.util.Path
 import co.touchlab.xcode.cli.util.PropertyList
 import co.touchlab.xcode.cli.util.Shell
 import co.touchlab.xcode.cli.util.Version
+import co.touchlab.xcode.cli.util.fromString
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
@@ -85,7 +84,7 @@ object XcodeHelper {
             checkNotNull(versionPlist.build?.trim()) { "Couldn't get build number of Xcode at $path." }
         }
 
-        if (Version.fromString(version) >= Version.fromString("15.3")) {
+        if (version15_3_orHigher(version)) {
             return XcodeInstallation(
                 version = version,
                 build = build,
@@ -94,10 +93,11 @@ object XcodeHelper {
         }
 
         val xcodeInfoPath = path / "Contents" / "Info"
-        val pluginCompatabilityIdResult = Shell.exec("/usr/bin/defaults", "read", xcodeInfoPath.value, "DVTPlugInCompatibilityUUID")
-            .checkSuccessful {
-                "Couldn't get plugin compatibility UUID from Xcode at ${path}."
-            }
+        val pluginCompatabilityIdResult =
+            Shell.exec("/usr/bin/defaults", "read", xcodeInfoPath.value, "DVTPlugInCompatibilityUUID")
+                .checkSuccessful {
+                    "Couldn't get plugin compatibility UUID from Xcode at ${path}."
+                }
         val pluginCompatabilityId = checkNotNull(pluginCompatabilityIdResult.output?.trim()) {
             "Couldn't get plugin compatibility ID of Xcode at path: ${path}."
         }
@@ -167,8 +167,13 @@ object XcodeHelper {
         val pluginCompatabilityId: String? = null,
     ) {
         val name: String = "Xcode $version ($build)"
+
+        fun supported(supportedXcodeUuids: Set<String>): Boolean = version15_3_orHigher(version) ||
+                supportedXcodeUuids.contains(pluginCompatabilityId)
     }
 
+    fun version15_3_orHigher(version: String) = Version.fromString(version) >= Version.fromString("15.3")
+
     @Serializable
     private data class SystemProfilerOutput(
         @SerialName("SPDeveloperToolsDataType")
@@ -216,6 +221,7 @@ object XcodeHelper {
                 NonApplePlugins(value.dictionary)
             }
         }
+
         fun PropertyList.nonApplePlugins(xcodeVersion: String): NonApplePlugins {
             val backingDictionary = root.dictionary.getOrPut(nonApplePluginsKeyPrefix + xcodeVersion) {
                 PropertyList.Object.Dictionary(

diff --git a/src/macosMain/kotlin/co/touchlab/xcode/cli/command/Info.kt b/src/macosMain/kotlin/co/touchlab/xcode/cli/command/Info.kt
@@ -43,8 +43,9 @@ class Info: BaseXcodeListSubcommand("info", "Shows information about the plugin"
             echo("Installed Xcode versions:")
             val longestNameLength = xcodeInstallations.maxOf { it.name.length }
             for (install in xcodeInstallations) {
-                val spacesAfterName = (1..(longestNameLength - install.name.length)).joinToString(separator = "") { " " }
-                val compatibilityMark = if (supportedXcodeUuids.contains(install.pluginCompatabilityId)) "✔" else "x"
+                val spacesAfterName =
+                    (1..(longestNameLength - install.name.length)).joinToString(separator = "") { " " }
+                val compatibilityMark = if (install.supported(supportedXcodeUuids)) "✔" else "x"
                 echo("$compatibilityMark\t${install.name}$spacesAfterName\t${install.pluginCompatabilityId}\t${install.path}")
             }