feat: reimplement clone command (#197)

Author: garrettkrohn

cloner/clone_test.go

@@ -0,0 +1,36 @@
+package cloner
+
+import (
+	"os"
+	"testing"
+
+	"github.com/joshmedeski/sesh/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestListSessions(t *testing.T) {
+	t.Run("get path with both cmd and repo", func(t *testing.T) {
+		mockOpts := model.GitCloneOptions{Repo: "https://www.github.comtest/repo.git", CmdDir: "cmdDir", Dir: "dir"}
+		actual := getPath(mockOpts)
+		assert.Equal(t, "cmdDir/dir", actual)
+	})
+	t.Run("get path cmdDir", func(t *testing.T) {
+		mockOpts := model.GitCloneOptions{Repo: "https://www.github.comtest/repo.git", CmdDir: "cmdDir"}
+		actual := getPath(mockOpts)
+		assert.Equal(t, "cmdDir/repo", actual)
+	})
+	t.Run("get path dir", func(t *testing.T) {
+		mockOpts := model.GitCloneOptions{Repo: "https://www.github.comtest/repo.git", Dir: "dir"}
+		actual := getPath(mockOpts)
+		expected, _ := os.Getwd()
+		expected = expected + "/" + "dir"
+		assert.Equal(t, expected, actual)
+	})
+	t.Run("get path with no dir or cmdDir", func(t *testing.T) {
+		mockOpts := model.GitCloneOptions{Repo: "https://www.github.comtest/repo.git"}
+		actual := getPath(mockOpts)
+		expected, _ := os.Getwd()
+		expected = expected + "/" + "repo"
+		assert.Equal(t, expected, actual)
+	})
+}

cloner/cloner.go

@@ -1,13 +1,17 @@
 package cloner
 
 import (
+	"os"
+	"strings"
+
 	"github.com/joshmedeski/sesh/connector"
 	"github.com/joshmedeski/sesh/git"
+	"github.com/joshmedeski/sesh/model"
 )
 
 type Cloner interface {
 	// Clones a git repository
-	Clone(path string) (string, error)
+	Clone(opts model.GitCloneOptions) (string, error)
 }
 
 type RealCloner struct {
@@ -22,9 +26,42 @@ func NewCloner(connector connector.Connector, git git.Git) Cloner {
 	}
 }
 
-func (c *RealCloner) Clone(path string) (string, error) {
-	// TODO: clone
-	// TODO: get name of directory
-	// TODO: connect to that directory
+func (c *RealCloner) Clone(opts model.GitCloneOptions) (string, error) {
+	if _, err := c.git.Clone(opts.Repo, opts.CmdDir, opts.Dir); err != nil {
+		return "", err
+	}
+
+	path := getPath(opts)
+
+	newOpts := model.ConnectOpts{}
+	if _, err := c.connector.Connect(path, newOpts); err != nil {
+		return "", err
+	}
+
 	return "", nil
+
+}
+
+func getPath(opts model.GitCloneOptions) string {
+	var path string
+	if opts.CmdDir != "" {
+		path = opts.CmdDir
+	} else {
+		path, _ = os.Getwd()
+	}
+
+	if opts.Dir != "" {
+		path = path + "/" + opts.Dir
+	} else {
+		repoName := getRepoName(opts.Repo)
+		path = path + "/" + repoName
+	}
+	return path
+}
+
+func getRepoName(url string) string {
+	parts := strings.Split(url, "/")
+	lastPart := parts[len(parts)-1]
+	repoName := strings.TrimSuffix(lastPart, ".git")
+	return repoName
 }

cloner/mock_Cloner.go

@@ -7,7 +7,7 @@ import (
 type Git interface {
 	ShowTopLevel(name string) (bool, string, error)
 	GitCommonDir(name string) (bool, string, error)
-	Clone(name string) (string, error)
+	Clone(url string, cmdDir string, dir string) (string, error)
 }
 
 type RealGit struct {
@@ -34,8 +34,19 @@ func (g *RealGit) GitCommonDir(path string) (bool, string, error) {
 	return true, out, nil
 }
 
-func (g *RealGit) Clone(name string) (string, error) {
-	out, err := g.shell.Cmd("git", "clone", name)
+func (g *RealGit) Clone(url string, cmdDir string, dir string) (string, error) {
+	var out string
+	var err error
+
+	args := []string{"clone", url}
+	if cmdDir != "" {
+		args = append([]string{"-C", cmdDir}, args...)
+	}
+	if dir != "" {
+		args = append(args, dir)
+	}
+
+	out, err = g.shell.Cmd("git", args...)
 	if err != nil {
 		return "", err
 	}

git/git.go

@@ -1,12 +1,14 @@
 package seshcli
 
 import (
-	"fmt"
+	"errors"
 
+	"github.com/joshmedeski/sesh/cloner"
+	"github.com/joshmedeski/sesh/model"
 	cli "github.com/urfave/cli/v2"
 )
 
-func Clone() *cli.Command {
+func Clone(c cloner.Cloner) *cli.Command {
 	return &cli.Command{
 		Name:                   "clone",
 		Aliases:                []string{"cl"},
@@ -15,14 +17,28 @@ func Clone() *cli.Command {
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:    "cmdDir",
-				Aliases: []string{"d"},
+				Aliases: []string{"c"},
 				Usage:   "The directory to run the git command in",
 			},
+			&cli.StringFlag{
+				Name:    "dir",
+				Aliases: []string{"d"},
+				Usage:   "The name of the directory that git is creating",
+			},
 		},
 		Action: func(cCtx *cli.Context) error {
-			// TODO: implement clone command
-			fmt.Println("Clone command coming soon to sesh v2")
-			return nil
+
+			if cCtx.NArg() != 1 {
+				return errors.New("please provide url to clone")
+			}
+			repo := cCtx.Args().First()
+
+			opts := model.GitCloneOptions{CmdDir: cCtx.String("cmdDir"), Repo: repo, Dir: cCtx.String("dir")}
+			if _, err := c.Clone(opts); err != nil {
+				return err
+			} else {
+				return nil
+			}
 		},
 	}
 }