more tmuxinator import tests

Author: tony

tmuxp/testsuite/test_config_tmuxinator.py

@@ -15,7 +15,7 @@
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')
 
 # https://github.com/aziz/tmuxinator
-
+# TODO: handle 'root' with a cd shell_command_before
 
 def tmuxinator_to_tmuxp(sconf):
     '''
@@ -28,12 +28,19 @@ def tmuxinator_to_tmuxp(sconf):
 
     if 'project_name' in sconf:
         tmuxp_config['session_name'] = sconf['project_name']
+    elif 'name' in sconf:
+        tmuxp_config['session_name'] = sconf['name']
     else:
         tmuxp_config['session_name'] = None
 
     if 'cli_args' in sconf:
         tmuxp_config['config'] = sconf['cli_args']
 
+        if '-f' in tmuxp_config['config']:
+            tmuxp_config['config'] = tmuxp_config['config'].replace('-f', '').strip()
+    elif 'tmux_options' in sconf:
+        tmuxp_config['config'] = sconf['tmux_options']
+
         if '-f' in tmuxp_config['config']:
             tmuxp_config['config'] = tmuxp_config['config'].replace('-f', '').strip()
 
@@ -45,7 +52,14 @@ def tmuxinator_to_tmuxp(sconf):
     if 'tabs' in sconf:
         sconf['windows'] = sconf.pop('tabs')
 
-    if 'pre' in sconf:
+    if 'pre' in sconf and 'pre_window' in sconf:
+        tmuxp_config['shell_command'] = sconf['pre']
+
+        if isinstance(sconf['pre'], basestring):
+            tmuxp_config['shell_command_before'] = [sconf['pre_window']]
+        else:
+            tmuxp_config['shell_command_before'] = sconf['pre_window']
+    elif 'pre' in sconf:
         if isinstance(sconf['pre'], basestring):
             tmuxp_config['shell_command_before'] = [sconf['pre']]
         else:
@@ -69,6 +83,10 @@ def tmuxinator_to_tmuxp(sconf):
                 windowdict['panes'] = [v]
                 tmuxp_config['windows'].append(windowdict)
                 continue
+            elif isinstance(v, list):
+                windowdict['panes'] = v
+                tmuxp_config['windows'].append(windowdict)
+                continue
 
             if 'pre' in v:
                 windowdict['shell_command_before'] = v['pre']
@@ -430,12 +448,95 @@ class TmuxinatoriSampleTest(unittest.TestCase):
         ]
     }
 
+    tmuxp_dict = {
+        'session_name': 'sample',
+        'socket_name': 'foo',
+        'config': '~/.tmux.mac.conf',
+        'shell_command': 'sudo /etc/rc.d/mysqld start',
+        'shell_command_before': [
+            'rbenv shell 2.0.0-p247'
+        ],
+        'windows': [
+            {
+                'window_name': 'editor',
+                'shell_command_before': [
+                    'echo "I get run in each pane, before each pane command!"',
+                    None
+                ],
+                'layout': 'main-vertical',
+                'panes': [
+                    'vim',
+                    None,
+                    'top'
+                ]
+            },
+            {
+                'window_name': 'shell',
+                'panes': [
+                    'git pull',
+                    'git merge'
+                ]
+            },
+            {
+                'window_name': 'guard',
+                'layout': 'tiled',
+                'shell_command_before': [
+                    'echo "I get run in each pane."',
+                    'echo "Before each pane command!"'
+                ],
+                'panes': [
+                    None,
+                    None,
+                    None
+                ]
+            },
+            {
+                'window_name': 'database',
+                'panes': [
+                    'bundle exec rails db'
+                ]
+            },
+            {
+                'window_name': 'server',
+                'panes': [
+                    'bundle exec rails s'
+                ]
+            },
+            {
+                'window_name': 'logs',
+                'panes': [
+                    'tail -f log/development.log'
+                ]
+            },
+            {
+                'window_name': 'console',
+                'panes': [
+                    'bundle exec rails c'
+                ]
+            },
+            {
+                'window_name': 'capistrano',
+                'panes': [
+                    None
+                ]
+            },
+            {
+                'window_name': 'server',
+                'panes': [
+                    'ssh user@example.com'
+                ]
+            }
+        ]
+    }
+
     def test_config_to_dict(self):
         self.maxDiff = None
         configparser = kaptan.Kaptan(handler='yaml')
         test_config = configparser.import_config(self.tmuxinator_yaml)
         yaml_to_dict = test_config.get()
         self.assertDictEqual(yaml_to_dict, self.tmuxinator_dict)
 
+        self.assertDictEqual(tmuxinator_to_tmuxp(self.tmuxinator_dict), self.tmuxp_dict)
+
 if __name__ == '__main__':
     unittest.main()