refactor: Remove 'package_helpers'

This removes package_helpers and does related general cleanup. At this point, all the
tests have been converted to use new style (not calling helper functions, but doing
everything while CD'ed into the package directory)

Author: hyperupcall

pkg/lib/util/util.sh

@@ -16,14 +16,14 @@ util.parse_package_full() {
 	repoSpec="${repoSpec#http?(s)://}"
 
 	local site user repository
-	if [[ "$repoSpec" = */*/* ]]; then
+	if [[ "$repoSpec" == */*/* ]]; then
 		IFS='/' read -r site user repository <<< "$repoSpec"
-	elif [[ "$repoSpec" = */* ]]; then
+	elif [[ "$repoSpec" == */* ]]; then
 		site="github.com"
 		IFS='/' read -r user repository <<< "$repoSpec"
 	fi
 
-	if [[ "$repository" = *@* ]]; then
+	if [[ "$repository" == *@* ]]; then
 		IFS='@' read -r repository ref <<< "$repository"
 	else
 		ref=""
@@ -80,7 +80,7 @@ util.construct_clone_url() {
 	else
 		repoSpec="${repoSpec%.git}"
 
-		if [[ "$repoSpec" = */*/* ]]; then
+		if [[ "$repoSpec" == */*/* ]]; then
 			IFS='/' read -r site package <<< "$repoSpec"
 		elif [[ "$repoSpec" = */* ]]; then
 			site="github.com"
@@ -89,7 +89,7 @@ util.construct_clone_url() {
 			die "Invalid repository '$repoSpec'"
 		fi
 
-		if [[ "$package" = *@* ]]; then
+		if [[ "$package" == *@* ]]; then
 			IFS='@' read -r package ref <<< "$package"
 		fi
 

tests/do-list.bats

@@ -3,9 +3,9 @@
 load 'util/init.sh'
 
 @test "properly list for 2 installed packages" {
-	create_package 'username/p1'
-	create_package 'username2/p2'
-	create_package 'username2/p3'
+	test_util.create_package 'username/p1'
+	test_util.create_package 'username2/p2'
+	test_util.create_package 'username2/p3'
 	test_util.fake_clone 'username/p1'
 	test_util.fake_clone 'username2/p2'
 
@@ -18,7 +18,7 @@ load 'util/init.sh'
 }
 
 @test "properly list for no installed packages" {
-	create_package username/p1
+	test_util.create_package 'username/p1'
 
 	run do-list
 
@@ -27,14 +27,24 @@ load 'util/init.sh'
 }
 
 @test "properly list outdated packages" {
-	create_package username/outdated
-	create_package username/uptodate
-	test_util.fake_clone username/outdated
-	test_util.fake_clone username/uptodate
-	create_exec username/outdated "second"
+	local pkg1='username/outdated'
+	local pkg2='username/uptodate'
+
+	test_util.create_package "$pkg1"
+	test_util.create_package "$pkg2"
+	test_util.fake_clone "$pkg1"
+	test_util.fake_clone "$pkg2"
+
+	# Make pkg1 outdated by commiting to it
+	cd "$BPM_ORIGIN_DIR/$pkg1"; {
+		mkdir -p bin
+		touch "bin/exec"
+		git add .
+		git commit -m "Add exec"
+	}; cd "$BPM_CWD"
 
 	run do-list --outdated
 
 	assert_success
-	assert_output username/outdated
+	assert_output 'username/outdated'
 }

tests/do-package-path.bats

@@ -3,10 +3,12 @@
 load 'util/init.sh'
 
 @test "prints the package path" {
-	create_package username/package
-	test_util.fake_clone username/package
+	local pkg='username/package'
 
-	run bpm-package-path username/package
+	test_util.create_package "$pkg"
+	test_util.fake_install "$pkg"
 
-	assert_success "$BPM_PACKAGES_PATH/username/package"
+	run bpm-package-path "$pkg"
+
+	assert_success "$BPM_PACKAGES_PATH/$pkg"
 }

tests/util/init.sh

@@ -5,7 +5,6 @@ shopt -s nullglob extglob
 
 load 'vendor/bats-core/load'
 load 'vendor/bats-assert/load'
-load 'util/package_helpers.sh'
 load 'util/test_util.sh'
 
 export BPM_TEST_DIR="$BATS_TMPDIR/bpm"

tests/util/package_helpers.sh

@@ -42,8 +42,6 @@ test_util.setup_pkg() {
 	touch 'README.md'
 	git add .
 	git commit -m "Initial commit"
-
-	cd "$BPM_ORIGIN_DIR/$pkg"
 }
 
 # @description Commits changes and cd's out of the package directory
@@ -53,3 +51,18 @@ test_util.finish_pkg() {
 	git commit --allow-empty -m "Make changes"
 	cd "$BPM_CWD"
 }
+
+test_util.create_package() {
+	local pkg="$1"
+
+	mkdir -p "$BPM_ORIGIN_DIR/$pkg"
+	cd "$BPM_ORIGIN_DIR/$pkg"
+
+	git init .
+	touch 'README.md'
+	touch 'bpm.toml'
+	git add .
+	git commit -m "Initial commit"
+
+	cd "$BPM_CWD"
+}