Skip to content

Commit 044c63f

Browse files
committed
v0.0.16
1 parent 1651012 commit 044c63f

File tree

4 files changed

+35
-7
lines changed

4 files changed

+35
-7
lines changed

CHANGES

+9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ tmuxp Changelog
33

44
Here you can find the recent changes to tmuxp.
55

6+
2013-10-27
7+
----------
8+
9+
- [cli] `argcomplete`_ overhaul for CLI bash completion.
10+
- [cli] ``tmuxp load``, ``tmuxp convert`` and ``tmuxp import`` now support
11+
relative and full filenames in addition to searching the config
12+
directory.
13+
614
2013-10-26
715
----------
816

@@ -244,3 +252,4 @@ initial
244252

245253
.. _tmuxinator: https://github.com/aziz/tmuxinator
246254
.. _teamocil: https://github.com/remiprev/teamocil
255+
.. _argcomplete: https://github.com/kislyuk/argcomplete

README.rst

+25-4
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,19 @@ Install ``tmuxp``:
3232
3333
See: `Quickstart`_
3434

35-
tmux bash completion
36-
""""""""""""""""""""
35+
CLI Commands
36+
""""""""""""
3737

3838
tmuxp uses ``switch-client`` for you if already in a TMUX client.
3939

4040
.. code-block:: bash
4141
4242
$ tmuxp attach-session<tab> # current sessions
43+
44+
Kill session
45+
46+
.. code-block:: bash
47+
4348
$ tmuxp kill-session<tab> # current sessions
4449
4550
Load a session configuration from a YAML or JSON file.
@@ -54,7 +59,15 @@ Convert a session config JSON <=> YAML:
5459
5560
$ tmuxp convert<tab> # configs in config dir, current directory
5661
57-
See: `installing bash completion`_
62+
Experimental: Import configuration from `teamocil`_ or `tmuxinator`_:
63+
64+
.. code-block:: bash
65+
66+
$ tmuxp import teamocil<tab> # configs in ~/.teamocil dir
67+
$ tmuxp import tmuxinator<tab> # configs in ~/.tmuxinator dir
68+
69+
See `installing bash completion`_ to get bash, zsh and tcsh completion
70+
working on your machine.
5871

5972
load tmux sessions from yaml and json
6073
"""""""""""""""""""""""""""""""""""""
@@ -65,12 +78,20 @@ Load from ``~/.tmuxp.yaml`` or ``~/.tmuxp.json`` in current directory.
6578
6679
$ tmuxp load .
6780
68-
Load ``myconfig.yaml``.
81+
Load ``myconfig.yaml`` from ``~/.tmuxp``
6982

7083
.. code-block:: bash
7184
7285
$ tmuxp load myconfig.yaml
7386
87+
Load a relative or full config file (bash complete supports this too)
88+
89+
.. code-block:: bash
90+
91+
$ tmuxp load ./myconfig.yaml
92+
$ tmuxp load ../myconfig.yaml
93+
$ tmuxp load /var/www/mywebproject/myconfig.yaml
94+
7495
``$ mkdir ~/.tmuxp`` and make a file ``~/.tmuxp/test.yaml``.
7596

7697
.. code-block:: yaml

tmuxp/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020

2121
import logging
2222

23-
__version__ = '0.0.15-dev'
23+
__version__ = '0.0.16-dev'

tmuxp/cli.py

-2
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,6 @@ def cli_parser():
468468
will check launch a ~/.pullv.yaml / ~/.pullv.json from the cwd.
469469
will also check for any ./*.yaml and ./*.json.
470470
''' % (cwd_dir + '/', config_dir),
471-
#).completer = ConfigCompleter
472-
#).completer = argcomplete.completers.FilesCompleter(allowednames=('.yaml', '.json'), directories=False)
473471
).completer = ConfigCompleter(allowednames=('.yaml', '.json'), directories=False)
474472
load.set_defaults(callback=subcommand_load)
475473

0 commit comments

Comments
 (0)