Let user disable version update reminders

camerondurham · May 28, 2021 · 025bfe1 · 025bfe1
1 parent bcd2296
commit 025bfe1
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -28,19 +28,7 @@ var rootCmd = &cobra.Command{
 
 func Execute() {
 
-	// TODO: only check if user didn't specify they don't want upgrade reminders
-	latestVersion, err := util.GetLatestVersion(util.GetRequest)
-	if err != nil {
-		util.DebugPrint(fmt.Sprintf("ignoring version check since error occured when retrieving latest version: %v\n", err))
-	} else if version.PkgVersion != "" && latestVersion != version.PkgVersion {
-		fmt.Printf(
-			"\tA new version of ch is available!\n"+
-				"\tYou are running version %s but the latest version is %s.\n"+
-				"\tSee %s instructions on upgrading.\n",
-			version.PkgVersion,
-			latestVersion,
-			RepositoryUrl)
-	}
+	checkCliVersion()
 
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Println(err)
@@ -79,3 +67,24 @@ func initConfig() {
 		util.DebugPrint(fmt.Sprint("Using config file:", viper.ConfigFileUsed()))
 	}
 }
+
+func checkCliVersion() {
+	opts, err := util.GetConfigOpts()
+
+	if err != nil {
+		util.DebugPrint(fmt.Sprintf("error reading environment file: %v", err))
+	} else if v, ok := opts["version_check"]; !ok || v == "true" {
+		latestVersion, err := util.GetLatestVersion(util.GetRequest)
+		if err != nil {
+			util.DebugPrint(fmt.Sprintf("ignoring version check since error occured when retrieving latest version: %v\n", err))
+		} else if version.PkgVersion != "" && latestVersion != version.PkgVersion {
+			fmt.Printf(
+				"\tA new version of ch is available!\n"+
+					"\tYou are running version %s but the latest version is %s.\n"+
+					"\tSee %s instructions on upgrading.\n",
+				version.PkgVersion,
+				latestVersion,
+				RepositoryUrl)
+		}
+	}
+}
diff --git a/cmd/util/cli.go b/cmd/util/cli.go
@@ -91,6 +91,7 @@ func (cli *Cli) Containers() map[string]*ContainerOpts {
 	return envs
 }
 
+// GetEnvs retrieves the environments managed by ch from ~/.ch.yaml
 func GetEnvs() (envs map[string]*ContainerOpts, err error) {
 	if !viper.IsSet("envs") {
 		return nil, ErrDoesNotExist
@@ -101,6 +102,16 @@ func GetEnvs() (envs map[string]*ContainerOpts, err error) {
 	return
 }
 
+// GetConfigOpts retrieves optional settings from ~/.ch.yaml
+func GetConfigOpts() (opts map[string]string, err error) {
+	if !viper.IsSet("envs") {
+		return nil, ErrDoesNotExist
+	}
+	opts = make(map[string]string)
+	err = viper.UnmarshalKey("opts", &opts)
+	return
+}
+
 func PrintEnvNotFoundMsg(envName string) {
 	fmt.Printf("no such environment: %v\n", envName)
 	envs, err := GetEnvs()