factor the watchdog into its own package

application/buildout/appserver.cfg

@@ -22,7 +22,7 @@ fs_theme_path = ${buildout:directory}/themes/default
 [pyramid]
 recipe = zc.recipe.egg
 eggs = 
-    briefkasten [webapp]
+    briefkasten
     diazo [wsgi]
     PasteScript
     Paste

application/development.cfg

@@ -23,20 +23,15 @@ extensions =
     mr.developer
 extends =
     buildout/appserver.cfg
-    buildout/deployment.cfg
-    buildout/watchdog.cfg
 parts =
     lxml
     pyramid
     wsgiconfig
-    deploy
     pytest
     test
     test-coverage
     codeintel
     omelette
-    watchdog
-    watchdog-config
 show-picked-versions = true
 develop = .
 
@@ -51,18 +46,11 @@ watchdog_notify_email = me@localhost
 watchdog_smtp_host = localhost
 
 
-[pyramid]
-eggs += briefkasten[watchdog]
-
 [pytest]
 recipe = zc.recipe.egg
 eggs =
     briefkasten [tests]
-    briefkasten [webapp]
-    briefkasten [freebsd-deployment]
-    briefkasten [watchdog]
-    ezjaildeploy [tests]
-    ezjailremote
+    briefkasten
     pytest
     pytest-cov
     WebTest

application/setup.py

@@ -18,31 +18,22 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=[
+        'Pyramid',
+        'pyramid_deform',
+        'deform',
+        'Paste',
+        'zope.testbrowser',
+        'pyquery',
     ],
     extras_require={
-        "webapp": [
-            'Pyramid',
-            'pyramid_deform',
-            'deform',
-            'zope.testbrowser',
-            'pyquery'],
         "tests": [
             'wsgi_intercept',
             'zope.testbrowser'],
-        "freebsd-deployment": [
-            'ezjaildeploy'],
-        "watchdog": [
-            'imapclient',
-            'zope.testbrowser',
-            'pyquery',
-            'pyramid_mailer'],
     },
     test_suite="briefkasten",
     entry_points="""
         [paste.app_factory]
         main = briefkasten:main
-        [console_scripts]
-        watchdog = briefkasten.watchdog:main
     """,
     message_extractors={'briefkasten': [
         ('**.py', 'lingua_python', None),

watchdog/README.rst

@@ -0,0 +1,3 @@
+TODO: this package hasn't been tested/fixed yet, since it has been factored out from the application.
+
+probably won't work right now...

application/buildout/watchdog.cfg → watchdog/buildout.cfg

@@ -8,6 +8,10 @@ parts =
 [config]
 debug = false
 debug_includes =
+test_submission_secret = changeme
+watchdog_sender = nobody@localhost
+watchdog_notify_email = me@localhost
+watchdog_smtp_host = localhost
 
 [watchdog]
 recipe = zc.recipe.egg
@@ -29,6 +33,6 @@ smtp_host = ${config:watchdog_smtp_host}
 [watchdog-config]
 recipe = collective.recipe.template
 debug_includes =
-input = ${buildout:directory}/templates/watchdog.ini.in
-output = ${buildout:directory}/etc/watchdog.ini
+input = ${buildout:directory}/watchdog.ini.in
+output = ${buildout:directory}/watchdog.ini
 

watchdog/setup.py

@@ -0,0 +1,36 @@
+from setuptools import setup
+
+version = '0.1.10-dev'
+
+
+setup(name='briefkasten-watchdog',
+    version=version,
+    description='test if a given briefkasten instance is working properly',
+    long_description="",
+    classifiers=[
+        "Programming Language :: Python",
+        "Framework :: Pylons",
+        "Topic :: Internet :: WWW/HTTP",
+        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
+        'License :: OSI Approved :: BSD License',
+    ],
+    packages='.',
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=[
+        'imapclient',
+        'zope.testbrowser',
+        'pyquery',
+        'pyramid_mailer',
+    ],
+    extras_require={
+        "tests": [
+            'wsgi_intercept',
+            'zope.testbrowser'],
+    },
+    test_suite="briefkasten",
+    entry_points="""
+        [console_scripts]
+        watchdog = watchdog:main
+    """,
+)