!squash almost finished

Author: tony

tmuxp/cli/debug_info.py

@@ -1,7 +1,16 @@
+import os
 import pathlib
+import platform
+import sys
 
 import click
 
+from libtmux import __version__ as libtmux_version
+from libtmux.common import get_version, tmux_cmd, which
+
+from .. import __version__
+from .utils import tmuxp_echo
+
 tmuxp_path = pathlib.Path(__file__).parent.parent
 
 

tmuxp/cli/edit.py

@@ -1,6 +1,9 @@
+import os
+import subprocess
+
 import click
 
-from .utils import ConfigPath
+from .utils import ConfigPath, scan_config
 
 
 @click.command(name="edit", short_help="Run $EDITOR on config.")
@@ -9,4 +12,4 @@ def command_edit_config(config):
     config = scan_config(config)
 
     sys_editor = os.environ.get("EDITOR", "vim")
-    call([sys_editor, config])
+    subprocess.call([sys_editor, config])

tmuxp/cli/freeze.py

@@ -1,9 +1,15 @@
+import os
+import sys
+
 import click
+import kaptan
 
 from libtmux.server import Server
 
 from .. import config, util
 from ..workspacebuilder import freeze
+from . import exc
+from .utils import _validate_choices, get_abs_path, get_config_dir
 
 
 @click.command(name="freeze")

tmuxp/cli/import_config.py

@@ -8,6 +8,43 @@
 from .utils import ConfigPath, _validate_choices, get_abs_path, tmuxp_echo
 
 
+def get_tmuxinator_dir():
+    """
+    Return tmuxinator configuration directory.
+
+    Checks for ``TMUXINATOR_CONFIG`` environmental variable.
+
+    Returns
+    -------
+    str :
+        absolute path to tmuxinator config directory
+
+    See Also
+    --------
+    :meth:`tmuxp.config.import_tmuxinator`
+    """
+    if "TMUXINATOR_CONFIG" in os.environ:
+        return os.path.expanduser(os.environ["TMUXINATOR_CONFIG"])
+
+    return os.path.expanduser("~/.tmuxinator/")
+
+
+def get_teamocil_dir():
+    """
+    Return teamocil configuration directory.
+
+    Returns
+    -------
+    str :
+        absolute path to teamocil config directory
+
+    See Also
+    --------
+    :meth:`tmuxp.config.import_teamocil`
+    """
+    return os.path.expanduser("~/.teamocil/")
+
+
 def _resolve_path_no_overwrite(config):
     path = get_abs_path(config)
     if os.path.exists(path):

tmuxp/cli/ls.py

@@ -3,7 +3,7 @@
 import click
 
 from .constants import VALID_CONFIG_DIR_FILE_EXTENSIONS
-from .utils import ConfigPath, _validate_choices, get_config_dir
+from .utils import get_config_dir
 
 
 @click.command(name="ls", short_help=f"List configured sessions in {get_config_dir()}.")

tmuxp/cli/shell.py

@@ -1,5 +1,12 @@
+import os
+
 import click
 
+from libtmux import Server
+
+from .. import util
+from .._compat import PY3, PYMINOR
+
 
 @click.command(name="shell")
 @click.argument("session_name", nargs=1, required=False)

tmuxp/cli/utils.py

@@ -54,43 +54,6 @@ def get_config_dir():
     return path
 
 
-def get_tmuxinator_dir():
-    """
-    Return tmuxinator configuration directory.
-
-    Checks for ``TMUXINATOR_CONFIG`` environmental variable.
-
-    Returns
-    -------
-    str :
-        absolute path to tmuxinator config directory
-
-    See Also
-    --------
-    :meth:`tmuxp.config.import_tmuxinator`
-    """
-    if "TMUXINATOR_CONFIG" in os.environ:
-        return os.path.expanduser(os.environ["TMUXINATOR_CONFIG"])
-
-    return os.path.expanduser("~/.tmuxinator/")
-
-
-def get_teamocil_dir():
-    """
-    Return teamocil configuration directory.
-
-    Returns
-    -------
-    str :
-        absolute path to teamocil config directory
-
-    See Also
-    --------
-    :meth:`tmuxp.config.import_teamocil`
-    """
-    return os.path.expanduser("~/.teamocil/")
-
-
 def _validate_choices(options):
     """
     Callback wrapper for validating click.prompt input.