diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..4a36ad86 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Rename module path from `wpm` to `go.wpm.so/cli`. +c5868413481c77e63181b97e4c2fbc1dd1f28b74 diff --git a/.gitignore b/.gitignore index fd77b2f5..35f7f2b2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ !README.md !docker-bake.hcl !Dockerfile +!.git-blame-ignore-revs # directories !cli diff --git a/cli/cobra.go b/cli/cobra.go index 6d9c1071..ef411cc1 100644 --- a/cli/cobra.go +++ b/cli/cobra.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "wpm/cli/command" - cliflags "wpm/cli/flags" + "go.wpm.so/cli/cli/command" + cliflags "go.wpm.so/cli/cli/flags" "github.com/fvbommel/sortorder" "github.com/moby/term" diff --git a/cli/command/auth/cmd.go b/cli/command/auth/cmd.go index 5af45a85..66aa02bc 100644 --- a/cli/command/auth/cmd.go +++ b/cli/command/auth/cmd.go @@ -1,8 +1,8 @@ package auth import ( - "wpm/cli" - "wpm/cli/command" + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" "github.com/spf13/cobra" ) diff --git a/cli/command/auth/login.go b/cli/command/auth/login.go index 1ff0bb8e..1492eb21 100644 --- a/cli/command/auth/login.go +++ b/cli/command/auth/login.go @@ -3,9 +3,10 @@ package auth import ( "context" "fmt" - "wpm/cli" - "wpm/cli/command" - "wpm/pkg/output" + + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/pkg/output" "github.com/morikuni/aec" "github.com/pkg/errors" diff --git a/cli/command/auth/logout.go b/cli/command/auth/logout.go index 3c6039c1..953781f7 100644 --- a/cli/command/auth/logout.go +++ b/cli/command/auth/logout.go @@ -2,8 +2,9 @@ package auth import ( "fmt" - "wpm/cli" - "wpm/cli/command" + + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/cli.go b/cli/command/cli.go index bbbd9307..7ee7d8ed 100644 --- a/cli/command/cli.go +++ b/cli/command/cli.go @@ -5,15 +5,15 @@ import ( "os" "runtime" - "wpm/cli/debug" - cliflags "wpm/cli/flags" - "wpm/cli/version" - "wpm/pkg/config" - "wpm/pkg/config/configfile" - "wpm/pkg/output" - "wpm/pkg/pm/registry" - "wpm/pkg/progress" - "wpm/pkg/streams" + "go.wpm.so/cli/cli/debug" + cliflags "go.wpm.so/cli/cli/flags" + "go.wpm.so/cli/cli/version" + "go.wpm.so/cli/pkg/config" + "go.wpm.so/cli/pkg/config/configfile" + "go.wpm.so/cli/pkg/output" + "go.wpm.so/cli/pkg/pm/registry" + "go.wpm.so/cli/pkg/progress" + "go.wpm.so/cli/pkg/streams" "github.com/spf13/cobra" ) diff --git a/cli/command/cli_options.go b/cli/command/cli_options.go index 88ee1ddc..568f568f 100644 --- a/cli/command/cli_options.go +++ b/cli/command/cli_options.go @@ -3,7 +3,7 @@ package command import ( "io" - "wpm/pkg/streams" + "go.wpm.so/cli/pkg/streams" "github.com/moby/term" ) diff --git a/cli/command/commands/commands.go b/cli/command/commands/commands.go index c7fde0e2..a31d58e4 100644 --- a/cli/command/commands/commands.go +++ b/cli/command/commands/commands.go @@ -1,16 +1,16 @@ package commands import ( - "wpm/cli/command" - "wpm/cli/command/auth" - pmInit "wpm/cli/command/init" - "wpm/cli/command/install" - "wpm/cli/command/ls" - "wpm/cli/command/outdated" - "wpm/cli/command/publish" - "wpm/cli/command/uninstall" - "wpm/cli/command/whoami" - "wpm/cli/command/why" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/cli/command/auth" + pmInit "go.wpm.so/cli/cli/command/init" + "go.wpm.so/cli/cli/command/install" + "go.wpm.so/cli/cli/command/ls" + "go.wpm.so/cli/cli/command/outdated" + "go.wpm.so/cli/cli/command/publish" + "go.wpm.so/cli/cli/command/uninstall" + "go.wpm.so/cli/cli/command/whoami" + "go.wpm.so/cli/cli/command/why" "github.com/spf13/cobra" ) diff --git a/cli/command/init/init.go b/cli/command/init/init.go index 63358787..da5a94a3 100644 --- a/cli/command/init/init.go +++ b/cli/command/init/init.go @@ -10,13 +10,13 @@ import ( "strings" "unicode" - "wpm/cli/command" - "wpm/pkg/output" - "wpm/pkg/pm/wpmjson" - "wpm/pkg/pm/wpmjson/types" - "wpm/pkg/pm/wpmjson/validator" - "wpm/pkg/version" - "wpm/pkg/wp/parser" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/pkg/output" + "go.wpm.so/cli/pkg/pm/wpmjson" + "go.wpm.so/cli/pkg/pm/wpmjson/types" + "go.wpm.so/cli/pkg/pm/wpmjson/validator" + "go.wpm.so/cli/pkg/version" + "go.wpm.so/cli/pkg/wp/parser" "github.com/Masterminds/semver/v3" "github.com/morikuni/aec" diff --git a/cli/command/install/install.go b/cli/command/install/install.go index ad500318..b0592409 100644 --- a/cli/command/install/install.go +++ b/cli/command/install/install.go @@ -8,13 +8,13 @@ import ( "strings" "sync" - "wpm/cli/command" - "wpm/cli/version" - "wpm/pkg/output" - "wpm/pkg/pm/workspace" - "wpm/pkg/pm/wpmjson" - "wpm/pkg/pm/wpmjson/types" - "wpm/pkg/pm/wpmjson/validator" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/cli/version" + "go.wpm.so/cli/pkg/output" + "go.wpm.so/cli/pkg/pm/workspace" + "go.wpm.so/cli/pkg/pm/wpmjson" + "go.wpm.so/cli/pkg/pm/wpmjson/types" + "go.wpm.so/cli/pkg/pm/wpmjson/validator" "github.com/morikuni/aec" "github.com/pkg/errors" diff --git a/cli/command/install/run.go b/cli/command/install/run.go index d401765d..e56ab994 100644 --- a/cli/command/install/run.go +++ b/cli/command/install/run.go @@ -7,12 +7,13 @@ import ( "path/filepath" "slices" "strconv" - "wpm/cli/command" - "wpm/pkg/output" - "wpm/pkg/pm/installer" - "wpm/pkg/pm/resolution" - "wpm/pkg/pm/wpmjson" - "wpm/pkg/pm/wpmlock" + + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/pkg/output" + "go.wpm.so/cli/pkg/pm/installer" + "go.wpm.so/cli/pkg/pm/resolution" + "go.wpm.so/cli/pkg/pm/wpmjson" + "go.wpm.so/cli/pkg/pm/wpmlock" "github.com/morikuni/aec" "github.com/pkg/errors" diff --git a/cli/command/ls/ls.go b/cli/command/ls/ls.go index 218f17ed..5275f947 100644 --- a/cli/command/ls/ls.go +++ b/cli/command/ls/ls.go @@ -8,10 +8,10 @@ import ( "path/filepath" "sort" - "wpm/cli" - "wpm/cli/command" - "wpm/pkg/pm/wpmjson" - "wpm/pkg/pm/wpmlock" + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/pkg/pm/wpmjson" + "go.wpm.so/cli/pkg/pm/wpmlock" "github.com/morikuni/aec" "github.com/pkg/errors" diff --git a/cli/command/outdated/outdated.go b/cli/command/outdated/outdated.go index 7204edc5..c9ef841b 100644 --- a/cli/command/outdated/outdated.go +++ b/cli/command/outdated/outdated.go @@ -8,12 +8,12 @@ import ( "sort" "sync" - "wpm/cli" - "wpm/cli/command" - "wpm/cli/version" - "wpm/pkg/output" - "wpm/pkg/pm/wpmjson" - "wpm/pkg/pm/wpmlock" + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/cli/version" + "go.wpm.so/cli/pkg/output" + "go.wpm.so/cli/pkg/pm/wpmjson" + "go.wpm.so/cli/pkg/pm/wpmlock" "github.com/Masterminds/semver/v3" "github.com/morikuni/aec" diff --git a/cli/command/publish/publish.go b/cli/command/publish/publish.go index ab851a3a..5bd970a2 100644 --- a/cli/command/publish/publish.go +++ b/cli/command/publish/publish.go @@ -11,15 +11,15 @@ import ( "strings" "text/tabwriter" - "wpm/cli" - "wpm/cli/command" - "wpm/cli/version" - "wpm/pkg/archive" - "wpm/pkg/output" - "wpm/pkg/pm/wpmignore" - "wpm/pkg/pm/wpmjson" - "wpm/pkg/pm/wpmjson/manifest" - "wpm/pkg/pm/wpmjson/types" + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/cli/version" + "go.wpm.so/cli/pkg/archive" + "go.wpm.so/cli/pkg/output" + "go.wpm.so/cli/pkg/pm/wpmignore" + "go.wpm.so/cli/pkg/pm/wpmjson" + "go.wpm.so/cli/pkg/pm/wpmjson/manifest" + "go.wpm.so/cli/pkg/pm/wpmjson/types" "github.com/docker/go-units" "github.com/morikuni/aec" diff --git a/cli/command/uninstall/uninstall.go b/cli/command/uninstall/uninstall.go index 5d3adb18..4d3d8d67 100644 --- a/cli/command/uninstall/uninstall.go +++ b/cli/command/uninstall/uninstall.go @@ -6,13 +6,13 @@ import ( "os" "path/filepath" - "wpm/cli" - "wpm/cli/command" - "wpm/cli/command/install" - "wpm/cli/version" - "wpm/pkg/output" - "wpm/pkg/pm/workspace" - "wpm/pkg/pm/wpmjson" + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/cli/command/install" + "go.wpm.so/cli/cli/version" + "go.wpm.so/cli/pkg/output" + "go.wpm.so/cli/pkg/pm/workspace" + "go.wpm.so/cli/pkg/pm/wpmjson" "github.com/morikuni/aec" "github.com/pkg/errors" diff --git a/cli/command/utils.go b/cli/command/utils.go index ed54234d..c905c13a 100644 --- a/cli/command/utils.go +++ b/cli/command/utils.go @@ -8,7 +8,8 @@ import ( "os" "runtime" "strings" - "wpm/pkg/streams" + + "go.wpm.so/cli/pkg/streams" "github.com/moby/term" ) diff --git a/cli/command/whoami/whoami.go b/cli/command/whoami/whoami.go index 0975abb7..a911a324 100644 --- a/cli/command/whoami/whoami.go +++ b/cli/command/whoami/whoami.go @@ -2,8 +2,9 @@ package whoami import ( "context" - "wpm/cli" - "wpm/cli/command" + + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cli/command/why/why.go b/cli/command/why/why.go index 1a6728f1..f216e60b 100644 --- a/cli/command/why/why.go +++ b/cli/command/why/why.go @@ -8,11 +8,11 @@ import ( "sort" "strings" - "wpm/cli" - "wpm/cli/command" - "wpm/pkg/output" - "wpm/pkg/pm/wpmjson" - "wpm/pkg/pm/wpmlock" + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/pkg/output" + "go.wpm.so/cli/pkg/pm/wpmjson" + "go.wpm.so/cli/pkg/pm/wpmlock" "github.com/morikuni/aec" "github.com/pkg/errors" diff --git a/cli/flags/options.go b/cli/flags/options.go index 9383ffc2..f9d987e8 100644 --- a/cli/flags/options.go +++ b/cli/flags/options.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "wpm/pkg/config" + "go.wpm.so/cli/pkg/config" "github.com/sirupsen/logrus" "github.com/spf13/pflag" diff --git a/cmd/wpm/wpm.go b/cmd/wpm/wpm.go index 60c2348b..4c166e75 100644 --- a/cmd/wpm/wpm.go +++ b/cmd/wpm/wpm.go @@ -8,12 +8,12 @@ import ( "os/signal" "syscall" - "wpm/cli" - "wpm/cli/command" - "wpm/cli/command/commands" - cliflags "wpm/cli/flags" - "wpm/cli/version" - platformsignals "wpm/cmd/wpm/internal/signals" + "go.wpm.so/cli/cli" + "go.wpm.so/cli/cli/command" + "go.wpm.so/cli/cli/command/commands" + cliflags "go.wpm.so/cli/cli/flags" + "go.wpm.so/cli/cli/version" + platformsignals "go.wpm.so/cli/cmd/wpm/internal/signals" "github.com/containerd/errdefs" "github.com/morikuni/aec" diff --git a/cmd/wpm/wpm_windows_386.go b/cmd/wpm/wpm_windows_386.go index ef752f77..e0abd9c7 100644 --- a/cmd/wpm/wpm_windows_386.go +++ b/cmd/wpm/wpm_windows_386.go @@ -4,4 +4,4 @@ package main -import _ "wpm/cmd/wpm/winresources" +import _ "go.wpm.so/cli/cmd/wpm/winresources" diff --git a/cmd/wpm/wpm_windows_amd64.go b/cmd/wpm/wpm_windows_amd64.go index 5b8e4a8a..a31714aa 100644 --- a/cmd/wpm/wpm_windows_amd64.go +++ b/cmd/wpm/wpm_windows_amd64.go @@ -4,4 +4,4 @@ package main -import _ "wpm/cmd/wpm/winresources" +import _ "go.wpm.so/cli/cmd/wpm/winresources" diff --git a/cmd/wpm/wpm_windows_arm.go b/cmd/wpm/wpm_windows_arm.go index 39c7ae86..30c54d3d 100644 --- a/cmd/wpm/wpm_windows_arm.go +++ b/cmd/wpm/wpm_windows_arm.go @@ -4,4 +4,4 @@ package main -import _ "wpm/cmd/wpm/winresources" +import _ "go.wpm.so/cli/cmd/wpm/winresources" diff --git a/cmd/wpm/wpm_windows_arm64.go b/cmd/wpm/wpm_windows_arm64.go index 70450ceb..cd89b76f 100644 --- a/cmd/wpm/wpm_windows_arm64.go +++ b/cmd/wpm/wpm_windows_arm64.go @@ -4,4 +4,4 @@ package main -import _ "wpm/cmd/wpm/winresources" +import _ "go.wpm.so/cli/cmd/wpm/winresources" diff --git a/go.mod b/go.mod index 5787069a..02d02b1c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module wpm +module go.wpm.so/cli go 1.25.0 diff --git a/pkg/api/http_client.go b/pkg/api/http_client.go index 68dd23df..a0d00253 100644 --- a/pkg/api/http_client.go +++ b/pkg/api/http_client.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "wpm/pkg/asciisanitizer" + "go.wpm.so/cli/pkg/asciisanitizer" "github.com/henvic/httpretty" "github.com/klauspost/compress/zstd" diff --git a/pkg/api/log_formatter.go b/pkg/api/log_formatter.go index 7d90f553..e757dd81 100644 --- a/pkg/api/log_formatter.go +++ b/pkg/api/log_formatter.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "wpm/pkg/jsonpretty" + "go.wpm.so/cli/pkg/jsonpretty" ) // jsonFormatter is a httpretty.Formatter that prettifies JSON payloads and GraphQL queries. diff --git a/pkg/api/rest_client.go b/pkg/api/rest_client.go index 7e7454c8..e225167f 100644 --- a/pkg/api/rest_client.go +++ b/pkg/api/rest_client.go @@ -7,7 +7,8 @@ import ( "io" "net/http" "strings" - "wpm/pkg/unsafeconv" + + "go.wpm.so/cli/pkg/unsafeconv" ) type RESTClient struct { diff --git a/pkg/config/config.go b/pkg/config/config.go index b276bd0d..3ee7f8ba 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "wpm/pkg/config/configfile" + "go.wpm.so/cli/pkg/config/configfile" "github.com/pkg/errors" ) diff --git a/pkg/pm/installer/installer.go b/pkg/pm/installer/installer.go index 16884829..17637cb3 100644 --- a/pkg/pm/installer/installer.go +++ b/pkg/pm/installer/installer.go @@ -16,11 +16,11 @@ import ( "syscall" "time" - "wpm/pkg/archive" - "wpm/pkg/pm/registry" - "wpm/pkg/pm/signatures" - "wpm/pkg/pm/wpmjson/types" - "wpm/pkg/pm/wpmjson/validator" + "go.wpm.so/cli/pkg/archive" + "go.wpm.so/cli/pkg/pm/registry" + "go.wpm.so/cli/pkg/pm/signatures" + "go.wpm.so/cli/pkg/pm/wpmjson/types" + "go.wpm.so/cli/pkg/pm/wpmjson/validator" "github.com/pkg/errors" "golang.org/x/sync/errgroup" diff --git a/pkg/pm/installer/plan.go b/pkg/pm/installer/plan.go index de14c301..8733a3e4 100644 --- a/pkg/pm/installer/plan.go +++ b/pkg/pm/installer/plan.go @@ -3,10 +3,11 @@ package installer import ( "os" "path/filepath" - "wpm/pkg/pm/resolution" - "wpm/pkg/pm/wpmjson" - "wpm/pkg/pm/wpmjson/types" - "wpm/pkg/pm/wpmlock" + + "go.wpm.so/cli/pkg/pm/resolution" + "go.wpm.so/cli/pkg/pm/wpmjson" + "go.wpm.so/cli/pkg/pm/wpmjson/types" + "go.wpm.so/cli/pkg/pm/wpmlock" ) type ActionType int diff --git a/pkg/pm/registry/client.go b/pkg/pm/registry/client.go index 304dd0c0..94c47b5f 100644 --- a/pkg/pm/registry/client.go +++ b/pkg/pm/registry/client.go @@ -7,9 +7,9 @@ import ( "io" "net/http" - "wpm/pkg/api" - "wpm/pkg/pm/signatures" - "wpm/pkg/pm/wpmjson/manifest" + "go.wpm.so/cli/pkg/api" + "go.wpm.so/cli/pkg/pm/signatures" + "go.wpm.so/cli/pkg/pm/wpmjson/manifest" ) const ( diff --git a/pkg/pm/resolution/resolver.go b/pkg/pm/resolution/resolver.go index 4a643383..940d0bfe 100644 --- a/pkg/pm/resolution/resolver.go +++ b/pkg/pm/resolution/resolver.go @@ -4,11 +4,12 @@ import ( "context" "fmt" "io" - "wpm/pkg/pm/registry" - "wpm/pkg/pm/wpmjson" - "wpm/pkg/pm/wpmjson/manifest" - "wpm/pkg/pm/wpmjson/types" - "wpm/pkg/pm/wpmlock" + + "go.wpm.so/cli/pkg/pm/registry" + "go.wpm.so/cli/pkg/pm/wpmjson" + "go.wpm.so/cli/pkg/pm/wpmjson/manifest" + "go.wpm.so/cli/pkg/pm/wpmjson/types" + "go.wpm.so/cli/pkg/pm/wpmlock" "github.com/Masterminds/semver/v3" "github.com/pkg/errors" diff --git a/pkg/pm/wpmjson/manifest/manifest.go b/pkg/pm/wpmjson/manifest/manifest.go index d22134f1..61854d55 100644 --- a/pkg/pm/wpmjson/manifest/manifest.go +++ b/pkg/pm/wpmjson/manifest/manifest.go @@ -1,6 +1,6 @@ package manifest -import "wpm/pkg/pm/wpmjson/types" +import "go.wpm.so/cli/pkg/pm/wpmjson/types" type Signature struct { KeyID string `json:"keyid"` diff --git a/pkg/pm/wpmjson/validator/validator.go b/pkg/pm/wpmjson/validator/validator.go index 54937093..f8ef67e6 100644 --- a/pkg/pm/wpmjson/validator/validator.go +++ b/pkg/pm/wpmjson/validator/validator.go @@ -8,7 +8,7 @@ import ( "strings" "unicode" - "wpm/pkg/pm/wpmjson/types" + "go.wpm.so/cli/pkg/pm/wpmjson/types" "github.com/Masterminds/semver/v3" ) diff --git a/pkg/pm/wpmjson/wpmjson.go b/pkg/pm/wpmjson/wpmjson.go index 09ac7900..97d54c1f 100644 --- a/pkg/pm/wpmjson/wpmjson.go +++ b/pkg/pm/wpmjson/wpmjson.go @@ -5,9 +5,10 @@ import ( "fmt" "os" "path/filepath" - "wpm/pkg/pm" - "wpm/pkg/pm/wpmjson/types" - "wpm/pkg/pm/wpmjson/validator" + + "go.wpm.so/cli/pkg/pm" + "go.wpm.so/cli/pkg/pm/wpmjson/types" + "go.wpm.so/cli/pkg/pm/wpmjson/validator" "github.com/pkg/errors" ) diff --git a/pkg/pm/wpmlock/lockfile.go b/pkg/pm/wpmlock/lockfile.go index e0fbae41..0b1bfa81 100644 --- a/pkg/pm/wpmlock/lockfile.go +++ b/pkg/pm/wpmlock/lockfile.go @@ -4,9 +4,10 @@ import ( "encoding/json" "os" "path/filepath" - "wpm/pkg/pm" - "wpm/pkg/pm/wpmjson/types" - "wpm/pkg/pm/wpmjson/validator" + + "go.wpm.so/cli/pkg/pm" + "go.wpm.so/cli/pkg/pm/wpmjson/types" + "go.wpm.so/cli/pkg/pm/wpmjson/validator" "github.com/pkg/errors" ) diff --git a/pkg/progress/progress.go b/pkg/progress/progress.go index d196e206..b5a51406 100644 --- a/pkg/progress/progress.go +++ b/pkg/progress/progress.go @@ -4,7 +4,8 @@ import ( "io" "sync" "time" - "wpm/pkg/unsafeconv" + + "go.wpm.so/cli/pkg/unsafeconv" "github.com/briandowns/spinner" ) diff --git a/pkg/streams/out.go b/pkg/streams/out.go index ade590ec..80d35b1e 100644 --- a/pkg/streams/out.go +++ b/pkg/streams/out.go @@ -3,7 +3,8 @@ package streams import ( "io" "os" - "wpm/pkg/unsafeconv" + + "go.wpm.so/cli/pkg/unsafeconv" "github.com/moby/term" "github.com/sirupsen/logrus"