diff --git a/cmd/commands/activate.go b/cmd/commands/activate.go index c5ccdda0..5a38a5ea 100644 --- a/cmd/commands/activate.go +++ b/cmd/commands/activate.go @@ -18,12 +18,12 @@ package commands import ( "fmt" + "github.com/version-fox/vfox/internal" "strings" "text/template" "github.com/urfave/cli/v2" "github.com/version-fox/vfox/internal/env" - "github.com/version-fox/vfox/internal/sdk" "github.com/version-fox/vfox/internal/shell" ) @@ -38,7 +38,7 @@ func activateCmd(ctx *cli.Context) error { if name == "" { return cli.Exit("shell name is required", 1) } - manager := sdk.NewSdkManager(sdk.GlobalRecordSource, sdk.ProjectRecordSource) + manager := internal.NewSdkManager(internal.GlobalRecordSource, internal.ProjectRecordSource) defer manager.Record.Save() defer manager.Close() envKeys := manager.EnvKeys() diff --git a/cmd/commands/add.go b/cmd/commands/add.go index cc9f7f7d..5018bb4d 100644 --- a/cmd/commands/add.go +++ b/cmd/commands/add.go @@ -18,7 +18,7 @@ package commands import ( "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" + "github.com/version-fox/vfox/internal" ) var Add = &cli.Command{ @@ -39,7 +39,7 @@ var Add = &cli.Command{ } func addCmd(ctx *cli.Context) error { - manager := sdk.NewSdkManagerWithSource() + manager := internal.NewSdkManagerWithSource() defer manager.Close() sdkName := ctx.Args().First() source := ctx.String("source") diff --git a/cmd/commands/available.go b/cmd/commands/available.go index 1a1745ea..f3ed9faa 100644 --- a/cmd/commands/available.go +++ b/cmd/commands/available.go @@ -19,7 +19,7 @@ package commands import ( "github.com/pterm/pterm" "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" + "github.com/version-fox/vfox/internal" ) var Available = &cli.Command{ @@ -29,7 +29,7 @@ var Available = &cli.Command{ } func availableCmd(ctx *cli.Context) error { - manager := sdk.NewSdkManagerWithSource() + manager := internal.NewSdkManagerWithSource() defer manager.Close() categoryName := ctx.Args().First() categories, err := manager.Available() diff --git a/cmd/commands/current.go b/cmd/commands/current.go index b7ba54a8..6d6807d9 100644 --- a/cmd/commands/current.go +++ b/cmd/commands/current.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/pterm/pterm" "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" + "github.com/version-fox/vfox/internal" ) var Current = &cli.Command{ @@ -32,7 +32,7 @@ var Current = &cli.Command{ } func currentCmd(ctx *cli.Context) error { - manager := sdk.NewSdkManager() + manager := internal.NewSdkManager() defer manager.Close() sdkName := ctx.Args().First() if sdkName == "" { diff --git a/cmd/commands/env.go b/cmd/commands/env.go index 400528d5..84c8fe61 100644 --- a/cmd/commands/env.go +++ b/cmd/commands/env.go @@ -18,10 +18,10 @@ package commands import ( "fmt" + "github.com/version-fox/vfox/internal" "os" "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" "github.com/version-fox/vfox/internal/shell" ) @@ -45,9 +45,9 @@ var Env = &cli.Command{ func envCmd(ctx *cli.Context) error { if ctx.IsSet("cleanup") { - manager := sdk.NewSdkManager() + manager := internal.NewSdkManager() defer manager.Close() - temp, err := sdk.NewTemp(manager.PathMeta.TempPath, os.Getppid()) + temp, err := internal.NewTemp(manager.PathMeta.TempPath, os.Getppid()) if err != nil { return err } @@ -63,7 +63,7 @@ func envCmd(ctx *cli.Context) error { if s == nil { return fmt.Errorf("unknow target shell %s", shellName) } - manager := sdk.NewSdkManagerWithSource(sdk.SessionRecordSource, sdk.ProjectRecordSource) + manager := internal.NewSdkManagerWithSource(internal.SessionRecordSource, internal.ProjectRecordSource) defer manager.Close() envKeys := manager.EnvKeys() exportStr := s.Export(envKeys) diff --git a/cmd/commands/info.go b/cmd/commands/info.go index 4605538c..d07a72e3 100644 --- a/cmd/commands/info.go +++ b/cmd/commands/info.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/pterm/pterm" "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" + "github.com/version-fox/vfox/internal" ) var Info = &cli.Command{ @@ -30,7 +30,7 @@ var Info = &cli.Command{ } func infoCmd(ctx *cli.Context) error { - manager := sdk.NewSdkManager() + manager := internal.NewSdkManager() defer manager.Close() args := ctx.Args().First() if args == "" { diff --git a/cmd/commands/install.go b/cmd/commands/install.go index c23d2bbb..9215f3c2 100644 --- a/cmd/commands/install.go +++ b/cmd/commands/install.go @@ -19,7 +19,7 @@ package commands import ( "fmt" "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" + "github.com/version-fox/vfox/internal" "strings" ) @@ -37,16 +37,16 @@ func installCmd(ctx *cli.Context) error { } argArr := strings.Split(sdkArg, "@") argsLen := len(argArr) - manager := sdk.NewSdkManager() + manager := internal.NewSdkManager() defer manager.Close() if argsLen > 2 { return cli.Exit("sdk version is invalid", 1) } else { var name string - var version sdk.Version + var version internal.Version if argsLen == 2 { name = strings.ToLower(argArr[0]) - version = sdk.Version(argArr[1]) + version = internal.Version(argArr[1]) } else { name = strings.ToLower(argArr[0]) version = "" diff --git a/cmd/commands/list.go b/cmd/commands/list.go index 4d079aef..19db4182 100644 --- a/cmd/commands/list.go +++ b/cmd/commands/list.go @@ -21,7 +21,7 @@ import ( "github.com/pterm/pterm" "github.com/pterm/pterm/putils" "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" + "github.com/version-fox/vfox/internal" ) var List = &cli.Command{ @@ -32,7 +32,7 @@ var List = &cli.Command{ } func listCmd(ctx *cli.Context) error { - manager := sdk.NewSdkManager() + manager := internal.NewSdkManager() defer manager.Close() sdkName := ctx.Args().First() if sdkName == "" { diff --git a/cmd/commands/remove.go b/cmd/commands/remove.go index 63a316d2..03d402a3 100644 --- a/cmd/commands/remove.go +++ b/cmd/commands/remove.go @@ -19,7 +19,7 @@ package commands import ( "github.com/pterm/pterm" "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" + "github.com/version-fox/vfox/internal" ) var Remove = &cli.Command{ @@ -34,7 +34,7 @@ func removeCmd(ctx *cli.Context) error { if l < 1 { return cli.Exit("invalid arguments", 1) } - manager := sdk.NewSdkManager() + manager := internal.NewSdkManager() defer manager.Close() pterm.Println("Removing this plugin will remove the installed sdk along with the plugin.") result, _ := pterm.DefaultInteractiveConfirm. diff --git a/cmd/commands/search.go b/cmd/commands/search.go index 7ad5e765..68d3ad7f 100644 --- a/cmd/commands/search.go +++ b/cmd/commands/search.go @@ -19,8 +19,8 @@ package commands import ( "fmt" "github.com/urfave/cli/v2" + "github.com/version-fox/vfox/internal" "github.com/version-fox/vfox/internal/printer" - "github.com/version-fox/vfox/internal/sdk" "strings" ) @@ -35,7 +35,7 @@ func searchCmd(ctx *cli.Context) error { if sdkName == "" { return cli.Exit("sdk name is required", 1) } - manager := sdk.NewSdkManager() + manager := internal.NewSdkManager() defer manager.Close() source, err := manager.LookupSdk(sdkName) if err != nil { @@ -90,5 +90,5 @@ func searchCmd(ctx *cli.Context) error { if err != nil { return fmt.Errorf("select version error: %w", err) } - return source.Install(sdk.Version(version.Key)) + return source.Install(internal.Version(version.Key)) } diff --git a/cmd/commands/uninstall.go b/cmd/commands/uninstall.go index 891f841e..1899d6ce 100644 --- a/cmd/commands/uninstall.go +++ b/cmd/commands/uninstall.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/pterm/pterm" "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" + "github.com/version-fox/vfox/internal" "os" "strings" ) @@ -37,7 +37,7 @@ func uninstallCmd(ctx *cli.Context) error { if sdkArg == "" { return cli.Exit("sdk name is required", 1) } - manager := sdk.NewSdkManagerWithSource(sdk.SessionRecordSource, sdk.GlobalRecordSource, sdk.ProjectRecordSource) + manager := internal.NewSdkManagerWithSource(internal.SessionRecordSource, internal.GlobalRecordSource, internal.ProjectRecordSource) defer manager.Close() argArr := strings.Split(sdkArg, "@") argsLen := len(argArr) @@ -46,7 +46,7 @@ func uninstallCmd(ctx *cli.Context) error { } name := strings.ToLower(argArr[0]) - version := sdk.Version(argArr[1]) + version := internal.Version(argArr[1]) source, err := manager.LookupSdk(name) if err != nil { @@ -64,7 +64,7 @@ func uninstallCmd(ctx *cli.Context) error { if cv == version { pterm.Println("Auto switch to the other version.") firstVersion := remainVersion[0] - return source.Use(firstVersion, sdk.Global) + return source.Use(firstVersion, internal.Global) } return nil } diff --git a/cmd/commands/update.go b/cmd/commands/update.go index 20a9ee6f..fd72dfa6 100644 --- a/cmd/commands/update.go +++ b/cmd/commands/update.go @@ -18,7 +18,7 @@ package commands import ( "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" + "github.com/version-fox/vfox/internal" ) var Update = &cli.Command{ @@ -33,7 +33,7 @@ func updateCmd(ctx *cli.Context) error { if l < 1 { return cli.Exit("invalid arguments", 1) } - manager := sdk.NewSdkManager() + manager := internal.NewSdkManager() defer manager.Close() return manager.Update(args.First()) } diff --git a/cmd/commands/use.go b/cmd/commands/use.go index ebb488c7..a0052edf 100644 --- a/cmd/commands/use.go +++ b/cmd/commands/use.go @@ -18,12 +18,12 @@ package commands import ( "fmt" + "github.com/version-fox/vfox/internal" "os" "strings" "github.com/pterm/pterm" "github.com/urfave/cli/v2" - "github.com/version-fox/vfox/internal/sdk" ) var Use = &cli.Command{ @@ -57,7 +57,7 @@ func useCmd(ctx *cli.Context) error { } var ( name string - version sdk.Version + version internal.Version ) argArr := strings.Split(sdkArg, "@") if len(argArr) <= 1 { @@ -65,22 +65,22 @@ func useCmd(ctx *cli.Context) error { version = "" } else { name = argArr[0] - version = sdk.Version(argArr[1]) + version = internal.Version(argArr[1]) } - var recordSources []sdk.RecordSource - scope := sdk.Session + var recordSources []internal.RecordSource + scope := internal.Session if ctx.IsSet("global") { - scope = sdk.Global - recordSources = append(recordSources, sdk.SessionRecordSource, sdk.GlobalRecordSource) + scope = internal.Global + recordSources = append(recordSources, internal.SessionRecordSource, internal.GlobalRecordSource) } else if ctx.IsSet("project") { - scope = sdk.Project - recordSources = append(recordSources, sdk.ProjectRecordSource) + scope = internal.Project + recordSources = append(recordSources, internal.ProjectRecordSource) } else { - scope = sdk.Session - recordSources = append(recordSources, sdk.SessionRecordSource) + scope = internal.Session + recordSources = append(recordSources, internal.SessionRecordSource) } - manager := sdk.NewSdkManagerWithSource(recordSources...) + manager := internal.NewSdkManagerWithSource(recordSources...) defer manager.Close() source, err := manager.LookupSdk(name) @@ -107,7 +107,7 @@ func useCmd(ctx *cli.Context) error { }, } result, _ := selectPrinter.Show(fmt.Sprintf("Please select a version of %s", name)) - version = sdk.Version(result) + version = internal.Version(result) } return source.Use(version, scope) } diff --git a/internal/sdk/checksum.go b/internal/checksum.go similarity index 98% rename from internal/sdk/checksum.go rename to internal/checksum.go index d903e05d..dc06e497 100644 --- a/internal/sdk/checksum.go +++ b/internal/checksum.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package sdk +package internal import ( "crypto/md5" diff --git a/internal/sdk/manager.go b/internal/manager.go similarity index 99% rename from internal/sdk/manager.go rename to internal/manager.go index 1f6cf964..9b3149b2 100644 --- a/internal/sdk/manager.go +++ b/internal/manager.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package sdk +package internal import ( "encoding/json" diff --git a/internal/sdk/path.go b/internal/path.go similarity index 99% rename from internal/sdk/path.go rename to internal/path.go index 0c6b98a0..1b6e802d 100644 --- a/internal/sdk/path.go +++ b/internal/path.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package sdk +package internal import ( "fmt" diff --git a/internal/sdk/plugin.go b/internal/plugin.go similarity index 99% rename from internal/sdk/plugin.go rename to internal/plugin.go index 2157243f..c9f6a76b 100644 --- a/internal/sdk/plugin.go +++ b/internal/plugin.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package sdk +package internal import ( "fmt" diff --git a/internal/sdk/repository.go b/internal/repository.go similarity index 98% rename from internal/sdk/repository.go rename to internal/repository.go index 266db4c6..ee1df331 100644 --- a/internal/sdk/repository.go +++ b/internal/repository.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package sdk +package internal type RemotePluginInfo struct { Filename string `json:"name"` diff --git a/internal/sdk/scope.go b/internal/scope.go similarity index 97% rename from internal/sdk/scope.go rename to internal/scope.go index 0ccf72fc..ec7d10d6 100644 --- a/internal/sdk/scope.go +++ b/internal/scope.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package sdk +package internal type UseScope int diff --git a/internal/sdk/sdk.go b/internal/sdk.go similarity index 99% rename from internal/sdk/sdk.go rename to internal/sdk.go index 4c5d1c55..5eab5997 100644 --- a/internal/sdk/sdk.go +++ b/internal/sdk.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package sdk +package internal import ( "errors" diff --git a/internal/sdk/tmp.go b/internal/tmp.go similarity index 98% rename from internal/sdk/tmp.go rename to internal/tmp.go index 5b22e7d3..069e6b0d 100644 --- a/internal/sdk/tmp.go +++ b/internal/tmp.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package sdk +package internal import ( "fmt" diff --git a/internal/sdk/version.go b/internal/version.go similarity index 98% rename from internal/sdk/version.go rename to internal/version.go index 3d5cd6c1..32e37f8f 100644 --- a/internal/sdk/version.go +++ b/internal/version.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package sdk +package internal type Package struct { Main *Info