Merge pull request #7 from Kinto/add-plugin-version

Add kinto-ldap plugin version in the capability.

CHANGELOG.rst

@@ -8,6 +8,7 @@ This document describes changes between each past release.
 ------------------
 
 - Set default value for ``multiauth.policy.ldap.use`` (fixes #3)
+- Add the plugin version in the capability.
 
 
 0.1.0 (2016-06-27)

Makefile

@@ -1,8 +1,25 @@
 VIRTUALENV = virtualenv
+VENV := $(shell echo $${VIRTUAL_ENV-.venv})
+PYTHON = $(VENV)/bin/python
+TOX = $(VENV)/bin/tox
 TEMPDIR := $(shell mktemp -d)
 
 build-requirements:
 	$(VIRTUALENV) $(TEMPDIR)
 	$(TEMPDIR)/bin/pip install -U pip
 	$(TEMPDIR)/bin/pip install -Ue .
 	$(TEMPDIR)/bin/pip freeze > requirements.txt
+
+virtualenv: $(PYTHON)
+$(PYTHON):
+	virtualenv $(VENV)
+
+tox: $(TOX)
+$(TOX): virtualenv
+	$(VENV)/bin/pip install tox
+
+tests-once: tox
+	$(VENV)/bin/tox -e py27
+
+tests: tox
+	$(VENV)/bin/tox

kinto_ldap/__init__.py

@@ -1,8 +1,13 @@
+import pkg_resources
+
 from ldappool import ConnectionManager
 from pyramid.exceptions import ConfigurationError
 
 from kinto_ldap.authentication import ldap_ping
 
+#: Module version, as defined in PEP-0396.
+__version__ = pkg_resources.get_distribution(__package__).version
+
 
 DEFAULT_SETTINGS = {
     'multiauth.policy.ldap.use': ('kinto_ldap.authentication.'
@@ -25,7 +30,7 @@ def includeme(config):
     defaults = {k: v for k, v in DEFAULT_SETTINGS.items() if k not in settings}
     config.add_settings(defaults)
     config.add_api_capability(
-        "ldap",
+        "ldap", version=__version__,
         description="Basic Auth user are validated against an LDAP server.",
         url="https://github.com/mozilla-services/kinto-ldap")
 

kinto_ldap/tests/test_views.py

@@ -3,6 +3,7 @@
 from kinto.core.utils import random_bytes_hex
 from pyramid.config import Configurator
 
+from kinto_ldap import __version__ as ldap_version
 from . import unittest
 
 
@@ -67,6 +68,7 @@ def test_ldap_capability(self, additional_settings=None):
         capabilities = resp.json['capabilities']
         self.assertIn('ldap', capabilities)
         expected = {
+            "version": ldap_version,
             "url": "https://github.com/mozilla-services/kinto-ldap",
             "description": "Basic Auth user are validated against an "
                            "LDAP server."