Merge branch 'confirm-convert' of github.com:aRkedos/tmuxp into confirm-convert

Author: aRkedos

tests/test_cli.py

@@ -387,7 +387,14 @@ def test_load_zsh_autotitle_warning(cli_args, tmpdir, monkeypatch):
         assert 'Please set' not in result.output
 
 
-@pytest.mark.parametrize("cli_args", [(['convert', '.']), (['convert', '.tmuxp.yaml'])])
+@pytest.mark.parametrize(
+    "cli_args",
+    [
+        (['convert', '.']),
+        (['convert', '.tmuxp.yaml']),
+        (['convert', '.tmuxp.yaml', '-y']),
+    ],
+)
 def test_convert(cli_args, tmpdir, monkeypatch):
     # create dummy tmuxp yaml so we don't get yelled at
     tmpdir.join('.tmuxp.yaml').write(
@@ -401,7 +408,10 @@ def test_convert(cli_args, tmpdir, monkeypatch):
     with tmpdir.as_cwd():
         runner = CliRunner()
 
-        runner.invoke(cli.cli, cli_args, input='y\ny\n')
+        # If autoconfirm (-y) no need to prompt y
+        input_args = 'y\ny\n' if '-y' not in cli_args else ''
+
+        runner.invoke(cli.cli, cli_args, input=input_args)
         assert tmpdir.join('.tmuxp.json').check()
         assert tmpdir.join('.tmuxp.json').open().read() == json.dumps(
             {'session_name': 'hello'}, indent=2

tmuxp/cli.py

@@ -898,50 +898,32 @@ def command_import_tmuxinator(configfile):
 
 
 @cli.command(name='convert')
-@click.option('--yes', '-y', 'confirmed', help='Auto confirms with "yes".', 
-              is_flag=True)
+@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)
-    if 'json' in ext and not confirmed:
-        if click.confirm('convert to <%s> to yaml?' % config):
-            configparser = kaptan.Kaptan()
-            configparser.import_config(config)
-            newfile = config.replace(ext, '.yaml')
-            newconfig = configparser.export('yaml', indent=2, default_flow_style=False)
+    if 'json' in ext:
+        to_filetype = 'yaml'
+    elif 'yaml' in ext:
+        to_filetype = 'json'
+
+    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('convert to <%s> to %s?' % (config, to_filetype)):
             if click.confirm('Save config to %s?' % newfile):
-                buf = open(newfile, 'w')
-                buf.write(newconfig)
-                buf.close()
-                print('New config saved to %s' % newfile)
-    elif 'yaml' in ext and not confirmed:
-        if click.confirm('convert to <%s> to json?' % config):
-            configparser = kaptan.Kaptan()
-            configparser.import_config(config)
-            newfile = config.replace(ext, '.json')
-            newconfig = configparser.export('json', indent=2)
-            print(newconfig)
-            if click.confirm('Save config to <%s>?' % newfile):
-                buf = open(newfile, 'w')
-                buf.write(newconfig)
-                buf.close()
-                print('New config saved to <%s>.' % newfile)
-    elif 'json' in ext and confirmed:
-        configparser = kaptan.Kaptan()
-        configparser.import_config(config)
-        newfile = config.replace(ext, '.yaml')
-        newconfig = configparser.export('yaml', indent=2, default_flow_style=False)
-        buf = open(newfile, 'w')
-        buf.write(newconfig)
-        buf.close()
-        print('New config saved to <%s>.' % newfile)
-    elif 'yaml' in ext and confirmed:
-        configparser = kaptan.Kaptan()
-        configparser.import_config(config)
-        newfile = config.replace(ext, '.json')
-        newconfig = configparser.export('json', indent=2)
+                confirmed = True
+
+    if confirmed:
         buf = open(newfile, 'w')
         buf.write(newconfig)
         buf.close()