feat: Support specifying package to upgrade with directory

Author: hyperupcall

pkg/lib/commands/do-remove.sh

@@ -7,7 +7,6 @@ do-remove() {
 
 	for repoSpec; do
 		# If is local directory
-		# TODO: do this for upgrade as well
 		if [ -d "$repoSpec" ]; then
 			local dir=
 			dir="$(util.readlink "$repoSpec")"

pkg/lib/commands/do-upgrade.sh

@@ -34,21 +34,39 @@ do-upgrade() {
 	fi
 
 	for repoSpec; do
-		util.construct_clone_url "$repoSpec"
-		local uri="$REPLY1"
-		local site="$REPLY2"
-		local package="$REPLY3"
-		local ref="$REPLY4"
-
-		log.info "Upgrading '$repoSpec'"
-		do-plumbing-remove-deps "$site/$package"
-		do-plumbing-unlink-bins "$site/$package"
-		do-plumbing-unlink-completions "$site/$package"
-		do-plumbing-unlink-man "$site/$package"
-		git -C "$BPM_PACKAGES_PATH/$site/$package" pull
-		do-plumbing-add-deps "$site/$package"
-		do-plumbing-link-bins "$site/$package"
-		do-plumbing-link-completions "$site/$package"
-		do-plumbing-link-man "$site/$package"
+		# 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"
+
+			do_actual_upgrade "$site/$package"
+		else
+			util.construct_clone_url "$repoSpec"
+			local site="$REPLY2"
+			local package="$REPLY3"
+			local ref="$REPLY4"
+
+			do_actual_upgrade "$site/$package"
+		fi
 	done
 }
+
+do_actual_upgrade() {
+	local id="$1"
+
+	log.info "Upgrading '$id'"
+	do-plumbing-remove-deps "$id"
+	do-plumbing-unlink-bins "$id"
+	do-plumbing-unlink-completions "$id"
+	do-plumbing-unlink-man "$id"
+	git -C "$BPM_PACKAGES_PATH/$id" pull
+	do-plumbing-add-deps "$id"
+	do-plumbing-link-bins "$id"
+	do-plumbing-link-completions "$id"
+	do-plumbing-link-man "$id"
+}

tests/do-upgrade.bats

@@ -25,6 +25,30 @@ load 'util/init.sh'
 	assert [ -f "$BPM_PACKAGES_PATH/$site/$pkg/script2.sh" ]
 }
 
+@test "simple upgrade (specifying with directory)" {
+	local site='github.com'
+	local pkg='username/package'
+
+	test_util.setup_pkg "$pkg"; {
+		touch 'script.sh'
+	}; test_util.finish_pkg
+	test_util.fake_install "$pkg"
+
+	cd "$BPM_ORIGIN_DIR/$site/$pkg"
+	touch 'script2.sh'
+	git add .
+	git commit -m 'Add script'
+	cd "$BPM_CWD"
+
+	do-upgrade "$BPM_ORIGIN_DIR/$site/$pkg"
+
+	run do-list --outdated
+	assert_output ""
+
+	assert [ -f "$BPM_PACKAGES_PATH/$site/$pkg/script2.sh" ]
+}
+
+
 @test "symlinks stay valid after upgrade" {
 	local site='github.com'
 	local pkg='username/package'