refactor: Clean up global operations

Author: hyperupcall

pkg/lib/commands/do-add.sh

@@ -20,11 +20,7 @@ do-add() {
 	# Package parsing (WET)
 	for pkg in "${pkgs[@]}"; do
 		util.get_package_info "$pkg"
-		local repo_type="$REPLY1"
-		local url="$REPLY2"
-		local site="$REPLY3"
-		local package="$REPLY4"
-		local version="$REPLY5"
+		local repo_type="$REPLY1" url="$REPLY2" site="$REPLY3" package="$REPLY4" version="$REPLY5"
 
 		if ! util.does_package_exist "$repo_type" "$url"; then
 			print.die "Package located at '$url' does not exist"

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

@@ -23,16 +23,13 @@ do-global-remove() {
 
 	for pkg in "${pkgs[@]}"; do
 		util.get_package_info "$pkg"
-		local repo_type="$REPLY1" url="$REPLY2" site="$REPLY3" package="$REPLY4" version="$REPLY5"
+		local url="$REPLY2" version="$REPLY5"
 
 		if [ -n "$version" ]; then
 			newindent.die "Must not specify ref when removing packages"
 		fi
 
-		util.get_package_id --allow-empty-version "$repo_type" "$url" "$site" "$package" "$version"
-		local package_id="$REPLY"
-
-		util.text_remove_dependency "$BASALT_GLOBAL_DATA_DIR/global/dependencies" "$url" "$package_id" "$flag_force"
+		util.text_remove_dependency "$BASALT_GLOBAL_DATA_DIR/global/dependencies" "$url" "$flag_force"
 	done
 
 	pkg.do-global-install

pkg/lib/util/util-temporary.sh

@@ -192,14 +192,14 @@ util.text_add_dependency() {
 	mkdir -p "${text_file%/*}"
 	touch "$text_file"
 
+	util.get_package_info "$dependency"
+	local url2="$REPLY2"
+
 	local line=
 	while IFS= read -r line; do
 		util.get_package_info "$line"
 		local url1="$REPLY2"
 
-		util.get_package_info "$dependency"
-		local url2="$REPLY2"
-
 		if [ "$url1" = "$url2" ]; then
 			print.indent-yellow 'Warning' "A version of '${line%@*}' is already installed. Skipping"
 		fi
@@ -211,19 +211,29 @@ util.text_add_dependency() {
 util.text_remove_dependency() {
 	local text_file="$1"
 	local dependency="$2"
-	local package_id="$3"
-	local flag_force="$4"
+	local flag_force="$3"
 
 	ensure.nonzero 'text_file'
 	ensure.nonzero 'dependency'
-	ensure.nonzero 'package_id'
 	ensure.nonzero 'flag_force'
 
+	util.get_package_info "$dependency"
+	local repo_type="$REPLY1" url="$REPLY2" site="$REPLY3" package="$REPLY4" version="$REPLY5"
+
+	util.get_package_id --allow-empty-version "$repo_type" "$url" "$site" "$package" "$version"
+	local package_id="$REPLY"
+
 	local -a arr=()
 	if util.text_dependency_is_installed "$text_file" "$dependency"; then
 		local line=
 		while IFS= read -r line; do
-			if [ "${dependency%@*}" != "${line%@*}" ]; then
+			util.get_package_info "$line"
+			local url1="$REPLY2"
+
+			util.get_package_info "$dependency"
+			local url2="$REPLY2"
+
+			if [ "$url1" != "$url2" ]; then
 				arr+=("$line")
 			fi
 		done < "$text_file"

pkg/lib/util/util.sh

@@ -294,6 +294,7 @@ util.get_tarball_url() {
 	fi
 }
 
+# TODO: remove this
 # If any version of a text dependency is installed
 util.text_dependency_is_installed() {
 	local text_file="$1"

tests/basalt-global.bats

@@ -11,6 +11,16 @@ load './util/init.sh'
 	assert_dir_exist "$BASALT_GLOBAL_DATA_DIR/store/packages/github.com/hyperupcall/[email protected]"
 }
 
+@test "Add works twice" {
+	basalt global add 'hyperupcall/[email protected]'
+
+	run basalt global add 'hyperupcall/[email protected]'
+	assert_success
+	assert [ "$(<"$BASALT_GLOBAL_DATA_DIR/global/dependencies")" = $'https://github.com/hyperupcall/[email protected]\nhttps://github.com/hyperupcall/[email protected]' ]
+	assert_file_exist "$BASALT_GLOBAL_DATA_DIR/store/tarballs/github.com/hyperupcall/[email protected]"
+	assert_dir_exist "$BASALT_GLOBAL_DATA_DIR/store/packages/github.com/hyperupcall/[email protected]"
+}
+
 @test "Remove works" {
 	basalt global add 'hyperupcall/[email protected]'
 
@@ -19,3 +29,23 @@ load './util/init.sh'
 	assert_file_exist "$BASALT_GLOBAL_DATA_DIR/store/tarballs/github.com/hyperupcall/[email protected]"
 	assert_dir_not_exist "$BASALT_GLOBAL_DATA_DIR/store/packages/github.com/hyperupcall/[email protected]"
 }
+
+@test "Remove works with multiple repositories" {
+	basalt global add 'hyperupcall/[email protected]'
+	basalt global add 'hyperupcall/[email protected]'
+
+	run basalt global remove 'hyperupcall/bash-object'
+	assert_success
+	assert [ "$(<"$BASALT_GLOBAL_DATA_DIR/global/dependencies")" = 'https://github.com/hyperupcall/[email protected]' ]
+	assert_file_exist "$BASALT_GLOBAL_DATA_DIR/store/tarballs/github.com/hyperupcall/[email protected]"
+	assert_dir_not_exist "$BASALT_GLOBAL_DATA_DIR/store/packages/github.com/hyperupcall/[email protected]"
+}
+
+@test "Remove force works" {
+	basalt global add 'hyperupcall/[email protected]'
+
+	run basalt global remove --force 'hyperupcall/bash-object'
+	assert_success
+	assert_file_not_exist "$BASALT_GLOBAL_DATA_DIR/store/tarballs/github.com/hyperupcall/[email protected]"
+	assert_dir_not_exist "$BASALT_GLOBAL_DATA_DIR/store/packages/github.com/hyperupcall/[email protected]"
+}