test: Fix tests that do not pass in --global

This also makes it so that it only checks for the bpm.toml
file on subcommands that actually require it. Tests made in
accordance

Author: hyperupcall

bpm.toml

@@ -39,30 +39,11 @@ main() {
 		esac
 	done
 
-	if [ "$is_global" = 'no' ]; then
-		if ! project_root_directory="$(
-			while [[ ! -f "bpm.toml" && "$PWD" != / ]]; do
-				cd ..
-			done
-
-			if [[ $PWD == / ]]; then
-				die "No 'bpm.toml' file found. Please create one to install local packages or pass the '--global' option"
-			fi
-
-			printf "%s" "$PWD"
-		)"; then
-			exit 1
-		fi
-
-		BPM_PREFIX="$project_root_directory/bpm_packages"
-		BPM_PACKAGES_PATH="$BPM_PREFIX/packages"
-		BPM_INSTALL_BIN="$BPM_PREFIX/bin"
-		BPM_INSTALL_MAN="$BPM_PREFIX/man"
-		BPM_INSTALL_COMPLETIONS="$BPM_PREFIX/completions"
-	fi
 
 	case "$1" in
 	add)
+		may_reset_bpm_vars "$is_global"
+
 		shift
 		do-add "$@"
 		;;
@@ -79,26 +60,38 @@ main() {
 		do-init "$@"
 		;;
 	link)
+		may_reset_bpm_vars "$is_global"
+
 		shift
 		do-link "$@"
 		;;
 	list)
+		may_reset_bpm_vars "$is_global"
+
 		shift
 		do-list "$@"
 		;;
 	outdated)
+		may_reset_bpm_vars "$is_global"
+
 		shift
 		bpm-outdated "$@"
 		;;
 	package-path)
+		may_reset_bpm_vars "$is_global"
+
 		shift
 		bpm-package-path "$@"
 		;;
 	remove)
+		may_reset_bpm_vars "$is_global"
+
 		shift
 		do-remove "$@"
 		;;
 	upgrade)
+		may_reset_bpm_vars "$is_global"
+
 		shift
 		do-upgrade "$@"
 		;;
@@ -111,4 +104,31 @@ main() {
 	esac
 }
 
+may_reset_bpm_vars() {
+	local is_global="$1"
+
+	if [ "$is_global" = 'no' ]; then
+		if ! project_root_directory="$(
+			while [[ ! -f "bpm.toml" && "$PWD" != / ]]; do
+				cd ..
+			done
+
+			if [[ $PWD == / ]]; then
+				die "No 'bpm.toml' file found. Please create one to install local packages or pass the '--global' option"
+			fi
+
+			printf "%s" "$PWD"
+		)"; then
+			exit 1
+		fi
+
+		BPM_ROOT="$project_root_directory"
+		BPM_PREFIX="$project_root_directory/bpm_packages"
+		BPM_PACKAGES_PATH="$BPM_PREFIX/packages"
+		BPM_INSTALL_BIN="$BPM_PREFIX/bin"
+		BPM_INSTALL_MAN="$BPM_PREFIX/man"
+		BPM_INSTALL_COMPLETIONS="$BPM_PREFIX/completions"
+	fi
+}
+
 main "$@"

pkg/lib/cmd/bpm.sh

@@ -3,81 +3,137 @@
 load 'util/init.sh'
 
 @test "default BPM_ROOT" {
-	BPM_ROOT= run bpm echo BPM_ROOT
+	BPM_ROOT= run bpm --global echo BPM_ROOT
 	assert_output "$HOME/.local/share/bpm"
 }
 
 @test "inherited BPM_ROOT" {
-	BPM_ROOT=/tmp/bpm run bpm echo BPM_ROOT
+	BPM_ROOT=/tmp/bpm run bpm --global echo BPM_ROOT
 	assert_output "/tmp/bpm"
 }
 
 @test "default BPM_PREFIX" {
-	BPM_ROOT= BPM_PREFIX= run bpm echo BPM_PREFIX
+	BPM_ROOT= BPM_PREFIX= run bpm --global echo BPM_PREFIX
 	assert_output "$HOME/.local/share/bpm/cellar"
 }
 
 @test "inherited BPM_PREFIX" {
-	BPM_PREFIX=/usr/local run bpm echo BPM_PREFIX
+	BPM_PREFIX=/usr/local run bpm --global echo BPM_PREFIX
 	assert_output "/usr/local"
 }
 
 @test "BPM_PREFIX based on BPM_ROOT" {
-	BPM_ROOT=/tmp/bpm BPM_PREFIX= run bpm echo BPM_PREFIX
+	BPM_ROOT=/tmp/bpm BPM_PREFIX= run bpm --global echo BPM_PREFIX
 	assert_output "/tmp/bpm/cellar"
 }
 
 @test "inherited BPM_PACKAGES_PATH" {
-	BPM_PACKAGES_PATH=/usr/local/packages run bpm echo BPM_PACKAGES_PATH
+	BPM_PACKAGES_PATH=/usr/local/packages run bpm --global echo BPM_PACKAGES_PATH
 	assert_output "/usr/local/packages"
 }
 
 @test "BPM_PACKAGES_PATH based on BPM_PREFIX" {
-	BPM_PREFIX=/tmp/bpm BPM_PACKAGES_PATH= run bpm echo BPM_PACKAGES_PATH
+	BPM_PREFIX=/tmp/bpm BPM_PACKAGES_PATH= run bpm --global echo BPM_PACKAGES_PATH
 	assert_output "/tmp/bpm/packages"
 }
 
 @test "default BPM_INSTALL_BIN" {
-	BPM_ROOT= BPM_PREFIX= BPM_INSTALL_BIN= run bpm echo BPM_INSTALL_BIN
+	BPM_ROOT= BPM_PREFIX= BPM_INSTALL_BIN= run bpm --global echo BPM_INSTALL_BIN
 	assert_output "$HOME/.local/share/bpm/cellar/bin"
 }
 
 @test "inherited BPM_INSTALL_BIN" {
-	BPM_INSTALL_BIN=/opt/bin run bpm echo BPM_INSTALL_BIN
+	BPM_INSTALL_BIN=/opt/bin run bpm --global echo BPM_INSTALL_BIN
 	assert_output "/opt/bin"
 }
 
 @test "BPM_INSTALL_BIN based on BPM_PREFIX" {
-	BPM_INSTALL_BIN= BPM_ROOT=/tmp/bpm BPM_PREFIX=/usr/local run bpm echo BPM_INSTALL_BIN
+	BPM_INSTALL_BIN= BPM_ROOT=/tmp/bpm BPM_PREFIX=/usr/local run bpm --global echo BPM_INSTALL_BIN
 	assert_output "/usr/local/bin"
 }
 
 @test "default BPM_INSTALL_MAN" {
-	BPM_ROOT= BPM_PREFIX= BPM_INSTALL_MAN= run bpm echo BPM_INSTALL_MAN
+	BPM_ROOT= BPM_PREFIX= BPM_INSTALL_MAN= run bpm --global echo BPM_INSTALL_MAN
 	assert_output "$HOME/.local/share/bpm/cellar/man"
 }
 
 @test "inherited BPM_INSTALL_MAN" {
-	BPM_INSTALL_MAN=/opt/man run bpm echo BPM_INSTALL_MAN
+	BPM_INSTALL_MAN=/opt/man run bpm --global echo BPM_INSTALL_MAN
 	assert_output "/opt/man"
 }
 
 @test "BPM_INSTALL_MAN based on BPM_PREFIX" {
-	BPM_INSTALL_MAN= BPM_PREFIX=/usr/local run bpm echo BPM_INSTALL_MAN
+	BPM_INSTALL_MAN= BPM_PREFIX=/usr/local run bpm --global echo BPM_INSTALL_MAN
 	assert_output "/usr/local/man"
 }
 
 @test "default BPM_INSTALL_COMPLETIONS" {
-	BPM_ROOT= BPM_PREFIX= BPM_INSTALL_COMPLETIONS= run bpm echo BPM_INSTALL_COMPLETIONS
+	BPM_ROOT= BPM_PREFIX= BPM_INSTALL_COMPLETIONS= run bpm --global echo BPM_INSTALL_COMPLETIONS
 	assert_output "$HOME/.local/share/bpm/cellar/completions"
 }
 
 @test "inherited BPM_INSTALL_COMPLETIONS" {
-	BPM_INSTALL_COMPLETIONS=/opt/completions run bpm echo BPM_INSTALL_COMPLETIONS
+	BPM_INSTALL_COMPLETIONS=/opt/completions run bpm --global echo BPM_INSTALL_COMPLETIONS
 	assert_output "/opt/completions"
 }
 
 @test "BPM_INSTALL_COMPLETIONS based on BPM_PREFIX" {
-	BPM_INSTALL_COMPLETIONS= BPM_PREFIX=/usr/local run bpm echo BPM_INSTALL_COMPLETIONS
+	BPM_INSTALL_COMPLETIONS= BPM_PREFIX=/usr/local run bpm --global echo BPM_INSTALL_COMPLETIONS
 	assert_output "/usr/local/completions"
 }
+
+
+
+@test "non-global default BPM_ROOT" {
+	touch 'bpm.toml'
+
+	BPM_ROOT= run bpm echo BPM_ROOT
+
+	assert_success
+	assert_line -p "$PWD"
+}
+
+@test "non-global default BPM_PREFIX" {
+	touch 'bpm.toml'
+
+	BPM_ROOT= BPM_PREFIX= run bpm echo BPM_PREFIX
+
+	assert_success
+	assert_line -p "$PWD/bpm_packages"
+}
+
+@test "non-global default BPM_PACKAGES_PATH" {
+	touch 'bpm.toml'
+
+	BPM_ROOT= BPM_PACKAGES_PATH= run bpm echo BPM_PACKAGES_PATH
+
+	assert_success
+	assert_line -p "$PWD/bpm_packages/packages"
+}
+
+@test "non-global default BPM_INSTALL_BIN" {
+	touch 'bpm.toml'
+
+	BPM_ROOT= BPM_INSTALL_BIN= run bpm echo BPM_INSTALL_BIN
+
+	assert_success
+	assert_line -p "$PWD/bpm_packages/bin"
+}
+
+@test "non-global default BPM_INSTALL_MAN" {
+	touch 'bpm.toml'
+
+	BPM_ROOT= BPM_INSTALL_MAN= run bpm echo BPM_INSTALL_MAN
+
+	assert_success
+	assert_line -p "$PWD/bpm_packages/man"
+}
+
+@test "non-global default BPM_INSTALL_COMPLETIONS" {
+	touch 'bpm.toml'
+
+	BPM_ROOT= BPM_INSTALL_COMPLETIONS= run bpm echo BPM_INSTALL_COMPLETIONS
+
+	assert_success
+	assert_line -p "$PWD/bpm_packages/completions"
+}

tests/do-echo.bats

@@ -0,0 +1,45 @@
+#!/usr/bin/env bats
+
+load 'util/init.sh'
+
+# We only test two of all commands
+@test "error when not passing --global to add, list, and upgrade" {
+	local str="No 'bpm.toml' file found. Please create one to install local packages or pass the '--global' option"
+
+	run bpm add foo
+	assert_failure
+	assert_line -p "$str"
+
+	run bpm list
+	assert_failure
+	assert_line -p "$str"
+
+	run bpm upgrade
+	assert_failure
+	assert_line -p "$str"
+}
+
+@test "do not error with bpm.toml when not passing --global to list" {
+	touch 'bpm.toml'
+
+	run bpm list
+	assert_success
+	assert_output ""
+}
+
+@test "do not error when not passing --global to echo, complete, and init" {
+	touch 'bpm.toml'
+
+	run bpm echo "PWD"
+	assert_success
+	assert_output "$PWD"
+
+	run bpm complete package-path
+	assert_success
+	assert_output ""
+
+	run bpm init bash
+	assert_success
+	assert_line -p "export PATH"
+	assert_line -p '. "$BPM_ROOT/'
+}