CLI no longer uses OS.execl to switch and attach built sessions

Author: tony

CHANGES

@@ -21,6 +21,8 @@ Here you can find the recent changes to tmuxp.
   ``target-window`` fix.
 - [internal] :class:`WorkspaceBuilder` now has ``.session`` attribute accessible
   publicly.
+- [cli] tmux will now use :meth:`Session.switch_client` and
+  :meth:`Session.attach_session` to open new sessions instead of ``os.exec``.
 
 2013-10-28
 ----------

tmuxp/cli.py

@@ -243,22 +243,23 @@ def load_workspace(config_file, args):
         builder.build()
 
         if 'TMUX' in os.environ:
-            if prompt_yes_no('Already inside TMUX, load session?'):
-                del os.environ['TMUX']
-                os.execl(tmux_bin, 'tmux', 'switch-client', '-t', sconfig[
-                         'session_name'])
+            if prompt_yes_no('Already inside TMUX, switch to session?'):
+                tmux_env = os.environ.pop('TMUX')
+                builder.session.switch_client()
 
-        os.execl(tmux_bin, 'tmux', 'attach-session', '-t', sconfig[
-                 'session_name'])
+                os.environ['TMUX'] = tmux_env
+                return
+            else:
+                sys.exit('Session created in detached state.')
+
+        builder.session.attach_session()
     except exc.TmuxSessionExists as e:
         if prompt_yes_no(e.message + ' Attach?'):
-            # TODO, do we need os.execl for this?
             if 'TMUX' in os.environ:
-                os.execl(tmux_bin, 'tmux', 'switch-client', '-t',
-                        sconfig['session_name'])
+                builder.session.switch_client()
+
             else:
-                os.execl(tmux_bin, 'tmux', 'attach-session', '-t',
-                        sconfig['session_name'])
+                builder.session.attach_session()
         return
     except Exception as e:
         logger.error(e)

tmuxp/workspacebuilder.py

@@ -112,13 +112,19 @@ def build(self, session=None):
                 )
 
             if self.server.has_session(self.sconf['session_name']):
+                self.session = self.server.findWhere(
+                    {
+                        'session_name': self.sconf['session_name']
+                    }
+                )
                 raise exc.TmuxSessionExists(
-                    'Session name %s is already running.' % self.sconf[
-                        'session_name']
+                    'Session name %s is already running.' %
+                    self.sconf['session_name']
                 )
             else:
                 session = self.server.new_session(
-                    session_name=self.sconf['session_name'])
+                    session_name=self.sconf['session_name']
+                )
 
             assert(self.sconf['session_name'] == session.get('session_name'))