vercel · samchouse · Feb 20, 2022 · Feb 22, 2022 · Feb 23, 2022 · Feb 27, 2022
@@ -1,179 +1,31 @@
 package main
 
 import (
-	"fmt"
 	"os"
-	"runtime/debug"
-	"strings"
-	"time"
 
-	"github.com/vercel/turborepo/cli/internal/config"
-	"github.com/vercel/turborepo/cli/internal/info"
-	"github.com/vercel/turborepo/cli/internal/login"
+	"github.com/hashicorp/go-hclog"
+	"github.com/vercel/turborepo/cli/internal/cmd"
 	"github.com/vercel/turborepo/cli/internal/process"
-	prune "github.com/vercel/turborepo/cli/internal/prune"
-	"github.com/vercel/turborepo/cli/internal/run"
-	"github.com/vercel/turborepo/cli/internal/ui"
-	uiPkg "github.com/vercel/turborepo/cli/internal/ui"
-	"github.com/vercel/turborepo/cli/internal/util"
-
-	"github.com/fatih/color"
-	hclog "github.com/hashicorp/go-hclog"
-	"github.com/mitchellh/cli"
 )
 
 func main() {
-	args := os.Args[1:]
-	heapFile := ""
-	traceFile := ""
-	cpuprofileFile := ""
-	argsEnd := 0
-	for _, arg := range args {
-		switch {
-		case strings.HasPrefix(arg, "--heap="):
-			heapFile = arg[len("--heap="):]
-		case strings.HasPrefix(arg, "--trace="):
-			traceFile = arg[len("--trace="):]
-		case strings.HasPrefix(arg, "--cpuprofile="):
-			cpuprofileFile = arg[len("--cpuprofile="):]
-		default:
-			// Strip any arguments that were handled above
-			args[argsEnd] = arg
-			argsEnd++
-		}
-	}
-	args = args[:argsEnd]
-
-	c := cli.NewCLI("turbo", turboVersion)
-
-	util.InitPrintf()
-	ui := ui.Default()
-
-	c.Args = args
-	c.HelpWriter = os.Stdout
-	c.ErrorWriter = os.Stderr
-	// Parse and validate cmd line flags and env vars
-	// Note that cf can be nil
-	cf, err := config.ParseAndValidate(c.Args, ui, turboVersion)
-	if err != nil {
-		ui.Error(fmt.Sprintf("%s %s", uiPkg.ERROR_PREFIX, color.RedString(err.Error())))
-		os.Exit(1)
-	}
-
-	var logger hclog.Logger
-	if cf != nil {
-		logger = cf.Logger
-	} else {
-		logger = hclog.Default()
-	}
-	processes := process.NewManager(logger.Named("processes"))
-	signalCh := watchSignals(func() { processes.Close() })
-	c.HiddenCommands = []string{"graph"}
-	c.Commands = map[string]cli.CommandFactory{
-		"run": func() (cli.Command, error) {
-			return &run.RunCommand{Config: cf, Ui: ui, Processes: processes},
-				nil
-		},
-		"prune": func() (cli.Command, error) {
-			return &prune.PruneCommand{Config: cf, Ui: ui}, nil
-		},
-		"link": func() (cli.Command, error) {
-			return &login.LinkCommand{Config: cf, Ui: ui}, nil
-		},
-		"unlink": func() (cli.Command, error) {
-			return &login.UnlinkCommand{Config: cf, Ui: ui}, nil
-		},
-		"login": func() (cli.Command, error) {
-			return &login.LoginCommand{Config: cf, UI: ui}, nil
-		},
-		"logout": func() (cli.Command, error) {
-			return &login.LogoutCommand{Config: cf, Ui: ui}, nil
-		},
-		"bin": func() (cli.Command, error) {
-			return &info.BinCommand{Config: cf, Ui: ui}, nil
-		},
-	}
-
-	// Capture the defer statements below so the "done" message comes last
 	exitCode := 1
 	doneCh := make(chan struct{})
+	processes := process.NewManager(hclog.Default().Named("processes"))
+	signalCh := watchSignals(func() { processes.Close() })
+
 	func() {
 		defer func() { close(doneCh) }()
-		// To view a CPU trace, use "go tool trace [file]". Note that the trace
-		// viewer doesn't work under Windows Subsystem for Linux for some reason.
-		if traceFile != "" {
-			if done := createTraceFile(args, traceFile); done == nil {
-				return
-			} else {
-				defer done()
-			}
-		}
-
-		// To view a heap trace, use "go tool pprof [file]" and type "top". You can
-		// also drop it into https://speedscope.app and use the "left heavy" or
-		// "sandwich" view modes.
-		if heapFile != "" {
-			if done := createHeapFile(args, heapFile); done == nil {
-				return
-			} else {
-				defer done()
-			}
-		}
-
-		// To view a CPU profile, drop the file into https://speedscope.app.
-		// Note: Running the CPU profiler doesn't work under Windows subsystem for
-		// Linux. The profiler has to be built for native Windows and run using the
-		// command prompt instead.
-		if cpuprofileFile != "" {
-			if done := createCpuprofileFile(args, cpuprofileFile); done == nil {
-				return
-			} else {
-				defer done()
-			}
-		}
-
-		if cpuprofileFile != "" {
-			// The CPU profiler in Go only runs at 100 Hz, which is far too slow to
-			// return useful information for esbuild, since it's so fast. Let's keep
-			// running for 30 seconds straight, which should give us 3,000 samples.
-			seconds := 30.0
-			start := time.Now()
-			for time.Since(start).Seconds() < seconds {
-				exitCode, err = c.Run()
-				if err != nil {
-					ui.Error(err.Error())
-				}
-			}
-		} else {
-			// Don't disable the GC if this is a long-running process
-			isServe := false
-			for _, arg := range args {
-				if arg == "--no-gc" {
-					isServe = true
-					break
-				}
-			}
-
-			// Disable the GC since we're just going to allocate a bunch of memory
-			// and then exit anyway. This speedup is not insignificant. Make sure to
-			// only do this here once we know that we're not going to be a long-lived
-			// process though.
-			if !isServe {
-				debug.SetGCPercent(-1)
-			}
-
-			exitCode, err = c.Run()
-			if err != nil {
-				ui.Error(err.Error())
-			}
-		}
+		exitCode = cmd.Execute(turboVersion, processes)
 	}()
+
 	// Wait for either our command to finish, in which case we need to clean up,
 	// or to receive a signal, in which case the signal handler above does the cleanup
 	select {
 	case <-doneCh:
 		processes.Close()
 	case <-signalCh:
 	}
+
 	os.Exit(exitCode)
 }
@@ -1,40 +1,49 @@
 module github.com/vercel/turborepo/cli
 
-go 1.16
+go 1.17
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.2.12
+	github.com/AlecAivazis/survey/v2 v2.3.2
 	github.com/Masterminds/semver v1.5.0
-	github.com/adrg/xdg v0.3.3
+	github.com/adrg/xdg v0.4.0
 	github.com/bmatcuk/doublestar/v4 v4.0.2
-	github.com/briandowns/spinner v1.16.0
-	github.com/deckarep/golang-set v1.7.1
+	github.com/briandowns/spinner v1.18.1
+	github.com/deckarep/golang-set v1.8.0
 	github.com/fatih/color v1.13.0
 	github.com/gobwas/glob v0.2.3
-	github.com/google/chrometracing v0.0.0-20210413150014-55fded0163e7
+	github.com/google/chrometracing v0.0.0-20210820115312-9b2483a9dc7d
 	github.com/google/uuid v1.3.0
-	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-gatedio v0.5.0
 	github.com/hashicorp/go-hclog v1.1.0
-	github.com/hashicorp/go-retryablehttp v0.6.8
+	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/karrick/godirwalk v1.16.1
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.14
-	github.com/mitchellh/cli v1.1.2
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.4.3
-	github.com/mitchellh/reflectwalk v1.0.1 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/pyr-sh/dag v1.0.0
-	github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f
+	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/sourcegraph/go-diff v0.6.1
 	github.com/spf13/cobra v1.3.0
 	github.com/stretchr/testify v1.7.0
 	github.com/yosuke-furukawa/json5 v0.1.1
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
+	golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
+	golang.org/x/text v0.3.7 // indirect
+)