fix: Improve naming of variables

Renaming should make it easier to test and use variables

Author: hyperupcall

pkg/lib/commands/do-init.sh

@@ -3,8 +3,7 @@
 echo_bpm_variables_posix() {
 	cat <<-EOF
 	# bpm variables
-	export BPM_ROOT="$BPM_ROOT"
-	export BPM_REPO_ROOT="$BPM_ROOT/source"
+	export BPM_REPO_ROOT="$BPM_REPO_ROOT"
 	export BPM_CELLAR="$BPM_CELLAR"
 
 	EOF
@@ -52,8 +51,7 @@ do-init() {
 	fish)
 		cat <<-EOF
 		# bpm variables
-		set -gx BPM_ROOT $BPM_ROOT
-		set -gx BPM_REPO_ROOT $BPM_ROOT/source
+		set -gx BPM_REPO_ROOT $BPM_REPO_ROOT
 		set -gx BPM_CELLAR $BPM_CELLAR
 
 		# bpm completion

tests/bpm-load.bats

@@ -11,8 +11,6 @@ load 'util/init.sh'
 	}; test_util.finish_pkg
 	test_util.mock_add "$pkg"
 
-	BPM_ROOT="$BPM_TEST_DIR"
-
 	source bpm-load
 	run bpm-load --global "$pkg"
 

tests/do-init.bats

@@ -3,16 +3,18 @@
 load './util/init.sh'
 
 @test "exports BPM_ROOT" {
-	unset BPM_ROOT
-	eval "$(BPM_ROOT=/lol do-init bash)"
+	BPM_REPO_ROOT="$BPM_TEST_REPO_ROOT/../source"
+	BPM_CELLAR="$BPM_TEST_REPO_ROOT/../cellar"
+
+	eval "$(BPM_REPO_ROOT=/lol do-init bash)"
 
 	assert_success
-	assert [ "$BPM_ROOT" = '/lol' ]
-	assert test_util.is_exported 'BPM_ROOT'
+	assert [ "$BPM_REPO_ROOT" = '/lol' ]
+	assert test_util.is_exported 'BPM_REPO_ROOT'
 }
 
 @test "exports BPM_CELLAR" {
-	unset BPM_ROOT
+	unset BPM_CELLAR
 	eval "$(BPM_CELLAR=/lol do-init bash)"
 
 	assert_success
@@ -28,6 +30,9 @@ load './util/init.sh'
 }
 
 @test "bash completion works" {
+	BPM_REPO_ROOT="$BPM_TEST_REPO_ROOT/../source"
+	BPM_CELLAR="$BPM_TEST_REPO_ROOT/../cellar"
+
 	! command -v _bpm
 
 	eval "$(do-init bash)"

tests/include.bats

@@ -3,6 +3,9 @@
 load 'util/init.sh'
 
 @test "with no arguments, prints an error" {
+	BPM_REPO_ROOT="$BPM_TEST_REPO_ROOT/.."
+	BPM_CELLAR="$BPM_TEST_REPO_ROOT/../cellar"
+
 	eval "$(do-init sh)"
 
 	run include

tests/util/init.sh

@@ -20,18 +20,21 @@ export BPM_IS_TEST=
 
 # Stub common variables
 test_util.get_repo_root
-export REPO_ROOT="$REPLY"
-export BPM_ROOT="${REPO_ROOT%/*}"
-export PROGRAM_LIB_DIR="$REPO_ROOT/pkg/lib"
+# The root of the real source. This is a separate variable because we want to
+# set 'BPM_ROOT' to some other value
+export BPM_TEST_REPO_ROOT="$REPLY"
+export PROGRAM_LIB_DIR="$BPM_TEST_REPO_ROOT/pkg/lib"
+
+export BPM_ROOT="$BPM_TEST_DIR"
 export BPM_CELLAR="$BPM_TEST_DIR/cellar"
 export BPM_PACKAGES_PATH="$BPM_CELLAR/packages"
 export BPM_INSTALL_BIN="$BPM_CELLAR/bin"
 export BPM_INSTALL_MAN="$BPM_CELLAR/man"
 export BPM_INSTALL_COMPLETIONS="$BPM_CELLAR/completions"
 export BPM_MODE='global' # for non-tests, the default is 'local'
 
-export PATH="$REPO_ROOT/pkg/bin:$PATH"
-for f in "$REPO_ROOT"/pkg/lib/{commands,util}/?*.sh; do
+export PATH="$BPM_TEST_REPO_ROOT/pkg/bin:$PATH"
+for f in "$BPM_TEST_REPO_ROOT"/pkg/lib/{commands,util}/?*.sh; do
 	source "$f"
 done