Skip to content
This repository has been archived by the owner on Jul 12, 2022. It is now read-only.

fix/load_tree #1

Merged
merged 1 commit into from
Apr 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func buildCommands(ritchieHomePath string) *cobra.Command {
formulaRunner := formula.NewRunner(ritchieHomePath, envResolvers, http.DefaultClient, treeManager)
formulaCreator := formula.NewCreator(ritchieHomePath, treeManager)

rootCmd := cmd.NewRootCmd(workspaceManager, loginManager, sessionValidator)
rootCmd := cmd.NewRootCmd(workspaceManager, loginManager, repoManager, sessionValidator)

// level 1
autocompleteCmd := cmd.NewAutocompleteCmd()
Expand Down
5 changes: 1 addition & 4 deletions pkg/cmd/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,16 @@ func (l loginCmd) RunFunc() CommandRunnerFunc {
return err
}

fmt.Println("Starting login...")
secret := security.Passcode(s)
if err := l.Login(secret); err != nil {
return err
}
fmt.Println("Login successful!")

fmt.Println("Loading repositories...")
if err := l.Load(); err != nil {
return err
}
fmt.Println("Done.")

fmt.Println("Session created successfully!")
return nil
}
}
18 changes: 12 additions & 6 deletions pkg/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cmd
import (
"errors"
"fmt"
"github.com/ZupIT/ritchie-cli/pkg/formula"
"github.com/ZupIT/ritchie-cli/pkg/prompt"
"github.com/ZupIT/ritchie-cli/pkg/security"
"github.com/ZupIT/ritchie-cli/pkg/session"
Expand Down Expand Up @@ -42,12 +43,13 @@ var (
type rootCmd struct {
workspaceManager workspace.Checker
loginManager security.LoginManager
repoLoader formula.RepoLoader
sessionValidator session.Validator
}

// NewRootCmd creates the root for all ritchie commands.
func NewRootCmd(wm workspace.Checker, l security.LoginManager, sv session.Validator) *cobra.Command {
o := &rootCmd{wm, l, sv}
func NewRootCmd(wm workspace.Checker, l security.LoginManager, r formula.RepoLoader, sv session.Validator) *cobra.Command {
o := &rootCmd{wm, l, r, sv}

return &cobra.Command{
Use: cmdUse,
Expand All @@ -59,10 +61,6 @@ func NewRootCmd(wm workspace.Checker, l security.LoginManager, sv session.Valida
}
}

func version() string {
return fmt.Sprintf(versionMsg, Version, env.Edition, BuildDate, runtime.Version())
}

func (o *rootCmd) PreRunFunc() CommandRunnerFunc {
return func(cmd *cobra.Command, args []string) error {
if err := o.workspaceManager.Check(); err != nil {
Expand Down Expand Up @@ -94,6 +92,10 @@ func (o *rootCmd) checkSession(commandPath string) error {
return err
}

if err := o.repoLoader.Load(); err != nil {
return err
}

fmt.Println("Session created successfully!")
os.Exit(0)
}
Expand All @@ -120,3 +122,7 @@ func sessionPrompt() (security.Passcode, error) {

return security.Passcode(passcode), nil
}

func version() string {
return fmt.Sprintf(versionMsg, Version, env.Edition, BuildDate, runtime.Version())
}