Fix bundle parsing

Author: jkmassel

Sources/hostmgr/commands/install/InstallHostmgrHelperCommand.swift

@@ -5,7 +5,7 @@ import libhostmgr
 struct InstallHostmgrHelperCommand: AsyncParsableCommand {
 
     static let configuration = CommandConfiguration(
-        commandName: "hostmgr-helper",
+        commandName: "helper",
         abstract: "Install the `hostmgr-helper` tool"
     )
 

Sources/libhostmgr/Model/LocalVMImage.swift

@@ -73,9 +73,9 @@ public struct LocalVMImage: Equatable, FilterableByBasename {
     public var basename: String {
         if architecture == .arm64 {
             return path
-                .deletingPathExtension()
                 .deletingPathExtension()
                 .lastPathComponent
+                .replacingOccurrences(of: ".vmpackage", with: "")
         } else {
             return path
                 .deletingPathExtension()

Tests/libhostmgrTests/Model/LocalVMImageTests.swift

@@ -18,4 +18,18 @@ final class LocalVMImageTests: XCTestCase {
     func testThatPackagedAppleSiliconImageIsDetectedAsArm64() {
         XCTAssertEqual(LocalVMImage(path: URL(fileURLWithPath: "/test.vmtemplate"))?.architecture, .arm64)
     }
+
+    func testThatBundlesWithXcodeMinorVersionIsParsedCorrectly() {
+        XCTAssertEqual(
+            LocalVMImage(path: URL(fileURLWithPath: "/xcode-14.3.bundle"))?.basename,
+            "xcode-14.3"
+        )
+    }
+
+    func testThatPackageWithXcodeMinorVersionIsParsedCorrectly() {
+        XCTAssertEqual(
+            LocalVMImage(path: URL(fileURLWithPath: "/xcode-14.3.vmpackage.aar"))?.basename,
+            "xcode-14.3"
+        )
+    }
 }