start_directory example showing concatenation. Tests for it. Fix #11.

Author: tony

CHANGES

@@ -11,6 +11,9 @@ Here you can find the recent changes to tmuxp.
 - [internal] :class:`Server` support for ``-2`` with ``colors=256`` and
   ``colors=8``.
 - [cli] ``$ tmuxp -2`` for forcing 256 colors and ``tmuxp -8`` for forcing 88.
+- [config] [tests] Concatenation with ``start_directory`` via
+  :meth:`Config.trickle()` if window ``start_directory`` is alphanumeric /
+  relative (doesn't start with ``/``). See :ref:`Examples` in *start directory*.
 
 2013-10-31
 ----------

examples/start_directory.json

@@ -5,17 +5,35 @@
         "pwd", 
         "echo 'it trickles down from session-level'"
       ], 
+      "window_name": "should be /var/"
+    }, 
+    {
+      "panes": [
+        "pwd", 
+        "echo 'window start_directory concatenates to session start_directory'", 
+        "echo 'if it is not absolute'"
+      ], 
+      "start_directory": "log", 
       "window_name": "should be /var/log"
     }, 
     {
       "panes": [
         "pwd", 
-        "echo 'has precedence'"
+        "echo 'has precedence'", 
+        "echo 'remember to quote ~ in YAML'"
+      ], 
+      "start_directory": "~", 
+      "window_name": "should be ~"
+    }, 
+    {
+      "panes": [
+        "pwd", 
+        "echo 'absolute paths also have precedence'"
       ], 
-      "start_directory": "$HOME", 
-      "window_name": "should be $HOME"
+      "start_directory": "/proc", 
+      "window_name": "should be /proc"
     }
   ], 
   "session_name": "start directory", 
-  "start_directory": "/var/log"
+  "start_directory": "/var/"
 }

examples/start_directory.yaml

@@ -1,12 +1,24 @@
 session_name: start directory
-start_directory: /var/log
+start_directory: /var/
 windows:
-  - window_name: should be /var/log
+  - window_name: should be /var/
     panes:
     - pwd
     - echo 'it trickles down from session-level'
-  - window_name: should be $HOME
-    start_directory: $HOME
+  - window_name: should be /var/log
+    start_directory: log
+    panes:
+      - pwd
+      - echo 'window start_directory concatenates to session start_directory'
+      - echo 'if it is not absolute'
+  - window_name: should be ~
+    start_directory: '~'
     panes:
     - pwd
     - echo 'has precedence'
+    - echo 'remember to quote ~ in YAML'
+  - window_name: should be /proc
+    start_directory: /proc
+    panes:
+    - pwd
+    - echo 'absolute paths also have precedence'

tmuxp/cli.py

@@ -232,7 +232,6 @@ def load_workspace(config_file, args):
     t = Server(
         socket_name=args.socket_name,
         socket_path=args.socket_path,
-        colors=args.colors
     )
 
     try:
@@ -831,7 +830,8 @@ def get_parser():
     parser.add_argument(
         '-v', '--version', action='version',
         version='tmuxp %s' % __version__,
-        help='Prints the tmuxp version')
+        help='Prints the tmuxp version',
+    )
 
     return parser
 

tmuxp/config.py

@@ -190,24 +190,38 @@ def trickle(config):
     ``shell_command_before``.
     '''
 
-    session_start_directory = config['start_directory'] if 'start_directory' in config else None
+    if 'start_directory' in config:
+        session_start_directory = config['start_directory']
+    else:
+        session_start_directory = None
 
     for windowconfig in config['windows']:
-        if not 'start_directory' in windowconfig and session_start_directory:
-            windowconfig['start_directory'] = session_start_directory
-        for paneconfig in windowconfig['panes']:
-            commands_before = config[
-                'shell_command_before'] if 'shell_command_before' in config else []
-            commands_before.extend(windowconfig[
-                                   'shell_command_before']) if 'shell_command_before' in windowconfig else None
-            commands_before.extend(paneconfig[
-                                   'shell_command_before']) if 'shell_command_before' in paneconfig else None
 
+        # Prepend start_directory to relative window commands
+        if session_start_directory:
+
+            if not 'start_directory' in windowconfig:
+                windowconfig['start_directory'] = session_start_directory
+            else:
+                if not any(windowconfig['start_directory'].startswith(a) for a in ['~', '/']):
+                    windowconfig['start_directory'] = os.path.join(session_start_directory, windowconfig['start_directory'])
+
+        for paneconfig in windowconfig['panes']:
+            commands_before = []
+
+            # Prepend shell_command_before to commands
+            if 'shell_command_before' in config:
+                commands_before = config['shell_command_before']
+            if 'shell_command_before' in windowconfig:
+                commands_before.extend(windowconfig['shell_command_before'])
+            if 'shell_command_before' in paneconfig:
+                commands_before.extend(paneconfig['shell_command_before'])
             if 'shell_command' not in paneconfig:
                 paneconfig['shell_command'] = list()
 
-            commands_before.extend(paneconfig[
-                                   'shell_command']) if paneconfig['shell_command'] else None
+            if paneconfig['shell_command']:
+                commands_before.extend(paneconfig['shell_command'])
+
             paneconfig['shell_command'] = commands_before
 
     return config

tmuxp/session.py

@@ -59,7 +59,6 @@ def by(val, *args):
             return list(filter(by, self.server._sessions))[0]
         except IndexError as e:
             logger.error(e)
-            logger.error(self._session_name)
             logger.error(self.server._sessions)
 
     def tmux(self, *args, **kwargs):

tmuxp/testsuite/test_config.py

@@ -583,6 +583,80 @@ def test_shell_command_before(self):
         self.assertDictEqual(test_config, self.config_after)
 
 
+
+class TrickleRelativeStartDirectory(unittest.TestCase):
+    config_expanded = {  # shell_command_before is string in some areas
+        'session_name': 'sampleconfig',
+        'start_directory': '/var',
+        'windows': [
+            {
+                'window_name': 'editor',
+                'start_directory': 'log',
+                'panes': [
+                    {
+                        'shell_command': ['vim'],
+                    },
+                    {
+                        'shell_command': ['cowsay "hey"']
+                    },
+                ],
+                'layout': 'main-verticle'
+            },
+            {
+                'window_name': 'logging',
+                'start_directory': '~',
+                'panes': [
+                    {
+                        'shell_command': ['tail -F /var/log/syslog'],
+                    },
+                    {
+                    }
+                ]
+            },
+         ]
+    }
+
+    config_after = {  # shell_command_before is string in some areas
+        'session_name': 'sampleconfig',
+        'start_directory': '/var',
+        'windows': [
+            {
+                'window_name': 'editor',
+                'start_directory': '/var/log',
+                'panes': [
+                    {
+                        'shell_command': ['vim'],
+                    },
+                    {
+                        'shell_command': [
+                            'cowsay "hey"'
+                        ]
+                    },
+                ],
+                'layout': 'main-verticle'
+            },
+            {
+                'start_directory': '~',
+                'window_name': 'logging',
+                'panes': [
+                    {
+                        'shell_command': ['tail -F /var/log/syslog'],
+                    },
+                    {
+                        'shell_command': []
+                    }
+                ]
+            },
+         ]
+    }
+
+    def test_shell_command_before(self):
+        self.maxDiff = None
+
+        test_config = config.trickle(self.config_expanded)
+        self.maxDiff = None
+        self.assertDictEqual(test_config, self.config_after)
+
 class ConfigConsistency(unittest.TestCase):
 
     delete_this = '''

tmuxp/window.py

@@ -278,7 +278,7 @@ def move_window(self, destination):
         proc = self.tmux(
             'move-window',
             '-s%s:%s' % (self.get('session_id'), self.get('window_index')),
-            '-t%s' % destination,
+            '-t%s:%s' % (self.get('session_id'), destination),
         )
 
         if proc.stderr:

tmuxp/workspacebuilder.py

@@ -127,6 +127,7 @@ def build(self, session=None):
                 )
 
             assert(self.sconf['session_name'] == session.get('session_name'))
+            assert(len(self.sconf['session_name']) > 0)
 
         self.session = session
 
@@ -165,6 +166,7 @@ def iter_create_windows(self, s):
             if i == int(1):  # if first window, use window 1
                 w1 = s.attached_window()
                 w1.move_window(99)
+                pass
             w = s.new_window(
                 window_name=window_name,
                 start_directory=wconf['start_directory'] if 'start_directory' in wconf else None,
@@ -246,8 +248,6 @@ def freeze(session):
                    'cd ' + p.get('pane_current_path'))
             pconf['shell_command'].append(p.get('pane_current_command'))
             wconf['panes'].append(pconf)
-            # logger.error(p)
-            # logger.error(dict(p))
 
         sconf['windows'].append(wconf)