add proper support for finding latest package for a unviersal mac binary

Author: nshaheed

src/package.cpp

@@ -334,8 +334,16 @@ optional<PackageVersion> Package::latest_version(string os, Architecture arch,
       continue;
     if (language_version < ck_min_ver)
       continue;
-    if (version.arch != ARCH_ALL && version.arch != arch)
-      continue;
+
+    // special cases for macos universal binaries and ARCH_ANY
+    if (version.arch != ARCH_ALL && version.arch != arch) {
+      // The version is a different arch and it's not a mac universal binary
+      if (version.arch != MAC_UNIVERSAL) continue;
+
+      // The version is a mac universal binary and our arch is not a mac arch
+      if (version.arch == MAC_UNIVERSAL && (arch != X86_64 && arch != ARM64))
+	continue;
+    }
 
     if (version.language_version_max) {
       ChuckVersion ck_max_ver(version.language_version_max.value());

tests/data/test-package-list.json

@@ -55,6 +55,29 @@
                         }
                     ]
                 },
+                {
+                    "version": "1.0.0",
+                    "api_version": {
+                        "major": 9,
+                        "minor": 0
+                    },
+                    "language_version_min": {
+                        "mega": 1,
+                        "major": 5,
+                        "minor": 2,
+                        "patch": 1
+                    },
+                    "os": "mac",
+                    "arch": "universal",
+                    "files": [
+                        {
+                            "url": "https://ccrma.stanford.edu/~nshaheed/chugins/Hydra/linux/butt.chug",
+                            "local_dir": "./",
+                            "file_type": "package",
+                            "checksum": "1234"
+                        }
+                    ]
+                },
                 {
                     "version": "0.9.1",
                     "api_version": {

tests/package_list_test.cpp

@@ -106,4 +106,14 @@ TEST_CASE("Find Package Version") {
         pkglist.find_package_version("Butt", "1.2.0");
     REQUIRE_FALSE(version.has_value());
   }
+
+  SECTION("Mac universal successfully find package") {
+    optional<PackageVersion> version = pkglist.find_latest_package_version(
+        "Butt", "mac", arch, ChuckVersion("1.5.2.1"), ApiVersion("9.0"));
+
+    REQUIRE(version.has_value());
+    REQUIRE(version.value().major == 1);
+    REQUIRE(version.value().minor == 0);
+    REQUIRE(version.value().patch == 0);
+  }
 }