test: Fix all tests

Author: hyperupcall

CONTRIBUTING.md

@@ -30,7 +30,7 @@ To be able to access the binaries, completion files, and man pages in your shell
 ```sh
 # ~/.bashrc
 export PATH="${XDG_DATA_HOME:-$HOME/.local/share}/basalt/source/pkg/bin:$PATH"
-eval "$(basalt init bash)" # zsh and fish are also supported
+eval "$(basalt global init bash)" # zsh and fish are also supported
 ```
 
 See [Installation](./docs/tutorials/installation.md) and [Getting Started](./docs/tutorials/getting-started.md) for more details

README.md

@@ -45,7 +45,7 @@ For `bash`, `zsh`, `sh`
 
 ```sh
 export PATH="${XDG_DATA_HOME:-$HOME/.local/share}/basalt/source/pkg/bin:$PATH"
-eval "$(basalt init bash)" # replace 'bash' with your shell
+eval "$(basalt global init bash)" # replace 'bash' with your shell
 ```
 
 For `fish`

docs/tutorials/installation.md

@@ -30,10 +30,6 @@ echo_package_path_posix() {
 # - Setting basalt package PATH
 # - Sourcing basalt package completion
 do-global-init() {
-	if [ "$1" = '-' ]; then
-		shift
-	fi
-
 	local shell="$1"
 
 	if [ -z "$shell" ]; then

pkg/lib/commands/do-global-init.sh

@@ -1,32 +1,96 @@
 # shellcheck shell=bash
 
 do-init() {
-	if [ -e basalt.toml ]; then
-		bprint.die "File 'basalt.toml' already exists"
+	local flag_type=
+	local -a args=()
+	for arg; do case "$arg" in
+	--bare)
+		flag_type='bare'
+		;;
+	--full)
+		flag_type='full'
+		;;
+	-*)
+		bprint.die "Flag '$arg' not recognized"
+		;;
+	*)
+		args+=("$arg")
+		;;
+	esac done
+
+	if ((${#args[@]} > 0)); then
+		bprint.die "No arguments must be specified"
 	fi
 
-	cat >| basalt.toml <<-"EOF"
-	[package]
-	name = ''
-	slug = ''
-	version = ''
-	authors = []
-	description = ''
+	case "$flag_type" in
+	'')
+		bprint.die "Must either specify '--bare' or '--full'. No default choice has been implemented"
+		;;
+	bare)
+		if [ -f 'basalt.toml' ]; then
+			bprint.die "File 'basalt.toml' already exists"
+		fi
+
+		local file1="./basalt.toml"
+		if ! cat >| "$file1" <<-"EOF"; then
+		[package]
+		name = ''
+		slug = ''
+		version = ''
+		authors = []
+		description = ''
+
+		[run]
+		dependencies = []
+		sourceDirs = []
+		builtinDirs = []
+		binDirs = []
+		completionDirs = []
+		manDirs = []
+
+		[run.shellEnvironment]
+
+		[run.setOptions]
 
-	[run]
-	dependencies = []
-	sourceDirs = []
-	builtinDirs = []
-	binDirs = []
-	completionDirs = []
-	manDirs = []
+		[run.shoptOptions]
+		EOF
+			bprint.die "Could not write to $file1"
+		fi
+		bprint.info "Created $file1"
 
-	[run.shellEnvironment]
 
-	[run.setOptions]
+		mkdir -p 'pkg/bin'
+		local file2="./pkg/bin/file"
+		if ! cat >| "$file2" <<-"EOF"; then
+		#!/usr/bin/env bash
 
-	[run.shoptOptions]
-	EOF
+		eval "$(basalt-package-init)"; basalt.package-init
+		basalt.package-load
+
+		source "$BASALT_PACKAGE_PATH/pkg/lib/cmd/file.sh"
+		file.main "$@"
+		EOF
+			bprint.die "Could not write to $file2"
+		fi
+		bprint.info "Created $file2"
+
+
+		mkdir -p 'pkg/lib/cmd'
+		local file3="./pkg/lib/cmd/file.sh"
+		if ! cat >| "$file3" <<"EOF"; then
+file.main() {
+	printf '%s\n' "Woof!"
+}
+EOF
+			bprint.die "Could not write to $file3"
+		fi
+		bprint.info "Created $file3"
 
-	bprint.info "Created basalt.toml"
+		;;
+	full)
+		if ! git clone -q 'https://github.com/hyperupcall/template-bash' .; then
+			bprint.die "Could not clone the full bash template"
+		fi
+		;;
+	esac
 }

pkg/lib/commands/do-init.sh

@@ -3,6 +3,10 @@
 do-list() {
 	util.init_local
 
+	if (($# != 0)); then
+		bprint.warn "No arguments or flags must be specified"
+	fi
+
 	if util.get_toml_array "$BASALT_LOCAL_PROJECT_DIR/basalt.toml" 'dependencies'; then
 		for dependency in "${REPLIES[@]}"; do
 			util.get_package_info "$dependency"

pkg/lib/commands/do-list.sh

@@ -13,6 +13,10 @@ do-run() {
 		;;
 	esac done
 
+	if ((${#args[@]} == 0)); then
+		bprint.die "The name of an executable must be passed"
+	fi
+
 	if ((${#args[@]} > 1)); then
 		bprint.die "The only argument must be the executable name"
 	fi

pkg/lib/commands/do-run.sh

@@ -32,7 +32,7 @@ ensure.nonzero() {
 
 	local -n value="$name"
 	if [ -z "$value" ]; then
-		bprint.fatal "Argument '$name' for function '${FUNCNAME[1]} ${FUNCNAME[2]} ${FUNCNAME[3]}' is empty"
+		bprint.fatal "Argument '$name' for function '${FUNCNAME[1]}' is empty"
 	fi
 }
 

pkg/lib/util/ensure.sh

@@ -15,6 +15,8 @@ bprint.fatal() {
 	else
 		printf "\033[0;31m%11s\033[0m %s\n" 'Fatal' "$1"
 	fi
+
+	exit 1
 }
 
 bprint.error() {

pkg/lib/util/print.sh

@@ -276,7 +276,7 @@ util.get_package_info() {
 			site="github.com"
 			package="$input"
 		else
-			bprint.die "String '$pkg' does not look like a package"
+			bprint.die "String '$input' does not look like a package"
 		fi
 
 		if [[ "$package" == *@* ]]; then