refactor: Small miscellaneous changes to keep code DRY

Author: hyperupcall

pkg/lib/commands/do-list.sh

@@ -34,10 +34,9 @@ do-list() {
 		done
 	else
 		for package_path in "$BPM_PACKAGES_PATH"/*/*/*; do
-			local site="${package_path%/*}"; site="${site%/*}"; site="${site##*/}"
-			local user="${package_path%/*}"; user="${user##*/}"
-			local repository="${package_path##*/}"
-			local package="$user/$repository"
+			util.extract_data_from_package_dir "$package_path"
+			local site="$REPLY1"
+			local package="$REPLY2/$REPLY3"
 
 			# Users that have installed packages before the switch to namespacing by
 			# site domain name will print incorrectly. So, we check to make sure the site

pkg/lib/commands/do-plumbing-clone.sh

@@ -6,7 +6,7 @@ do-plumbing-clone() {
 	local ref="$3"
 
 	ensure.non_zero 'uri' "$uri"
-	# TODO: ensure.non_zero 'id'
+	ensure.non_zero 'id' "$id"
 
 	if [ -e "$BPM_PACKAGES_PATH/$id" ]; then
 		die "Package '$id' is already present"

pkg/lib/commands/do-remove.sh

@@ -9,22 +9,19 @@ do-remove() {
 		# If is local directory
 		# TODO: do this for upgrade as well
 		if [ -d "$repoSpec" ]; then
-			local fullPath=
-			fullPath="$(util.readlink "$repoSpec")"
-			fullPath="${fullPath%/}"
+			local dir=
+			dir="$(util.readlink "$repoSpec")"
+			dir="${dir%/}"
 
-			# TODO: make this a funcion, share it with do-list
-			local site="${fullPath%/*}"; site="${site%/*}"; site="${site##*/}"
-			local user="${fullPath%/*}"; user="${user##*/}"
-			local repository="${fullPath##*/}"
-			local package="$user/$repository"
+			util.extract_data_from_package_dir "$dir"
+			local site="$REPLY1"
+			local package="$REPLY2/$REPLY3"
 
-			if [ "$fullPath" = "$BPM_PACKAGES_PATH/$site/$package" ]; then
+			if [ "$dir" = "$BPM_PACKAGES_PATH/$site/$package" ]; then
 				do_actual_removal "$site/$package"
 			fi
 		else
 			util.construct_clone_url "$repoSpec"
-			local uri="$REPLY1"
 			local site="$REPLY2"
 			local package="$REPLY3"
 			local ref="$REPLY4"

pkg/lib/util/abstract-completions.sh

@@ -104,7 +104,6 @@ abstract.completions_do_action_zsh() {
 	local file="$2"
 
 	if grep -qs "^#compdef" "$file"; then
-		# TODO: run mkdir outside of loop
 		case "$action" in
 		link)
 			mkdir -p "$BPM_INSTALL_COMPLETIONS/zsh/compsys"

pkg/lib/util/util.sh

@@ -104,6 +104,26 @@ util.construct_clone_url() {
 	fi
 }
 
+# @description Given a path to a package directory, this extracts
+# data like the site it was cloned from, the owner of
+# the repository, and the name of the repository
+util.extract_data_from_package_dir() {
+	REPLY1=
+	REPLY2=
+	REPLY3=
+
+	local dir="$1"
+	ensure.non_zero 'dir' "$dir"
+
+	local site="${dir%/*}"; site="${site%/*}"; site="${site##*/}"
+	local user="${dir%/*}"; user="${user##*/}"
+	local repository="${dir##*/}"
+
+	REPLY1="$site"
+	REPLY2="$user"
+	REPLY3="$repository"
+}
+
 util.readlink() {
 	if command -v realpath &>/dev/null; then
 		realpath "$1"