added guidance for initializing training in a fresh directory when git is not enabled (#54)

Author: roblaszczak

trainings/init.go

@@ -46,8 +46,13 @@ func (h *Handlers) Init(ctx context.Context, trainingName string, dir string, no
 
 	if alreadyInitialized {
 		trainingRootFs := newTrainingRootFs(trainingRootDir)
+		cfg := h.config.TrainingConfig(trainingRootFs)
+		if !cfg.GitEnabled {
+			printInitNeedsFreshDir(cfg)
+			return nil
+		}
 		if files.DirOrFileExists(trainingRootFs, ".tdl-exercise") {
-			fmt.Println("Training is already initialised, nothing to do.")
+			fmt.Println("Training is already initialized, nothing to do.")
 			return nil
 		}
 		// Partial init: exercise not yet set up, fall through to nextExercise.
@@ -342,7 +347,7 @@ func (h *Handlers) startTraining(
 
 	alreadyExistingTrainingRoot, err := h.config.FindTrainingRoot()
 	if err == nil {
-		fmt.Println(color.BlueString("Training was already initialised. Training root:" + alreadyExistingTrainingRoot))
+		fmt.Println(color.BlueString("Found existing training workspace at: " + alreadyExistingTrainingRoot))
 		trainingRootDir = alreadyExistingTrainingRoot
 	} else if !errors.Is(err, config.TrainingRootNotFoundError) {
 		return "", false, false, errors.Wrap(err, "can't check if training root exists")

trainings/migration.go

@@ -103,6 +103,44 @@ func printGitNotices(cfg config.TrainingConfig) {
 	printGitNowAvailableNotice(cfg)
 }
 
+// printInitNeedsFreshDir is shown during `tdl training init` when the user runs init
+// in a directory that was already set up without git. Unlike printGitNowAvailableNotice
+// (rate-limited, shown during run/next/etc.), this fires unconditionally because the
+// user explicitly ran init and needs clear, actionable guidance.
+func printInitNeedsFreshDir(cfg config.TrainingConfig) {
+	sep := color.HiBlackString(strings.Repeat("─", internal.TerminalWidth()))
+	initCmd := color.CyanString("tdl training init %s .", cfg.TrainingName)
+
+	_, gitErr := git.CheckVersion()
+	gitAvailable := gitErr == nil
+
+	fmt.Println(sep)
+	if gitAvailable {
+		title := color.New(color.Bold, color.FgHiGreen).Sprint("  *** Git is now available! ***")
+		fmt.Println(title)
+		fmt.Println()
+		fmt.Println("  Git is now installed, but this workspace was set up without git tracking.")
+		fmt.Println("  To enable git integration, initialize in a fresh empty directory.")
+	} else {
+		title := color.New(color.Bold, color.FgHiYellow).Sprint("  *** Fresh directory required ***")
+		fmt.Println(title)
+		fmt.Println()
+		fmt.Println("  This workspace was set up without git tracking.")
+		fmt.Println("  Once git is installed, initialize in a fresh directory to enable it.")
+	}
+	fmt.Println()
+	fmt.Println("  Your progress is saved on the server and will be restored")
+	fmt.Println("  automatically: solutions, completion history, everything.")
+	fmt.Println()
+	fmt.Println("  Create a new directory and reinitialize:")
+	fmt.Println()
+	fmt.Printf("    cd ..\n")
+	fmt.Printf("    mkdir my-training && cd my-training\n")
+	fmt.Printf("    %s\n", initCmd)
+	fmt.Println(sep)
+	fmt.Println()
+}
+
 // showGitInstallNoticeIfDue shows the "git not installed" notice at most once per 24 h.
 // Fires whenever git is disabled and still not installed — covers both workspaces where
 // git was missing at init (GitUnavailable=true) and older workspaces that were silently

trainings/migration_test.go

@@ -0,0 +1,65 @@
+package trainings
+
+import (
+	"bytes"
+	"io"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/ThreeDotsLabs/cli/trainings/config"
+	"github.com/ThreeDotsLabs/cli/trainings/git"
+)
+
+func captureStdout(f func()) string {
+	old := os.Stdout
+	r, w, _ := os.Pipe()
+	os.Stdout = w
+	f()
+	w.Close()
+	os.Stdout = old
+	var buf bytes.Buffer
+	_, _ = io.Copy(&buf, r)
+	return buf.String()
+}
+
+func TestPrintInitNeedsFreshDir_GitAvailable(t *testing.T) {
+	cfg := config.TrainingConfig{
+		TrainingName:   "go-event-driven",
+		GitConfigured:  true,
+		GitEnabled:     false,
+		GitUnavailable: true,
+	}
+
+	out := captureStdout(func() { printInitNeedsFreshDir(cfg) })
+
+	assert.Contains(t, out, "go-event-driven")
+	assert.Contains(t, out, "cd ..")
+	assert.Contains(t, out, "mkdir my-training")
+	assert.Contains(t, out, "tdl training init go-event-driven .")
+	assert.Contains(t, out, "Git is now available")
+}
+
+func TestPrintInitNeedsFreshDir_GitNotAvailable(t *testing.T) {
+	origPath := os.Getenv("PATH")
+	t.Cleanup(func() {
+		os.Setenv("PATH", origPath)
+		git.ResetCheckVersion()
+	})
+	os.Setenv("PATH", "")
+	git.ResetCheckVersion()
+
+	cfg := config.TrainingConfig{
+		TrainingName:  "go-event-driven",
+		GitConfigured: false,
+		GitEnabled:    false,
+	}
+
+	out := captureStdout(func() { printInitNeedsFreshDir(cfg) })
+
+	assert.Contains(t, out, "go-event-driven")
+	assert.Contains(t, out, "Once git is installed")
+	assert.Contains(t, out, "tdl training init go-event-driven .")
+	assert.NotContains(t, out, "Git is now available")
+}