feat: add startup command

Author: joshmedeski

cloner/mock_Cloner.go

@@ -8,6 +8,7 @@ import (
 	"github.com/joshmedeski/sesh/lister"
 	"github.com/joshmedeski/sesh/model"
 	"github.com/joshmedeski/sesh/namer"
+	"github.com/joshmedeski/sesh/startup"
 	"github.com/joshmedeski/sesh/tmux"
 	"github.com/joshmedeski/sesh/zoxide"
 	"github.com/stretchr/testify/assert"
@@ -19,6 +20,7 @@ func TestConfigStrategy(t *testing.T) {
 	mockHome := new(home.MockHome)
 	mockLister := new(lister.MockLister)
 	mockNamer := new(namer.MockNamer)
+	mockStartup := new(startup.MockStartup)
 	mockTmux := new(tmux.MockTmux)
 	mockZoxide := new(zoxide.MockZoxide)
 
@@ -28,6 +30,7 @@ func TestConfigStrategy(t *testing.T) {
 		mockHome,
 		mockLister,
 		mockNamer,
+		mockStartup,
 		mockTmux,
 		mockZoxide,
 	}

connector/config_test.go

@@ -21,15 +21,16 @@ func (c *RealConnector) Connect(name string, opts model.ConnectOpts) (string, er
 
 	for _, strategy := range strategies {
 		if connection, err := strategy(c, name); err != nil {
-		} else if connection.Found {
 			return "", fmt.Errorf("failed to establish connection: %w", err)
+		} else if connection.Found {
 			// TODO: allow CLI flag to disable zoxide and overwrite all settings?
 			// sesh connect --ignore-zoxide "dotfiles"
 			if connection.AddToZoxide {
 				c.zoxide.Add(connection.Session.Path)
 			}
 			if connection.New {
 				c.tmux.NewSession(connection.Session.Name, connection.Session.Path)
+				c.startup.Exec(connection.Session)
 			}
 			// TODO: configure the ability to create a session in a detached way (like update)
 			// TODO: configure the ability to create a popup instead of switching (with no tmux bar?)

connector/connect.go

@@ -6,6 +6,7 @@ import (
 	"github.com/joshmedeski/sesh/lister"
 	"github.com/joshmedeski/sesh/model"
 	"github.com/joshmedeski/sesh/namer"
+	"github.com/joshmedeski/sesh/startup"
 	"github.com/joshmedeski/sesh/tmux"
 	"github.com/joshmedeski/sesh/zoxide"
 )
@@ -15,13 +16,14 @@ type Connector interface {
 }
 
 type RealConnector struct {
-	config model.Config
-	dir    dir.Dir
-	home   home.Home
-	lister lister.Lister
-	namer  namer.Namer
-	tmux   tmux.Tmux
-	zoxide zoxide.Zoxide
+	config  model.Config
+	dir     dir.Dir
+	home    home.Home
+	lister  lister.Lister
+	namer   namer.Namer
+	startup startup.Startup
+	tmux    tmux.Tmux
+	zoxide  zoxide.Zoxide
 }
 
 func NewConnector(
@@ -30,6 +32,7 @@ func NewConnector(
 	home home.Home,
 	lister lister.Lister,
 	namer namer.Namer,
+	startup startup.Startup,
 	tmux tmux.Tmux,
 	zoxide zoxide.Zoxide,
 ) Connector {
@@ -39,6 +42,7 @@ func NewConnector(
 		home,
 		lister,
 		namer,
+		startup,
 		tmux,
 		zoxide,
 	}

connector/connector.go

@@ -8,6 +8,7 @@ import (
 	"github.com/joshmedeski/sesh/lister"
 	"github.com/joshmedeski/sesh/model"
 	"github.com/joshmedeski/sesh/namer"
+	"github.com/joshmedeski/sesh/startup"
 	"github.com/joshmedeski/sesh/tmux"
 	"github.com/joshmedeski/sesh/zoxide"
 	"github.com/stretchr/testify/assert"
@@ -19,6 +20,7 @@ func TestEstablishTmuxConnection(t *testing.T) {
 	mockHome := new(home.MockHome)
 	mockLister := new(lister.MockLister)
 	mockNamer := new(namer.MockNamer)
+	mockStartup := new(startup.MockStartup)
 	mockTmux := new(tmux.MockTmux)
 	mockZoxide := new(zoxide.MockZoxide)
 
@@ -28,6 +30,7 @@ func TestEstablishTmuxConnection(t *testing.T) {
 		mockHome,
 		mockLister,
 		mockNamer,
+		mockStartup,
 		mockTmux,
 		mockZoxide,
 	}

connector/tmux_test.go

@@ -22,9 +22,10 @@ func listConfig(l *RealLister) (model.SeshSessions, error) {
 				return model.SeshSessions{}, fmt.Errorf("couldn't expand home: %q", err)
 			}
 			directory[key] = model.SeshSession{
-				Src:  "config",
-				Name: session.Name,
-				Path: path,
+				Src:            "config",
+				Name:           session.Name,
+				Path:           path,
+				StartupCommand: session.StartupCommand,
 			}
 		}
 	}

lister/config.go

@@ -8,7 +8,8 @@ type (
 	}
 
 	DefaultSessionConfig struct {
-		StartupScript  string `toml:"startup_script"`
+		// TODO: mention breaking change in v2 release notes
+		// StartupScript  string `toml:"startup_script"`
 		StartupCommand string `toml:"startup_command"`
 		Tmuxp          string `toml:"tmuxp"`
 		Tmuxinator     string `toml:"tmuxinator"`

model/config.go

@@ -15,9 +15,10 @@ type (
 		Name string // The display name
 		Path string // The absolute directory path
 
-		Attached int     // Whether the session is currently attached
-		Windows  int     // The number of windows in the session
-		Score    float64 // The score of the session (from Zoxide)
+		StartupCommand string  // The command to run when the session is started
+		Attached       int     // Whether the session is currently attached
+		Windows        int     // The number of windows in the session
+		Score          float64 // The score of the session (from Zoxide)
 	}
 
 	SeshSrcs struct {

model/sesh_session.go

@@ -5,10 +5,7 @@ import "strings"
 // Gets the name from a git bare repository
 func gitBareName(n *RealNamer, path string) (string, error) {
 	var name string
-	isGit, commonDir, err := n.git.GitCommonDir(path)
-	if err != nil {
-		return "", err
-	}
+	isGit, commonDir, _ := n.git.GitCommonDir(path)
 	if isGit && strings.HasSuffix(commonDir, "/.bare") {
 		topLevelDir := strings.TrimSuffix(commonDir, "/.bare")
 		relativePath := strings.TrimPrefix(path, topLevelDir)

namer/git.go

@@ -38,23 +38,3 @@ func TestFromPath(t *testing.T) {
 		assert.Equal(t, "neovim", name)
 	})
 }
-
-func TestConvertToValidName(t *testing.T) {
-	t.Run("Test with dot", func(t *testing.T) {
-		input := "test.name"
-		want := "test_name"
-		assert.Equal(t, want, convertToValidName(input))
-	})
-
-	t.Run("Test with colon", func(t *testing.T) {
-		input := "test:name"
-		want := "test_name"
-		assert.Equal(t, want, convertToValidName(input))
-	})
-
-	t.Run("Test with multiple special characters", func(t *testing.T) {
-		input := "test.name:with.multiple"
-		want := "test_name_with_multiple"
-		assert.Equal(t, want, convertToValidName(input))
-	})
-}