Fix generation of puzzle object

Author: dnnrly

cmd/next/main.go

@@ -40,7 +40,7 @@ func Run(config *Config) error {
 	all := re.FindAll(contents, -1)
 	next := len(all) + 1
 
-	text := fmt.Sprintf("\tpuzzles = append(puzzles, puzzle.Puzzle%03d)\n\t// next puzzle", next)
+	text := fmt.Sprintf("\tpuzzles = append(puzzles, Puzzle%03d())\n\t// next puzzle", next)
 
 	re = regexp.MustCompile("\t// next puzzle")
 	update := re.ReplaceAllString(string(contents), text)
@@ -50,10 +50,30 @@ func Run(config *Config) error {
 	}
 
 	puzzle := fmt.Sprintf(`package puzzle
-	
-func Puzzle%03d() int {
-	return 0
-}`, next)
+
+// Puzzle%03d is the solutions for puzzle %d
+func Puzzle%03d() Puzzle {
+	// Here's where you put some extra data you might need to process
+	data := ""
+
+	// You can create helpers like this that can be called later
+	processData := func() {
+		data += "a"
+	}
+
+	return Puzzle {
+		// Init will be called before any of the solutions. Do all of your
+		// expsensive pre-processing here.
+		Init: func() {
+			processData()
+		},
+		// Parts contains all of the different sub-solutions that you need
+		// to implement (looking at you Advent of Code).
+		Parts: []Solution{
+			func() int { return 0 },
+		},
+	}
+}`, next, next, next)
 
 	err = afero.WriteFile(
 		config.fs,

cmd/next/main_test.go

@@ -21,7 +21,7 @@ func TestRunDetectsMissingMainFile(t *testing.T) {
 
 func TestRunFailsWhenWritingInvalidFile(t *testing.T) {
 	memFs := afero.NewMemMapFs()
-	afero.WriteFile(memFs, "puzzle.go", []byte(`func RegisterPuzzles() []Puzzle {
+	afero.WriteFile(memFs, "puzzles.go", []byte(`func RegisterPuzzles() []Puzzle {
 		puzzles := Puzzle{}
 	
 		// next puzzle
@@ -39,7 +39,7 @@ func TestRunFailsWhenWritingInvalidFile(t *testing.T) {
 
 func TestRunRegistersNewTest(t *testing.T) {
 	memFs := afero.NewMemMapFs()
-	afero.WriteFile(memFs, "puzzle.go", []byte(`func RegisterPuzzles() []Puzzle {
+	afero.WriteFile(memFs, "puzzles.go", []byte(`func RegisterPuzzles() []Puzzle {
 		puzzles := Puzzle{}
 	
 		// next puzzle
@@ -52,15 +52,15 @@ func TestRunRegistersNewTest(t *testing.T) {
 	})
 	assert.NoError(t, err)
 
-	contents, err := afero.ReadFile(memFs, "puzzle.go")
+	contents, err := afero.ReadFile(memFs, "puzzles.go")
 	assert.NoError(t, err)
-	assert.Contains(t, string(contents), "puzzles = append(puzzles, puzzle.Puzzle001)")
+	assert.Contains(t, string(contents), "puzzles = append(puzzles, Puzzle001())")
 	assert.Contains(t, string(contents), "// next puzzle")
 }
 
 func TestRunCreatesPuzzleFile(t *testing.T) {
 	memFs := afero.NewMemMapFs()
-	afero.WriteFile(memFs, "puzzle.go", []byte(`func RegisterPuzzles() []Puzzle {
+	afero.WriteFile(memFs, "puzzles.go", []byte(`func RegisterPuzzles() []Puzzle {
 		puzzles := Puzzle{}
 	
 		// next puzzle
@@ -76,5 +76,5 @@ func TestRunCreatesPuzzleFile(t *testing.T) {
 	contents, err := afero.ReadFile(memFs, "puzzle001.go")
 	assert.NoError(t, err)
 	assert.Contains(t, string(contents), "package puzzle")
-	assert.Contains(t, string(contents), "func Puzzle001() int")
+	assert.Contains(t, string(contents), "func Puzzle001() Puzzle")
 }