Relative start_directory paths. When loading, start_directory is relative to the config file

Author: tony

examples/start_directory.json

@@ -2,36 +2,70 @@
   "windows": [
     {
       "panes": [
-        "pwd", 
-        "echo 'it trickles down from session-level'"
+        {
+          "shell_command": [
+            "echo \"\\033c", 
+            "it trickles down from session-level\""
+          ]
+        }, 
+        "pwd"
       ], 
       "window_name": "should be /var/"
     }, 
     {
       "panes": [
-        "pwd", 
-        "echo 'window start_directory concatenates to session start_directory'", 
-        "echo 'if it is not absolute'"
+        {
+          "shell_command": [
+            "echo '\\033c", 
+            "window start_directory concatenates to session start_directory", 
+            "if it is not absolute'"
+          ]
+        }, 
+        "pwd"
       ], 
       "start_directory": "log", 
       "window_name": "should be /var/log"
     }, 
     {
       "panes": [
-        "pwd", 
-        "echo 'has precedence'", 
-        "echo 'remember to quote ~ in YAML'"
+        {
+          "shell_command": [
+            "echo \\\\033c ~ has precedence. note: remember to quote ~ in YAML"
+          ]
+        }, 
+        "pwd"
       ], 
       "start_directory": "~", 
       "window_name": "should be ~"
     }, 
     {
       "panes": [
-        "pwd", 
-        "echo 'absolute paths also have precedence'"
+        "echo '\\033c absolute paths also have precedence.'", 
+        "pwd"
       ], 
       "start_directory": "/proc", 
       "window_name": "should be /proc"
+    }, 
+    {
+      "panes": [
+        {
+          "shell_command": [
+            "echo '\\033c", 
+            "./ is relative to config file location", 
+            "../ will be parent of config file", 
+            "./test will be \\\"test\\\" dir inside dir of config file'"
+          ]
+        }, 
+        {
+          "shell_command": [
+            "echo '\\033c", 
+            "This way you can load up workspaces from projects and maintain", 
+            "relative paths.'"
+          ]
+        }
+      ], 
+      "start_directory": "./", 
+      "window_name": "should be config's dir"
     }
   ], 
   "session_name": "start directory", 

examples/start_directory.yaml

@@ -3,22 +3,38 @@ start_directory: /var/
 windows:
   - window_name: should be /var/
     panes:
-    - pwd
-    - echo 'it trickles down from session-level'
+      - shell_command:
+        - echo "\033c
+        - it trickles down from session-level"
+      - pwd
   - window_name: should be /var/log
     start_directory: log
     panes:
+      - shell_command:
+        - echo '\033c
+        - window start_directory concatenates to session start_directory
+        - if it is not absolute'
       - pwd
-      - echo 'window start_directory concatenates to session start_directory'
-      - echo 'if it is not absolute'
   - window_name: should be ~
     start_directory: '~'
     panes:
+    - shell_command:
+      - 'echo \\033c ~ has precedence. note: remember to quote ~ in YAML'
     - pwd
-    - echo 'has precedence'
-    - echo 'remember to quote ~ in YAML'
   - window_name: should be /proc
     start_directory: /proc
     panes:
+    - echo '\033c absolute paths also have precedence.'
     - pwd
-    - echo 'absolute paths also have precedence'
+  - window_name: should be config's dir
+    start_directory: ./
+    panes:
+      - shell_command:
+        - echo '\033c
+        - ./ is relative to config file location
+        - ../ will be parent of config file
+        - ./test will be \"test\" dir inside dir of config file'
+      - shell_command:
+        - echo '\033c
+        - This way you can load up workspaces from projects and maintain
+        - relative paths.'

tmuxp/cli.py

@@ -226,7 +226,7 @@ def load_workspace(config_file, args):
 
     sconfig = kaptan.Kaptan()
     sconfig = sconfig.import_config(config_file).get()
-    sconfig = config.expand(sconfig)
+    sconfig = config.expand(sconfig, os.path.dirname(config_file))
     sconfig = config.trickle(sconfig)
 
     t = Server(

tmuxp/testsuite/test_config.py

@@ -257,14 +257,12 @@ def test_config(self):
         """Expand shell commands from string to list."""
         self.maxDiff = None
         test_config = config.expand(self.before_config)
-        logger.error(test_config)
         self.assertDictEqual(test_config, self.after_config)
 
 
 class InlineTest(unittest.TestCase):
 
-    '''tests for :meth:`config.inline()`.
-    '''
+    """Tests for :meth:`config.inline()`."""
 
     before_config = {
         'session_name': 'sampleconfig',
@@ -339,21 +337,15 @@ class InlineTest(unittest.TestCase):
     }
 
     def test_config(self):
-        '''
-        config.inline() inlines shell commands from list to string where applicable
-        '''
+        """:meth:`config.inline()` shell commands list to string where applicable."""
+
         self.maxDiff = None
         test_config = config.inline(self.before_config)
         self.assertDictEqual(test_config, self.after_config)
 
 
 class InheritanceTest(unittest.TestCase):
-
-    '''
-    test config inheritance for the nested 'start_command'
-
-    format for tests will be
-    '''
+    """Test config inheritance for the nested 'start_command'."""
 
     config_before = {
         'session_name': 'sampleconfig',