attach-session will attach-session if outside tmux, and switch-client if inside. Wire in kill-session to tmuxp kill-session.

Author: tony

CHANGES

@@ -8,7 +8,8 @@ Here you can find the recent changes to tmuxp.
 
 - [cli] zsh/bash/tcsh completion improvements for tab-completion options
 - [cli] tmuxp ``kill-session`` with tab-completion.
-- [cli] tmuxp ``attach-session`` with tab-completion.
+- [cli] tmuxp ``attach-session`` with tab-completion. Attach session will
+  ``switch-client`` for you if you are inside of of a tmux client.
 - [cli] tmuxp ``load`` for loading configs.
 - [tests] unit test fixes.
 

setup.py

@@ -2,7 +2,7 @@
 tmuxp
 -----
 
-A Pythonic ORM Toolkit for managing tmux(1) workspaces.
+Manage tmux workspaces from JSON and YAML, pythonic API, shell completion.
 
 
 """
@@ -39,7 +39,8 @@ def requirements(f):
     license='BSD',
     author='Tony Narlock',
     author_email='tony@git-pull.com',
-    description='Manage and build tmux workspaces.',
+    description='Manage tmux workspaces from JSON and YAML, pythonic API, '
+                'shell completion',
     long_description=open('README.rst').read(),
     packages=['tmuxp', 'tmuxp.testsuite'],
     include_package_data=True,

tmuxp/cli.py

@@ -137,7 +137,6 @@ def build_workspace(config_file, args):
         return
 
 
-
 def subcommand_load(args):
     if args.list_configs:
         startup(config_dir)
@@ -177,42 +176,44 @@ def subcommand_load(args):
                 build_workspace(file_user, args)
             else:
                 logger.error('%s not found.' % configfile)
-    else:
-        parser.print_help()
 
 
 def subcommand_attach_session(args):
-    #print('attac session')
-    for session_name in args.session_name:
-        print(session_name)
+    commands = []
+    try:
+        ctext = args.session_name[0]
+    except IndexError as e:
+        return
 
-    def session_complete(command, commands, ctext):
-        if ctext.startswith(command + ' '):
-            commands[:] = []
-            ctext_attach = ctext.replace(command + ' ', '')
+    t = Server()
+    try:
+        session = [s for s in t.sessions if s.get('session_name') == ctext][0]
+    except IndexError as e:
+        print('Session not found.')
+        return
 
-            sessions = [s.get('session_name') for s in t._sessions]
-            commands.extend([c for c in sessions if ctext_attach in c])
+    if 'TMUX' in os.environ:
+        del os.environ['TMUX']
+        session.switch_client()
+        print('Inside tmux client, switching client.')
+    else:
+        session.attach_session()
+        print('Attaching client.')
 
-def subcommand_kill_session(args):
-    #print('kill session')
-    #print(args)
-    #print(type(args.session_name))
-    #print(args.session_name)
 
+def subcommand_kill_session(args):
     commands = []
     ctext = args.session_name[0]
 
-    def session_complete(command, commands, ctext):
-        if ctext.startswith(command + ' '):
-            commands[:] = []
-            ctext_attach = ctext.replace(command + ' ', '')
-
-            sessions = [s.get('session_name') for s in t._sessions]
-            commands.extend([c for c in sessions if ctext_attach in c])
+    t = Server()
+    sessions = [s for s in t.sessions if s.get('session_name') == ctext]
 
-    print(' \n'.join(commands))
+    if (len(sessions) == 1):
+        proc = sessions[0].kill_session()
+        if proc.stderr:
+            print(proc.stderr)
 
+        print(proc.stdout)
 
 
 def cli_parser():
@@ -225,8 +226,8 @@ def cli_parser():
 
     parser = argparse.ArgumentParser()
     subparsers = parser.add_subparsers(title='subcommands',
-                                        description='valid subcommands',
-                                        help='additional help')
+                                       description='valid subcommands',
+                                       help='additional help')
 
     kill_session = subparsers.add_parser('kill-session')
     kill_session.set_defaults(callback=subcommand_kill_session)
@@ -238,10 +239,16 @@ def cli_parser():
         default=None,
     )
 
-
     attach_session = subparsers.add_parser('attach-session')
     attach_session.set_defaults(callback=subcommand_attach_session)
 
+    attach_session.add_argument(
+        dest='session_name',
+        nargs='*',
+        type=str,
+        default=None,
+    )
+
     load = subparsers.add_parser('load')
 
     load.add_argument(
@@ -265,7 +272,6 @@ def cli_parser():
     )
     load.set_defaults(callback=subcommand_load)
 
-
     parser.add_argument('--log-level', dest='log_level', default='INFO',
                         metavar='log-level',
                         help='Log level e.g. INFO, DEBUG, ERROR')
@@ -280,9 +286,9 @@ def cli_parser():
         '-v', '--version', dest='version', action='store_true',
         help='Prints the tmuxp version')
 
-
     return parser
 
+
 def main():
 
     parser = cli_parser()
@@ -298,9 +304,9 @@ def main():
 
     if args.callback is subcommand_load:
         subcommand_load(args)
-    if args.callback is subcommand_attach_session:
+    elif args.callback is subcommand_attach_session:
         subcommand_attach_session(args)
-    if args.callback is subcommand_kill_session:
+    elif args.callback is subcommand_kill_session:
         subcommand_kill_session(args)
     else:
         if args.version:
@@ -309,7 +315,6 @@ def main():
         parser.print_help()
 
 
-
 def complete(cline, cpoint):
 
     parser = argparse.ArgumentParser()
@@ -353,20 +358,21 @@ def session_complete(command, commands, ctext):
             sessions = [s.get('session_name') for s in t._sessions]
             commands.extend([c for c in sessions if ctext_subargs in c])
 
-            #commands = [c for c in commands if ctext_subcommand_args in c]
-            #commands = [c for c in commands if c.startswith(ctext_subargs)]
+            # commands = [c for c in commands if ctext_subcommand_args in c]
+            # commands = [c for c in commands if c.startswith(ctext_subargs)]
 
     def config_complete(command, commands, ctext):
         if ctext.startswith(command + ' '):
             commands[:] = []
             ctext_subargs = ctext.replace(command + ' ', '')
             configs = []
             configs += ['./' + c for c in config.in_cwd()]
-            #configs += config.in_cwd()
-            configs += [os.path.join(config_dir, c) for c in config.in_dir(config_dir)]
-            #configs += config.in_dir(config_dir)
+            # configs += config.in_cwd()
+            configs += [os.path.join(config_dir, c)
+                        for c in config.in_dir(config_dir)]
+            # configs += config.in_dir(config_dir)
             configs += ['./' + c for c in config.in_dir(cwd_dir)]
-            #configs += config.in_dir(cwd_dir)
+            # configs += config.in_dir(cwd_dir)
             commands += [c for c in configs if c.startswith(ctext_subargs)]
 
     session_complete('attach-session', commands, ctext)

tmuxp/session.py

@@ -68,6 +68,42 @@ def tmux(self, *args, **kwargs):
         #    kwargs['-t'] = self.get['session_id']
         return self.server.tmux(*args, **kwargs)
 
+    def attach_session(self, target_session=None):
+        '''
+        ``$ tmux attach-session`` aka alias: ``$ tmux attach``
+
+        :param: target_session: str. name of the session. fnmatch(3) works.
+        '''
+        proc = self.tmux('attach-session', '-t%s' % self.get('session_id'))
+
+        if proc.stderr:
+            raise Exception(proc.stderr)
+
+    def kill_session(self, target_session=None):
+        '''
+        ``$ tmux kill-session``
+
+        :param: target_session: str. note this accepts fnmatch(3). 'asdf' will
+                                kill asdfasd
+        '''
+        proc = self.tmux('kill-session', '-t%s' % self.get('session_id'))
+
+        if proc.stderr:
+            raise Exception(proc.stderr)
+
+    def switch_client(self, target_session=None):
+        '''
+        ``$ tmux kill-session``
+
+        :param: target_session: str. note this accepts fnmatch(3). 'asdf' will
+                                kill asdfasd
+        '''
+        proc = self.tmux('switch-client', '-t%s' % self.get('session_id'))
+
+        if proc.stderr:
+            raise Exception(proc.stderr)
+
+
     def rename_session(self, new_name):
         '''rename session and return new :class:`Session` object