Skip to content

Commit c723816

Browse files
committed
doc updates
1 parent 402238e commit c723816

File tree

4 files changed

+64
-8
lines changed

4 files changed

+64
-8
lines changed

doc/about.rst

Lines changed: 55 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. module:: tmuxp
2+
13
.. _about:
24

35
=====
@@ -18,18 +20,65 @@ Interested in some kung-fu or joining the effort? :ref:`api` and
1820
License is `BSD-licensed`_. Code can be found at github at
1921
http://github.com/tony/tmuxp.
2022

21-
How is tmuxp different from teamocil and tmuxinator
22-
---------------------------------------------------
23+
Differences from tmuxinator / teamocil
24+
--------------------------------------
25+
26+
.. note::
27+
28+
If you use teamocli / tmuxinator and can clarify or add differences,
29+
please free to `edit this page`_ on github.
30+
31+
Similarities
32+
""""""""""""
33+
34+
**Load sessions** Loads tmux sessions from config
35+
36+
**YAML** Supports YAML format
37+
38+
**Inlining / shorthand configuration** All three support short-hand and
39+
simplified markup for panes that have one command.
40+
41+
Missing
42+
"""""""
43+
44+
**Stability** tmuxinator and teamocil are far more stable and
45+
well-developed than tmuxp.
46+
47+
**ERB / Template support** teamocil supports `ERB`_ markup.
48+
49+
**Version support** tmuxp only supports ``tmux >= 1.8``. Teamocil and
50+
tmuxinator may have support for earlier versions.
51+
52+
Differences
53+
"""""""""""
54+
55+
**Programming Language** python. teamocil and tmuxinator uses ruby.
56+
57+
**Internals** teamocil and tmuxinator pipe configurations into
58+
commands. tmuxp turns configuration into a live :class:`Session` object
59+
with access to all window and pane data. See :ref:`ORM_AL`.
60+
61+
**CLI** tmuxp's CLI can attach and kill sessions.
62+
63+
Additional Features
64+
"""""""""""""""""""
65+
66+
**Unit tests** Tests against live tmux version to test statefulness of
67+
tmux sessions, windows and panes. See :ref:`travis`.
68+
69+
**Import config** import configs from Teamocil / Tmuxinator
70+
71+
**JSON config** JSON config support
2372

24-
teamocil and tmuxinator both build tmux workspaces from yaml. tmuxp
25-
also handles building workspaces.
73+
**Conversion**
2674

27-
teamocil and tmuxinator do this by turning YAML directly into tmux
28-
commands.
75+
**Session freezing** Supports session freezing into YAML and JSON format.
2976

3077
.. _attempt at 1.7 test: https://travis-ci.org/tony/tmuxp/jobs/12348263
3178
.. _kaptan: https://github.com/emre/kaptan
3279
.. _unittest: http://docs.python.org/2/library/unittest.html
3380
.. _BSD-licensed: http://opensource.org/licenses/BSD-2-Clause
3481
.. _tmuxinator: https://github.com/aziz/tmuxinator
3582
.. _teamocil: https://github.com/remiprev/teamocil
83+
.. _ERB: http://ruby-doc.org/stdlib-2.0.0/libdoc/erb/rdoc/ERB.html
84+
.. _edit this page: https://github.com/tony/tmuxp/edit/master/doc/about.rst

doc/developing.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ this will load the ``.tmuxp.yaml`` in the root of the project.
224224
.. literalinclude:: ../.tmuxp.yaml
225225
:language: yaml
226226

227+
.. _travis:
228+
227229
Travis CI
228230
"""""""""
229231

doc/index.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ tmuxp, a novel approach to managing `tmux(1)`_ workspaces through
1010
python objects. Features:
1111

1212
- Load + switch to new session from inside tmux.
13-
- bash / zsh / tcsh completion
13+
- :ref:`bash / zsh / tcsh completion <bash_completion>`.
1414
- JSON, YAML and `python dict`_ configuration.
1515
- Support for pre-commands with ``shell_command_before`` to load
1616
virtualenv / rvm / any other commands.
1717
- Session resuming from config file if already running.
18-
- Per-project tmux sessions
18+
- Per-project tmux sessions, load directly from config file.
19+
`` $ tmuxp load /full/file/path.json ``
1920
- uses tmux 1.8's ``pane_id``, ``window_id`` and ``session_id`` to build
2021
create python objects to build workspaces with the freshest data.
22+
- (experimental) Import configs from `teamocil`_ and `tmuxinator`_.
23+
- (experimental) Freezing sessions.
2124

2225
tmuxp works in 3 ways:
2326

doc/quickstart.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ This creates your tmuxp session.
4545

4646
.. seealso:: :ref:`examples`
4747

48+
.. _bash_completion:
49+
4850
Bash completion
4951
"""""""""""""""
5052

0 commit comments

Comments
 (0)