Add TmuxCommand, wrap tmux_cmd in old behavior

Author: tony

libtmux/common.py

@@ -142,7 +142,7 @@ def show_environment(self, name=None):
         return vars_dict
 
 
-class tmux_cmd(object):
+class TmuxCommand(object):
 
     """
     :term:`tmux(1)` command via :py:mod:`subprocess`.
@@ -183,8 +183,8 @@ class tmux_cmd(object):
     Notes
     -----
 
-    .. versionchanged:: 0.8
-        Renamed from ``tmux`` to ``tmux_cmd``.
+    .. versionadded:: 0.8.4
+        Wrap to split execution from command from instance of it
     """
 
     def __init__(self, *args, **kwargs):
@@ -234,6 +234,38 @@ def execute(self):
         return self
 
 
+def tmux_cmd(*args, **kwargs):
+    """Wrapper around TmuxCommand. Executes instantly.
+
+    Examples
+    --------
+
+    .. code-block:: python
+
+        proc = tmux_cmd('new-session', '-s%' % 'my session')
+
+        if proc.stderr:
+            raise exc.LibTmuxException(
+                'Command: %s returned error: %s' % (proc.cmd, proc.stderr)
+            )
+
+        print('tmux command returned %s' % proc.stdout)
+
+    Equivalent to:
+
+    .. code-block:: bash
+
+        $ tmux new-session -s my session
+
+    Notes
+    -----
+
+    .. versionchanged:: 0.8
+        Renamed from ``tmux`` to ``tmux_cmd``.
+    """
+    return TmuxCommand(*args, **kwargs).execute()
+
+
 class TmuxMappingObject(MutableMapping):
 
     r"""Base: :py:class:`MutableMapping`.
@@ -458,7 +490,7 @@ def get_version():
     :class:`distutils.version.LooseVersion`
         tmux version according to :func:`libtmux.common.which`'s tmux
     """
-    proc = tmux_cmd("-V").execute()
+    proc = tmux_cmd("-V")
     if proc.stderr:
         if proc.stderr[0] == "tmux: unknown option -- V":
             if sys.platform.startswith("openbsd"):  # openbsd has no tmux -V

libtmux/server.py

@@ -10,10 +10,10 @@
 from . import exc, formats
 from .common import (
     EnvironmentMixin,
+    TmuxCommand,
     TmuxRelationalObject,
     has_gte_version,
     session_check_name,
-    tmux_cmd,
 )
 from .session import Session
 
@@ -123,7 +123,7 @@ def cmd(self, *args, **kwargs):
             else:
                 raise ValueError("Server.colors must equal 88 or 256")
 
-        return tmux_cmd(*args, **kwargs).execute()
+        return TmuxCommand(*args, **kwargs).execute()
 
     def _list_sessions(self):
         """
@@ -132,7 +132,7 @@ def _list_sessions(self):
         Retrieved from ``$ tmux(1) list-sessions`` stdout.
 
         The :py:obj:`list` is derived from ``stdout`` in
-        :class:`common.tmux_cmd` which wraps :py:class:`subprocess.Popen`.
+        :class:`common.TmuxCommand` which wraps :py:class:`subprocess.Popen`.
 
         Returns
         -------
@@ -197,7 +197,7 @@ def _list_windows(self):
         Retrieved from ``$ tmux(1) list-windows`` stdout.
 
         The :py:obj:`list` is derived from ``stdout`` in
-        :class:`common.tmux_cmd` which wraps :py:class:`subprocess.Popen`.
+        :class:`common.TmuxCommand` which wraps :py:class:`subprocess.Popen`.
 
         Returns
         -------
@@ -260,7 +260,7 @@ def _list_panes(self):
         Retrieved from ``$ tmux(1) list-panes`` stdout.
 
         The :py:obj:`list` is derived from ``stdout`` in
-        :class:`util.tmux_cmd` which wraps :py:class:`subprocess.Popen`.
+        :class:`util.TmuxCommand` which wraps :py:class:`subprocess.Popen`.
 
         Returns
         -------

tests/test_common.py

@@ -27,8 +27,9 @@
 version_regex = re.compile(r"([0-9]\.[0-9])|(master)")
 
 
-def test_allows_master_version(monkeypatch):
-    def mock_tmux_cmd(param):
+@pytest.mark.parametrize("executor", ["mock_tmux_cmd", "mock_TmuxCommand"])
+def test_allows_master_version(monkeypatch, executor):
+    def mock_TmuxCommand(param):
         class Hi(object):
             stdout = ["tmux master"]
             stderr = None
@@ -38,7 +39,16 @@ def execute(self):
 
         return Hi()
 
-    monkeypatch.setattr(libtmux.common, "tmux_cmd", mock_tmux_cmd)
+    def mock_tmux_cmd(param):
+        class Hi(object):
+            stdout = ["tmux master"]
+            stderr = None
+
+        return Hi()
+
+    mock_cmd = locals()[executor]
+
+    monkeypatch.setattr(libtmux.common, "tmux_cmd", mock_cmd)
 
     assert has_minimum_version()
     assert has_gte_version(TMUX_MIN_VERSION)