Some cleanups

trainings/config/training.go

@@ -8,8 +8,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
-
-	"github.com/ThreeDotsLabs/cli/internal"
 )
 
 const trainingConfigFile = ".tdl-training"
@@ -40,8 +38,7 @@ func (c Config) TrainingConfig(trainingRootFs afero.Fs) TrainingConfig {
 	return config
 }
 
-// todo - check if it's printing properly
-var TrainingRootNotFoundError = errors.Errorf("training root not found, did you run %s?", internal.SprintCommand("tdl trainings init"))
+var TrainingRootNotFoundError = errors.Errorf("training root not found")
 
 func (c Config) FindTrainingRoot() (string, error) {
 	wd, err := os.Getwd()

trainings/info.go

@@ -10,16 +10,14 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/ThreeDotsLabs/cli/internal"
 	"github.com/ThreeDotsLabs/cli/trainings/config"
 	"github.com/ThreeDotsLabs/cli/trainings/web"
 )
 
 func (h *Handlers) Info(ctx context.Context) error {
 	trainingRoot, err := h.config.FindTrainingRoot()
 	if errors.Is(err, config.TrainingRootNotFoundError) {
-		fmt.Println("You are not in a training directory. If you already started the training, please go to the exercise directory.")
-		fmt.Printf("Please run %s if you didn't start training yet.\n", internal.SprintCommand("tdl training init"))
+		h.printNotInATrainingDirectory()
 		return nil
 	}
 

trainings/next.go

@@ -2,9 +2,7 @@ package trainings
 
 import (
 	"context"
-	"fmt"
 
-	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
@@ -13,7 +11,6 @@ import (
 
 	"github.com/ThreeDotsLabs/cli/trainings/files"
 
-	"github.com/ThreeDotsLabs/cli/internal"
 	"github.com/ThreeDotsLabs/cli/trainings/config"
 	"github.com/ThreeDotsLabs/cli/trainings/genproto"
 )
@@ -36,15 +33,17 @@ func (h *Handlers) nextExercise(ctx context.Context, currentExerciseID string) e
 		return err
 	}
 	if finished {
-		trainingFinished()
+		printFinished()
 		return nil
 	}
 
 	if err := h.writeExerciseFiles(resp, trainingRootFs); err != nil {
 		return err
 	}
 
-	return h.showExerciseTips()
+	h.printExerciseTips()
+
+	return nil
 }
 
 func (h *Handlers) getNextExercise(ctx context.Context, currentExerciseID string, trainingRootFs afero.Fs) (finished bool, resp *genproto.NextExerciseResponse, err error) {
@@ -77,14 +76,3 @@ func (h *Handlers) writeExerciseFiles(resp *genproto.NextExerciseResponse, train
 		},
 	)
 }
-
-func (h *Handlers) showExerciseTips() error {
-	fmt.Printf("To run solution, please execute " + internal.SprintCommand("tdl training run"))
-	fmt.Println()
-
-	return nil
-}
-
-func trainingFinished() {
-	fmt.Println("Congratulations, you finished the training " + color.YellowString("🏆"))
-}

trainings/print.go

@@ -0,0 +1,22 @@
+package trainings
+
+import (
+	"fmt"
+
+	"github.com/ThreeDotsLabs/cli/internal"
+	"github.com/fatih/color"
+)
+
+func (h *Handlers) printNotInATrainingDirectory() {
+	fmt.Println("You are not in a training directory. If you already started the training, please go to the exercise directory.")
+	fmt.Printf("Please run %s if you didn't start training yet.\n", internal.SprintCommand("tdl training init"))
+}
+
+func (h *Handlers) printExerciseTips() {
+	fmt.Printf("To run solution, please execute " + internal.SprintCommand("tdl training run"))
+	fmt.Println()
+}
+
+func printFinished() {
+	fmt.Println("Congratulations, you finished the training " + color.YellowString("🏆"))
+}

trainings/run.go

@@ -24,8 +24,7 @@ import (
 func (h *Handlers) Run(ctx context.Context) (bool, error) {
 	trainingRoot, err := h.config.FindTrainingRoot()
 	if errors.Is(err, config.TrainingRootNotFoundError) {
-		fmt.Println("You are not in a training directory. If you already started the training, please go to the exercise directory.")
-		fmt.Printf("Please run %s if you didn't start training yet.\n", internal.SprintCommand("tdl training init"))
+		h.printNotInATrainingDirectory()
 		return false, nil
 	}