mct-cli 0.2.5__tar.gz → 0.2.6__tar.gz

{mct_cli-0.2.5 → mct_cli-0.2.6}/.github/workflows/release.yml

@@ -114,54 +114,27 @@ jobs:
           done
           echo "Warning: Timed out waiting for PyPI, continuing anyway..."
 
-      - name: Set up Homebrew
-        uses: Homebrew/actions/setup-homebrew@master
+      - name: Checkout
+        uses: actions/checkout@v6
 
-      - name: Get PyPI package URL and SHA256
-        id: pypi
-        run: |
-          VERSION="${{ steps.version.outputs.version }}"
-          # Fetch package info from PyPI
-          PYPI_JSON=$(curl -s "https://pypi.org/pypi/mct-cli/$VERSION/json")
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
 
-          # Extract the sdist (source distribution) URL and SHA256
-          URL=$(echo "$PYPI_JSON" | python3 -c "import sys, json; urls = json.load(sys.stdin)['urls']; sdist = next(u for u in urls if u['packagetype'] == 'sdist'); print(sdist['url'])")
-          SHA256=$(echo "$PYPI_JSON" | python3 -c "import sys, json; urls = json.load(sys.stdin)['urls']; sdist = next(u for u in urls if u['packagetype'] == 'sdist'); print(sdist['digests']['sha256'])")
+      - name: Set up Homebrew
+        uses: Homebrew/actions/setup-homebrew@main
 
-          echo "url=$URL" >> $GITHUB_OUTPUT
-          echo "sha256=$SHA256" >> $GITHUB_OUTPUT
-          echo "Package URL: $URL"
-          echo "SHA256: $SHA256"
+      - name: Tap formula repo
+        run: brew tap ocolunga/mct-cli
 
-      - name: Tap and update formula
+      - name: Update formula
         run: |
           VERSION="${{ steps.version.outputs.version }}"
-          SHA256="${{ steps.pypi.outputs.sha256 }}"
-          URL="${{ steps.pypi.outputs.url }}"
-
-          # Tap the repo (installs to proper Homebrew location)
-          brew tap ocolunga/mct-cli
-
-          # Get the tap directory
           TAP_DIR="$(brew --prefix)/Library/Taps/ocolunga/homebrew-mct-cli"
-          FORMULA="$TAP_DIR/Formula/mct-cli.rb"
-
-          # Update URL and SHA256
-          sed -i '' "s|url \".*\"|url \"${URL}\"|" "$FORMULA"
-          sed -i '' "s|sha256 \".*\"|sha256 \"${SHA256}\"|" "$FORMULA"
-
+          python scripts/update_homebrew_formula.py "$VERSION" "$TAP_DIR/Formula/mct-cli.rb"
           echo "Updated formula:"
-          cat "$FORMULA"
-
-      - name: Update Python resource dependencies
-        run: |
-          echo "Updating Python resources..."
-          for i in {1..6}; do
-            brew update-python-resources ocolunga/mct-cli/mct-cli && break
-            echo "Attempt $i/6 failed, waiting 30s for PyPI to propagate..."
-            sleep 30
-          done
-          echo "Resources updated successfully"
+          cat "$TAP_DIR/Formula/mct-cli.rb"
 
       - name: Commit and push
         env:

{mct_cli-0.2.5 → mct_cli-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mct-cli
-Version: 0.2.5
+Version: 0.2.6
 Summary: macOS Configuration Tools
 Author-email: Oscar Colunga <oscar@ancile.dev>
 License-File: LICENSE

{mct_cli-0.2.5 → mct_cli-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mct-cli"
-version = "0.2.5"
+version = "0.2.6"
 authors = [{ name = "Oscar Colunga", email = "oscar@ancile.dev" }]
 description = "macOS Configuration Tools"
 readme = "README.md"

mct_cli-0.2.6/scripts/update_homebrew_formula.py

@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+"""Update Homebrew formula: main url/sha256 + all resource blocks."""
+import json
+import re
+import subprocess
+import sys
+import urllib.request
+
+PACKAGE = "mct-cli"
+
+
+def pypi_json(name, version):
+    url = f"https://pypi.org/pypi/{name}/{version}/json"
+    with urllib.request.urlopen(url) as f:
+        return json.loads(f.read())
+
+
+def sdist_url_sha256(name, version):
+    data = pypi_json(name, version)
+    for u in data["urls"]:
+        if u["packagetype"] == "sdist":
+            return u["url"], u["digests"]["sha256"]
+    raise RuntimeError(f"No sdist for {name}=={version}")
+
+
+def get_deps(package, version):
+    """Return {name: version} for all transitive pip deps (excluding the package itself)."""
+    result = subprocess.run(
+        [sys.executable, "-m", "pip", "install",
+         "--dry-run", "--ignore-installed", "--quiet",
+         "--report", "-", f"{package}=={version}"],
+        capture_output=True, text=True, check=True,
+    )
+    report = json.loads(result.stdout)
+    pkg_names = {package.lower(), package.replace("-", "_").lower()}
+    return {
+        pkg["metadata"]["name"]: pkg["metadata"]["version"]
+        for pkg in report["install"]
+        if pkg["metadata"]["name"].lower() not in pkg_names
+    }
+
+
+def update_formula(formula_path, main_url, main_sha256, resources):
+    with open(formula_path) as f:
+        content = f.read()
+
+    # Only replace the top-level url/sha256 (2-space indent, not inside resource blocks)
+    content = re.sub(r'^  url ".*"', f'  url "{main_url}"', content, flags=re.MULTILINE)
+    content = re.sub(r'^  sha256 ".*"', f'  sha256 "{main_sha256}"', content, flags=re.MULTILINE)
+
+    # Rebuild resource blocks
+    blocks = ""
+    for name in sorted(resources):
+        url, sha256 = resources[name]
+        rb_name = name.lower().replace("_", "-")
+        blocks += f'\n  resource "{rb_name}" do\n    url "{url}"\n    sha256 "{sha256}"\n  end\n'
+
+    # Replace all existing resource blocks, insert before `def install`
+    content = re.sub(r'\n  resource ".*?" do.*?end\n', "", content, flags=re.DOTALL)
+    content = content.replace("\n  def install", blocks + "\n  def install")
+
+    with open(formula_path, "w") as f:
+        f.write(content)
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 3:
+        print(f"Usage: {sys.argv[0]} <version> <formula_path>", file=sys.stderr)
+        sys.exit(1)
+
+    version = sys.argv[1]
+    formula_path = sys.argv[2]
+
+    print(f"Fetching {PACKAGE}=={version} from PyPI...")
+    main_url, main_sha256 = sdist_url_sha256(PACKAGE, version)
+    print(f"URL: {main_url}")
+    print(f"SHA256: {main_sha256}")
+
+    print("Resolving dependencies...")
+    deps = get_deps(PACKAGE, version)
+    for name, ver in deps.items():
+        print(f"  {name}=={ver}")
+
+    resources = {}
+    for name, ver in deps.items():
+        url, sha256 = sdist_url_sha256(name, ver)
+        resources[name] = (url, sha256)
+
+    update_formula(formula_path, main_url, main_sha256, resources)
+    print("Formula updated successfully.")

{mct_cli-0.2.5 → mct_cli-0.2.6}/uv.lock

@@ -37,7 +37,7 @@ wheels = [
 
 [[package]]
 name = "mct-cli"
-version = "0.2.5"
+version = "0.2.6"
 source = { editable = "." }
 dependencies = [
     { name = "pyyaml" },