Skip to content

Commit 3f5fdd6

Browse files
authored
Merge pull request #639 from tmux-python/bug-start-directory
Fixes #631
2 parents 6469857 + 086e118 commit 3f5fdd6

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

CHANGES

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ current
88
-------
99
- *Insert changes/features/fixes for next release here*
1010

11+
tmuxp 1.5.8 (2020-10-31)
12+
-----------------------
13+
- :issue: `631` Passes start_directory through to new tmux session
14+
1115
tmuxp 1.5.7 (2020-10-31)
1216
------------------------
1317
- :issue:`637` Support for loading directories with periods in it

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ skip-string-normalization = true
33

44
[tool.poetry]
55
name = "tmuxp"
6-
version = "1.5.7post0"
6+
version = "1.5.8"
77
description = "tmux session manager"
88
license = "MIT"
99
authors = ["Tony Narlock <[email protected]>"]

tests/test_cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ def test_import_tmuxinator(cli_args, inputs, tmpdir, monkeypatch):
522522
(['freeze'], ['\n', 'y\n', './exists.yaml\n', './la.yaml\n', 'y\n']), # Exists
523523
( # Create a new one
524524
['freeze', 'mysession', '--force'],
525-
['\n', 'y\n', './la.yaml\n', 'y\n']
525+
['\n', 'y\n', './la.yaml\n', 'y\n'],
526526
),
527527
( # Imply current session if not entered
528528
['freeze', '--force'],
@@ -554,7 +554,7 @@ def test_freeze(server, cli_args, inputs, tmpdir, monkeypatch):
554554
),
555555
( # Imply current session if not entered
556556
['freeze', '--force'],
557-
['\n', 'y\n', './exists.yaml\n', 'y\n']
557+
['\n', 'y\n', './exists.yaml\n', 'y\n'],
558558
),
559559
],
560560
)

tmuxp/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__title__ = 'tmuxp'
22
__package_name__ = 'tmuxp'
3-
__version__ = '1.5.7post0'
3+
__version__ = '1.5.8'
44
__description__ = 'tmux session manager'
55
__email__ = '[email protected]'
66
__author__ = 'Tony Narlock'

tmuxp/workspacebuilder.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,15 @@ def build(self, session=None):
137137
'Session name %s is already running.' % self.sconf['session_name']
138138
)
139139
else:
140-
session = self.server.new_session(
141-
session_name=self.sconf['session_name']
142-
)
140+
if 'start_directory' in self.sconf:
141+
session = self.server.new_session(
142+
session_name=self.sconf['session_name'],
143+
start_directory=self.sconf['start_directory'],
144+
)
145+
else:
146+
session = self.server.new_session(
147+
session_name=self.sconf['session_name']
148+
)
143149

144150
assert self.sconf['session_name'] == session.name
145151
assert len(self.sconf['session_name']) > 0

0 commit comments

Comments
 (0)