Merge pull request #1086 from twpayne/upgrade-cmd

Restore upgrade command

cmd/config.go

@@ -129,6 +129,7 @@ type Config struct {
 	state           stateCmdConfig
 	status          statusCmdConfig
 	update          updateCmdConfig
+	upgrade         upgradeCmdConfig
 	verify          verifyCmdConfig
 
 	// Computed configuration.
@@ -911,40 +912,39 @@ func (c *Config) newRootCmd() (*cobra.Command, error) {
 	}
 
 	rootCmd.SetHelpCommand(c.newHelpCmd())
-	for _, newCmdFunc := range []func() *cobra.Command{
-		c.newAddCmd,
-		c.newApplyCmd,
-		c.newArchiveCmd,
-		c.newCatCmd,
-		c.newCDCmd,
-		c.newChattrCmd,
-		c.newCompletionCmd,
-		c.newDataCmd,
-		c.newDiffCmd,
-		c.newDocsCmd,
-		c.newDoctorCmd,
-		c.newDumpCmd,
-		c.newEditCmd,
-		c.newEditConfigCmd,
-		c.newExecuteTemplateCmd,
-		c.newForgetCmd,
-		c.newGitCmd,
-		c.newImportCmd,
-		c.newInitCmd,
-		c.newManagedCmd,
-		c.newMergeCmd,
-		c.newPurgeCmd,
-		c.newRemoveCmd,
-		c.newSecretCmd,
-		c.newSourcePathCmd,
-		c.newStateCmd,
-		c.newStatusCmd,
-		c.newUnmanagedCmd,
-		c.newUpdateCmd,
-		c.newVerifyCmd,
-	} {
-		rootCmd.AddCommand(newCmdFunc())
-	}
+	rootCmd.AddCommand(
+		c.newAddCmd(),
+		c.newApplyCmd(),
+		c.newArchiveCmd(),
+		c.newCatCmd(),
+		c.newCDCmd(),
+		c.newChattrCmd(),
+		c.newCompletionCmd(),
+		c.newDataCmd(),
+		c.newDiffCmd(),
+		c.newDocsCmd(),
+		c.newDoctorCmd(),
+		c.newDumpCmd(),
+		c.newEditCmd(),
+		c.newEditConfigCmd(),
+		c.newExecuteTemplateCmd(),
+		c.newForgetCmd(),
+		c.newGitCmd(),
+		c.newImportCmd(),
+		c.newInitCmd(),
+		c.newManagedCmd(),
+		c.newMergeCmd(),
+		c.newPurgeCmd(),
+		c.newRemoveCmd(),
+		c.newSecretCmd(),
+		c.newSourcePathCmd(),
+		c.newStateCmd(),
+		c.newStatusCmd(),
+		c.newUnmanagedCmd(),
+		c.newUpdateCmd(),
+		c.newUpgradeCmd(),
+		c.newVerifyCmd(),
+	)
 
 	return rootCmd, nil
 }

cmd/githubtemplatefuncs.go

@@ -2,15 +2,11 @@ package cmd
 
 import (
 	"context"
-	"net/http"
-	"os"
 
 	"github.com/google/go-github/v33/github"
-	"golang.org/x/oauth2"
 )
 
 type gitHubData struct {
-	client    *github.Client
 	keysCache map[string][]*github.Key
 }
 
@@ -22,29 +18,14 @@ func (c *Config) gitHubKeysTemplateFunc(user string) []*github.Key {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	if c.gitHub.client == nil {
-		var httpClient *http.Client
-		for _, key := range []string{
-			"CHEZMOI_GITHUB_ACCESS_TOKEN",
-			"GITHUB_ACCESS_TOKEN",
-			"GITHUB_TOKEN",
-		} {
-			if accessToken := os.Getenv(key); accessToken != "" {
-				httpClient = oauth2.NewClient(ctx, oauth2.StaticTokenSource(&oauth2.Token{
-					AccessToken: accessToken,
-				}))
-				break
-			}
-		}
-		c.gitHub.client = github.NewClient(httpClient)
-	}
+	gitHubClient := newGitHubClient(ctx)
 
 	var allKeys []*github.Key
 	opts := &github.ListOptions{
 		PerPage: 100,
 	}
 	for {
-		keys, resp, err := c.gitHub.client.Users.ListKeys(ctx, user, opts)
+		keys, resp, err := gitHubClient.Users.ListKeys(ctx, user, opts)
 		if err != nil {
 			returnTemplateError(err)
 			return nil

cmd/upgradecmd.go

@@ -0,0 +1,32 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+)
+
+type upgradeCmdConfig struct {
+	method string
+	owner  string
+	repo   string
+}
+
+func (c *Config) newUpgradeCmd() *cobra.Command {
+	upgradeCmd := &cobra.Command{
+		Use:     "upgrade",
+		Short:   "Upgrade chezmoi to the latest released version",
+		Long:    mustLongHelp("upgrade"),
+		Example: example("upgrade"),
+		Args:    cobra.NoArgs,
+		RunE:    c.runUpgradeCmd,
+		Annotations: map[string]string{
+			runsCommands: "true",
+		},
+	}
+
+	flags := upgradeCmd.Flags()
+	flags.StringVar(&c.upgrade.method, "method", "", "set method")
+	flags.StringVar(&c.upgrade.owner, "owner", "twpayne", "set owner")
+	flags.StringVar(&c.upgrade.repo, "repo", "chezmoi", "set repo")
+
+	return upgradeCmd
+}