Skip to content
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
7 changes: 7 additions & 0 deletions cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,10 @@ const msgRerunConfigure = `

%s configure
`

const msgMissingMetadata = `

The exercise you are submitting doesn't have the necessary metadata.
Please see https://exercism.io/cli-v1-to-v2 for instructions on how to fix it.

`
13 changes: 3 additions & 10 deletions cmd/submit.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ func runSubmit(cfg config.Configuration, flags *pflag.FlagSet, args []string) er
for _, arg := range args {
dir, err := ws.SolutionDir(arg)
if err != nil {
if workspace.IsMissingMetadata(err) {
return errors.New(msgMissingMetadata)
}
return err
}
if exerciseDir != "" && dir != exerciseDir {
Expand All @@ -132,16 +135,6 @@ func runSubmit(cfg config.Configuration, flags *pflag.FlagSet, args []string) er
if err != nil {
return err
}
if len(sx) == 0 {
// TODO: add test
msg := `

The exercise you are submitting doesn't have the necessary metadata.
Please see https://exercism.io/cli-v1-to-v2 for instructions on how to fix it.

`
return errors.New(msg)
}
if len(sx) > 1 {
msg := `

Expand Down
26 changes: 26 additions & 0 deletions cmd/submit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,32 @@ func TestSubmitNonExistentFile(t *testing.T) {
assert.Regexp(t, "cannot be found", err.Error())
}

func TestSubmitExerciseWithoutSolutionMetadataFile(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "no-metadata-file")
assert.NoError(t, err)

dir := filepath.Join(tmpDir, "bogus-track", "bogus-exercise")
os.MkdirAll(dir, os.FileMode(0755))

file := filepath.Join(dir, "file.txt")
err = ioutil.WriteFile(file, []byte("This is a file."), os.FileMode(0755))
assert.NoError(t, err)

v := viper.New()
v.Set("token", "abc123")
v.Set("workspace", tmpDir)

cfg := config.Configuration{
Persister: config.InMemoryPersister{},
Dir: tmpDir,
UserViperConfig: v,
}

err = runSubmit(cfg, pflag.NewFlagSet("fake", pflag.PanicOnError), []string{file})
assert.Error(t, err)
assert.Regexp(t, "doesn't have the necessary metadata", err.Error())
}

func TestSubmitFilesAndDir(t *testing.T) {
tmpDir, err := ioutil.TempDir("", "submit-no-such-file")
assert.NoError(t, err)
Expand Down
9 changes: 8 additions & 1 deletion workspace/workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ import (
"strings"
)

var errMissingMetadata = errors.New("no solution metadata file found")

// IsMissingMetadata verifies the type of error.
func IsMissingMetadata(err error) bool {
return err == errMissingMetadata
}

var rgxSerialSuffix = regexp.MustCompile(`-\d*$`)

// Workspace represents a user's Exercism workspace.
Expand Down Expand Up @@ -186,7 +193,7 @@ func (ws Workspace) SolutionDir(s string) (string, error) {
path := s
for {
if path == ws.Dir {
return "", errors.New("couldn't find it")
return "", errMissingMetadata
}
if _, err := os.Lstat(path); os.IsNotExist(err) {
return "", err
Expand Down