add globbing env and package version

Author: saxix

CHANGELOG

@@ -1,7 +1,8 @@
 1.5 (dev)
 ---------
-* dropped python 3.3 support
-* add python 3.5 suport
+* add support for 'globbing' package version and enviromnent variables
+* dropped python 2.6 support
+* add python 3.5 and 3.6 support
 
 1.4
 ---

README.md renamed to README.rst

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
+import fnmatch
 import os
 from pprint import pformat
 
+import pip
 
-__version__ = '1.4'
+__version__ = '1.5'
 
 
 class RetrieveException(Exception):
@@ -88,6 +90,28 @@ def get_module_attribute(path):
         return str(e)
 
 
+def get_env(var_name):
+    if '*' in var_name:
+        targets = [(key, value)
+                   for key, value in os.environ.items()
+                   if fnmatch.fnmatch(key, var_name)]
+    else:
+        targets = [(var_name, os.environ.get(var_name, "<not set>"))]
+
+    return targets
+
+
+def get_version(package_name):
+    if '*' in package_name:
+        targets = [(i.key, i.version)
+                   for i in pip.get_installed_distributions()
+                   if fnmatch.fnmatch(i.key, package_name)]
+    else:
+        targets = [(package_name, _get_version(package_name))]
+
+    return targets
+
+
 def _get_version(package_name):
     try:
         import pkg_resources
@@ -113,12 +137,22 @@ def pytest_report_header(config):
     ret = []
     if config.option.echo_envs:
         ret.append("Environment:")
-        ret.append("\n".join(["    %s: %s" % (k, os.environ.get(k, "<not set>"))
-                              for k in config.option.echo_envs]))
+        data = []
+        for k in config.option.echo_envs:
+            data.extend(get_env(k))
+        ret.append("\n".join(["    %s: %s" % (k, v)
+                              for k,v in sorted(data)]))
+
+        # ret.append("\n".join(["    %s: %s" % (k, os.environ.get(k, "<not set>"))
+        #                       for k in config.option.echo_envs]))
     if config.option.echo_versions:
         ret.append("Package version:")
-        ret.append("\n".join(["    %s: %s" % (k, _get_version(k))
-                              for k in config.option.echo_versions]))
+        data = []
+        for k in config.option.echo_versions:
+            data.extend(get_version(k))
+        ret.append("\n".join(["    %s: %s" % (k, v)
+                              for k,v in sorted(data)]))
+
     if config.option.echo_attribues:
         ret.append("Inspections:")
         ret.append("\n".join(["    %s: %s" % (k, get_module_attribute(k))

pytest_echo.py

@@ -1,5 +1,6 @@
 import os
 import sys
+from contextlib import contextmanager
 
 import pytest
 
@@ -29,17 +30,53 @@ def test_version():
     assert pytest_echo.__version__
 
 
+@contextmanager
+def env(**kwargs):
+    backup = {}
+    for k, v in kwargs.items():
+        if k in os.environ:
+            backup[k] = v
+        os.environ[k] = v
+    yield
+    for k, v in kwargs.items():
+        if k in backup:
+            os.environ[k] = backup[k]
+        else:
+            del os.environ[k]
+
+
 def test_echo_env(testdir):
-    os.environ['PYTESTECHO'] = '123'
-    result = testdir.runpytest('--echo-env=PYTESTECHO')
-    result.stdout.fnmatch_lines([
-        "    PYTESTECHO: 123"
-    ])
+    # os.environ['PYTESTECHO'] = '123'
+    with env(PYTESTECHO='123'):
+        result = testdir.runpytest('--echo-env=PYTESTECHO')
+        result.stdout.fnmatch_lines([
+            "    PYTESTECHO: 123"
+        ])
+
+
+def test_echo_env_glob(testdir):
+    # os.environ['PYTESTECHO-a'] = '1'
+    # os.environ['PYTESTECHO-b'] = '2'
+    with env(**{'PYTESTECHO-a': '1', 'PYTESTECHO-b': '2'}):
+        result = testdir.runpytest('--echo-env=PYTESTECHO*')
+        result.stdout.fnmatch_lines([
+            "    PYTESTECHO-a: 1",
+            "    PYTESTECHO-b: 2"
+        ])
 
 
 def test_echo_version(testdir):
-    result = testdir.runpytest('--echo-version=pytest_echo')
-    result.stdout.fnmatch_lines(["    pytest_echo: %s" % pytest_echo.__version__])
+    result = testdir.runpytest('--echo-version=pytest-echo')
+    result.stdout.fnmatch_lines(["    pytest-echo: %s" % pytest_echo.__version__])
+
+
+def test_echo_version_glob(testdir):
+    result = testdir.runpytest('--echo-version=pytest*')
+    result.stdout.fnmatch_lines(["    pytest: %s" % pytest.__version__,
+                                 "    pytest-echo: %s" % pytest_echo.__version__,
+                                 ])
+    # result.stdout.fnmatch_lines(["    pytest-echo: %s" % pytest_echo.__version__])
+    # result.stdout.fnmatch_lines(["    pytest: %s" % pytest.__version__])
 
 
 def test_echo_all(testdir):
@@ -102,7 +139,6 @@ def test_echo_attr_module_object_attr(testdir):
 
 
 def test_django_settings(testdir):
-
     pytest.importorskip("django")
     testdir.makeconftest("""
         def pytest_configure(config):
@@ -115,6 +151,7 @@ def pytest_configure(config):
         "    django.conf.settings.DEBUG: False",
     ])
 
+
 def test_django_settings_extended(testdir):
     pytest.importorskip("django")
     testdir.makeconftest("""
@@ -128,4 +165,3 @@ def pytest_configure(config):
     result.stdout.fnmatch_lines([
         "    django.conf.settings.DATABASES.default.ENGINE: 'sqlite3'"
     ])
-

test_echo.py

@@ -1,9 +1,11 @@
 [tox]
-envlist=py26,py27,py33,py34,py35,pypy
+envlist=py27,py33,py34,py35,py36,pypy
 
 [testenv]
-deps =  pytest
-        pytest-cache
+deps =
+;       py27: pytest>=3.3.2
+    py{33,34}: pytest<3
+    py{33,34}: py<1.5
 
 commands =
     pip install {toxinidir}