tools.vpm: fix install paths, only normalize relevant, restore assign install_path_fmted, add input tests (#19984)

Author: ttytm

cmd/tools/vpm/expect/accept_reinstall_mod_with_version_installation.expect

@@ -0,0 +1,20 @@
+#!/usr/bin/env expect
+
+set timeout 3
+
+set vexe [lindex $argv 0]
+set mod [lindex $argv 1]
+set cur_tag [lindex $argv 2]
+set new_tag [lindex $argv 3]
+set install_path [lindex $argv 4]
+
+spawn $vexe install $mod@$new_tag
+
+expect "Scanning `$mod`..." {} timeout { exit 1 }
+expect "Module `$mod@$cur_tag` is already installed at `$install_path`." {} timeout { exit 1 }
+expect "Replace it with `$mod@$new_tag`? \\\[Y/n\\\]: " { send "\r" } timeout { exit 1 }
+expect "Installing `$mod`..." {} timeout { exit 1 }
+expect "Skipping download count increment for `$mod`." {} timeout { exit 1 }
+expect "Installed `$mod`." {} timeout { exit 1 }
+
+expect eof

cmd/tools/vpm/expect/decline_reinstall_mod_with_version_installation.expect

@@ -0,0 +1,17 @@
+#!/usr/bin/env expect
+
+set timeout 3
+
+set vexe [lindex $argv 0]
+set mod [lindex $argv 1]
+set cur_tag [lindex $argv 2]
+set new_tag [lindex $argv 3]
+set install_path [lindex $argv 4]
+
+spawn $vexe install $mod@$new_tag
+
+expect "Scanning `$mod`..." {} timeout { exit 1 }
+expect "Module `$mod@$cur_tag` is already installed at `$install_path`." {} timeout { exit 1 }
+expect "Replace it with `$mod@$new_tag`? \\\[Y/n\\\]: " { send "n\r" } timeout { exit 1 }
+
+expect eof

cmd/tools/vpm/install.v

@@ -141,14 +141,14 @@ fn (m Module) confirm_install() bool {
 		println('Module `${m.name}${at_version(m.installed_version)}` is already installed, use --force to overwrite.')
 		return false
 	} else {
-		install_version := at_version(if m.version == '' { 'latest' } else { m.version })
 		println('Module `${m.name}${at_version(m.installed_version)}` is already installed at `${m.install_path_fmted}`.')
 		if settings.fail_on_prompt {
 			vpm_error('VPM should not have entered a confirmation prompt.')
 			exit(1)
 		}
+		install_version := at_version(if m.version == '' { 'latest' } else { m.version })
 		input := os.input('Replace it with `${m.name}${install_version}`? [Y/n]: ')
-		match input.to_lower() {
+		match input.trim_space().to_lower() {
 			'', 'y' {
 				return true
 			}

cmd/tools/vpm/install_version_input_test.v

@@ -0,0 +1,63 @@
+// vtest retry: 3
+import os
+import v.vmod
+
+const vexe = os.quoted_path(@VEXE)
+const test_path = os.join_path(os.vtmp_dir(), 'vpm_install_version_input_test')
+const expect_tests_path = os.join_path(@VEXEROOT, 'cmd', 'tools', 'vpm', 'expect')
+const expect_exe = os.quoted_path(os.find_abs_path_of_executable('expect') or {
+	eprintln('skipping test, since expect is missing')
+	exit(0)
+})
+
+fn testsuite_begin() {
+	os.setenv('VMODULES', test_path, true)
+	os.setenv('VPM_NO_INCREMENT', '1', true)
+	os.setenv('VPM_DEBUG', '', true)
+	// Explicitly disable fail on prompt.
+	os.setenv('VPM_FAIL_ON_PROMPT', '', true)
+	os.mkdir_all(test_path) or {}
+	os.chdir(test_path)!
+}
+
+fn testsuite_end() {
+	os.rmdir_all(test_path) or {}
+}
+
+fn get_mod_name_and_version(path string) (string, string) {
+	mod := vmod.from_file(os.join_path(test_path, path, 'v.mod')) or {
+		eprintln(err)
+		return '', ''
+	}
+	return mod.name, mod.version
+}
+
+// Test installing another version of a module of which an explicit version is already installed.
+fn test_reinstall_mod_with_version_installation() {
+	// Install version.
+	mod := 'vsl'
+	tag := 'v0.1.47'
+	os.execute_or_exit('${vexe} install ${mod}@${tag}')
+	mut name, mut version := get_mod_name_and_version(mod)
+	assert name == mod
+	assert version == tag.trim_left('v')
+
+	// Try reinstalling.
+	new_tag := 'v0.1.50'
+	install_path := os.real_path(os.join_path(test_path, mod))
+	expect_args := [vexe, mod, tag, new_tag, install_path].join(' ')
+
+	// Decline.
+	decline_test := os.join_path(expect_tests_path, 'decline_reinstall_mod_with_version_installation.expect')
+	manifest_path := os.join_path(install_path, 'v.mod')
+	last_modified := os.file_last_mod_unix(manifest_path)
+	os.execute_or_exit('${expect_exe} ${decline_test} ${expect_args}')
+	assert last_modified == os.file_last_mod_unix(manifest_path)
+
+	// Accept.
+	accept_test := os.join_path(expect_tests_path, 'accept_reinstall_mod_with_version_installation.expect')
+	os.execute_or_exit('${expect_exe} ${accept_test} ${expect_args}')
+	name, version = get_mod_name_and_version(mod)
+	assert name == mod, name
+	assert version == new_tag.trim_left('v'), version
+}

cmd/tools/vpm/parse.v

@@ -58,13 +58,12 @@ fn parse_query(query []string) []Module {
 				continue
 			}
 			// Resolve path.
-			base := if is_http { publisher } else { '' }
-			install_path := normalize_mod_path(os.real_path(os.join_path(settings.vmodules_path,
-				base, manifest.name)))
+			mod_path := normalize_mod_path(os.join_path(if is_http { publisher } else { '' },
+				manifest.name))
 			Module{
 				name: manifest.name
 				url: ident
-				install_path: install_path
+				install_path: os.real_path(os.join_path(settings.vmodules_path, mod_path))
 				is_external: true
 				manifest: manifest
 			}
@@ -113,17 +112,16 @@ fn parse_query(query []string) []Module {
 				vmod.Manifest{}
 			}
 			// Resolve path.
-			ident_as_path := info.name.replace('.', os.path_separator)
-			install_path := normalize_mod_path(os.real_path(os.join_path(settings.vmodules_path,
-				ident_as_path)))
+			mod_path := normalize_mod_path(info.name.replace('.', os.path_separator))
 			Module{
 				name: info.name
 				url: info.url
 				vcs: vcs
-				install_path: install_path
+				install_path: os.real_path(os.join_path(settings.vmodules_path, mod_path))
 				manifest: manifest
 			}
 		}
+		mod.install_path_fmted = fmt_mod_path(mod.install_path)
 		mod.version = version
 		mod.get_installed()
 		modules << mod