@pubm/plugin-brew 0.4.3 → 0.4.5

package/dist/index.js

@@ -18,7 +18,42 @@ function generateFormula(opts) {
   const darwinArm64 = findAsset(opts.assets, "darwin-arm64");
   const darwinX64 = findAsset(opts.assets, "darwin-x64");
   const linuxArm64 = findAsset(opts.assets, "linux-arm64");
+  const linuxArm64Musl = findAsset(opts.assets, "linux-arm64-musl");
   const linuxX64 = findAsset(opts.assets, "linux-x64");
+  const linuxX64Musl = findAsset(opts.assets, "linux-x64-musl");
+  const hasMusl = linuxArm64Musl || linuxX64Musl;
+  let linuxBlock;
+  if (hasMusl) {
+    linuxBlock = `  on_linux do
+    if Hardware::CPU.arm?
+      if OS::Linux.libc_is_musl?
+        url "${linuxArm64Musl?.url ?? "PLACEHOLDER"}"
+        sha256 "${linuxArm64Musl?.sha256 ?? "PLACEHOLDER"}"
+      else
+        url "${linuxArm64?.url ?? "PLACEHOLDER"}"
+        sha256 "${linuxArm64?.sha256 ?? "PLACEHOLDER"}"
+      end
+    elsif Hardware::CPU.intel?
+      if OS::Linux.libc_is_musl?
+        url "${linuxX64Musl?.url ?? "PLACEHOLDER"}"
+        sha256 "${linuxX64Musl?.sha256 ?? "PLACEHOLDER"}"
+      else
+        url "${linuxX64?.url ?? "PLACEHOLDER"}"
+        sha256 "${linuxX64?.sha256 ?? "PLACEHOLDER"}"
+      end
+    end
+  end`;
+  } else {
+    linuxBlock = `  on_linux do
+    if Hardware::CPU.arm?
+      url "${linuxArm64?.url ?? "PLACEHOLDER"}"
+      sha256 "${linuxArm64?.sha256 ?? "PLACEHOLDER"}"
+    elsif Hardware::CPU.intel?
+      url "${linuxX64?.url ?? "PLACEHOLDER"}"
+      sha256 "${linuxX64?.sha256 ?? "PLACEHOLDER"}"
+    end
+  end`;
+  }
   return `class ${className} < Formula
   desc "${opts.desc}"
   homepage "${opts.homepage}"
@@ -35,15 +70,7 @@ function generateFormula(opts) {
     end
   end
 
-  on_linux do
-    if Hardware::CPU.arm?
-      url "${linuxArm64?.url ?? "PLACEHOLDER"}"
-      sha256 "${linuxArm64?.sha256 ?? "PLACEHOLDER"}"
-    elsif Hardware::CPU.intel?
-      url "${linuxX64?.url ?? "PLACEHOLDER"}"
-      sha256 "${linuxX64?.sha256 ?? "PLACEHOLDER"}"
-    end
-  end
+${linuxBlock}
 
   def install
     bin.install "${opts.name}"
@@ -58,16 +85,31 @@ end
 function updateFormula(content, version, assets) {
   let updated = content.replace(/version\s+"[^"]+"/, `version "${version}"`);
   for (const asset of assets) {
+    const isMusl = asset.platform === "linux-arm64-musl" || asset.platform === "linux-x64-musl";
     const platformPatterns = {
       "darwin-arm64": { os: "on_macos", cpu: "arm" },
       "darwin-x64": { os: "on_macos", cpu: "intel" },
       "linux-arm64": { os: "on_linux", cpu: "arm" },
-      "linux-x64": { os: "on_linux", cpu: "intel" }
+      "linux-arm64-musl": { os: "on_linux", cpu: "arm", musl: true },
+      "linux-x64": { os: "on_linux", cpu: "intel" },
+      "linux-x64-musl": { os: "on_linux", cpu: "intel", musl: true }
     };
     const pattern = platformPatterns[asset.platform];
     if (!pattern)
       continue;
-    const osBlockRegex = new RegExp(`(${pattern.os}\\s+do[\\s\\S]*?Hardware::CPU\\.${pattern.cpu}\\?\\s*\\n\\s*)url\\s+"[^"]+"(\\s*\\n\\s*)sha256\\s+"[^"]+"`, "m");
+    let osBlockRegex;
+    if (isMusl) {
+      osBlockRegex = new RegExp(`(${pattern.os}\\s+do[\\s\\S]*?Hardware::CPU\\.${pattern.cpu}\\?\\s*\\n[\\s\\S]*?libc_is_musl\\?\\s*\\n\\s*)url\\s+"[^"]+"(\\s*\\n\\s*)sha256\\s+"[^"]+"`, "m");
+    } else if (pattern.os === "on_linux") {
+      const muslCheck = new RegExp(`${pattern.os}\\s+do[\\s\\S]*?Hardware::CPU\\.${pattern.cpu}\\?[\\s\\S]*?libc_is_musl\\?`);
+      if (muslCheck.test(updated)) {
+        osBlockRegex = new RegExp(`(${pattern.os}\\s+do[\\s\\S]*?Hardware::CPU\\.${pattern.cpu}\\?\\s*\\n[\\s\\S]*?libc_is_musl\\?\\s*\\n\\s*url\\s+"[^"]+"\\s*\\n\\s*sha256\\s+"[^"]+"\\s*\\n\\s*else\\s*\\n\\s*)url\\s+"[^"]+"(\\s*\\n\\s*)sha256\\s+"[^"]+"`, "m");
+      } else {
+        osBlockRegex = new RegExp(`(${pattern.os}\\s+do[\\s\\S]*?Hardware::CPU\\.${pattern.cpu}\\?\\s*\\n\\s*)url\\s+"[^"]+"(\\s*\\n\\s*)sha256\\s+"[^"]+"`, "m");
+      }
+    } else {
+      osBlockRegex = new RegExp(`(${pattern.os}\\s+do[\\s\\S]*?Hardware::CPU\\.${pattern.cpu}\\?\\s*\\n\\s*)url\\s+"[^"]+"(\\s*\\n\\s*)sha256\\s+"[^"]+"`, "m");
+    }
     updated = updated.replace(osBlockRegex, `$1url "${asset.url}"$2sha256 "${asset.sha256}"`);
   }
   return updated;
@@ -75,14 +117,24 @@ function updateFormula(content, version, assets) {
 var FORMULA_PLATFORMS = {
   "darwin-arm64": { os: "darwin", arch: "arm64" },
   "darwin-x64": { os: "darwin", arch: "x64" },
+  "darwin-x64-baseline": { os: "darwin", arch: "x64", variant: "baseline" },
   "linux-arm64": { os: "linux", arch: "arm64" },
-  "linux-x64": { os: "linux", arch: "x64" }
+  "linux-arm64-musl": { os: "linux", arch: "arm64", abi: "musl" },
+  "linux-x64": { os: "linux", arch: "x64" },
+  "linux-x64-baseline": { os: "linux", arch: "x64", variant: "baseline" },
+  "linux-x64-musl": { os: "linux", arch: "x64", abi: "musl" },
+  "linux-x64-musl-baseline": {
+    os: "linux",
+    arch: "x64",
+    abi: "musl",
+    variant: "baseline"
+  }
 };
 function matchAssetToPlatform(assets, formulaPlatform, customMatcher) {
   if (customMatcher)
     return assets.find(customMatcher);
-  const { os, arch } = FORMULA_PLATFORMS[formulaPlatform];
-  return assets.find((a) => a.platform.os === os && a.platform.arch === arch);
+  const spec = FORMULA_PLATFORMS[formulaPlatform];
+  return assets.find((a) => a.platform.os === spec.os && a.platform.arch === spec.arch && (a.platform.abi ?? undefined) === ("abi" in spec ? spec.abi : undefined) && (a.platform.variant ?? undefined) === ("variant" in spec ? spec.variant : undefined));
 }
 function releaseAssetsToFormulaAssets(assets, customMatchers) {
   const result = [];
@@ -106,12 +158,12 @@ function ensureGitIdentity(cwd) {
   try {
     execSync("git config user.name", { ...opts, stdio: "pipe" });
   } catch {
-    execSync('git config user.name "pubm[bot]"', opts);
+    execSync('git config user.name "pubm-bot"', opts);
   }
   try {
     execSync("git config user.email", { ...opts, stdio: "pipe" });
   } catch {
-    execSync('git config user.email "pubm[bot]@users.noreply.github.com"', opts);
+    execSync('git config user.email "pubmsupport@gmail.com"', opts);
   }
 }
 
@@ -154,7 +206,7 @@ function brewCore(options) {
     ],
     hooks: {
       afterRelease: async (_ctx, releaseCtx) => {
-        if (options.packageName && releaseCtx.packageName !== options.packageName) {
+        if (options.packageName && releaseCtx.displayLabel !== options.packageName) {
           return;
         }
         const { execSync: execSync2 } = await import("node:child_process");
@@ -249,7 +301,7 @@ function brewTap(options) {
     ],
     hooks: {
       afterRelease: async (_ctx, releaseCtx) => {
-        if (options.packageName && releaseCtx.packageName !== options.packageName) {
+        if (options.packageName && releaseCtx.displayLabel !== options.packageName) {
           return;
         }
         const formulaAssets = releaseAssetsToFormulaAssets(releaseCtx.assets, options.assetPlatforms);
@@ -297,7 +349,8 @@ function brewTap(options) {
           const { execSync: execSync2 } = await import("node:child_process");
           const tmpDir = join2(tmpdir2(), `pubm-brew-tap-${Date.now()}`);
           const formulaFile = basename(formulaPath);
-          execSync2(`git clone --depth 1 ${options.repo} ${tmpDir}`, {
+          const repoUrl = /^[^/]+\/[^/]+$/.test(options.repo) ? `https://github.com/${options.repo}.git` : options.repo;
+          execSync2(`git clone --depth 1 ${repoUrl} ${tmpDir}`, {
             stdio: "inherit"
           });
           ensureGitIdentity(tmpDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pubm/plugin-brew",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "type": "module",
   "description": "pubm plugin for Homebrew formula publishing workflows",
   "main": "./dist/index.js",
@@ -23,7 +23,7 @@
   },
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@pubm/core": ">=0.3.6"
+    "@pubm/core": ">=0.4.3"
   },
   "publishConfig": {
     "access": "public"