From db7c79f44ea10061c31a93b203abb718f33b132c Mon Sep 17 00:00:00 2001 From: Douglas Parsons Date: Mon, 7 Feb 2022 11:36:47 +0000 Subject: [PATCH] Rename go module to allow command line installs The `go install` command doesn't like it when the go.mod file declares a different path to the module, to the actual path. e.g. ``` $ go install github.com/vercel/turborepo/cli/cmd/turbo@latest go install: github.com/vercel/turborepo/cli/cmd/turbo@latest: github.com/vercel/turborepo/cli@v0.0.0-20211216165811-9163f2518d55: parsing go.mod: module declares its path as: turbo but was required as: github.com/vercel/turborepo/cli ``` This PR renames the go module to match the path name, as go expects. This allows the turborepo CLI to be installed via `go install` --- cli/cmd/turbo/main.go | 16 ++++++++-------- cli/go.mod | 2 +- cli/internal/api/types.go | 2 +- cli/internal/backends/backends.go | 8 ++++---- cli/internal/backends/nodejs/nodejs.go | 6 +++--- cli/internal/cache/async_cache.go | 2 +- cli/internal/cache/cache.go | 4 ++-- cli/internal/cache/cache_fs.go | 4 ++-- cli/internal/cache/cache_http.go | 4 ++-- cli/internal/config/config.go | 2 +- cli/internal/context/color_cache.go | 2 +- cli/internal/context/context.go | 14 +++++++------- cli/internal/context/context_test.go | 2 +- cli/internal/core/scheduler.go | 2 +- cli/internal/core/scheduler_test.go | 2 +- cli/internal/fs/hash.go | 2 +- cli/internal/fs/package_deps_hash.go | 2 +- cli/internal/globby/globby.go | 2 +- cli/internal/info/bin.go | 4 ++-- cli/internal/login/link.go | 10 +++++----- cli/internal/login/login.go | 8 ++++---- cli/internal/login/logout.go | 6 +++--- cli/internal/login/unlink.go | 6 +++--- cli/internal/prune/prune.go | 10 +++++----- cli/internal/run/run.go | 26 +++++++++++++------------- cli/internal/run/run_state.go | 8 ++++---- cli/internal/run/run_test.go | 4 ++-- cli/internal/scm/scm.go | 2 +- cli/internal/util/printf.go | 2 +- 29 files changed, 82 insertions(+), 82 deletions(-) diff --git a/cli/cmd/turbo/main.go b/cli/cmd/turbo/main.go index 58b04b0c70095..ac79427480939 100644 --- a/cli/cmd/turbo/main.go +++ b/cli/cmd/turbo/main.go @@ -6,14 +6,14 @@ import ( "runtime/debug" "strings" "time" - "turbo/internal/config" - "turbo/internal/info" - "turbo/internal/login" - "turbo/internal/process" - prune "turbo/internal/prune" - "turbo/internal/run" - uiPkg "turbo/internal/ui" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/info" + "github.com/vercel/turborepo/cli/internal/login" + "github.com/vercel/turborepo/cli/internal/process" + prune "github.com/vercel/turborepo/cli/internal/prune" + "github.com/vercel/turborepo/cli/internal/run" + 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" diff --git a/cli/go.mod b/cli/go.mod index e55fefaf8f3d8..1194b1bcf7b2f 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -1,4 +1,4 @@ -module turbo +module github.com/vercel/turborepo/cli go 1.16 diff --git a/cli/internal/api/types.go b/cli/internal/api/types.go index 362f14a1715e3..8ae616e98ccc1 100644 --- a/cli/internal/api/types.go +++ b/cli/internal/api/types.go @@ -1,6 +1,6 @@ package api -import "turbo/internal/fs" +import "github.com/vercel/turborepo/cli/internal/fs" // LanguageBackend is an abstraction across programming languages and their related package managers type LanguageBackend struct { diff --git a/cli/internal/backends/backends.go b/cli/internal/backends/backends.go index 69d5e41613a39..ff76ffb3a5e48 100644 --- a/cli/internal/backends/backends.go +++ b/cli/internal/backends/backends.go @@ -2,10 +2,10 @@ package backends import ( "errors" - "turbo/internal/api" - "turbo/internal/backends/nodejs" - "turbo/internal/fs" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/api" + "github.com/vercel/turborepo/cli/internal/backends/nodejs" + "github.com/vercel/turborepo/cli/internal/fs" + "github.com/vercel/turborepo/cli/internal/util" ) var backends = []api.LanguageBackend{ diff --git a/cli/internal/backends/nodejs/nodejs.go b/cli/internal/backends/nodejs/nodejs.go index 92cc67b5ec483..f29956e49f688 100644 --- a/cli/internal/backends/nodejs/nodejs.go +++ b/cli/internal/backends/nodejs/nodejs.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "log" "path/filepath" - "turbo/internal/api" - "turbo/internal/fs" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/api" + "github.com/vercel/turborepo/cli/internal/fs" + "github.com/vercel/turborepo/cli/internal/util" "gopkg.in/yaml.v3" ) diff --git a/cli/internal/cache/async_cache.go b/cli/internal/cache/async_cache.go index 34b98e1119a80..2ee6f051619fa 100644 --- a/cli/internal/cache/async_cache.go +++ b/cli/internal/cache/async_cache.go @@ -2,7 +2,7 @@ package cache import ( "sync" - "turbo/internal/config" + "github.com/vercel/turborepo/cli/internal/config" ) // An asyncCache is a wrapper around a Cache interface that handles incoming diff --git a/cli/internal/cache/cache.go b/cli/internal/cache/cache.go index 7c56dcbf80264..e38ee2952f41a 100644 --- a/cli/internal/cache/cache.go +++ b/cli/internal/cache/cache.go @@ -4,8 +4,8 @@ package cache import ( "fmt" "sync" - "turbo/internal/config" - "turbo/internal/ui" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/ui" ) // Cache is abstracted way to cache/fetch previously run tasks diff --git a/cli/internal/cache/cache_fs.go b/cli/internal/cache/cache_fs.go index 94ef10d8d36f2..fa808a572c238 100644 --- a/cli/internal/cache/cache_fs.go +++ b/cli/internal/cache/cache_fs.go @@ -3,8 +3,8 @@ package cache import ( "fmt" "path/filepath" - "turbo/internal/config" - "turbo/internal/fs" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/fs" "golang.org/x/sync/errgroup" ) diff --git a/cli/internal/cache/cache_http.go b/cli/internal/cache/cache_http.go index cb6bb2b4c5a54..2ec1535672391 100644 --- a/cli/internal/cache/cache_http.go +++ b/cli/internal/cache/cache_http.go @@ -11,8 +11,8 @@ import ( "os" "path" "time" - "turbo/internal/config" - "turbo/internal/fs" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/fs" ) type httpCache struct { diff --git a/cli/internal/config/config.go b/cli/internal/config/config.go index c26fd5d7f707d..74768dca95d9c 100644 --- a/cli/internal/config/config.go +++ b/cli/internal/config/config.go @@ -9,7 +9,7 @@ import ( "path/filepath" "runtime" "strings" - "turbo/internal/client" + "github.com/vercel/turborepo/cli/internal/client" hclog "github.com/hashicorp/go-hclog" "github.com/kelseyhightower/envconfig" diff --git a/cli/internal/context/color_cache.go b/cli/internal/context/color_cache.go index e0769253a47d2..1937efee5deb5 100644 --- a/cli/internal/context/color_cache.go +++ b/cli/internal/context/color_cache.go @@ -2,7 +2,7 @@ package context import ( "sync" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/util" "github.com/fatih/color" ) diff --git a/cli/internal/context/context.go b/cli/internal/context/context.go index 4727ac083a1a8..6c7fd918550f0 100644 --- a/cli/internal/context/context.go +++ b/cli/internal/context/context.go @@ -9,13 +9,13 @@ import ( "sort" "strings" "sync" - "turbo/internal/api" - "turbo/internal/backends" - "turbo/internal/config" - "turbo/internal/core" - "turbo/internal/fs" - "turbo/internal/globby" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/api" + "github.com/vercel/turborepo/cli/internal/backends" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/core" + "github.com/vercel/turborepo/cli/internal/fs" + "github.com/vercel/turborepo/cli/internal/globby" + "github.com/vercel/turborepo/cli/internal/util" mapset "github.com/deckarep/golang-set" "github.com/google/chrometracing" diff --git a/cli/internal/context/context_test.go b/cli/internal/context/context_test.go index a6ed649e2c315..498e6f24aa0f5 100644 --- a/cli/internal/context/context_test.go +++ b/cli/internal/context/context_test.go @@ -4,7 +4,7 @@ import ( "os" "reflect" "testing" - "turbo/internal/fs" + "github.com/vercel/turborepo/cli/internal/fs" ) func TestGetTargetsFromArguments(t *testing.T) { diff --git a/cli/internal/core/scheduler.go b/cli/internal/core/scheduler.go index 4c94f45c4a3e5..797e94809f6fa 100644 --- a/cli/internal/core/scheduler.go +++ b/cli/internal/core/scheduler.go @@ -3,7 +3,7 @@ package core import ( "fmt" "strings" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/util" "github.com/pyr-sh/dag" ) diff --git a/cli/internal/core/scheduler_test.go b/cli/internal/core/scheduler_test.go index 6d743b5d4aa7e..94e8252f8d158 100644 --- a/cli/internal/core/scheduler_test.go +++ b/cli/internal/core/scheduler_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" "testing" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/util" "github.com/pyr-sh/dag" ) diff --git a/cli/internal/fs/hash.go b/cli/internal/fs/hash.go index 6aa81b3d20f5b..a5c0c6aa01100 100644 --- a/cli/internal/fs/hash.go +++ b/cli/internal/fs/hash.go @@ -7,7 +7,7 @@ import ( "io" "os" "strconv" - "turbo/internal/xxhash" + "github.com/vercel/turborepo/cli/internal/xxhash" ) func HashObject(i interface{}) (string, error) { diff --git a/cli/internal/fs/package_deps_hash.go b/cli/internal/fs/package_deps_hash.go index 17f081aa4698f..d788a1654b7c9 100644 --- a/cli/internal/fs/package_deps_hash.go +++ b/cli/internal/fs/package_deps_hash.go @@ -7,7 +7,7 @@ import ( "path/filepath" "regexp" "strings" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/util" ) // Predefine []byte variables to avoid runtime allocations. diff --git a/cli/internal/globby/globby.go b/cli/internal/globby/globby.go index 66174f9857454..a3b17913c64af 100644 --- a/cli/internal/globby/globby.go +++ b/cli/internal/globby/globby.go @@ -1,7 +1,7 @@ package globby import ( - "turbo/internal/fs" + "github.com/vercel/turborepo/cli/internal/fs" "path/filepath" "strings" diff --git a/cli/internal/info/bin.go b/cli/internal/info/bin.go index 5dec1823a55ad..a9b4f2673e836 100644 --- a/cli/internal/info/bin.go +++ b/cli/internal/info/bin.go @@ -4,8 +4,8 @@ import ( "fmt" "os" "strings" - "turbo/internal/config" - "turbo/internal/ui" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/ui" "github.com/fatih/color" "github.com/hashicorp/go-hclog" diff --git a/cli/internal/login/link.go b/cli/internal/login/link.go index 275f91c5ef3ba..366c23dd26d2b 100644 --- a/cli/internal/login/link.go +++ b/cli/internal/login/link.go @@ -5,11 +5,11 @@ import ( "os/exec" "path/filepath" "strings" - "turbo/internal/client" - "turbo/internal/config" - "turbo/internal/fs" - "turbo/internal/ui" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/client" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/fs" + "github.com/vercel/turborepo/cli/internal/ui" + "github.com/vercel/turborepo/cli/internal/util" "github.com/AlecAivazis/survey/v2" "github.com/fatih/color" diff --git a/cli/internal/login/login.go b/cli/internal/login/login.go index 9d7aef44f123d..e567f70370b7a 100644 --- a/cli/internal/login/login.go +++ b/cli/internal/login/login.go @@ -7,10 +7,10 @@ import ( "net/url" "os" "strings" - "turbo/internal/config" - "turbo/internal/ui" - "turbo/internal/util" - "turbo/internal/util/browser" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/ui" + "github.com/vercel/turborepo/cli/internal/util" + "github.com/vercel/turborepo/cli/internal/util/browser" "github.com/fatih/color" "github.com/hashicorp/go-hclog" diff --git a/cli/internal/login/logout.go b/cli/internal/login/logout.go index c1948197dc99f..2c06fa08c2465 100644 --- a/cli/internal/login/logout.go +++ b/cli/internal/login/logout.go @@ -3,9 +3,9 @@ package login import ( "fmt" "strings" - "turbo/internal/config" - "turbo/internal/ui" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/ui" + "github.com/vercel/turborepo/cli/internal/util" "github.com/fatih/color" "github.com/hashicorp/go-hclog" diff --git a/cli/internal/login/unlink.go b/cli/internal/login/unlink.go index 6fb3491d7da47..e9adff8818cf5 100644 --- a/cli/internal/login/unlink.go +++ b/cli/internal/login/unlink.go @@ -4,9 +4,9 @@ import ( "fmt" "path/filepath" "strings" - "turbo/internal/config" - "turbo/internal/ui" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/ui" + "github.com/vercel/turborepo/cli/internal/util" "github.com/fatih/color" "github.com/hashicorp/go-hclog" diff --git a/cli/internal/prune/prune.go b/cli/internal/prune/prune.go index 105ce2cd27cc7..1271b67b10fb7 100644 --- a/cli/internal/prune/prune.go +++ b/cli/internal/prune/prune.go @@ -10,11 +10,11 @@ import ( "path/filepath" "strings" "sync" - "turbo/internal/config" - "turbo/internal/context" - "turbo/internal/fs" - "turbo/internal/ui" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/context" + "github.com/vercel/turborepo/cli/internal/fs" + "github.com/vercel/turborepo/cli/internal/ui" + "github.com/vercel/turborepo/cli/internal/util" mapset "github.com/deckarep/golang-set" "github.com/fatih/color" diff --git a/cli/internal/run/run.go b/cli/internal/run/run.go index 944adf3fe529a..15240023ea0db 100644 --- a/cli/internal/run/run.go +++ b/cli/internal/run/run.go @@ -14,19 +14,19 @@ import ( "strings" "sync" "time" - "turbo/internal/cache" - "turbo/internal/config" - "turbo/internal/context" - "turbo/internal/core" - "turbo/internal/fs" - "turbo/internal/globby" - "turbo/internal/logstreamer" - "turbo/internal/process" - "turbo/internal/scm" - "turbo/internal/ui" - "turbo/internal/util" - "turbo/internal/util/browser" - "turbo/internal/util/filter" + "github.com/vercel/turborepo/cli/internal/cache" + "github.com/vercel/turborepo/cli/internal/config" + "github.com/vercel/turborepo/cli/internal/context" + "github.com/vercel/turborepo/cli/internal/core" + "github.com/vercel/turborepo/cli/internal/fs" + "github.com/vercel/turborepo/cli/internal/globby" + "github.com/vercel/turborepo/cli/internal/logstreamer" + "github.com/vercel/turborepo/cli/internal/process" + "github.com/vercel/turborepo/cli/internal/scm" + "github.com/vercel/turborepo/cli/internal/ui" + "github.com/vercel/turborepo/cli/internal/util" + "github.com/vercel/turborepo/cli/internal/util/browser" + "github.com/vercel/turborepo/cli/internal/util/filter" "github.com/pyr-sh/dag" diff --git a/cli/internal/run/run_state.go b/cli/internal/run/run_state.go index 17fc170740081..5a41218c0bdee 100644 --- a/cli/internal/run/run_state.go +++ b/cli/internal/run/run_state.go @@ -8,11 +8,11 @@ import ( "strings" "sync" "time" - "turbo/internal/fs" - "turbo/internal/ui" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/fs" + "github.com/vercel/turborepo/cli/internal/ui" + "github.com/vercel/turborepo/cli/internal/util" - cursor "turbo/internal/ui/term" + cursor "github.com/vercel/turborepo/cli/internal/ui/term" "github.com/google/chrometracing" "github.com/mitchellh/cli" diff --git a/cli/internal/run/run_test.go b/cli/internal/run/run_test.go index ffa03a8226d9e..a8a25d911fbbb 100644 --- a/cli/internal/run/run_test.go +++ b/cli/internal/run/run_test.go @@ -4,8 +4,8 @@ import ( "fmt" "path/filepath" "testing" - "turbo/internal/context" - "turbo/internal/util" + "github.com/vercel/turborepo/cli/internal/context" + "github.com/vercel/turborepo/cli/internal/util" "github.com/stretchr/testify/assert" ) diff --git a/cli/internal/scm/scm.go b/cli/internal/scm/scm.go index d0d06229c2312..cd6b287fdd799 100644 --- a/cli/internal/scm/scm.go +++ b/cli/internal/scm/scm.go @@ -5,7 +5,7 @@ package scm import ( "fmt" "path/filepath" - "turbo/internal/fs" + "github.com/vercel/turborepo/cli/internal/fs" ) // An SCM represents an SCM implementation that we can ask for various things. diff --git a/cli/internal/util/printf.go b/cli/internal/util/printf.go index f21b48fe4b49f..663434ecf159a 100644 --- a/cli/internal/util/printf.go +++ b/cli/internal/util/printf.go @@ -4,7 +4,7 @@ import ( "fmt" "io" "os" - "turbo/internal/ui" + "github.com/vercel/turborepo/cli/internal/ui" ) // initPrintf sets up the replacements used by printf.