Fix config.trickle to pass down start_directory properly. Assure that StartDirectory works correctly.

tony · tony · commit 5d66126342a8 · 2013-10-31T10:23:56.000+08:00
diff --git a/tmuxp/config.py b/tmuxp/config.py
@@ -190,7 +190,11 @@ def trickle(config):
     ``shell_command_before``.
     '''
 
+    session_start_directory = config['start_directory'] if 'start_directory' in config else 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 []
diff --git a/tmuxp/testsuite/test_config.py b/tmuxp/testsuite/test_config.py
@@ -144,8 +144,9 @@ class ExpandTest(unittest.TestCase):
             'window_name': 'editor',
             'panes': [
                 {
-                    'start_directory': '~', 'shell_command': ['vim'],
-                    },  {
+                    'shell_command': ['vim'],
+                },
+                {
                     'shell_command': 'cowsay "hey"'
                 },
             ],
@@ -154,7 +155,7 @@ class ExpandTest(unittest.TestCase):
                 'window_name': 'logging',
                 'panes': [
                     {'shell_command': ['tail -F /var/log/syslog'],
-                     'start_directory':'/var/log'}
+                     }
                 ]
             },
             {
@@ -181,7 +182,7 @@ class ExpandTest(unittest.TestCase):
                 'window_name': 'editor',
                 'panes': [
                     {
-                        'start_directory': '~', 'shell_command': ['vim'],
+                        'shell_command': ['vim'],
                     },  {
                         'shell_command': ['cowsay "hey"']
                     },
@@ -192,7 +193,7 @@ class ExpandTest(unittest.TestCase):
                 'window_name': 'logging',
                 'panes': [
                     {'shell_command': ['tail -F /var/log/syslog'],
-                     'start_directory':'/var/log'}
+                     }
                 ]
             },
             {
@@ -215,6 +216,7 @@ def test_config(self):
         '''
         expands shell commands from string to list
         '''
+        self.maxDiff = None
         test_config = config.expand(self.before_config)
         self.assertDictEqual(test_config, self.after_config)
 
@@ -426,7 +428,7 @@ class ShellCommandBeforeTest(unittest.TestCase):
                 'shell_command_before': 'source .env/bin/activate',
                 'panes': [
                     {
-                        'start_directory': '~', 'shell_command': ['vim'],
+                        'shell_command': ['vim'],
                     },  {
                         'shell_command_before': ['rbenv local 2.0.0-p0'], 'shell_command': ['cowsay "hey"']
                     },
@@ -438,17 +440,17 @@ class ShellCommandBeforeTest(unittest.TestCase):
                 'window_name': 'logging',
                 'panes': [
                     {'shell_command': ['tail -F /var/log/syslog'],
-                        'start_directory':'/var/log'},
+                        },
                     {
-                        'start_directory': '/var/log'}
+                        }
                 ]
             },
             {
                 'window_name': 'shufu',
                 'panes': [
                     {
                         'shell_command_before': ['rbenv local 2.0.0-p0'],
-                        'shell_command': ['htop'], 'start_directory': '/etc/'}
+                        'shell_command': ['htop'], }
                 ]
             },
             {
@@ -473,7 +475,7 @@ class ShellCommandBeforeTest(unittest.TestCase):
                 'shell_command_before': ['source .env/bin/activate'],
                 'panes': [
                     {
-                        'start_directory': '~', 'shell_command': ['vim'],
+                        'shell_command': ['vim'],
                     },  {
                         'shell_command_before': ['rbenv local 2.0.0-p0'], 'shell_command': ['cowsay "hey"']
                     },
@@ -485,17 +487,17 @@ class ShellCommandBeforeTest(unittest.TestCase):
                 'window_name': 'logging',
                 'panes': [
                     {'shell_command': ['tail -F /var/log/syslog'],
-                        'start_directory':'/var/log'},
+                        },
                     {
-                        'start_directory': '/var/log'}
+                        }
                 ]
             },
             {
                 'window_name': 'shufu',
                 'panes': [
                     {
                         'shell_command_before': ['rbenv local 2.0.0-p0'],
-                        'shell_command': ['htop'], 'start_directory': '/etc/'}
+                        'shell_command': ['htop'],}
                 ]
             },
             {
@@ -522,7 +524,6 @@ class ShellCommandBeforeTest(unittest.TestCase):
                 'shell_command_before': ['source .env/bin/activate'],
                 'panes': [
                     {
-                        'start_directory': '~',
                         'shell_command': ['source .env/bin/activate', 'vim'],
                     },  {
                         'shell_command_before': ['rbenv local 2.0.0-p0'],
@@ -536,29 +537,33 @@ class ShellCommandBeforeTest(unittest.TestCase):
             },
             {
                 'shell_command_before': ['rbenv local 2.0.0-p0'],
+                'start_directory': '/',
                 'window_name': 'logging',
                 'panes': [
                     {'shell_command': ['rbenv local 2.0.0-p0', 'tail -F /var/log/syslog'],
-                        'start_directory':'/var/log'},
+                        },
                     {
-                        'start_directory': '/var/log', 'shell_command': ['rbenv local 2.0.0-p0']}
+                        'shell_command': ['rbenv local 2.0.0-p0']}
                 ]
             },
             {
+                'start_directory': '/',
                 'window_name': 'shufu',
                 'panes': [
                     {
                         'shell_command_before': ['rbenv local 2.0.0-p0'],
-                        'shell_command': ['rbenv local 2.0.0-p0', 'htop'], 'start_directory': '/etc/'}
+                        'shell_command': ['rbenv local 2.0.0-p0', 'htop'],}
                 ]
             },
             {
+                'start_directory': '/',
                 'options': {'automatic_rename': True, },
                 'panes': [
                     {'shell_command': ['htop']}
                 ]
             },
             {
+                'start_directory': '/',
                 'panes': [
                     {'shell_command': ['top']}
                 ]
diff --git a/tmuxp/testsuite/test_workspacebuilder.py b/tmuxp/testsuite/test_workspacebuilder.py
@@ -271,7 +271,7 @@ def test_automatic_rename_option(self):
 class StartDirectoryTest(TmuxTestCase):
     yaml_config = '''
     session_name: sampleconfig
-    #start_directory: '/home/tony'
+    start_directory: '/var'
     windows:
     - window_name: test
       start_directory: '/var/log'
@@ -293,20 +293,31 @@ class StartDirectoryTest(TmuxTestCase):
         - echo "hey"
       - shell_command:
         - echo "moo"
+    - window_name: testsa3
+      layout: main-horizontal
+      panes:
+      - shell_command:
+        - pwd
+      - shell_command:
+        - echo "hey"
+      - shell_command:
+        - echo "moo3"
     '''
 
     def test_start_directory(self):
 
         sconfig = kaptan.Kaptan(handler='yaml')
         sconfig = sconfig.import_config(self.yaml_config).get()
+        sconfig = config.expand(sconfig)
+        sconfig = config.trickle(sconfig)
 
         builder = WorkspaceBuilder(sconf=sconfig)
         builder.build(session=self.session)
 
         assert(self.session == builder.session)
         for window in self.session.windows:
             for p in window.panes:
-                self.assertTrue(any(p.get('pane_start_path', ['/var/log', '/dev/'])))
+                self.assertTrue(any(p.get('pane_start_path', ['/var/log', '/dev/', '/var/'])))
 
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,9 @@ class ExpandTest(unittest.TestCase):`
`144`	`144`	`'window_name': 'editor',`
`145`	`145`	`'panes': [`
`146`	`146`	`{`
`147`		`- 'start_directory': '~', 'shell_command': ['vim'],`
`148`		`- }, {`
	`147`	`+ 'shell_command': ['vim'],`
	`148`	`+ },`
	`149`	`+ {`
`149`	`150`	`'shell_command': 'cowsay "hey"'`
`150`	`151`	`},`
`151`	`152`	`],`
`@@ -154,7 +155,7 @@ class ExpandTest(unittest.TestCase):`
`154`	`155`	`'window_name': 'logging',`
`155`	`156`	`'panes': [`
`156`	`157`	`{'shell_command': ['tail -F /var/log/syslog'],`
`157`		`- 'start_directory':'/var/log'}`
	`158`	`+ }`
`158`	`159`	`]`
`159`	`160`	`},`
`160`	`161`	`{`
`@@ -181,7 +182,7 @@ class ExpandTest(unittest.TestCase):`
`181`	`182`	`'window_name': 'editor',`
`182`	`183`	`'panes': [`
`183`	`184`	`{`
`184`		`- 'start_directory': '~', 'shell_command': ['vim'],`
	`185`	`+ 'shell_command': ['vim'],`
`185`	`186`	`}, {`
`186`	`187`	`'shell_command': ['cowsay "hey"']`
`187`	`188`	`},`
`@@ -192,7 +193,7 @@ class ExpandTest(unittest.TestCase):`
`192`	`193`	`'window_name': 'logging',`
`193`	`194`	`'panes': [`
`194`	`195`	`{'shell_command': ['tail -F /var/log/syslog'],`
`195`		`- 'start_directory':'/var/log'}`
	`196`	`+ }`
`196`	`197`	`]`
`197`	`198`	`},`
`198`	`199`	`{`
`@@ -215,6 +216,7 @@ def test_config(self):`
`215`	`216`	`'''`
`216`	`217`	`expands shell commands from string to list`
`217`	`218`	`'''`
	`219`	`+ self.maxDiff = None`
`218`	`220`	`test_config = config.expand(self.before_config)`
`219`	`221`	`self.assertDictEqual(test_config, self.after_config)`
`220`	`222`
`@@ -426,7 +428,7 @@ class ShellCommandBeforeTest(unittest.TestCase):`
`426`	`428`	`'shell_command_before': 'source .env/bin/activate',`
`427`	`429`	`'panes': [`
`428`	`430`	`{`
`429`		`- 'start_directory': '~', 'shell_command': ['vim'],`
	`431`	`+ 'shell_command': ['vim'],`
`430`	`432`	`}, {`
`431`	`433`	`'shell_command_before': ['rbenv local 2.0.0-p0'], 'shell_command': ['cowsay "hey"']`
`432`	`434`	`},`
`@@ -438,17 +440,17 @@ class ShellCommandBeforeTest(unittest.TestCase):`
`438`	`440`	`'window_name': 'logging',`
`439`	`441`	`'panes': [`
`440`	`442`	`{'shell_command': ['tail -F /var/log/syslog'],`
`441`		`- 'start_directory':'/var/log'},`
	`443`	`+ },`
`442`	`444`	`{`
`443`		`- 'start_directory': '/var/log'}`
	`445`	`+ }`
`444`	`446`	`]`
`445`	`447`	`},`
`446`	`448`	`{`
`447`	`449`	`'window_name': 'shufu',`
`448`	`450`	`'panes': [`
`449`	`451`	`{`
`450`	`452`	`'shell_command_before': ['rbenv local 2.0.0-p0'],`
`451`		`- 'shell_command': ['htop'], 'start_directory': '/etc/'}`
	`453`	`+ 'shell_command': ['htop'], }`
`452`	`454`	`]`
`453`	`455`	`},`
`454`	`456`	`{`
`@@ -473,7 +475,7 @@ class ShellCommandBeforeTest(unittest.TestCase):`
`473`	`475`	`'shell_command_before': ['source .env/bin/activate'],`
`474`	`476`	`'panes': [`
`475`	`477`	`{`
`476`		`- 'start_directory': '~', 'shell_command': ['vim'],`
	`478`	`+ 'shell_command': ['vim'],`
`477`	`479`	`}, {`
`478`	`480`	`'shell_command_before': ['rbenv local 2.0.0-p0'], 'shell_command': ['cowsay "hey"']`
`479`	`481`	`},`
`@@ -485,17 +487,17 @@ class ShellCommandBeforeTest(unittest.TestCase):`
`485`	`487`	`'window_name': 'logging',`
`486`	`488`	`'panes': [`
`487`	`489`	`{'shell_command': ['tail -F /var/log/syslog'],`
`488`		`- 'start_directory':'/var/log'},`
	`490`	`+ },`
`489`	`491`	`{`
`490`		`- 'start_directory': '/var/log'}`
	`492`	`+ }`
`491`	`493`	`]`
`492`	`494`	`},`
`493`	`495`	`{`
`494`	`496`	`'window_name': 'shufu',`
`495`	`497`	`'panes': [`
`496`	`498`	`{`
`497`	`499`	`'shell_command_before': ['rbenv local 2.0.0-p0'],`
`498`		`- 'shell_command': ['htop'], 'start_directory': '/etc/'}`
	`500`	`+ 'shell_command': ['htop'],}`
`499`	`501`	`]`
`500`	`502`	`},`
`501`	`503`	`{`
`@@ -522,7 +524,6 @@ class ShellCommandBeforeTest(unittest.TestCase):`
`522`	`524`	`'shell_command_before': ['source .env/bin/activate'],`
`523`	`525`	`'panes': [`
`524`	`526`	`{`
`525`		`- 'start_directory': '~',`
`526`	`527`	`'shell_command': ['source .env/bin/activate', 'vim'],`
`527`	`528`	`}, {`
`528`	`529`	`'shell_command_before': ['rbenv local 2.0.0-p0'],`
`@@ -536,29 +537,33 @@ class ShellCommandBeforeTest(unittest.TestCase):`
`536`	`537`	`},`
`537`	`538`	`{`
`538`	`539`	`'shell_command_before': ['rbenv local 2.0.0-p0'],`
	`540`	`+ 'start_directory': '/',`
`539`	`541`	`'window_name': 'logging',`
`540`	`542`	`'panes': [`
`541`	`543`	`{'shell_command': ['rbenv local 2.0.0-p0', 'tail -F /var/log/syslog'],`
`542`		`- 'start_directory':'/var/log'},`
	`544`	`+ },`
`543`	`545`	`{`
`544`		`- 'start_directory': '/var/log', 'shell_command': ['rbenv local 2.0.0-p0']}`
	`546`	`+ 'shell_command': ['rbenv local 2.0.0-p0']}`
`545`	`547`	`]`
`546`	`548`	`},`
`547`	`549`	`{`
	`550`	`+ 'start_directory': '/',`
`548`	`551`	`'window_name': 'shufu',`
`549`	`552`	`'panes': [`
`550`	`553`	`{`
`551`	`554`	`'shell_command_before': ['rbenv local 2.0.0-p0'],`
`552`		`- 'shell_command': ['rbenv local 2.0.0-p0', 'htop'], 'start_directory': '/etc/'}`
	`555`	`+ 'shell_command': ['rbenv local 2.0.0-p0', 'htop'],}`
`553`	`556`	`]`
`554`	`557`	`},`
`555`	`558`	`{`
	`559`	`+ 'start_directory': '/',`
`556`	`560`	`'options': {'automatic_rename': True, },`
`557`	`561`	`'panes': [`
`558`	`562`	`{'shell_command': ['htop']}`
`559`	`563`	`]`
`560`	`564`	`},`
`561`	`565`	`{`
	`566`	`+ 'start_directory': '/',`
`562`	`567`	`'panes': [`
`563`	`568`	`{'shell_command': ['top']}`
`564`	`569`	`]`