Skip to content

Commit

Permalink
chore: move package
Browse files Browse the repository at this point in the history
  • Loading branch information
@aooohan
aooohan committed Jan 22, 2024
1 parent f992618 commit 215ea52
Show file tree
Hide file tree
Showing 22 changed files with 53 additions and 53 deletions.
4 changes: 2 additions & 2 deletions cmd/commands/activate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions cmd/commands/add.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions cmd/commands/available.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions cmd/commands/current.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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 == "" {
Expand Down
8 changes: 4 additions & 4 deletions cmd/commands/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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
}
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions cmd/commands/info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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 == "" {
Expand Down
8 changes: 4 additions & 4 deletions cmd/commands/install.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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 = ""
Expand Down
4 changes: 2 additions & 2 deletions cmd/commands/list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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 == "" {
Expand Down
4 changes: 2 additions & 2 deletions cmd/commands/remove.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cmd/commands/search.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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 {
Expand Down Expand Up @@ -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))
}
8 changes: 4 additions & 4 deletions cmd/commands/uninstall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand All @@ -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)
Expand All @@ -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 {
Expand All @@ -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
}
4 changes: 2 additions & 2 deletions cmd/commands/update.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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())
}
26 changes: 13 additions & 13 deletions cmd/commands/use.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -57,30 +57,30 @@ func useCmd(ctx *cli.Context) error {
}
var (
name string
version sdk.Version
version internal.Version
)
argArr := strings.Split(sdkArg, "@")
if len(argArr) <= 1 {
name = argArr[0]
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)
Expand All @@ -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)
}
2 changes: 1 addition & 1 deletion internal/sdk/checksum.go → internal/checksum.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package sdk
package internal

import (
"crypto/md5"
Expand Down
2 changes: 1 addition & 1 deletion internal/sdk/manager.go → internal/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package sdk
package internal

import (
"encoding/json"
Expand Down
2 changes: 1 addition & 1 deletion internal/sdk/path.go → internal/path.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package sdk
package internal

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion internal/sdk/plugin.go → internal/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package sdk
package internal

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion internal/sdk/repository.go → internal/repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package sdk
package internal

type RemotePluginInfo struct {
Filename string `json:"name"`
Expand Down
2 changes: 1 addition & 1 deletion internal/sdk/scope.go → internal/scope.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package sdk
package internal

type UseScope int

Expand Down
Loading

0 comments on commit 215ea52

Please sign in to comment.