midway commit: pane_start_path / start_directory support

Author: tony

CHANGES

@@ -13,7 +13,8 @@ Here you can find the recent changes to tmuxp.
 - [cli] ``tmuxp freeze <filename>`` experimental
 - [freeze] [tests] tmuxp now has experimental support for freezing live
   sessions.
-- [internals] :meth:`Window.kill_window()`
+- [internal] :meth:`Window.kill_window()`
+- [internal] support for ``start_directory`` (work in progress)
 
 2013-10-29
 ----------

tmuxp/session.py

@@ -100,7 +100,6 @@ def switch_client(self, target_session=None):
         if proc.stderr:
             raise Exception(proc.stderr)
 
-
     def rename_session(self, new_name):
         '''rename session and return new :class:`Session` object
 
@@ -121,6 +120,7 @@ def rename_session(self, new_name):
 
     def new_window(self,
                    window_name=None,
+                   start_directory=None,
                    attach=True):
         '''
         ``$ tmux new-window``
@@ -134,10 +134,12 @@ def new_window(self,
 
         .. code-block:: bash
 
-            $ tmux new-window -n <window_name>
+            $ tmux new-window -n <window_name> -c <start_directory>
 
         :type window_name: string
-
+        :param start_directory: specifies the working directory in which the
+            new created.
+        :type start_directory: string
         :param attach: make new window the current window after creating it,
                        default True.
         :param type: bool
@@ -149,14 +151,22 @@ def new_window(self,
         window_args = (
             '-t%s' % self.get('session_id'),
             '-P',
-            '-F%s' % '\t'.join(tmux_formats),  # output
         )
 
+        if not attach:
+            window_args += ('-d',)
+
+        if start_directory:
+            # start_directory = pipes.quote(start_directory)
+            logger.error(start_directory)
+            window_args += ('-c %s' % start_directory,)
+
         if window_name:
             window_args += ('-n%s' % window_name,)
 
-        if not attach:
-            window_args += ('-d',)
+        window_args += (
+            '-F%s' % '\t'.join(tmux_formats),  # output
+        )
 
         proc = self.tmux('new-window', *window_args)
 

tmuxp/testsuite/test_config.py

@@ -158,6 +158,7 @@ class ExpandTest(unittest.TestCase):
                 ]
             },
             {
+                'start_directory': '/var/log',
                 'options': {'automatic_rename': True, },
                 'panes': [
                     {'shell_command': 'htop'},
@@ -195,6 +196,7 @@ class ExpandTest(unittest.TestCase):
                 ]
             },
             {
+                'start_directory': '/var/log',
                 'options': {'automatic_rename': True},
                 'panes': [
                     {'shell_command': ['htop']},

tmuxp/testsuite/test_workspacebuilder.py

@@ -26,14 +26,12 @@ class TwoPaneTest(TmuxTestCase):
       panes:
       - shell_command:
         - vim
-        start_directory: '~'
       - shell_command:
         - echo "hey"
       window_name: editor
     - panes:
       - shell_command:
         - tail -F /var/log/syslog
-        start_directory: /var/log
       window_name: logging
     - window_name: test
       panes:
@@ -72,7 +70,6 @@ class ThreePaneTest(TmuxTestCase):
       panes:
       - shell_command:
         - vim
-        start_directory: '~'
       - shell_command:
         - echo "hey"
       - shell_command:
@@ -114,7 +111,6 @@ class FocusAndPaneIndexTest(TmuxTestCase):
       panes:
       - shell_command:
         - vim
-        start_directory: '~'
       - shell_command:
         - echo "hey"
       - shell_command:
@@ -125,8 +121,7 @@ class FocusAndPaneIndexTest(TmuxTestCase):
       panes:
       - shell_command:
         - vim
-        start_directory: '~'
-        focus: true
+        rocus: true
       - shell_command:
         - echo "hey"
       - shell_command:
@@ -273,5 +268,40 @@ def test_automatic_rename_option(self):
         self.assertNotEqual(w.get('window_name'), 'man')
 
 
+class StartDirectoryTest(TmuxTestCase):
+
+    yaml_config = '''
+    session_name: sampleconfig
+    start_directory: '~'
+    windows:
+    - window_name: test
+      start_directory: /var/log
+      layout: main-horizontal
+      panes:
+      - shell_command:
+        - vim
+      - shell_command:
+        - echo "hey"
+      - shell_command:
+        - echo "moo"
+    '''
+
+    def test_start_directory(self):
+        sconfig = kaptan.Kaptan(handler='yaml')
+        sconfig = sconfig.import_config(self.yaml_config).get()
+        #sconfig = config.expand(sconfig)
+
+        builder = WorkspaceBuilder(sconf=sconfig)
+        builder.build(session=self.session)
+
+        assert(self.session == builder.session)
+        logger.error(self.session)
+        self.assertEqual(1, len(self.session.windows))
+        for window in self.session.windows:
+            for p in window.panes:
+                logger.error(dict(p))
+                logger.error(p.get('pane_start_path'))
+                self.assertEqual('/var/log', p.get('pane_start_path'))
+
 if __name__ == '__main__':
     unittest.main()

tmuxp/util.py

@@ -69,6 +69,9 @@ def __init__(self, *args, **kwargs):
         self.stderr = stderr.decode().split('\n')
         self.stderr = list(filter(None, self.stderr))  # filter empty values
 
+        if 'new-window' in cmd:
+            logger.error(' '.join(cmd))
+
         if 'has-session' in cmd and len(self.stderr):
             if not self.stdout:
                 self.stdout = self.stderr[0]

tmuxp/workspacebuilder.py

@@ -161,18 +161,19 @@ def iter_create_windows(self, s):
             else:
                 window_name = wconf['window_name']
 
+            w1 = None
             if i == int(1):  # if first window, use window 1
-                # w = s.select_window(1)
-                w = s.attached_window()
-                w = w.rename_window(window_name)
-            else:
-                w = s.new_window(
-                    window_name=window_name,
-                    attach=False  # do not move to the new window
-                )
-
+                w1 = s.attached_window()
+            w = s.new_window(
+                window_name=window_name,
+                start_directory=wconf['start_directory'] if 'start_directory' in wconf else None,
+                attach=False  # do not move to the new window
+            )
+
+            if i == int(1) and w1:  # if first window, use window 1
+                w1.kill_window()
             assert(isinstance(w, Window))
-
+            s.server._update_windows()
             if 'options' in wconf and isinstance(wconf['options'], dict):
                 for key, val in wconf['options'].items():
                     w.set_window_option(key, val)