add prolog config

Author: xavdid

workspace/exercise_config.go

@@ -15,7 +15,8 @@ var configFilepath = filepath.Join(ignoreSubdir, configFilename)
 // Note: we only use a subset of its fields
 type ExerciseConfig struct {
 	Files struct {
-		Test []string `json:"test"`
+		Solution []string `json:"solution"`
+		Test     []string `json:"test"`
 	} `json:"files"`
 }
 
@@ -33,12 +34,24 @@ func NewExerciseConfig(dir string) (*ExerciseConfig, error) {
 	return &config, nil
 }
 
-// GetTestFiles finds returns the names of the files that hold unit tests for this exercise, if any
+// GetTestFiles finds returns the names of the file(s) that hold unit tests for this exercise, if any
+func (c *ExerciseConfig) GetSolutionFiles() ([]string, error) {
+	result := c.Files.Solution
+	if result == nil {
+		// solution file(s) key was missing in config json, which is an error when calling this fuction
+		return []string{}, errors.New("no `files.solution` key in your `config.json`. Was it removed by mistake?")
+	}
+
+	return result, nil
+}
+
+// GetTestFiles finds returns the names of the file(s) that hold unit tests for this exercise, if any
 func (c *ExerciseConfig) GetTestFiles() ([]string, error) {
-	if c.Files.Test == nil {
-		// test files key was missing in config json, which is an error when calling this fuction
+	result := c.Files.Test
+	if result == nil {
+		// test file(s) key was missing in config json, which is an error when calling this fuction
 		return []string{}, errors.New("no `files.test` key in your `config.json`. Was it removed by mistake?")
 	}
 
-	return c.Files.Test, nil
+	return result, nil
 }

workspace/exercise_config_test.go

@@ -28,6 +28,11 @@ func TestExerciseConfig(t *testing.T) {
 	ec, err := NewExerciseConfig(dir)
 	assert.NoError(t, err)
 
+	assert.Equal(t, ec.Files.Solution, []string{"lasagna.rb"})
+	solutionFiles, err := ec.GetSolutionFiles()
+	assert.NoError(t, err)
+	assert.Equal(t, solutionFiles, []string{"lasagna.rb"})
+
 	assert.Equal(t, ec.Files.Test, []string{"lasagna_test.rb"})
 	testFiles, err := ec.GetTestFiles()
 	assert.NoError(t, err)
@@ -45,12 +50,14 @@ func TestExerciseConfigNoTestKey(t *testing.T) {
 	f, err := os.Create(filepath.Join(dir, ".exercism", "config.json"))
 	assert.NoError(t, err)
 
-	_, err = f.WriteString(`{ "blurb": "Learn about the basics of Ruby by following a lasagna recipe.", "authors": ["iHiD", "pvcarrera"], "files": { "solution": ["lasagna.rb"], "exemplar": [".meta/exemplar.rb"] } } `)
+	_, err = f.WriteString(`{ "blurb": "Learn about the basics of Ruby by following a lasagna recipe.", "authors": ["iHiD", "pvcarrera"], "files": { "exemplar": [".meta/exemplar.rb"] } } `)
 	assert.NoError(t, err)
 
 	ec, err := NewExerciseConfig(dir)
 	assert.NoError(t, err)
 
+	_, err = ec.GetSolutionFiles()
+	assert.Error(t, err, "no `files.solution` key in your `config.json`")
 	_, err = ec.GetTestFiles()
 	assert.Error(t, err, "no `files.test` key in your `config.json`")
 }

workspace/test_configurations.go

@@ -1,6 +1,7 @@
 package workspace
 
 import (
+	"fmt"
 	"runtime"
 	"strings"
 )
@@ -22,12 +23,32 @@ func (c *TestConfiguration) GetTestCommand() (string, error) {
 		cmd = c.Command
 	}
 
-	if strings.Contains(cmd, "{{test_files}}") {
-		exerciseConfig, err := NewExerciseConfig(".")
+	// pre-declare these so we can conditionally initialize them
+	var exerciseConfig *ExerciseConfig
+	var err error
+
+	if strings.Contains(cmd, "{{") {
+		// only read exercise's config.json if we need it
+		exerciseConfig, err = NewExerciseConfig(".")
 		if err != nil {
 			return "", err
 		}
+	}
 
+	if strings.Contains(cmd, "{{solution_files}}") {
+		if exerciseConfig == nil {
+			return "", fmt.Errorf("exerciseConfig not initialize before use")
+		}
+		solutionFiles, err := exerciseConfig.GetSolutionFiles()
+		if err != nil {
+			return "", err
+		}
+		cmd = strings.ReplaceAll(cmd, "{{solution_files}}", strings.Join(solutionFiles, " "))
+	}
+	if strings.Contains(cmd, "{{test_files}}") {
+		if exerciseConfig == nil {
+			return "", fmt.Errorf("exerciseConfig not initialize before use")
+		}
 		testFiles, err := exerciseConfig.GetTestFiles()
 		if err != nil {
 			return "", err
@@ -146,6 +167,9 @@ var TestConfigurations = map[string]TestConfiguration{
 	"php": {
 		Command: "phpunit {{test_files}}",
 	},
+	"prolog": {
+		Command: "swipl -f {{solution_files}} -s {{test_files}} -g run_tests,halt -t 'halt(1)'",
+	},
 	"purescript": {
 		Command: "spago test",
 	},

workspace/test_configurations_test.go

@@ -49,6 +49,27 @@ func TestGetCommandMissingConfig(t *testing.T) {
 	assert.Contains(t, err.Error(), path.Join(".exercism", "config.json:"))
 }
 
+func TestIncludesSolutionAndTestFilesInCommand(t *testing.T) {
+	testConfig, ok := TestConfigurations["prolog"]
+	assert.True(t, ok, "unexpectedly unable to find prolog test config")
+
+	// this creates a config file in the test directory and removes it
+	dir := filepath.Join(".", ".exercism")
+	err := os.Mkdir(dir, os.ModePerm)
+	assert.NoError(t, err)
+	defer os.RemoveAll(dir)
+
+	f, err := os.Create(filepath.Join(dir, "config.json"))
+	assert.NoError(t, err)
+
+	_, err = f.WriteString(`{ "blurb": "Learn about the basics of Prolog by following a lasagna recipe.", "authors": ["iHiD", "pvcarrera"], "files": { "solution": ["lasagna.pl"], "test": ["lasagna_tests.plt"] } } `)
+	assert.NoError(t, err)
+
+	cmd, err := testConfig.GetTestCommand()
+	assert.NoError(t, err)
+	assert.Equal(t, cmd, "swipl -f lasagna.pl -s lasagna_tests.plt -g run_tests,halt -t 'halt(1)'")
+}
+
 func TestIncludesTestFilesInCommand(t *testing.T) {
 	testConfig, ok := TestConfigurations["ruby"]
 	assert.True(t, ok, "unexpectedly unable to find ruby test config")