Merge pull request #21 from ThreeDotsLabs/specify-directory-with-clone

specify directory for clone

Author: roblaszczak

tdl/main.go

@@ -191,7 +191,7 @@ var app = &cli.App{
 					Name:  "clone",
 					Usage: "clone solution files to current directory",
 					ArgsUsage: fmt.Sprintf(
-						"<executionID from 'Share your solution' at %s>",
+						"<executionID from 'Share your solution' at %s> [directory, if empty defaults to current directory]",
 						internal.WebsiteAddress,
 					),
 					Action: func(c *cli.Context) error {
@@ -200,7 +200,9 @@ var app = &cli.App{
 							return missingArgumentError{"Missing executionID argument"}
 						}
 
-						return newHandlers(c).Clone(c.Context, executionID)
+						directory := c.Args().Get(1)
+
+						return newHandlers(c).Clone(c.Context, executionID, directory)
 					},
 				},
 				{

trainings/clone.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"path"
 
 	"github.com/ThreeDotsLabs/cli/trainings/config"
 	"github.com/ThreeDotsLabs/cli/trainings/genproto"
@@ -12,7 +13,7 @@ import (
 	"github.com/spf13/afero"
 )
 
-func (h *Handlers) Clone(ctx context.Context, executionID string) error {
+func (h *Handlers) Clone(ctx context.Context, executionID string, directory string) error {
 	pwd, err := os.Getwd()
 	if err != nil {
 		return fmt.Errorf("failed to get current working directory: %w", err)
@@ -30,12 +31,14 @@ func (h *Handlers) Clone(ctx context.Context, executionID string) error {
 		"err":  err,
 	}).Debug("Received exercise from server")
 
-	wd, err := os.Getwd()
+	absoluteDirToClone, err := os.Getwd()
 	if err != nil {
 		return errors.WithStack(err)
 	}
 
-	if _, err := h.startTraining(ctx, resp.TrainingName, wd); err != nil {
+	absoluteDirToClone = path.Join(absoluteDirToClone, directory)
+
+	if _, err := h.startTraining(ctx, resp.TrainingName, absoluteDirToClone); err != nil {
 		return err
 	}