add completion

Author: kurowski

Dockerfile

@@ -5,9 +5,9 @@ RUN sed -i 's/^UMASK\s*022/UMASK 002/' /etc/login.defs
 RUN usermod -aG www-data vscode
 
 # Add glow for formatting command usage output (and because it's just nice)
-sudo mkdir -p /etc/apt/keyrings
-curl -fsSL https://repo.charm.sh/apt/gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/charm.gpg
-echo "deb [signed-by=/etc/apt/keyrings/charm.gpg] https://repo.charm.sh/apt/ * *" | sudo tee /etc/apt/sources.list.d/charm.list
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://repo.charm.sh/apt/gpg.key | gpg --dearmor -o /etc/apt/keyrings/charm.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/charm.gpg] https://repo.charm.sh/apt/ * *" | tee /etc/apt/sources.list.d/charm.list
 
 # Install MariaDB and Redis and PHP (incl Apache) and Cypress dependencies
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

README.md

@@ -22,7 +22,7 @@ I frequently invoke `uceap refresh-content` to reset my local environment after
 > drush $DRUSH_TASK
 > ```
 
-Sometimes a process can die or port forwarding can fail. `uceap devcontainer-post-start` runs a few commands that should get things working again. (Again, shell completion makes this `uce<TAB>post-s<TAB>`).
+Sometimes a process can die or port forwarding can fail. `uceap devcontainer-post-start` runs a few commands that should get things working again. (Again, shell completion makes this `uce<TAB>sta<TAB>`).
 
 Using devcontainers facilitates treating local environments as ephemeral: they're quick and easy to set up. Treat them as safe to destroy because you can always create a new one (or multiple new ones, to suit your needs). One thing you might miss is your shell history. Check out [Atuin](https://atuin.sh/) to sync your shell history across environments. `Control-R` has never looked so good 😎
 

local/etc/uceap.d/completion.sh

@@ -0,0 +1,61 @@
+function completion() {
+	commands=("${funcs[@]//_/-}")
+	if [ $# -eq 1 ]; then
+		shell="$1"
+		case "$shell" in
+			bash)
+  		  echo complete -W \"${commands[*]}\" uceap
+				;;
+			zsh)
+				echo "_uceap() { _arguments \"1: :(${commands[*]})\" }"
+				echo "compdef _uceap uceap"
+				;;
+			*)
+				echo "[error] Unsupported shell: $shell"
+				return 1
+				;;
+		esac
+	else
+		echo "[error] Invalid number of arguments"
+		return 1
+	fi
+}
+
+_completion_desc="generate shell completion scripts"
+_completion_help='
+Generate shell completion scripts for UCEAP CLI commands.
+
+# Usage
+
+``` sh
+uceap completion bash
+uceap completion zsh
+```
+
+## bash
+
+First, ensure that you install `bash-completion` using your package manager.
+
+After, add this to your `~/.bash_profile`:
+
+``` bash
+eval "$(uceap completion bash)"
+```
+
+## zsh
+
+Generate a `_uceap` completion script and put it somewhere in your `$fpath`:
+
+``` zsh
+uceap completion zsh > /usr/local/share/zsh/site-functions/_uceap
+```
+
+Ensure that the following is present in your `~/.zshrc`:
+
+``` zsh
+autoload -U compinit
+compinit -i
+```
+
+Zsh version 5.7 or later is recommended.
+'

local/etc/uceap.d/devcontainer_on_create.sh

@@ -48,6 +48,12 @@ function devcontainer_on_create() {
 	mkdir -p $WORKSPACE_FOLDER/.vscode
 	cp /usr/local/share/vscode/* $WORKSPACE_FOLDER/.vscode/
 
+	# Setup shell completion
+	uceap completion bash | sudo sh -c "cat > /etc/bash_completion.d/uceap"
+	uceap completion zsh | sudo sh -c "cat > /usr/local/share/zsh/site-functions/_uceap"
+	# Force loading of the completion script because I can't get it to autoload
+	echo "autoload -Uz _uceap && compdef _uceap uceap" >> ~/.zshrc
+
 	# Run local devcontainer lifecycle scripts
 	if [ -x .devcontainer/onCreate.sh ]; then
 		.devcontainer/onCreate.sh