From 1e98efd1ab1a84b948f99eb47db5a2eed9fcfeaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20MB?= <seb@essembeh.org>
Date: Wed, 24 Jul 2024 23:42:59 +0200
Subject: [PATCH] Update Justfile

---
 Justfile   | 26 ++++++++++++++++++++------
 release.sh | 39 ---------------------------------------
 2 files changed, 20 insertions(+), 45 deletions(-)
 delete mode 100755 release.sh

diff --git a/Justfile b/Justfile
index 8057225..7abc478 100644
--- a/Justfile
+++ b/Justfile
@@ -1,8 +1,22 @@
-run:
-    dotenv run -- fastapi dev yourss/main.py
+run: 
+    poetry run -- dotenv run -- fastapi dev yourss/main.py
 
 run-redis:
-    docker run --rm -ti  -p 6379:6379 redis
-    
-test:
-    pytest tests/
+    docker run --rm -ti -p 6379:6379 redis 
+
+test pytest_args="":
+    poetry run -- pytest {{pytest_args}} tests/
+
+release bump="patch":
+    echo "{{bump}}" | grep -E "^(major|minor|patch)$"
+    poetry version "{{bump}}"
+    VERSION=`poetry version -s` yq e '.version = strenv(VERSION)'    -i charts/yourss/Chart.yaml
+    VERSION=`poetry version -s` yq e '.appVersion = strenv(VERSION)' -i charts/yourss/Chart.yaml
+    git add pyproject.toml charts/yourss/Chart.yaml
+    git commit --message "🔖 New release: `poetry version -s`"
+    git tag "`poetry version -s`"
+
+publish:
+    git log -1 --pretty="%B" | grep '^🔖 New release: '
+    git push
+    git push --tags
\ No newline at end of file
diff --git a/release.sh b/release.sh
deleted file mode 100755
index 7a8f3f7..0000000
--- a/release.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-set -eu -o pipefail
-
-[ "$1" = "patch" ] || [ "$1" = "minor" ] || [ "$1" = "major" ]
-
-# create new version with poetry
-VERSION=$(poetry version "$1" -s)
-export VERSION
-
-# update charts
-yq e '.version = strenv(VERSION)'    -i charts/yourss/Chart.yaml
-yq e '.appVersion = strenv(VERSION)' -i charts/yourss/Chart.yaml
-
-# add updated files to staging
-git add pyproject.toml charts/yourss/Chart.yaml
-git --no-pager diff --staged 
-
-echo ""
-echo ""
-echo ""
-
-# ask confirmation before commit
-read -p "💡 Commit changes and create tag? [y/n] " -n 1 -r
-if [[ $REPLY =~ ^[Yy]$ ]]; then
-    git commit --message "🔖 New release: $VERSION"
-    git tag "$VERSION"
-
-    # ask confirmation before push to origin
-    read -p "💡 Push to origin? [y/n] " -n 1 -r
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-        git push 
-        git push --tags
-    fi
-else
-    # revert changes
-    echo "Reverting changes ..."
-    git reset HEAD pyproject.toml charts/yourss/Chart.yaml
-    git checkout pyproject.toml charts/yourss/Chart.yaml
-fi