Merge pull request exercism#59 from isbadawi/config-flag

Add -c/--config flag to specify config file path.

Author: kytrinyx

configuration/from_file.go

@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 )
 
-func FromFile(dir string) (c Config, err error) {
-	bytes, err := ioutil.ReadFile(Filename(dir))
+func FromFile(path string) (c Config, err error) {
+	bytes, err := ioutil.ReadFile(path)
 	if err != nil {
 		return
 	}

configuration/to_file.go

@@ -6,17 +6,16 @@ import (
 	"io/ioutil"
 )
 
-func ToFile(dir string, c Config) error {
+func ToFile(path string, c Config) error {
 	bytes, err := json.Marshal(c)
 	if err != nil {
 		return err
 	}
 
-	filename := Filename(dir)
-	err = ioutil.WriteFile(filename, bytes, 0644)
+	err = ioutil.WriteFile(path, bytes, 0644)
 	if err != nil {
 		return err
 	}
-	fmt.Printf("Your credentials have been written to %s\n", filename)
+	fmt.Printf("Your credentials have been written to %s\n", path)
 	return nil
 }

configuration/to_file_test.go

@@ -8,6 +8,7 @@ import (
 
 func TestReadingWritingConfig(t *testing.T) {
 	tmpDir, err := ioutil.TempDir("", "")
+	filename := Filename(tmpDir)
 	assert.NoError(t, err)
 
 	writtenConfig := Config{
@@ -16,9 +17,9 @@ func TestReadingWritingConfig(t *testing.T) {
 		ExercismDirectory: "/exercism/directory",
 	}
 
-	ToFile(tmpDir, writtenConfig)
+	ToFile(filename, writtenConfig)
 
-	loadedConfig, err := FromFile(tmpDir)
+	loadedConfig, err := FromFile(filename)
 	assert.NoError(t, err)
 
 	assert.Equal(t, writtenConfig, loadedConfig)

exercism.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 )
 
-func logout(dir string) {
-	os.Remove(configuration.Filename(dir))
+func logout(path string) {
+	os.Remove(path)
 }
 
 func absolutePath(path string) (string, error) {

main.go

@@ -15,13 +15,16 @@ func main() {
 	app.Name = "exercism"
 	app.Usage = "A command line tool to interact with http://exercism.io"
 	app.Version = VERSION
+	app.Flags = []cli.Flag{
+		cli.StringFlag{"config, c", configuration.Filename(configuration.HomeDir()), "path to config file"},
+	}
 	app.Commands = []cli.Command{
 		{
 			Name:      "current",
 			ShortName: "c",
 			Usage:     "Show the current assignments",
 			Action: func(c *cli.Context) {
-				config, err := configuration.FromFile(configuration.HomeDir())
+				config, err := configuration.FromFile(c.GlobalString("config"))
 				if err != nil {
 					fmt.Println("Are you sure you are logged in? Please login again.")
 					return
@@ -44,7 +47,7 @@ func main() {
 			ShortName: "d",
 			Usage:     "Fetch first assignment for each language from exercism.io",
 			Action: func(c *cli.Context) {
-				config, err := configuration.FromFile(configuration.HomeDir())
+				config, err := configuration.FromFile(c.GlobalString("config"))
 				if err != nil {
 					config, err = configuration.Demo()
 					if err != nil {
@@ -76,8 +79,7 @@ func main() {
 					return
 				}
 
-				config, err := configuration.FromFile(configuration.HomeDir())
-
+				config, err := configuration.FromFile(c.GlobalString("config"))
 				if err != nil {
 					if len(c.Args()) == 0 {
 						fmt.Println("Are you sure you are logged in? Please login again.")
@@ -112,23 +114,23 @@ func main() {
 			ShortName: "l",
 			Usage:     "Save exercism.io api credentials",
 			Action: func(c *cli.Context) {
-				configuration.ToFile(configuration.HomeDir(), askForConfigInfo())
+				configuration.ToFile(c.GlobalString("config"), askForConfigInfo());
 			},
 		},
 		{
 			Name:      "logout",
 			ShortName: "o",
 			Usage:     "Clear exercism.io api credentials",
 			Action: func(c *cli.Context) {
-				logout(configuration.HomeDir())
+				logout(c.GlobalString("config"))
 			},
 		},
 		{
 			Name:      "peek",
 			ShortName: "p",
 			Usage:     "Fetch upcoming assignment from exercism.io",
 			Action: func(c *cli.Context) {
-				config, err := configuration.FromFile(configuration.HomeDir())
+				config, err := configuration.FromFile(c.GlobalString("config"))
 				if err != nil {
 					fmt.Println("Are you sure you are logged in? Please login again.")
 					return
@@ -157,7 +159,7 @@ func main() {
 				"to a file and have not submitted it, and you're trying to restore the last " +
 				"submitted version, first move that file out of the way, then call restore.",
 			Action: func(c *cli.Context) {
-				config, err := configuration.FromFile(configuration.HomeDir())
+				config, err := configuration.FromFile(c.GlobalString("config"))
 				if err != nil {
 					fmt.Println("Are you sure you are logged in? Please login again.")
 					return
@@ -184,7 +186,7 @@ func main() {
 			ShortName: "s",
 			Usage:     "Submit code to exercism.io on your current assignment",
 			Action: func(c *cli.Context) {
-				config, err := configuration.FromFile(configuration.HomeDir())
+				config, err := configuration.FromFile(c.GlobalString("config"))
 				if err != nil {
 					fmt.Println("Are you sure you are logged in? Please login again.")
 					return
@@ -237,7 +239,7 @@ func main() {
 			ShortName: "u",
 			Usage:     "Delete the last submission",
 			Action: func(c *cli.Context) {
-				config, err := configuration.FromFile(configuration.HomeDir())
+				config, err := configuration.FromFile(c.GlobalString("config"))
 				if err != nil {
 					fmt.Println("Are you sure you are logged in? Please login again.")
 					return
@@ -261,7 +263,7 @@ func main() {
 			ShortName: "w",
 			Usage:     "Get the github username that you are logged in as",
 			Action: func(c *cli.Context) {
-				config, err := configuration.FromFile(configuration.HomeDir())
+				config, err := configuration.FromFile(c.GlobalString("config"))
 				if err != nil {
 					fmt.Println("Are you sure you are logged in? Please login again.")
 					return