From c7323e79bcd6c8461f85f86af7409dcec835ab08 Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Fri, 7 May 2021 15:11:23 -0700 Subject: [PATCH] cmd/version: simplified some code + added homebrew support Signed-off-by: Sam Alba --- cmd/dagger/cmd/root.go | 16 ++++----- cmd/dagger/cmd/version.go | 69 ++++++++++++++++++++++++--------------- 2 files changed, 48 insertions(+), 37 deletions(-) diff --git a/cmd/dagger/cmd/root.go b/cmd/dagger/cmd/root.go index 70995e55..a8a6189b 100644 --- a/cmd/dagger/cmd/root.go +++ b/cmd/dagger/cmd/root.go @@ -25,8 +25,12 @@ func init() { rootCmd.PersistentFlags().StringP("log-level", "l", "info", "Log level") rootCmd.PersistentFlags().StringP("environment", "e", "", "Select an environment") - rootCmd.PersistentPreRun = checkVersionHook - rootCmd.PersistentPostRun = warnVersionHook + rootCmd.PersistentPreRun = func(*cobra.Command, []string) { + go checkVersion() + } + rootCmd.PersistentPostRun = func(*cobra.Command, []string) { + warnVersion() + } rootCmd.AddCommand( computeCmd, @@ -53,14 +57,6 @@ func init() { viper.AutomaticEnv() } -func checkVersionHook(cmd *cobra.Command, args []string) { - go checkVersion() -} - -func warnVersionHook(cmd *cobra.Command, args []string) { - warnVersion() -} - func Execute() { var ( ctx = appcontext.Context() diff --git a/cmd/dagger/cmd/version.go b/cmd/dagger/cmd/version.go index f6b4a76f..3f66f11c 100644 --- a/cmd/dagger/cmd/version.go +++ b/cmd/dagger/cmd/version.go @@ -20,6 +20,8 @@ import ( const ( defaultVersion = "devel" + versionFile = "$HOME/.dagger/version-check" + versionURL = "https://releases.dagger.io/dagger/latest_version" ) // set by goreleaser or other builder using @@ -29,13 +31,13 @@ var ( versionMessage = "" ) -// Disable version hook here -// It can lead to a double check if --check flag is enable var versionCmd = &cobra.Command{ - Use: "version", - Short: "Print dagger version", - PersistentPreRun: func(cmd *cobra.Command, args []string) {}, - Args: cobra.NoArgs, + Use: "version", + Short: "Print dagger version", + // Disable version hook here to avoid double version check + PersistentPreRun: func(*cobra.Command, []string) {}, + PersistentPostRun: func(*cobra.Command, []string) {}, + Args: cobra.NoArgs, Run: func(cmd *cobra.Command, args []string) { if bi, ok := debug.ReadBuildInfo(); ok && version == defaultVersion { // No specific version provided via version @@ -47,15 +49,9 @@ var versionCmd = &cobra.Command{ ) if check := viper.GetBool("check"); check { - latestVersion, err := isVersionLatest() - if err != nil { - fmt.Println("error: could not check version.") - return - } - - if latestVersion != "" { - fmt.Printf("there is a new version available (%s), please go to https://github.com/dagger/dagger/doc/update.md for instructions.\n", latestVersion) - } else { + _ = os.Remove(os.ExpandEnv(versionFile)) + checkVersion() + if !warnVersion() { fmt.Println("dagger is up to date.") } } @@ -106,7 +102,7 @@ func getCurrentVersion() (*goVersion.Version, error) { } func getLatestVersion(currentVersion *goVersion.Version) (*goVersion.Version, error) { - req, err := http.NewRequest("GET", "https://releases.dagger.io/dagger/latest_version", nil) + req, err := http.NewRequest("GET", versionURL, nil) if err != nil { return nil, err } @@ -150,17 +146,22 @@ func isVersionLatest() (string, error) { } func checkVersion() { - home, err := os.UserHomeDir() - if err != nil { + if version == defaultVersion { + // running devel version return } - daggerDirectory := path.Join(home, ".dagger") - if err := os.MkdirAll(daggerDirectory, 0666); err != nil { - return + versionFilePath := os.ExpandEnv(versionFile) + baseDir := path.Dir(versionFilePath) + + if _, err := os.Stat(baseDir); os.IsNotExist(err) { + if err := os.MkdirAll(baseDir, 0755); err != nil { + // mkdir fails, ignore silently + return + } } - if !isCheckOutdated(path.Join(daggerDirectory, "version_check.txt")) { + if !isCheckOutdated(versionFilePath) { return } @@ -171,16 +172,30 @@ func checkVersion() { } if latestVersion != "" { - versionMessage = fmt.Sprintf("there is a new version available (%s), please go to https://github.com/dagger/dagger/doc/update.md for instructions.", latestVersion) + versionMessage = fmt.Sprintf("\nA new version is available (%s), please go to https://github.com/dagger/dagger/doc/install.md for instructions.", latestVersion) } // Update check timestamps file now := time.Now().Format(time.RFC3339) - ioutil.WriteFile(path.Join(daggerDirectory, "version_check.txt"), []byte(now), 0600) + ioutil.WriteFile(path.Join(versionFilePath), []byte(now), 0600) } -func warnVersion() { - if versionMessage != "" { - fmt.Println(versionMessage) +func warnVersion() bool { + if versionMessage == "" { + return false } + + if binPath, err := os.Executable(); err == nil { + if p, err := os.Readlink(binPath); err == nil { + // Homebrew detected, print custom message + if strings.Contains(p, "/Cellar/") { + fmt.Println("\nA new version is available, please run:\n\nbrew update && brew upgrade dagger") + return true + } + } + } + + // Print default message + fmt.Println(versionMessage) + return true }