Split the updater and version command files

cmd/update.go

+/*Package cmd is used for command line.
+
+Copyright © 2020 Addshore
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"gerrit.wikimedia.org/r/mediawiki/tools/cli/internal/config"
+	"gerrit.wikimedia.org/r/mediawiki/tools/cli/internal/updater"
+	"github.com/manifoldco/promptui"
+	"github.com/spf13/cobra"
+)
+
+var updateCmd = &cobra.Command{
+	Use:   "update",
+	Short: "Checks for and performs updates",
+	Run: func(cmd *cobra.Command, args []string) {
+		c := config.LoadFromDisk()
+		fmt.Println("You are on the " + c.UpdateChannel + " channel.")
+
+		canUpdate, toUpdateToOrMessage := updater.CanUpdate(Version, GitSummary, Verbosity >= 2)
+
+		if !canUpdate {
+			fmt.Println(toUpdateToOrMessage)
+			os.Exit(0)
+		}
+
+		fmt.Println("New update found: " + toUpdateToOrMessage)
+
+		updatePrompt := promptui.Prompt{
+			Label:     " Do you want to update?",
+			IsConfirm: true,
+		}
+		_, err := updatePrompt.Run()
+		if err == nil {
+			// Note: technically there is a small race condition here, and we might update to a newer version if it was release between stages
+			updateSuccess, updateMessage := updater.Update(Version, GitSummary, Verbosity >= 2)
+			fmt.Println(updateMessage)
+			if !updateSuccess {
+				os.Exit(1)
+			}
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(updateCmd)
+
+	updateCmd.PersistentFlags().IntVarP(&Verbosity, "verbosity", "v", 1, "verbosity level (1-2)")
+}

cmd/version.go

@@ -18,11 +18,7 @@ package cmd
 
 import (
 	"fmt"
-	"os"
 
-	"gerrit.wikimedia.org/r/mediawiki/tools/cli/internal/config"
-	"gerrit.wikimedia.org/r/mediawiki/tools/cli/internal/updater"
-	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 )
 
@@ -40,41 +36,6 @@ Version: %s
 	},
 }
 
-var updateCmd = &cobra.Command{
-	Use:   "update",
-	Short: "Checks for and performs updates",
-	Run: func(cmd *cobra.Command, args []string) {
-		c := config.LoadFromDisk()
-		fmt.Println("You are on the " + c.UpdateChannel + " channel.")
-
-		canUpdate, toUpdateToOrMessage := updater.CanUpdate(Version, GitSummary, Verbosity >= 2)
-
-		if !canUpdate {
-			fmt.Println(toUpdateToOrMessage)
-			os.Exit(0)
-		}
-
-		fmt.Println("New update found: " + toUpdateToOrMessage)
-
-		updatePrompt := promptui.Prompt{
-			Label:     " Do you want to update?",
-			IsConfirm: true,
-		}
-		_, err := updatePrompt.Run()
-		if err == nil {
-			// Note: technically there is a small race condition here, and we might update to a newer version if it was release between stages
-			updateSuccess, updateMessage := updater.Update(Version, GitSummary, Verbosity >= 2)
-			fmt.Println(updateMessage)
-			if !updateSuccess {
-				os.Exit(1)
-			}
-		}
-	},
-}
-
 func init() {
 	rootCmd.AddCommand(versionCmd)
-	rootCmd.AddCommand(updateCmd)
-
-	updateCmd.PersistentFlags().IntVarP(&Verbosity, "verbosity", "v", 1, "verbosity level (1-2)")
 }