chore: Update Glue

Glue bug parsing `glue.toml` improperly caused all files to cease to exist. That has been fixed, so directories now sync over properly

Author: hyperupcall

Diff for: .glue/actions/auto/tool-bats.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+ensure.cmd 'bats'
+
+for dir in test tests; do
+	[[ -d $dir ]] || continue
+
+	bats --recursive --output "." "$dir"
+done
+
+unbootstrap

Diff for: .glue/actions/auto/tool-shdoc.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+ensure.cmd 'shdoc'
+
+util.shopt -s dotglob
+util.shopt -s globstar
+util.shopt -s nullglob
+
+declare outDir=".glue/generated/tool-shdoc"
+rm -rf "$outDir"
+for file in ./**/*.{sh,bash}; do
+	if [[ $file == *'/.glue/'* ]]; then
+		continue
+	fi
+
+	declare output="$outDir/$file"
+	mkdir -p "${output%/*}"
+	output="${output%.*}"
+	output="$output.md"
+	shdoc < "$file" > "$output"
+done
+
+unbootstrap

Diff for: .glue/actions/auto/tool-shellcheck.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+ensure.cmd 'shellcheck'
+
+# https://github.com/koalaman/shellcheck/issues/143
+# find . -ignore_readdir_race -regex '.*\.\(sh\|ksh\|bash\)' -print0 \
+# 	| xargs -r0 \
+# 	shellcheck --check-sourced --
+
+
+util.shopt -u dotglob
+util.shopt -s globstar
+util.shopt -s nullglob
+
+shellcheck --check-sourced -- ./**/*.{sh,ksh,bash}
+
+unbootstrap

Diff for: .glue/actions/auto/tool-shellharden.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+ensure.cmd 'shellharden'
+
+util.shopt -s globstar
+util.shopt -s nullglob
+
+# shellharden --suggest -- ./**/*.{sh,bash}
+# shellharden --check -- ./**/*.{sh,bash}
+
+unbootstrap

Diff for: .glue/actions/auto/util-release-post.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+# eval "$GLUE_BOOTSTRAP"
+# bootstrap || exit
+
+# @file util-release-post.sh
+# @brief Steps to perform after specialized version bumping
+
+unset main
+main() {
+	local newVersion="$1"
+	ensure.nonZero 'newVersion' "$newVersion"
+
+	ensure.cmd 'git'
+	ensure.cmd 'gh'
+
+	# Ensure working tree is dirty
+	if [ -z "$(git status --porcelain)" ]; then
+		die 'Working tree is not dirty. Cannot make a release if versions have not been bumped in their respective files'
+	fi
+
+	# Local Release
+	git add -A
+	git commit -m "chore(release): v$newVersion"
+	git tag -a "v$newVersion" -m "Release $newVersion" HEAD
+	git push --follow-tags origin HEAD
+
+	local -a args=()
+	if [ -f CHANGELOG.md ]; then
+		args+=("--notes-file" "CHANGELOG.md")
+	elif [ -f changelog.md ]; then
+		args+=("--notes-file" "changelog.md")
+	else
+		log.warn 'CHANGELOG.md file not found. Not creating a notes file for release'
+	fi
+
+	# Remote Release
+	toml.get_key name glue.toml
+	local projectName="${REPLY:-Release}"
+	gh release create "v$newVersion" --target main --title "$projectName v$newVersion" "${args[@]}"
+}
+
+main "$@"
+
+# unbootstrap

Diff for: .glue/actions/auto/util-release-pre.sh

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# eval "$GLUE_BOOTSTRAP"
+# bootstrap || exit
+
+# @file util-release-pre.sh
+# @brief Steps to perform before specialized version bumping
+# @description Before the release is made, this ensures there
+#   are no changes in the working directory, and from the version
+#   in 'glue-auto.toml', increments the version. This does not handle
+#   anything language specific, so this is usually called along with
+#   'util-release-post.sh', and any other files that need version bumping
+#   is performed in the interum
+
+unset main
+main() {
+	ensure.cmd 'git'
+	ensure.file 'glue-auto.toml'
+
+	# Ensure working tree not dirty
+	if [ -n "$(git status --porcelain)" ]; then
+		die 'Working tree still dirty. Please commit all changes before making a release'
+	fi
+
+	# Ensure we can push new version and its tags changes without --force-lease
+	if ! git merge-base --is-ancestor origin/main main; then
+		# main NOT is the same or has new additional commits on top of origin/main"
+		die "Detected that your 'main' branch and it's remote have diverged. Won't initiate release process until histories are shared"
+	fi
+
+	# Get current version
+	toml.get_key version glue-auto.toml
+	local currentVersion="$REPLY"
+
+	# Get new version number
+	# TODO: make incremenet better
+	echo "Current Version: $currentVersion"
+	read -rp 'New Version? ' -ei "$currentVersion"
+	local newVersion="$REPLY"
+	declare -g REPLY="$newVersion" # explicit
+
+	# Ensure new version is valid (does not already exist)
+	if [ -n "$(git tag -l "v$newVersion")" ]; then
+		# TODO: ensure there are no tag sthat exists that are greater than it
+		die 'Version already exists in a Git tag'
+	fi
+
+	sed -i -e "s|\(version[ \t]*=[ \t]*\"\).*\(\"\)|\1${newVersion}\2|g" glue-auto.toml
+}
+
+main "$@"
+
+# unbootstrap

Diff for: .glue/commands/auto/Bash.ci.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+unbootstrap

Diff for: .glue/commands/auto/Bash.docs.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+# glue useAction(tool-shdoc.sh)
+util.get_action 'tool-shdoc.sh'
+source "$REPLY"
+
+unbootstrap

Diff for: .glue/commands/auto/Bash.lint.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+# glue useAction(tool-shellcheck.sh)
+util.get_action 'tool-shellcheck.sh'
+source "$REPLY"
+
+# glue useAction(tool-shellharden.sh)
+# util.get_action 'tool-shellharden.sh'
+# source "$REPLY"
+
+unbootstrap

Diff for: .glue/commands/auto/Bash.release.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+# glue useAction(util-release-pre.sh)
+util.get_action 'util-release-pre.sh'
+source "$REPLY"
+newVersion="$REPLY"
+
+# TODO: generalize
+sed -i -e "s|\(PROGRAM_VERSION=\"\).*\(\"\)|\1${newVersion}\2|g" glue.sh || :
+
+# glue useAction(util-release-post.sh)
+util.get_action 'util-release-post.sh'
+source "$REPLY" "$newVersion"
+
+unset newVersion
+unbootstrap

Diff for: .glue/commands/auto/Bash.run.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+dirty=
+if [ -n "$(git status --porcelain)" ]; then
+	dirty=yes
+fi
+
+if version="$(git describe --match 'v*' --abbrev=0 2>/dev/null)"; then
+	version="${version/#v/}"
+else
+	version="0.0.0"
+fi
+
+id="$(git rev-parse --short HEAD)"
+version+="+$id${dirty:+-DIRTY}"
+
+sed -i -e "s|\(version=\"\).*\(\"\)|\1${version}\2|g" glue.toml
+
+# TODO: exec project
+
+# if [ -f Taskfile.yml ]; then
+# 	if command -v go-task &>/dev/null; then
+# 		go-task run "$@"
+# 	elif command -v task &>/dev/null; then
+# 		if ! task help | grep -q Taskwarrior; then
+# 			task run "$@"
+# 		else
+# 			ensure.cmd 'go-task'
+# 		fi
+# 	else
+# 		ensure.cmd 'go-task'
+# 	fi
+# elif [ -f Justfile ]; then
+# 	ensure.cmd 'just'
+
+# 	just run "$@"
+# fi
+
+unbootstrap

Diff for: .glue/commands/auto/Bash.test.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+eval "$GLUE_BOOTSTRAP"
+bootstrap || exit
+
+# glue useAction(tool-bats.sh)
+util.get_action 'tool-bats.sh'
+source "$REPLY"
+
+unbootstrap

Diff for: .glue/common/auto/ensure.sh

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
 ensure.cmd() {
-	if ! command -v "$1" &>/dev/null; then
-		die "Command '$1' not found"
+	local cmd="$1"
+
+	if ! command -v "$cmd" &>/dev/null; then
+		die "Command '$cmd' not found"
 	fi
 }
 
@@ -24,10 +26,26 @@ ensure.args() {
 }
 
 ensure.nonZero() {
-	varName="$1"
-	varValue="$2"
+	local varName="$1"
+	local varValue="$2"
 
 	if [ -z "$varValue" ]; then
 		die "ensure.nonZero: Variable '$varName' must be non zero"
 	fi
 }
+
+ensure.file() {
+	local fileName="$1"
+
+	if [ ! -f "$fileName" ]; then
+		die "ensure.file: File '$fileName' does not exist"
+	fi
+}
+
+ensure.dir() {
+	local dirName="$1"
+
+	if [ ! -f "$dirName" ]; then
+		die "ensure.file: File '$dirName' does not exist"
+	fi
+}

Diff for: glue-auto.toml

@@ -0,0 +1 @@
+version = "0.5.0"