Merge branch 'ivanvc-ruby/fix-already-installed-return-code'

Author: Stratus3D

internal/cli/cli.go

@@ -1092,11 +1092,18 @@ func installCommand(logger *log.Logger, toolName, version string, keepDownload b
 		if version == "" {
 			err = versions.Install(conf, plugin, dir, os.Stdout, os.Stderr)
 			if err != nil {
+				var vaiErr versions.VersionAlreadyInstalledError
+				if errors.As(err, &vaiErr) {
+					logger.Println(err)
+					return nil
+				}
+
 				if _, ok := err.(versions.NoVersionSetError); ok {
 					logger.Printf("No versions specified for %s in config files or environment", toolName)
 					os.Exit(1)
 				}
 
+				logger.Printf("error installing version: %v", err)
 				return err
 			}
 		} else {
@@ -1112,7 +1119,13 @@ func installCommand(logger *log.Logger, toolName, version string, keepDownload b
 			}
 
 			if err != nil {
-				logger.Printf("error installing version: %s", err)
+				var vaiErr versions.VersionAlreadyInstalledError
+				if errors.As(err, &vaiErr) {
+					logger.Println(err)
+					return nil
+				}
+
+				logger.Printf("error installing version: %v", err)
 			}
 		}
 	}
@@ -1123,6 +1136,11 @@ func installCommand(logger *log.Logger, toolName, version string, keepDownload b
 func filterInstallErrors(errs []error) []error {
 	var filtered []error
 	for _, err := range errs {
+		var vaiErr versions.VersionAlreadyInstalledError
+		if errors.As(err, &vaiErr) {
+			continue
+		}
+
 		if _, ok := err.(versions.NoVersionSetError); !ok {
 			filtered = append(filtered, err)
 		}

internal/versions/versions.go

@@ -51,6 +51,17 @@ func (e NoVersionSetError) Error() string {
 	return "no version set"
 }
 
+// VersionAlreadyInstalledError is returned whenever a version is already
+// installed.
+type VersionAlreadyInstalledError struct {
+	toolName string
+	version  toolversions.Version
+}
+
+func (e VersionAlreadyInstalledError) Error() string {
+	return fmt.Sprintf("version %s of %s is already installed", e.version.Value, e.toolName)
+}
+
 // InstallAll installs all specified versions of every tool for the current
 // directory. Typically this will just be a single version, if not already
 // installed, but it may be multiple versions if multiple versions for the tool
@@ -94,13 +105,16 @@ func Install(conf config.Config, plugin plugins.Plugin, dir string, stdOut io.Wr
 	}
 
 	for _, version := range versions.Versions {
-		err := InstallOneVersion(conf, plugin, version, false, stdOut, stdErr)
-		if err != nil {
-			return err
+		iErr := InstallOneVersion(conf, plugin, version, false, stdOut, stdErr)
+		var vaiErr VersionAlreadyInstalledError
+		if errors.As(iErr, &vaiErr) {
+			err = errors.Join(err, iErr)
+		} else if iErr != nil {
+			return iErr
 		}
 	}
 
-	return nil
+	return err
 }
 
 // InstallVersion installs a version of a specific tool, the version may be an
@@ -143,7 +157,7 @@ func InstallOneVersion(conf config.Config, plugin plugins.Plugin, versionStr str
 	installDir := installs.InstallPath(conf, plugin, version)
 
 	if installs.IsInstalled(conf, plugin, version) {
-		return fmt.Errorf("version %s of %s is already installed", version, plugin.Name)
+		return VersionAlreadyInstalledError{version: version, toolName: plugin.Name}
 	}
 
 	env := map[string]string{

internal/versions/versions_test.go

@@ -122,6 +122,30 @@ func TestInstall(t *testing.T) {
 		assertVersionInstalled(t, conf.DataDir, plugin.Name, "1.0.0")
 		assertVersionInstalled(t, conf.DataDir, plugin.Name, "2.0.0")
 	})
+
+	t.Run("if multiple versions are defined and installed returns an error", func(t *testing.T) {
+		conf, plugin := generateConfig(t)
+		stdout, stderr := buildOutputs()
+		currentDir := t.TempDir()
+
+		versions := "1.0.0 2.0.0"
+		// write a version file
+		data := []byte(fmt.Sprintf("%s %s", plugin.Name, versions))
+		err := os.WriteFile(filepath.Join(currentDir, ".tool-versions"), data, 0o666)
+		assert.NoError(t, err)
+
+		err = Install(conf, plugin, currentDir, &stdout, &stderr)
+		assert.NoError(t, err)
+
+		assertVersionInstalled(t, conf.DataDir, plugin.Name, "1.0.0")
+		assertVersionInstalled(t, conf.DataDir, plugin.Name, "2.0.0")
+
+		err = Install(conf, plugin, currentDir, &stdout, &stderr)
+		assert.Error(t, err)
+		// Expect a VersionAlreadyInstalledError
+		var eerr VersionAlreadyInstalledError
+		assert.ErrorAs(t, err, &eerr)
+	})
 }
 
 func TestInstallVersion(t *testing.T) {
@@ -204,7 +228,10 @@ func TestInstallOneVersion(t *testing.T) {
 
 		// Install a second time
 		err = InstallOneVersion(conf, plugin, "1.0.0", false, &stdout, &stderr)
-		assert.NotNil(t, err)
+		assert.Error(t, err)
+		// Expect a VersionAlreadyInstalledError
+		var eerr VersionAlreadyInstalledError
+		assert.ErrorAs(t, err, &eerr)
 	})
 
 	t.Run("creates download directory", func(t *testing.T) {

test/install_command.bats

@@ -321,3 +321,60 @@ EOM
 #  [ "$status" -eq 0 ]
 #  [[ "$output" == *'asdf: Warn:'*'not be preserved'* ]]
 #}
+
+@test "install command without arguments installs version a second time without errors" {
+  cd "$PROJECT_DIR"
+  echo -n 'dummy 1.2.0' >".tool-versions"
+  run asdf install
+  [ "$status" -eq 0 ]
+  [ "$(cat "$ASDF_DIR/installs/dummy/1.2.0/version")" = "1.2.0" ]
+
+  run asdf install
+  [ "$status" -eq 0 ]
+}
+
+@test "install command with tool installs version a second time without errors" {
+  cd "$PROJECT_DIR"
+  echo -n 'dummy 1.2.0' >".tool-versions"
+  run asdf install dummy
+  [ "$status" -eq 0 ]
+  [ "$(cat "$ASDF_DIR/installs/dummy/1.2.0/version")" = "1.2.0" ]
+
+  run asdf install dummy
+  [ "$status" -eq 0 ]
+}
+
+@test "install command with tool and version installs version a second time without errors" {
+  run asdf install dummy 1.0.0
+  [ "$status" -eq 0 ]
+  [ "$(cat "$ASDF_DIR/installs/dummy/1.0.0/version")" = "1.0.0" ]
+
+  run asdf install dummy 1.0.0
+  [ "$status" -eq 0 ]
+}
+
+@test "install command with tool and different version installs version a second time without errors" {
+  cd "$PROJECT_DIR"
+  echo -n 'dummy 1.0.0 1.1.0' >".tool-versions"
+
+  run asdf install dummy 1.0.0
+  [ "$status" -eq 0 ]
+  [ "$(cat "$ASDF_DIR/installs/dummy/1.0.0/version")" = "1.0.0" ]
+
+  run asdf install
+  [ "$status" -eq 0 ]
+  [ "$(cat "$ASDF_DIR/installs/dummy/1.1.0/version")" = "1.1.0" ]
+}
+
+@test "install command with two tools installs tool version a second time without errors" {
+  cd "$PROJECT_DIR"
+  printf "dummy 1.0.0\nlegacy-dummy 1.0.0" >"$PROJECT_DIR/.tool-versions"
+
+  run asdf install dummy 1.0.0
+  [ "$status" -eq 0 ]
+  [ "$(cat "$ASDF_DIR/installs/dummy/1.0.0/version")" = "1.0.0" ]
+
+  run asdf install
+  [ "$status" -eq 0 ]
+  [ "$(cat "$ASDF_DIR/installs/legacy-dummy/1.0.0/version")" = "1.0.0" ]
+}