workforest 0.2.0__tar.gz → 0.2.2__tar.gz

{workforest-0.2.0 → workforest-0.2.2}/.github/workflows/publish_aur.yml

@@ -8,6 +8,9 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     container: archlinux:latest
+    environment:
+      name: aur
+      url: https://aur.archlinux.org/packages/workforest
     permissions:
       contents: write  # commit the generated PKGBUILD back to main
     steps:

workforest-0.2.2/.github/workflows/publish_homebrew.yml

@@ -0,0 +1,91 @@
+name: Publish to Homebrew tap
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: macos-latest
+    environment:
+      name: homebrew-tap
+      url: https://github.com/ArkadyBuryakov/homebrew-tap
+    permissions:
+      contents: write  # commit the generated formula back to main
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Update formula to released version
+        run: |
+          version="${GITHUB_REF_NAME#v}"
+          url="https://github.com/ArkadyBuryakov/workforest/archive/v$version.tar.gz"
+          curl -fsSL "$url" -o /tmp/workforest.tar.gz
+          sha256=$(shasum -a 256 /tmp/workforest.tar.gz | cut -d' ' -f1)
+          cd packaging/homebrew
+          sed -i '' "s|^  url .*|  url \"$url\"|" workforest.rb
+          sed -i '' "s|^  sha256 .*|  sha256 \"$sha256\"|" workforest.rb
+
+      - name: Build, test, and smoke test
+        run: |
+          brew install --build-from-source --formula packaging/homebrew/workforest.rb
+          brew test --formula packaging/homebrew/workforest.rb
+          workforest --version
+          wf --version
+          workforest shell-init bash | bash -n
+          workforest shell-init zsh | head -1 | grep -q Workforest
+
+      - name: Push to tap
+        env:
+          TAP_SSH_PRIVATE_KEY: ${{ secrets.TAP_SSH_PRIVATE_KEY }}
+        run: |
+          version="${GITHUB_REF_NAME#v}"
+          # Host keys are pinned rather than keyscanned (same policy as the
+          # AUR workflow); these are GitHub's published SSH fingerprints.
+          mkdir -p /tmp/ssh
+          printf '%s\n' "$TAP_SSH_PRIVATE_KEY" > /tmp/ssh/tap
+          chmod 600 /tmp/ssh/tap
+          cat > /tmp/ssh/known_hosts <<'EOF'
+          github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
+          github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
+          EOF
+          export GIT_SSH_COMMAND="ssh -i /tmp/ssh/tap -o UserKnownHostsFile=/tmp/ssh/known_hosts -o IdentitiesOnly=yes"
+          git config --global user.name "Arkady Buryakov"
+          git config --global user.email "arkady@buryakov.pro"
+          git clone git@github.com:ArkadyBuryakov/homebrew-tap.git /tmp/tap
+          cd /tmp/tap
+          git checkout main 2>/dev/null || git checkout -b main
+          mkdir -p Formula
+          cp "$GITHUB_WORKSPACE/packaging/homebrew/workforest.rb" Formula/workforest.rb
+          git add Formula/workforest.rb
+          if git diff --cached --quiet; then
+            echo "No changes to publish."
+          else
+            git commit -m "workforest $version"
+            git push origin main
+          fi
+
+      - name: Commit generated formula back to main
+        run: |
+          version="${GITHUB_REF_NAME#v}"
+          cp packaging/homebrew/workforest.rb /tmp/workforest.rb
+          git config --global user.name "Arkady Buryakov"
+          git config --global user.email "arkady@buryakov.pro"
+          # The workflow runs detached at the release tag; move to main to
+          # commit. Retry because the AUR publisher pushes to main from the
+          # same release event and the two can race.
+          for attempt in 1 2 3; do
+            git fetch origin main
+            git checkout -f -B main origin/main
+            cp /tmp/workforest.rb packaging/homebrew/workforest.rb
+            git add packaging/homebrew/workforest.rb
+            if git diff --cached --quiet; then
+              echo "Repo copy already up to date."
+              break
+            fi
+            git commit -m "Update Homebrew formula to $version"
+            if git push origin main; then
+              break
+            fi
+            echo "Push raced with another workflow, retrying ($attempt)..."
+            sleep 10
+          done

{workforest-0.2.0 → workforest-0.2.2}/.github/workflows/publish_pypi.yml

@@ -7,7 +7,9 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    environment: pypi
+    environment:
+      name: pypi
+      url: https://pypi.org/project/workforest/
     permissions:
       id-token: write  # OIDC for PyPI trusted publishing
     steps:

{workforest-0.2.0 → workforest-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: workforest
-Version: 0.2.0
+Version: 0.2.2
 Summary: Git worktree forest management: create, open, and clean up per-branch worktrees with project-defined setup hooks
 Project-URL: Homepage, https://github.com/ArkadyBuryakov/workforest
 Author-email: Arkady Buryakov <arkady@buryakov.pro>
@@ -10,6 +10,7 @@ Keywords: cli,developer-tools,git,worktree
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
+Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Version Control :: Git
@@ -48,6 +49,9 @@ opened, and cleaned up with one command.
 # Arch Linux
 yay -S workforest        # AUR
 
+# macOS (or Linux with Homebrew)
+brew install arkadyburyakov/tap/workforest
+
 # anywhere else
 uv tool install workforest   # or: pipx install workforest
 ```
@@ -64,7 +68,8 @@ shell's directory — a plain binary cannot) and registers completions. Without
 it everything still works, but "open in current shell" prints the `cd`
 command instead of performing it.
 
-Requirements: Linux, git ≥ 2.36, Python ≥ 3.14. Optional: `fzf` for the TUI.
+Requirements: Linux or macOS, git ≥ 2.36, Python ≥ 3.14 (the AUR and
+Homebrew packages bring their own). Optional: `fzf` for the TUI.
 
 ## Quick start
 
@@ -195,11 +200,12 @@ make install      # install this checkout as a uv tool (~/.local/bin/workforest)
 make uninstall    # remove it again
 ```
 
-Packaging recipes live under
-`packaging/` (one directory per package manager; currently `packaging/AUR/`).
-Release: bump `__version__`, tag, update `sha256sums` in
-`packaging/AUR/PKGBUILD`, regenerate `.SRCINFO`
-(`makepkg --printsrcinfo > .SRCINFO` inside `packaging/AUR/`), push to AUR.
+Packaging recipes live under `packaging/` (one directory per package
+manager: `packaging/AUR/`, `packaging/homebrew/`).
+Release: bump `__version__` and push to main — CI tags the release and
+publishes to PyPI, the AUR, and the
+[Homebrew tap](https://github.com/ArkadyBuryakov/homebrew-tap), committing
+the regenerated recipes back to the repo.
 
 ## License
 

{workforest-0.2.0 → workforest-0.2.2}/README.md

@@ -29,6 +29,9 @@ opened, and cleaned up with one command.
 # Arch Linux
 yay -S workforest        # AUR
 
+# macOS (or Linux with Homebrew)
+brew install arkadyburyakov/tap/workforest
+
 # anywhere else
 uv tool install workforest   # or: pipx install workforest
 ```
@@ -45,7 +48,8 @@ shell's directory — a plain binary cannot) and registers completions. Without
 it everything still works, but "open in current shell" prints the `cd`
 command instead of performing it.
 
-Requirements: Linux, git ≥ 2.36, Python ≥ 3.14. Optional: `fzf` for the TUI.
+Requirements: Linux or macOS, git ≥ 2.36, Python ≥ 3.14 (the AUR and
+Homebrew packages bring their own). Optional: `fzf` for the TUI.
 
 ## Quick start
 
@@ -176,11 +180,12 @@ make install      # install this checkout as a uv tool (~/.local/bin/workforest)
 make uninstall    # remove it again
 ```
 
-Packaging recipes live under
-`packaging/` (one directory per package manager; currently `packaging/AUR/`).
-Release: bump `__version__`, tag, update `sha256sums` in
-`packaging/AUR/PKGBUILD`, regenerate `.SRCINFO`
-(`makepkg --printsrcinfo > .SRCINFO` inside `packaging/AUR/`), push to AUR.
+Packaging recipes live under `packaging/` (one directory per package
+manager: `packaging/AUR/`, `packaging/homebrew/`).
+Release: bump `__version__` and push to main — CI tags the release and
+publishes to PyPI, the AUR, and the
+[Homebrew tap](https://github.com/ArkadyBuryakov/homebrew-tap), committing
+the regenerated recipes back to the repo.
 
 ## License
 

{workforest-0.2.0 → workforest-0.2.2}/packaging/AUR/.SRCINFO

@@ -1,8 +1,8 @@
 pkgbase = workforest
 	pkgdesc = Git worktree forest management: per-branch worktrees with project-defined setup hooks
-	pkgver = 0.1.0
+	pkgver = 0.2.1
 	pkgrel = 1
-	url = https://github.com/arkadyb/workforest
+	url = https://github.com/ArkadyBuryakov/workforest
 	arch = any
 	license = MIT
 	makedepends = python-build
@@ -13,7 +13,7 @@ pkgbase = workforest
 	depends = python-yaml
 	depends = git
 	optdepends = fzf: interactive TUI (workforest tui)
-	source = workforest-0.1.0.tar.gz::https://github.com/arkadyb/workforest/archive/v0.1.0.tar.gz
-	sha256sums = SKIP
+	source = workforest-0.2.1.tar.gz::https://github.com/ArkadyBuryakov/workforest/archive/v0.2.1.tar.gz
+	sha256sums = 47062e51ae374a9afce50ee0be6c39b08da6c96064450b3c2c58566d05fb7078
 
 pkgname = workforest

{workforest-0.2.0 → workforest-0.2.2}/packaging/AUR/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Arkady Buryakov <arkady@buryakov.pro>
 pkgname=workforest
-pkgver=0.1.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="Git worktree forest management: per-branch worktrees with project-defined setup hooks"
 arch=(any)
@@ -10,7 +10,7 @@ depends=(python python-yaml git)
 makedepends=(python-build python-installer python-wheel python-hatchling)
 optdepends=('fzf: interactive TUI (workforest tui)')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-sha256sums=('9998d8fc554623ed905224feb9e2aa5734f8da44384331c3d4540909ac246be8')
+sha256sums=('47062e51ae374a9afce50ee0be6c39b08da6c96064450b3c2c58566d05fb7078')
 
 build() {
   cd "$pkgname-$pkgver"

workforest-0.2.2/packaging/homebrew/workforest.rb

@@ -0,0 +1,50 @@
+# The publish_homebrew workflow rewrites url/sha256 on release and pushes
+# this file to the ArkadyBuryakov/homebrew-tap repo; this copy is the source
+# of truth for everything else (deps, completions, caveats, test).
+class Workforest < Formula
+  include Language::Python::Virtualenv
+
+  desc "Git worktree forest management with per-branch setup hooks"
+  homepage "https://github.com/ArkadyBuryakov/workforest"
+  url "https://github.com/ArkadyBuryakov/workforest/archive/v0.2.1.tar.gz"
+  sha256 "47062e51ae374a9afce50ee0be6c39b08da6c96064450b3c2c58566d05fb7078"
+  license "MIT"
+  head "https://github.com/ArkadyBuryakov/workforest.git", branch: "main"
+
+  depends_on "fzf"
+  depends_on "python@3.14"
+
+  resource "pyyaml" do
+    url "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz"
+    sha256 "d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f"
+  end
+
+  def install
+    virtualenv_install_with_resources
+
+    # Completions for the plain binary; the wf shell function itself comes
+    # from `workforest shell-init` (see caveats).
+    bash_completion.install "src/workforest/shell/completion.bash" => "workforest"
+    zsh_completion.install "completions/_workforest"
+
+    # Reference configs, mirroring the Arch package's /usr/share/doc layout.
+    (doc/"examples").install "src/workforest/examples/config.yaml"
+    (doc/"examples").install "src/workforest/examples/.workforest.yaml" => "workforest.project.yaml"
+  end
+
+  def caveats
+    <<~EOS
+      To upgrade `wf` to a shell function (so `wf open` can change your
+      shell's directory) and register completions, add this to your
+      ~/.zshrc or ~/.bashrc:
+        eval "$(workforest shell-init)"
+    EOS
+  end
+
+  test do
+    assert_match version.to_s, shell_output("#{bin}/workforest --version")
+    assert_match version.to_s, shell_output("#{bin}/wf --version")
+    (testpath/"init.bash").write shell_output("#{bin}/workforest shell-init bash")
+    system "bash", "-n", testpath/"init.bash"
+  end
+end

{workforest-0.2.0 → workforest-0.2.2}/pyproject.toml

@@ -18,6 +18,7 @@ classifiers = [
     "Environment :: Console",
     "Intended Audience :: Developers",
     "Operating System :: POSIX :: Linux",
+    "Operating System :: MacOS",
     "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Version Control :: Git",
 ]

{workforest-0.2.0 → workforest-0.2.2}/src/workforest/__init__.py

@@ -1,3 +1,3 @@
 """Workforest — git worktree forest management."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"

{workforest-0.2.0 → workforest-0.2.2}/src/workforest/tui.py

@@ -161,7 +161,7 @@ def run(initial_mode: str | None = None) -> CommandResult:  # pragma: no cover -
     is unit-tested; this function only wires them to the fzf subprocess."""
     if shutil.which("fzf") is None:
         raise WorkforestError(
-            "the TUI requires fzf (e.g. pacman -S fzf); "
+            "the TUI requires fzf (e.g. pacman -S fzf, brew install fzf); "
             "all actions are also available as plain subcommands"
         )
     ctx = commands.build_context()