autoload modules with config registrations

memphis/config/api.py

@@ -4,6 +4,8 @@
 from zope.interface.interface import adapter_hooks
 from zope.interface.interfaces import IObjectEvent
 
+mods = set()
+
 
 class StopException(Exception):
     """ Special initialization exception means stop execution """
@@ -36,23 +38,22 @@ def initialize(packages=None, excludes=(), reg=None):
     sys.modules['memphis.config'].registry = reg
     sys.modules['memphis.config.api'].registry = reg
 
+    def exclude_filter(modname):
+        if modname in packages:
+            return True
+        return exclude(modname, excludes)
+
     # list all packages
     if packages is None:
         packages = loadPackages(excludes=excludes)
+        packages.extend([mod for mod in mods if exclude_filter(mod)])
     else:
         packages = loadPackages(packages, excludes=excludes)
 
-    packages.append('__main__')
-
     # scan packages and load all actions
     seen = set()
     actions = []
 
-    def exclude_filter(modname):
-        if modname in packages:
-            return True
-        return exclude(modname, excludes)
-
     for pkg in packages:
         actions.extend(directives.scan(pkg, seen, exclude_filter))
 
@@ -87,7 +88,6 @@ def loadPackage(name, seen, first=True):
 
     try:
         dist = pkg_resources.get_distribution(name)
-
         for req in dist.requires():
             pkg = req.project_name
             if pkg in seen:
@@ -156,6 +156,8 @@ def addCleanup(handler):
 
 
 def cleanUp(*modIds):
+    mods.clear()
+
     for h in _cleanups:
         h()
 

memphis/config/directives.py

@@ -182,6 +182,8 @@ def __init__(self, depth=1, moduleLevel = False, allowed_scope=None):
         self.module = module
         self.codeinfo = codeinfo
 
+        api.mods.add(self.module.__name__)
+
     @property
     def context(self):
         if self.scope == 'module':

memphis/config/tests/test_directives.py

@@ -415,3 +415,33 @@ def test_api_loadpackage(self):
 
         packages = api.loadPackage('memphis.config', seen)
         self.assertEqual(packages, [])
+
+
+class BadicTesting(unittest.TestCase):
+
+    def test_exclude_test(self):
+        from memphis.config import api
+
+        self.assertFalse(api.exclude('blah.test'))
+        self.assertFalse(api.exclude('blah.ftest'))
+        self.assertFalse(api.exclude('blah.subpkg', ('blah.',)))
+        self.assertTrue(api.exclude('blah.subpkg'))
+
+    def test_loadpackages(self):
+        from memphis.config import api
+
+        self.assertEqual(
+            api.loadPackages(('memphis',), excludes=('memphis',)), [])
+
+        self.assertEqual(api.loadPackages(), ['memphis'])
+        self.assertEqual(api.loadPackages(excludes=('memphis',)), [])
+
+    def test_stop_exc(self):
+        from memphis.config import api
+
+        err = ValueError('test')
+
+        exc = api.StopException(err)
+        self.assertIs(exc.exc, err)
+        self.assertEqual(str(exc), 'test')
+