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
17 changes: 9 additions & 8 deletions exercism.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@ func absolutePath(path string) (string, error) {
return filepath.EvalSymlinks(path)
}

func askForConfigInfo() (c configuration.Config) {
func askForConfigInfo() (c configuration.Config, err error) {
var un, key, dir string
delim := "\r\n"

bio := bufio.NewReader(os.Stdin)

currentDir, err := os.Getwd()
if err != nil {
panic(err)
return
}

fmt.Print("Your GitHub username: ")
un, err = bio.ReadString('\n')
if err != nil {
panic(err)
return
}

fmt.Print("Your exercism.io API key: ")
key, err = bio.ReadString('\n')
if err != nil {
panic(err)
return
}

fmt.Println("What is your exercism exercises project path?")
fmt.Printf("Press Enter to select the default (%s):\n", currentDir)
fmt.Print("> ")
dir, err = bio.ReadString('\n')
if err != nil && err.Error() != "unexpected newline" {
panic(err)
if err != nil {
return
}

key = strings.TrimRight(key, delim)
Expand All @@ -70,8 +70,9 @@ func askForConfigInfo() (c configuration.Config) {

dir, err = absolutePath(dir)
if err != nil {
panic(err)
return
}

return configuration.Config{GithubUsername: un, ApiKey: key, ExercismDirectory: dir, Hostname: "http://exercism.io"}
c = configuration.Config{GithubUsername: un, ApiKey: key, ExercismDirectory: dir, Hostname: "http://exercism.io"}
return
}
5 changes: 4 additions & 1 deletion exercism_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ func TestAskForConfigInfoAllowsSpaces(t *testing.T) {

os.Stdin = file

c := askForConfigInfo()
c, err := askForConfigInfo()
if err != nil {
t.Errorf("Error asking for configuration info [%v]", err)
}
os.Stdin = oldStdin
absoluteDirName, _ := absolutePath(dirName)
_, err = os.Stat(absoluteDirName)
Expand Down
7 changes: 6 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,12 @@ func main() {
ShortName: "l",
Usage: "Save exercism.io api credentials",
Action: func(c *cli.Context) {
configuration.ToFile(c.GlobalString("config"), askForConfigInfo())
config, err := askForConfigInfo()
if err != nil {
fmt.Println(err)
return
}
configuration.ToFile(c.GlobalString("config"), config)
},
},
{
Expand Down