Merge branch 'click-7'

Click 7.0 support.

Fixes #428, #430

Author: tony

Pipfile

@@ -6,7 +6,7 @@ name = "pypi"
 [dev-packages]
 kaptan = ">=0.5.7"
 libtmux = "==0.8.0"
-click = "<7"
+click = ">=7<8"
 colorama = "==0.3.9"
 docutils = "==0.14"
 alagitpull = "==0.0.21"
@@ -24,7 +24,7 @@ tmuxp = {path = ".", editable = true}
 [packages]
 kaptan = ">=0.5.7"
 libtmux = "==0.8.0"
-click = "<7"
+click = ">=7<8"
 colorama = "==0.3.9"
 
 [requires]

requirements/base.txt

@@ -1,4 +1,4 @@
 kaptan>=0.5.7
 libtmux==0.8.0
-click<7
+click>=7<8
 colorama==0.3.9

tests/test_cli.py

@@ -222,9 +222,7 @@ def test_scan_config_arg(homedir, configdir, projectdir, monkeypatch):
     runner = CliRunner()
 
     @click.command()
-    @click.argument(
-        'config', click.Path(exists=True), nargs=-1, callback=cli.scan_config_argument
-    )
+    @click.argument('config', type=cli.ConfigPath(exists=True), nargs=-1)
     def config_cmd(config):
         click.echo(config)
 
@@ -463,7 +461,8 @@ def test_import_tmuxinator(cli_args, inputs, tmpdir, monkeypatch):
 
     with tmpdir.as_cwd():
         runner = CliRunner()
-        runner.invoke(cli.cli, cli_args, input=''.join(inputs))
+        out = runner.invoke(cli.cli, cli_args, input=''.join(inputs))
+        print(out.output)
         assert tmpdir.join('la.yaml').check()
 
 
@@ -510,20 +509,21 @@ def test_validate_choices():
         assert validate('choice3')
 
 
-def test_create_scan_config_arg(tmpdir):
+def test_pass_config_dir_ClickPath(tmpdir):
     configdir = tmpdir.join('myconfigdir')
     configdir.mkdir()
     user_config_name = 'myconfig'
     user_config = configdir.join('%s.yaml' % user_config_name).ensure()
 
     expect = str(configdir.join('myconfig.yaml'))
-    my_scan_config = cli._create_scan_config_argument(str(configdir))
 
     runner = CliRunner()
 
     @click.command()
     @click.argument(
-        'config', click.Path(exists=True), nargs=-1, callback=my_scan_config
+        'config',
+        type=cli.ConfigPath(exists=True, config_dir=(str(configdir))),
+        nargs=-1,
     )
     def config_cmd(config):
         click.echo(config)

tmuxp/cli.py

@@ -196,13 +196,18 @@ def is_pure_name(path):
     )
 
 
-def _create_scan_config_argument(config_dir):
-    """For finding configurations in tmuxinator/teamocil"""
+class ConfigPath(click.Path):
+    def __init__(self, config_dir=None, *args, **kwargs):
+        super(ConfigPath, self).__init__(*args, **kwargs)
+        self.config_dir = config_dir
 
-    def func(ctx, param, value):
-        return scan_config_argument(ctx, param, value, config_dir)
+    def convert(self, value, param, ctx):
+        config_dir = self.config_dir
+        if callable(config_dir):
+            config_dir = config_dir()
 
-    return func
+        value = scan_config(value, config_dir=config_dir)
+        return super(ConfigPath, self).convert(value, param, ctx)
 
 
 def scan_config_argument(ctx, param, value, config_dir=None):
@@ -719,25 +724,23 @@ def command_freeze(session_name, socket_name, socket_path):
 
 @cli.command(name='load', short_help='Load tmuxp workspaces.')
 @click.pass_context
-@click.argument(
-    'config', click.Path(exists=True), nargs=-1, callback=scan_config_argument
-)
+@click.argument('config', type=ConfigPath(exists=True), nargs=-1)
 @click.option('-S', 'socket_path', help='pass-through for tmux -S')
 @click.option('-L', 'socket_name', help='pass-through for tmux -L')
 @click.option('--yes', '-y', 'answer_yes', help='yes', is_flag=True)
 @click.option(
     '-d', 'detached', help='Load the session without attaching it', is_flag=True
 )
 @click.option(
-    '-2',
     'colors',
+    '-2',
     flag_value=256,
     default=True,
     help='Force tmux to assume the terminal supports 256 colours.',
 )
 @click.option(
-    '-8',
     'colors',
+    '-8',
     flag_value=88,
     help='Like -2, but indicates that the terminal supports 88 colours.',
 )
@@ -854,10 +857,7 @@ def import_config(configfile, importfunc):
     name='teamocil', short_help='Convert and import a teamocil config.'
 )
 @click.argument(
-    'configfile',
-    click.Path(exists=True),
-    nargs=1,
-    callback=_create_scan_config_argument(get_teamocil_dir),
+    'configfile', type=ConfigPath(exists=True, config_dir=get_teamocil_dir), nargs=1
 )
 def command_import_teamocil(configfile):
     """Convert a teamocil config from CONFIGFILE to tmuxp format and import
@@ -870,10 +870,7 @@ def command_import_teamocil(configfile):
     name='tmuxinator', short_help='Convert and import a tmuxinator config.'
 )
 @click.argument(
-    'configfile',
-    click.Path(exists=True),
-    nargs=1,
-    callback=_create_scan_config_argument(get_tmuxinator_dir),
+    '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
@@ -882,9 +879,7 @@ def command_import_tmuxinator(configfile):
 
 
 @cli.command(name='convert')
-@click.argument(
-    'config', click.Path(exists=True), nargs=1, callback=scan_config_argument
-)
+@click.argument('config', type=ConfigPath(exists=True), nargs=1)
 def command_convert(config):
     """Convert a tmuxp config between JSON and YAML."""