fix: run install hook on upgrade (#347)

Author: alecthomas

app/upgrade_cmd.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/cashapp/hermit"
@@ -42,13 +43,23 @@ func (g *upgradeCmd) Run(l *ui.UI, env *hermit.Env) error {
 	}
 
 	changes := shell.NewChanges(envars.Parse(os.Environ()))
-
+	w := l.WriterAt(ui.LevelInfo)
 	// upgrade packages
 	for _, pkg := range packages {
-		c, err := env.Upgrade(l, pkg)
+		c, upgraded, err := env.Upgrade(l, pkg)
 		if err != nil {
 			return errors.WithStack(err)
+		} else if upgraded == nil {
+			continue
+		}
+		messages, err := env.TriggerForPackage(l, manifest.EventInstall, upgraded)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+		for _, message := range messages {
+			fmt.Fprintln(w, message)
 		}
+		upgraded.LogWarnings(l)
 		changes = changes.Merge(c)
 	}
 

env.go

@@ -661,12 +661,14 @@ func (e *Env) install(l *ui.UI, p *manifest.Package) (*shell.Changes, error) {
 }
 
 // Upgrade package.
-func (e *Env) Upgrade(l *ui.UI, pkg *manifest.Package) (*shell.Changes, error) {
+//
+// If an upgrade does not occur, returns all nils.
+func (e *Env) Upgrade(l *ui.UI, pkg *manifest.Package) (*shell.Changes, *manifest.Package, error) {
 	task := l.Task(pkg.Reference.String())
 
 	if pkg.Reference.IsChannel() {
 		err := e.state.UpgradeChannel(task, pkg)
-		return nil, errors.WithStack(err)
+		return nil, nil, errors.WithStack(err)
 	}
 	return e.upgradeVersion(l, pkg)
 }
@@ -1090,34 +1092,33 @@ func (e *Env) BinDir() string {
 // upgradeVersion upgrades the package to its latest version.
 //
 // If the package is already at its latest version, this is a no-op.
-func (e *Env) upgradeVersion(l *ui.UI, pkg *manifest.Package) (*shell.Changes, error) {
+func (e *Env) upgradeVersion(l *ui.UI, pkg *manifest.Package) (*shell.Changes, *manifest.Package, error) {
 	resolver, err := e.resolver(l)
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, nil, errors.WithStack(err)
 	}
 	// Get the latest version of the package
 	resolved, err := resolver.Resolve(l, manifest.PrefixSelector(pkg.Reference.Major()))
 	if err != nil {
-		return nil, errors.WithStack(err)
+		return nil, nil, errors.WithStack(err)
 	}
 	if err := resolved.EnsureSupported(); err != nil {
-		return nil, errors.Wrapf(err, "upgrade failed")
+		return nil, nil, errors.Wrapf(err, "upgrade failed")
 	}
 	if !resolved.Reference.Version.Match(pkg.Reference.Version) {
 		l.Task(pkg.Reference.Name).SubTask("upgrade").Infof("Upgrading %s to %s", pkg, resolved)
 		uc, err := e.uninstall(l.Task(pkg.Reference.String()), pkg)
 		if err != nil {
-			return nil, errors.WithStack(err)
+			return nil, nil, errors.WithStack(err)
 		}
 		ic, err := e.install(l, resolved)
 		if err != nil {
-			return nil, errors.WithStack(err)
+			return nil, nil, errors.WithStack(err)
 		}
 		// Update the package.
-		*pkg = *resolved
-		return uc.Merge(ic), nil
+		return uc.Merge(ic), resolved, nil
 	}
-	return shell.NewChanges(envars.Parse(os.Environ())), nil
+	return nil, nil, nil
 }
 
 func (e *Env) readPackageState(pkg *manifest.Package) {

integration/integration_test.go

@@ -238,6 +238,14 @@ func TestIntegration(t *testing.T) {
 			hermit manifest add-digests packages/testbin1.hcl
 			assert grep d4f8989a4a6bf56ccc768c094448aa5f42be3b9f0287adc2f4dfd2241f80d2c0 packages/testbin1.hcl 
 			`},
+		{name: "UpgradeTriggersInstallHook",
+			preparations: prep{fixture("testenv1"), activate(".")},
+			script: `
+			hermit install testbin1-1.0.0
+			hermit upgrade testbin1
+			`,
+			expectations: exp{outputContains("testbin1-1.0.0 hook"), outputContains("testbin1-1.0.1 hook")},
+		},
 	}
 
 	checkForShells(t)

integration/testdata/testenv1/packages/testbin1.hcl

@@ -2,4 +2,7 @@ description = "Test package one"
 env = {FOO: "bar", TESTBIN1VERSION: "${version}"}
 source = "${env}/packages/testbin1.tgz"
 binaries = ["testbin1"]
+on install {
+  message { text = "testbin1-${version} hook" }
+}
 version "1.0.0" "1.0.1" {}