fix: Allow 'remove' to remove (unlink) linked local repos. Fixes #42

Author: hyperupcall

pkg/lib/commands/do-add.sh

@@ -30,7 +30,7 @@ do-add() {
 		local package="$REPLY3"
 		local ref="$REPLY4"
 
-		if [ "${package%/*}" = 'local' ]; then
+		if [ "$site" = 'local' ]; then
 			die "Cannot install packages owned by username 'local' because that conflicts with linked packages"
 		fi
 

pkg/lib/commands/do-list.sh

@@ -63,7 +63,7 @@ do-list() {
 				repo_branch_str="Branch: $(git -C "$pkg_path" branch --show-current)"
 				printf -v pkg_output "%s  %s\n" "$pkg_output" "$repo_branch_str"
 
-				if git config remote.origin.url &>/dev/null; then
+				if git -C "$pkg_path" config remote.origin.url &>/dev/null; then
 					# shellcheck disable=SC1083
 					if [ "$(git -C "$pkg_path" rev-list --count HEAD...HEAD@{upstream})" -gt 0 ]; then
 						if [ -n "${NO_COLOR+x}" ] || [ "$TERM" = dumb ]; then

pkg/lib/commands/do-remove.sh

@@ -6,32 +6,16 @@ do-remove() {
 	fi
 
 	for repoSpec; do
-		# If is local directory
-		if [ -d "$repoSpec" ]; then
-			local dir=
-			dir="$(util.readlink "$repoSpec")"
-			dir="${dir%/}"
-
-			util.extract_data_from_package_dir "$dir"
-			local site="$REPLY1"
-			local package="$REPLY2/$REPLY3"
-
-			if [ "$dir" = "$BPM_PACKAGES_PATH/$site/$package" ]; then
-				do_actual_removal "$site/$package"
-			fi
+		util.extract_data_from_input "$repoSpec"
+		local site="$REPLY2"
+		local package="$REPLY3"
+
+		if [ -d "$BPM_PACKAGES_PATH/$site/$package" ]; then
+			do_actual_removal "$site/$package"
+		elif [ -e "$BPM_PACKAGES_PATH/$site/$package" ]; then
+			rm -f "$BPM_PACKAGES_PATH/$site/$package"
 		else
-			util.extract_data_from_input "$repoSpec"
-			local site="$REPLY2"
-			local package="$REPLY3"
-			local ref="$REPLY4"
-
-			if [ -d "$BPM_PACKAGES_PATH/$site/$package" ]; then
-				do_actual_removal "$site/$package"
-			elif [ -e "$BPM_PACKAGES_PATH/$site/$package" ]; then
-				rm -f "$BPM_PACKAGES_PATH/$site/$package"
-			else
-				die "Package '$site/$package' is not installed"
-			fi
+			die "Package '$site/$package' is not installed"
 		fi
 	done
 }
@@ -44,11 +28,16 @@ do_actual_removal() {
 	do-plumbing-unlink-bins "$id"
 	do-plumbing-unlink-completions "$id"
 
-	printf '%s\n' "  -> Deleting Git repository"
-	echo "${BPM_PACKAGES_PATH:?}/$id"
-	rm -rf "${BPM_PACKAGES_PATH:?}/$id"
-	if ! rmdir -p "${BPM_PACKAGES_PATH:?}/${id%/*}" &>/dev/null; then
-		# Do not exit on failure
-		:
+	if [ "${id%%/*}" = 'local' ]; then
+		printf '%s\n' "  -> Unsymlinking directory"
+		unlink "$BPM_PACKAGES_PATH/$id"
+	else
+		printf '%s\n' "  -> Deleting Git repository"
+		rm -rf "${BPM_PACKAGES_PATH:?}/$id"
+		if ! rmdir -p "${BPM_PACKAGES_PATH:?}/${id%/*}" &>/dev/null; then
+			# Do not exit on "failure"
+			:
+		fi
 	fi
+
 }

pkg/lib/util/util.sh

@@ -25,6 +25,7 @@ util.extract_data_from_input() {
 
 	local regex="^https?://"
 	local regex2="^git@"
+	local regex3="^local/"
 	if [[ "$repoSpec" =~ $regex ]]; then
 		local http="${repoSpec%%://*}"
 		repoSpec="${repoSpec#http?(s)://}"
@@ -46,6 +47,14 @@ util.extract_data_from_input() {
 		REPLY2="$site"
 		REPLY3="$package"
 		REPLY4=
+	elif [[ "$repoSpec" =~ $regex3 ]]; then
+		repoSpec="${repoSpec#local\/}"
+		IFS='@' read -r package ref <<< "$repoSpec"
+
+		REPLY1=
+		REPLY2='local'
+		REPLY3="$package"
+		REPLY4="$ref"
 	else
 		repoSpec="${repoSpec%.git}"
 

tests/do-remove.bats

@@ -56,6 +56,23 @@ load 'util/init.sh'
 	assert [ ! -d "$BPM_PACKAGES_PATH/github.com/$pkg" ]
 }
 
+@test "properly remove (unlink) locally installed packages" {
+	local site='github.com'
+	local dir='project3'
+
+	test_util.setup_pkg "$dir"; {
+		touch 'file.sh'
+	}; test_util.finish_pkg
+	test_util.fake_link "$dir"
+
+	assert [ -d "$BPM_PACKAGES_PATH/local/$dir" ]
+
+	run do-remove "local/$dir"
+
+	assert_success
+	assert [ ! -d "$BPM_PACKAGES_PATH/local/$dir" ]
+}
+
 @test "fails to remove package directory with wrong site name" {
 	local site='github.com'
 	local pkg='username/package'

tests/util-extract-data-from-input.bats

@@ -126,3 +126,19 @@ load 'util/init.sh'
 	assert [ "$REPLY3" = 'eankeen/proj' ]
 	assert [ "$REPLY4" = 'v0.2.0' ]
 }
+
+@test "works with local" {
+	util.extract_data_from_input 'local/project2' 'no'
+	assert [ "$REPLY1" = '' ]
+	assert [ "$REPLY2" = 'local' ]
+	assert [ "$REPLY3" = 'project2' ]
+	assert [ "$REPLY4" = '' ]
+}
+
+@test "works with local and ref" {
+	util.extract_data_from_input 'local/project2@v0.2.0' 'no'
+	assert [ "$REPLY1" = '' ]
+	assert [ "$REPLY2" = 'local' ]
+	assert [ "$REPLY3" = 'project2' ]
+	assert [ "$REPLY4" = 'v0.2.0' ]
+}

tests/util/test_util.sh

@@ -32,20 +32,18 @@ test_util.fake_add() {
 
 # @description Mocks a 'bpm link'
 test_util.fake_link() {
-	local pkg="$1"
-	ensure.non_zero 'pkg' "$pkg"
+	local dir="$1"
+	ensure.non_zero 'dir' "$dir"
 
 	mkdir -p "$BPM_PACKAGES_PATH/local"
 
-	ls -al "$BPM_ORIGIN_DIR/github.com/$pkg" >&3
-	ls -al "$BPM_PACKAGES_PATH/local" >&3
 	mkdir -p "$BPM_PACKAGES_PATH/local"
-	ln -s "$BPM_ORIGIN_DIR/github.com/$pkg" "$BPM_PACKAGES_PATH/local"
+	ln -s "$BPM_ORIGIN_DIR/github.com/$dir" "$BPM_PACKAGES_PATH/local"
 
-	do-plumbing-add-deps "$pkg"
-	do-plumbing-link-bins "$pkg"
-	do-plumbing-link-completions "$pkg"
-	do-plumbing-link-man "$pkg"
+	do-plumbing-add-deps "local/$dir"
+	do-plumbing-link-bins "local/$dir"
+	do-plumbing-link-completions "local/$dir"
+	do-plumbing-link-man "local/$dir"
 }
 
 # @description Creates a 'bpm package', and cd's into it