!squash more

Author: tony

tests/test_cli.py

@@ -13,21 +13,17 @@
 import libtmux
 from libtmux.common import has_lt_version
 from libtmux.exc import LibTmuxException
-from tmuxp import config, exc
-from tmuxp.cli import load as cli
+from tmuxp import cli, config, exc
+from tmuxp.cli.debug_info import command_debug_info
 from tmuxp.cli.load import (
-    ConfigPath,
     _load_append_windows_to_current_session,
     _load_attached,
     _reattach,
-    command_debug_info,
-    command_ls,
-    get_config_dir,
-    is_pure_name,
     load_plugins,
     load_workspace,
-    scan_config,
 )
+from tmuxp.cli.ls import command_ls
+from tmuxp.cli.utils import ConfigPath, get_config_dir, is_pure_name, scan_config
 from tmuxp.workspacebuilder import WorkspaceBuilder
 
 from .constants import FIXTURE_PATH

tests/test_workspacebuilder.py

@@ -13,7 +13,7 @@
 from libtmux.common import has_gte_version
 from libtmux.test import retry, temp_session
 from tmuxp import config, exc
-from tmuxp.cli import load_plugins
+from tmuxp.cli.load import load_plugins
 from tmuxp.workspacebuilder import WorkspaceBuilder
 
 from .constants import EXAMPLE_PATH, FIXTURE_PATH

tmuxp/__init__.py

@@ -8,6 +8,7 @@
 :license: MIT, see LICENSE for details
 
 """
+
 from . import cli, config, util
 from .__about__ import (
     __author__,

tmuxp/cli/__init__.py

@@ -5,12 +5,19 @@
 
 """
 import logging
+import os
+import sys
 
 import click
 
+from libtmux.common import has_minimum_version
+from libtmux.exc import TmuxCommandNotFound
+
+from .. import exc
 from ..__about__ import __version__
 from ..log import setup_logger
 from .load import command_load
+from .utils import tmuxp_echo
 
 log = logging.getLogger(__name__)
 

tmuxp/cli/config.py

@@ -0,0 +1 @@
+VALID_CONFIG_DIR_FILE_EXTENSIONS = [".yaml", ".yml", ".json"]

tmuxp/cli/constants.py

@@ -1,3 +1,10 @@
+import pathlib
+
+import click
+
+tmuxp_path = pathlib.Path(__file__).parent.parent
+
+
 @click.command(name="debug-info", short_help="Print out all diagnostic info")
 def command_debug_info():
     """

tmuxp/cli/debug_info.py

@@ -1,3 +1,8 @@
+import click
+
+from .utils import ConfigPath
+
+
 @click.command(name="edit", short_help="Run $EDITOR on config.")
 @click.argument("config", type=ConfigPath(exists=True), nargs=1)
 def command_edit_config(config):

tmuxp/cli/edit.py

@@ -1,3 +1,11 @@
+import click
+
+from libtmux.server import Server
+
+from .. import config, util
+from ..workspacebuilder import freeze
+
+
 @click.command(name="freeze")
 @click.argument("session_name", nargs=1, required=False)
 @click.option("-S", "socket_path", help="pass-through for tmux -S")

tmuxp/cli/freeze.py

@@ -1,4 +1,21 @@
-@cli.group(name="import")
+import os
+import sys
+
+import click
+import kaptan
+
+from .. import config
+from .utils import ConfigPath, _validate_choices, get_abs_path, tmuxp_echo
+
+
+def _resolve_path_no_overwrite(config):
+    path = get_abs_path(config)
+    if os.path.exists(path):
+        raise click.exceptions.UsageError("%s exists. Pick a new filename." % path)
+    return path
+
+
+@click.group(name="import")
 def import_config_cmd():
     """Import a teamocil/tmuxinator config."""
 
@@ -53,6 +70,56 @@ def import_config(configfile, importfunc):
         sys.exit()
 
 
+@import_config_cmd.command(
+    name="tmuxinator", short_help="Convert and import a tmuxinator config."
+)
+@click.argument(
+    "configfile", type=ConfigPath(exists=True, config_dir=get_tmuxinator_dir), nargs=1
+)
+def command_import_tmuxinator(configfile):
+    """Convert a tmuxinator config from CONFIGFILE to tmuxp format and import
+    it into tmuxp."""
+    import_config(configfile, config.import_tmuxinator)
+
+
+@click.command(name="convert")
+@click.option(
+    "--yes", "-y", "confirmed", help='Auto confirms with "yes".', is_flag=True
+)
+@click.argument("config", type=ConfigPath(exists=True), nargs=1)
+def command_convert(confirmed, config):
+    """Convert a tmuxp config between JSON and YAML."""
+
+    _, ext = os.path.splitext(config)
+    ext = ext.lower()
+    if ext == ".json":
+        to_filetype = "yaml"
+    elif ext in [".yaml", ".yml"]:
+        to_filetype = "json"
+    else:
+        raise click.BadParameter(
+            f"Unknown filetype: {ext} (valid: [.json, .yaml, .yml])"
+        )
+
+    configparser = kaptan.Kaptan()
+    configparser.import_config(config)
+    newfile = config.replace(ext, ".%s" % to_filetype)
+
+    export_kwargs = {"default_flow_style": False} if to_filetype == "yaml" else {}
+    newconfig = configparser.export(to_filetype, indent=2, **export_kwargs)
+
+    if not confirmed:
+        if click.confirm(f"convert to <{config}> to {to_filetype}?"):
+            if click.confirm("Save config to %s?" % newfile):
+                confirmed = True
+
+    if confirmed:
+        buf = open(newfile, "w")
+        buf.write(newconfig)
+        buf.close()
+        print("New config saved to <%s>." % newfile)
+
+
 @import_config_cmd.command(
     name="teamocil", short_help="Convert and import a teamocil config."
 )