Update bootstrap (#242)

* Update configure-pyright.sh

* Update bootstrap

Author: katybaulch

.trunk/configure-pyright.sh

@@ -7,22 +7,10 @@ venv_name=$(grep -m 1 venv pyproject.toml | tr -s ' ' | tr -d '"' | tr -d "'" |
 # Check if pyrightconfig already exists.
 if [[ ! -f pyrightconfig.json ]]; then
 
-	if [[ -z ${venv_name} ]]; then
-		echo "Using Poetry"
-		poetry_env_info=$(poetry env info --path) >/dev/null 2>&1
-		venv_path=${poetry_env_info%/*} # ABCDE
-		venv_name=${poetry_env_info#*/} # 12345
-
-		# Generate the pyrightconfig.json file.
-		json_string=$(jq -n \
-			--arg v "${venv_name}" \
-			--arg vp "${venv_path}" \
-			'{venv: $v, venvPath: $vp} ')
-
-		echo "${json_string}" >pyrightconfig.json
-	else
-		echo "Using Pyenv"
-		# Check if pyenv-pyright plugin is installed
+	# Capture poetry environment path and check if it's empty.
+	poetry_env_info=$(poetry env info --path 2>/dev/null || true)
+	if [[ -z ${poetry_env_info} ]]; then
+		# Check if pyenv is installed
 		if ! command -v pyenv &>/dev/null; then
 			echo "pyenv not installed. Please install pyenv..."
 			exit 1
@@ -32,14 +20,26 @@ if [[ ! -f pyrightconfig.json ]]; then
 		dir_path="${pyenv_root}"/plugins/pyenv-pyright
 		if [[ ! -d ${dir_path} ]]; then
 			# trunk-ignore(shellcheck/SC2312)
-			if [[ -n $(ls -A "${dir_path}") ]]; then
+			if [[ -z $(ls -A "${dir_path}") ]]; then
 				git clone https://github.com/alefpereira/pyenv-pyright.git "${dir_path}"
 			fi
 		fi
 
 		# Generate the pyrightconfig.json file.
 		pyenv pyright "${venv_name}"
 		pyenv local "${venv_name}"
+	else
+		poetry_env_info=$(poetry env info --path 2>/dev/null || true)
+		venv_path=$(dirname "${poetry_env_info}")  # Get directory path
+		venv_name=$(basename "${poetry_env_info}") # Get base name
+
+		# Generate the pyrightconfig.json file.
+		json_string=$(jq -n \
+			--arg v "${venv_name}" \
+			--arg vp "${venv_path}" \
+			'{venv: $v, venvPath: $vp} ')
+
+		echo "${json_string}" >pyrightconfig.json
 	fi
 fi
 
@@ -48,5 +48,4 @@ if ! jq -r --arg venv_name "${venv_name}" '. | select((.venv != $venv_name or .v
 	echo "Failed to configure pyright to use environment '${venv_name}' as interpreter. Please check pyrightconfig.json..."
 	exit 1
 fi
-echo "All done!"
 exit 0

Makefile

@@ -1,10 +1,3 @@
-bootstrap:
-	-pyenv deactivate
-	pyenv virtualenv 3.10 admin-backend
-	pyenv activate admin-backend
-	pip3 install poetry
-	poetry install
-
 install_trunk:
 	$(eval trunk_installed=$(shell trunk --version > /dev/null 2>&1 ; echo $$? ))
 ifneq (${trunk_installed},0)
@@ -16,8 +9,25 @@ uninstall_trunk:
 	sudo rm -if `which trunk`
 	rm -ifr ${HOME}/.cache/trunk
 
-git_hooks: install_trunk
-	trunk actions run configure-pyright-with-pyenv
+create_env:
+	# Copy .env
+	cp .env.example .env
+
+configure_pyright:
+	trunk actions run configure-pyright
+
+setup_with_pyenv: install_trunk create_env ## Sets up a local dev environment using Pyenv
+	$(eval venv_name=$(shell  grep 'venv =' pyproject.toml | cut -d '"' -f 2 ))
+	if [ -n "$(venv_name)" ] && ! pyenv versions --bare | grep -q "^$(venv_name)$$"; then \
+		$(eval python_version=$(shell grep 'python =' pyproject.toml | cut -d '"' -f 2 | sed 's/^\^//')) \
+		$(eval pyenv_version=$(shell pyenv versions --bare | grep$(python_version) )) \
+		pyenv virtualenv $(pyenv_version) $(venv_name); \
+	fi
+	@eval "$$(pyenv init -)" && \
+	pyenv activate $(venv_name) && \
+	poetry install
+
+	make configure_pyright
 
 check:
 	trunk fmt