Merge pull request #350 from bfredl/clientinfo

host: add client info

Author: bfredl

neovim/__init__.py

@@ -12,16 +12,14 @@
                           stdio_session, tcp_session)
 from .plugin import (Host, autocmd, command, decode, encoding, function,
                      plugin, rpc_export, shutdown_hook)
-from .util import Version
+from .util import VERSION, Version
 
 
 __all__ = ('tcp_session', 'socket_session', 'stdio_session', 'child_session',
            'start_host', 'autocmd', 'command', 'encoding', 'decode',
-           'function', 'plugin', 'rpc_export', 'Host', 'Nvim', 'VERSION',
-           'shutdown_hook', 'attach', 'setup_logging', 'ErrorResponse')
-
-
-VERSION = Version(major=0, minor=2, patch=6, prerelease='')
+           'function', 'plugin', 'rpc_export', 'Host', 'Nvim', 'Version',
+           'VERSION', 'shutdown_hook', 'attach', 'setup_logging',
+           'ErrorResponse')
 
 
 def start_host(session=None):

neovim/plugin/host.py

@@ -5,21 +5,24 @@
 import os
 import os.path
 import re
+import sys
 from functools import partial
 from traceback import format_exc
 
 from . import script_host
 from ..api import decode_if_bytes, walk
 from ..compat import IS_PYTHON3, find_module
 from ..msgpack_rpc import ErrorResponse
-from ..util import format_exc_skip
+from ..util import VERSION, format_exc_skip
 
 __all__ = ('Host')
 
 logger = logging.getLogger(__name__)
 error, debug, info, warn = (logger.error, logger.debug, logger.info,
                             logger.warning,)
 
+host_method_spec = {"poll": {}, "specs": {"nargs": 1}, "shutdown": {}}
+
 
 class Host(object):
 
@@ -116,6 +119,7 @@ def _missing_handler_error(self, name, kind):
         return msg
 
     def _load(self, plugins):
+        has_script = False
         for path in plugins:
             err = None
             if path in self._loaded:
@@ -124,6 +128,7 @@ def _load(self, plugins):
             try:
                 if path == "script_host.py":
                     module = script_host
+                    has_script = True
                 else:
                     directory, name = os.path.split(os.path.splitext(path)[0])
                     file, pathname, descr = find_module(name, [directory])
@@ -141,6 +146,17 @@ def _load(self, plugins):
                 error(err)
                 self._load_errors[path] = err
 
+        if len(plugins) == 1 and has_script:
+            kind = "script"
+        else:
+            kind = "rplugin"
+        name = "python{}-{}-host".format(sys.version_info[0], kind)
+        attributes = {"license": "Apache v2",
+                      "website": "github.com/neovim/python-client"}
+        self.nvim.api.set_client_info(
+            name, VERSION.__dict__, "host", host_method_spec,
+            attributes, async_=True)
+
     def _unload(self):
         for path, plugin in self._loaded.items():
             handlers = plugin['handlers']

neovim/util.py

@@ -30,3 +30,6 @@ def __repr__(self):
     def __eq__(self, other):
         """Check if version is same as other."""
         return self.__dict__ == other.__dict__
+
+
+VERSION = Version(major=0, minor=2, patch=6, prerelease='')

test/conftest.py

@@ -10,7 +10,7 @@
 
 @pytest.fixture(autouse=True)
 def cleanup_func(vim):
-    fun = textwrap.dedent(''':function BeforeEachTest()
+    fun = textwrap.dedent('''function! BeforeEachTest()
         set all&
         redir => groups
         silent augroup
@@ -47,7 +47,7 @@ def cleanup_func(vim):
         comclear
         endfunction
     ''')
-    vim.input(fun)
+    vim.command(fun)
     vim.command('call BeforeEachTest()')
     assert len(vim.tabpages) == len(vim.windows) == len(vim.buffers) == 1
 

test/test_host.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+from neovim.plugin.host import Host, host_method_spec
+
+def test_host_method_spec(vim):
+    h = Host(vim)
+    assert h._request_handlers.keys() == host_method_spec.keys()