Fix teamocil import. Add start_directory support for teamocil.

Author: tony

tmuxp/cli.py

@@ -452,7 +452,7 @@ def command_import_teamocil(args):
         if os.path.exists(configfile):
             print(configfile)
             configparser.import_config(configfile)
-            newconfig = config.import_tmuxinator(configparser.get())
+            newconfig = config.import_teamocil(configparser.get())
             configparser.import_config(newconfig)
         else:
             sys.exit('File not found: %s' % configfile)

tmuxp/config.py

@@ -395,6 +395,9 @@ def import_teamocil(sconf):
     else:
         tmuxp_config['session_name'] = None
 
+    if 'root' in sconf:
+        tmuxp_config['start_directory'] = sconf.pop('root')
+
     tmuxp_config['windows'] = []
 
     for w in sconf['windows']:
@@ -413,6 +416,9 @@ def import_teamocil(sconf):
                 for b in w['filters']['after']:
                     windowdict['shell_command_after'] = w['filters']['after']
 
+        if 'root' in w:
+            windowdict['start_directory'] = w.pop('root')
+
         if 'splits' in w:
             w['panes'] = w.pop('splits')
 

tmuxp/testsuite/test_config_teamocil.py

@@ -50,6 +50,7 @@ class TeamocilTest(TestCase):
             {
                 'window_name': 'sample-two-panes',
                 'layout': 'even-horizontal',
+                'start_directory': '~/Code/sample/www',
                 'panes': [
                     {
                         'shell_command': [
@@ -124,6 +125,7 @@ class Teamocil2Test(TestCase):
             {
                 'window_name': 'sample-four-panes',
                 'layout': 'tiled',
+                'start_directory': '~/Code/sample/www',
                 'panes': [
                     {
                         'shell_command': 'pwd'
@@ -206,6 +208,7 @@ class Teamocil3Test(TestCase):
             {
                 'window_name': 'my-first-window',
                 'layout': 'even-vertical',
+                'start_directory': "~/Projects/foo-www",
                 'shell_command_before': 'rbenv local 2.0.0-p0',
                 'shell_command_after': 'echo \'I am done initializing this pane.\'',
                 'panes': [
@@ -272,6 +275,7 @@ class Teamocil4Test(TestCase):
         'windows': [
             {
                 'window_name': 'erb-example',
+                'start_directory': "<%= ENV['MY_PROJECT_ROOT'] %>",
                 'panes': [
                     {
                         'shell_command': 'pwd'
@@ -530,6 +534,7 @@ class TeamocilLayoutsTest(TestCase):
             'windows': [
                 {
                     'window_name': 'foo',
+                    'start_directory': '/foo',
                     'clear': True,
                     'layout': 'tiled',
                     'panes': [
@@ -543,6 +548,7 @@ class TeamocilLayoutsTest(TestCase):
                 },
                 {
                     'window_name': 'bar',
+                    'start_directory': '/bar',
                     'panes': [
                         {
                             'shell_command': [
@@ -566,6 +572,7 @@ class TeamocilLayoutsTest(TestCase):
             'windows': [
                 {
                     'window_name': 'foo',
+                    'start_directory': '/foo',
                     'shell_command_before': [
                         'echo first before filter',
                         'echo second before filter',
@@ -592,6 +599,7 @@ class TeamocilLayoutsTest(TestCase):
             'windows': [
                 {
                     'window_name': 'foo',
+                    'start_directory': '/foo',
                     'clear': True,
                     'layout': 'tiled',
                     'panes': [
@@ -605,6 +613,7 @@ class TeamocilLayoutsTest(TestCase):
                 },
                 {
                     'window_name': 'bar',
+                    'start_directory': '/bar',
                     'panes': [
                         {
                             'shell_command': [