Merge a6ac9b2 into 6ea3662

requirements/base.txt

@@ -1,4 +1,4 @@
 kaptan>=0.5.7
 libtmux==0.4.1
-argcomplete
+click==6.6
 colorama

setup.py

@@ -56,7 +56,7 @@ def run_tests(self):
     zip_safe=False,
     keywords=about['__title__'],
     scripts=['pkg/tmuxp.bash', 'pkg/tmuxp.zsh', 'pkg/tmuxp.tcsh'],
-    entry_points=dict(console_scripts=['tmuxp=tmuxp:cli.main']),
+    entry_points=dict(console_scripts=['tmuxp=tmuxp:cli.cli']),
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         "License :: OSI Approved :: BSD License",

tests/conftest.py

@@ -12,15 +12,19 @@
 
 
 @pytest.fixture(scope='function')
-def server():
+def server(request):
     t = Server()
     t.socket_name = 'tmuxp_test%s' % next(namer)
 
+    def fin():
+        t.kill_server()
+    request.addfinalizer(fin)
+
     return t
 
 
 @pytest.fixture(scope='function')
-def session(request, server):
+def session(server):
     session_name = 'tmuxp'
 
     if not server.has_session(session_name):
@@ -61,10 +65,6 @@ def session(request, server):
     assert TEST_SESSION_NAME == session.get('session_name')
     assert TEST_SESSION_NAME != 'tmuxp'
 
-    def fin():
-        server.kill_server()
-    request.addfinalizer(fin)
-
     return session
 
 

tests/test_cli.py

@@ -1,12 +1,19 @@
 # -*- coding: utf-8 -*-
 """Test for tmuxp command line interface."""
 
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals, with_statement)
+from __future__ import absolute_import, print_function, with_statement
 
 import os
+import json
+import libtmux
+import pytest
+import click
+from click.testing import CliRunner
 
 from tmuxp import cli, config
+from tmuxp.cli import is_pure_name, load_workspace, resolve_config
+
+from .fixtures._util import curjoin
 
 
 def test_creates_config_dir_not_exists(tmpdir):
@@ -49,3 +56,267 @@ def test_get_configs_cwd(tmpdir):
         configs_found = config.in_cwd()
         assert len(configs_found) == 1
         assert '.tmuxp.json' in configs_found
+
+
+@pytest.mark.parametrize('path,expect', [
+    ('.', False),
+    ('./', False),
+    ('', False),
+    ('.tmuxp.yaml', False),
+    ('../.tmuxp.yaml', False),
+    ('../', False),
+    ('/hello/world', False),
+    ('~/.tmuxp/hey', False),
+    ('~/work/c/tmux/', False),
+    ('~/work/c/tmux/.tmuxp.yaml', False),
+    ('myproject', True),
+])
+def test_is_pure_name(path, expect):
+    assert is_pure_name(path) == expect
+
+"""
+    scans for .tmuxp.{yaml,yml,json} in directory, returns first result
+    log warning if multiple found:
+
+    - current directory: ., ./, noarg
+    - relative to cwd directory: ../, ./hello/, hello/, ./hello/
+    - absolute directory: /path/to/dir, /path/to/dir/, ~/
+    - no path, no ext, config_dir: projectname, tmuxp
+
+    load file directly -
+
+    - no directory (cwd): .tmuxp.yaml
+    - relative to cwd: ../.tmuxp.yaml, ./hello/.tmuxp.yaml
+    - absolute path: /path/to/file.yaml, ~/path/to/file/.tmuxp.yaml
+
+    Any case where file is not found should return error.
+"""
+
+
+@pytest.fixture
+def homedir(tmpdir):
+    return tmpdir.join('home').mkdir()
+
+
+@pytest.fixture
+def configdir(homedir):
+    return homedir.join('.tmuxp').mkdir()
+
+
+@pytest.fixture
+def projectdir(homedir):
+    return homedir.join('work').join('project')
+
+
+def test_resolve_dot(tmpdir, homedir, configdir, projectdir, monkeypatch):
+    monkeypatch.setenv('HOME', homedir)
+    projectdir.join('.tmuxp.yaml').ensure()
+    user_config_name = 'myconfig'
+    user_config = configdir.join('%s.yaml' % user_config_name).ensure()
+
+    project_config = str(projectdir.join('.tmuxp.yaml'))
+
+    with projectdir.as_cwd():
+        expect = project_config
+        assert resolve_config('.') == expect
+        assert resolve_config('./') == expect
+        assert resolve_config('') == expect
+        assert resolve_config('../project') == expect
+        assert resolve_config('../project/') == expect
+        assert resolve_config('.tmuxp.yaml') == expect
+        assert resolve_config(
+            '../../.tmuxp/%s.yaml' % user_config_name) == str(user_config)
+        assert resolve_config('myconfig') == str(user_config)
+        assert resolve_config(
+            '~/.tmuxp/myconfig.yaml') == str(user_config)
+
+        with pytest.raises(Exception):
+            resolve_config('.tmuxp.json')
+        with pytest.raises(Exception):
+            resolve_config('.tmuxp.ini')
+        with pytest.raises(Exception):
+            resolve_config('../')
+        with pytest.raises(Exception):
+            resolve_config('mooooooo')
+
+    with homedir.as_cwd():
+        expect = project_config
+        assert resolve_config('work/project') == expect
+        assert resolve_config('work/project/') == expect
+        assert resolve_config('./work/project') == expect
+        assert resolve_config('./work/project/') == expect
+        assert resolve_config(
+            '.tmuxp/%s.yaml' % user_config_name) == str(user_config)
+        assert resolve_config(
+            './.tmuxp/%s.yaml' % user_config_name) == str(user_config)
+        assert resolve_config('myconfig') == str(user_config)
+        assert resolve_config(
+            '~/.tmuxp/myconfig.yaml') == str(user_config)
+
+        with pytest.raises(Exception):
+            resolve_config('')
+        with pytest.raises(Exception):
+            resolve_config('.')
+        with pytest.raises(Exception):
+            resolve_config('.tmuxp.yaml')
+        with pytest.raises(Exception):
+            resolve_config('../')
+        with pytest.raises(Exception):
+            resolve_config('mooooooo')
+
+    with configdir.as_cwd():
+        expect = project_config
+        assert resolve_config('../work/project') == expect
+        assert resolve_config('../../home/work/project') == expect
+        assert resolve_config('../work/project/') == expect
+        assert resolve_config(
+            '%s.yaml' % user_config_name) == str(user_config)
+        assert resolve_config(
+            './%s.yaml' % user_config_name) == str(user_config)
+        assert resolve_config('myconfig') == str(user_config)
+        assert resolve_config(
+            '~/.tmuxp/myconfig.yaml') == str(user_config)
+
+        with pytest.raises(Exception):
+            resolve_config('')
+        with pytest.raises(Exception):
+            resolve_config('.')
+        with pytest.raises(Exception):
+            resolve_config('.tmuxp.yaml')
+        with pytest.raises(Exception):
+            resolve_config('../')
+        with pytest.raises(Exception):
+            resolve_config('mooooooo')
+
+    with tmpdir.as_cwd():
+        expect = project_config
+        assert resolve_config('home/work/project') == expect
+        assert resolve_config('./home/work/project/') == expect
+        assert resolve_config(
+            'home/.tmuxp/%s.yaml' % user_config_name) == str(user_config)
+        assert resolve_config(
+            './home/.tmuxp/%s.yaml' % user_config_name) == str(user_config)
+        assert resolve_config('myconfig') == str(user_config)
+        assert resolve_config(
+            '~/.tmuxp/myconfig.yaml') == str(user_config)
+
+        with pytest.raises(Exception):
+            resolve_config('')
+        with pytest.raises(Exception):
+            resolve_config('.')
+        with pytest.raises(Exception):
+            resolve_config('.tmuxp.yaml')
+        with pytest.raises(Exception):
+            resolve_config('../')
+        with pytest.raises(Exception):
+            resolve_config('mooooooo')
+
+
+def test_resolve_config_arg(homedir, configdir, projectdir, monkeypatch):
+    runner = CliRunner()
+
+    @click.command()
+    @click.argument(
+        'config', click.Path(exists=True), nargs=-1,
+        callback=cli.resolve_config_argument)
+    def config_cmd(config):
+        click.echo(config)
+
+    monkeypatch.setenv('HOME', homedir)
+    projectdir.join('.tmuxp.yaml').ensure()
+    user_config_name = 'myconfig'
+    user_config = configdir.join('%s.yaml' % user_config_name).ensure()
+
+    project_config = str(projectdir.join('.tmuxp.yaml'))
+
+    def check_cmd(config_arg):
+        return runner.invoke(config_cmd, [config_arg]).output
+
+    with projectdir.as_cwd():
+        expect = project_config
+        assert expect in check_cmd('.')
+        assert expect in check_cmd('./')
+        assert expect in check_cmd('')
+        assert expect in check_cmd('../project')
+        assert expect in check_cmd('../project/')
+        assert expect in check_cmd('.tmuxp.yaml')
+        assert str(user_config) in check_cmd(
+            '../../.tmuxp/%s.yaml' % user_config_name)
+        assert str(user_config) in check_cmd('myconfig')
+        assert str(user_config) in check_cmd(
+            '~/.tmuxp/myconfig.yaml')
+
+        assert 'does not exist' in check_cmd('.tmuxp.json')
+        assert 'does not exist' in check_cmd('.tmuxp.ini')
+        assert 'No configs found' in check_cmd('../')
+        assert 'No configs found' in check_cmd('moo')
+
+
+def test_load_workspace(server, monkeypatch):
+    # this is an implementation test. Since this testsuite may be ran within
+    # a tmux session by the developer themselv, delete the TMUX variable
+    # temporarily.
+    monkeypatch.delenv('TMUX', raising=False)
+    session_file = curjoin("workspacebuilder/two_pane.yaml")
+
+    # open it detached
+    session = load_workspace(
+        session_file, socket_name=server.socket_name,
+        detached=True
+    )
+
+    assert isinstance(session, libtmux.Session)
+    assert session.name == 'sampleconfig'
+
+
+@pytest.mark.parametrize("cli_args", [
+    (['load', '.']),
+    (['load', '.tmuxp.yaml']),
+])
+def test_load_zsh_autotitle_warning(cli_args, tmpdir, monkeypatch):
+    # create dummy tmuxp yaml so we don't get yelled at
+    tmpdir.join('.tmuxp.yaml').ensure()
+    tmpdir.join('.oh-my-zsh').ensure(dir=True)
+    monkeypatch.setenv('HOME', str(tmpdir))
+
+    with tmpdir.as_cwd():
+        runner = CliRunner()
+
+        monkeypatch.delenv('DISABLE_AUTO_TITLE', raising=False)
+        monkeypatch.setenv('SHELL', 'zsh')
+        result = runner.invoke(cli.cli, cli_args)
+        assert 'Please set' in result.output
+
+        monkeypatch.setenv('DISABLE_AUTO_TITLE', 'false')
+        result = runner.invoke(cli.cli, cli_args)
+        assert 'Please set' in result.output
+
+        monkeypatch.setenv('DISABLE_AUTO_TITLE', 'true')
+        result = runner.invoke(cli.cli, cli_args)
+        assert 'Please set' not in result.output
+
+        monkeypatch.delenv('DISABLE_AUTO_TITLE', raising=False)
+        monkeypatch.setenv('SHELL', 'sh')
+        result = runner.invoke(cli.cli, cli_args)
+        assert 'Please set' not in result.output
+
+
+@pytest.mark.parametrize("cli_args", [
+    (['convert', '.']),
+    (['convert', '.tmuxp.yaml']),
+])
+def test_convert(cli_args, tmpdir, monkeypatch):
+    # create dummy tmuxp yaml so we don't get yelled at
+    tmpdir.join('.tmuxp.yaml').write("""
+session_name: hello
+    """)
+    tmpdir.join('.oh-my-zsh').ensure(dir=True)
+    monkeypatch.setenv('HOME', str(tmpdir))
+
+    with tmpdir.as_cwd():
+        runner = CliRunner()
+
+        runner.invoke(cli.cli, cli_args, input='y\ny\n')
+        assert tmpdir.join('.tmuxp.json').check()
+        assert tmpdir.join('.tmuxp.json').open().read() == \
+            json.dumps({'session_name': 'hello'}, indent=2)