teach plugins with dependencies to behave

.gitignore

@@ -1 +1,2 @@
-*.pyc
+*.pyc
+*.log

.travis.yml

@@ -10,4 +10,4 @@ install:
     - pip install -e git://github.com/getpelican/pelican.git#egg=pelican
     - pip install --use-mirrors Markdown
     - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors webassets cssmin; fi
-script: nosetests tests
+script: nosetests

Contributing.rst

@@ -9,7 +9,9 @@ request. Make sure that your plugin follows the structure below::
     my_plugin
        ├──  __init__.py
        ├──  my_plugin.py
+       ├──  test_my_plugin.py
        └──  Readme.rst / Readme.md
+      
 
 ``my_plugin.py`` is the actual plugin implementation. Include a brief
 explanation of what the plugin does as a module docstring. Leave any further
@@ -17,9 +19,8 @@ explanations and usage details to ``Readme`` file.
 
 ``__init__.py`` should contain a single line with ``from .my_plugin import *``.
 
-If you have tests for your plugin, place them in the ``tests`` folder with name
-``test_my_plugin.py``. You can use ``test_data`` folder inside, if you need content 
-or templates in your tests.
+Place tests for your plugin in the same folder with name ``test_my_plugin.py``. 
+You can use ``test_data`` main folder, if you need content or templates in your tests.
 
 **Note:** Plugins in the repository are licensed with *GNU AFFERO GENERAL PUBLIC LICENSE
 Version 3*. By submitting a pull request, you accept to release your 

assets/assets.py

@@ -20,9 +20,14 @@ import os
 import logging
 
 from pelican import signals
-from webassets import Environment
-from webassets.ext.jinja2 import AssetsExtension
+logger = logging.getLogger(__name__)
 
+try:
+    import webassets
+    from webassets import Environment
+    from webassets.ext.jinja2 import AssetsExtension
+except ImportError:
+    webassets = None
 
 def add_jinja2_ext(pelican):
     """Add Webassets to Jinja2 extensions in Pelican settings."""
@@ -41,13 +46,15 @@ def create_assets_env(generator):
         for item in generator.settings['ASSET_CONFIG']:
             generator.env.assets_environment.config[item[0]] = item[1]
 
-    logger = logging.getLogger(__name__)
     if logging.getLevelName(logger.getEffectiveLevel()) == "DEBUG":
         generator.env.assets_environment.debug = True
 
 
 def register():
     """Plugin registration."""
-
-    signals.initialized.connect(add_jinja2_ext)
-    signals.generator_init.connect(create_assets_env)
+    if webassets:
+        signals.initialized.connect(add_jinja2_ext)
+        signals.generator_init.connect(create_assets_env)
+    else:
+        logger.warning('`assets` failed to load dependency `webassets`.'
+                       '`assets` plugin not loaded.')

assets/test_assets.py

@@ -13,10 +13,6 @@ import subprocess
 from pelican import Pelican
 from pelican.settings import read_settings
 
-import pytest
-
-assets = pytest.importorskip("assets")
-
 CUR_DIR = os.path.dirname(__file__)
 THEME_DIR = os.path.join(CUR_DIR, 'test_data')
 CSS_REF = open(os.path.join(THEME_DIR, 'static', 'css',
@@ -62,10 +58,10 @@ class TestWebAssets(unittest.TestCase):
     """Base class for testing webassets."""
 
     def setUp(self, override=None):
-        
+        import assets
         self.temp_path = mkdtemp(prefix='pelicantests.')
         settings = {
-            'PATH': os.path.join(os.path.dirname(CUR_DIR), 'tests', 'content'),
+            'PATH': os.path.join(os.path.dirname(CUR_DIR), 'test_data', 'content'),
             'OUTPUT_PATH': self.temp_path,
             'PLUGINS': [assets],
             'THEME': THEME_DIR,

github_activity/github_activity.py

@@ -11,6 +11,9 @@ A plugin to list your Github Activity
 
 from __future__ import unicode_literals, print_function
 
+import logging
+logger = logging.getLogger(__name__)
+
 from pelican import signals
 
 
@@ -19,12 +22,9 @@ class GitHubActivity():
         A class created to fetch github activity with feedparser
     """
     def __init__(self, generator):
-        try:
-            import feedparser
-            self.activities = feedparser.parse(
-                generator.settings['GITHUB_ACTIVITY_FEED'])
-        except ImportError:
-            raise Exception("Unable to find feedparser")
+        import feedparser
+        self.activities = feedparser.parse(
+            generator.settings['GITHUB_ACTIVITY_FEED'])
 
     def fetch(self):
         """
@@ -63,5 +63,9 @@ def register():
     """
         Plugin registration
     """
-    signals.article_generator_init.connect(feed_parser_initialization)
-    signals.article_generate_context.connect(fetch_github_activity)
+    try:
+        signals.article_generator_init.connect(feed_parser_initialization)
+        signals.article_generate_context.connect(fetch_github_activity)
+    except ImportError:
+        logger.warning('`github_activity` failed to load dependency `feedparser`.'
+                       '`github_activity` plugin not loaded.')

goodreads_activity/goodreads_activity.py

@@ -9,12 +9,16 @@ Copyright (c) Talha Mansoor
 """
 
 from __future__ import unicode_literals
+
+import logging
+logger = logging.getLogger(__name__)
+
 from pelican import signals
-import feedparser
 
 
 class GoodreadsActivity():
     def __init__(self, generator):
+        import feedparser
         self.activities = feedparser.parse(
             generator.settings['GOODREADS_ACTIVITY_FEED'])
 
@@ -51,5 +55,9 @@ def initialize_feedparser(generator):
 
 
 def register():
-    signals.article_generator_init.connect(initialize_feedparser)
-    signals.article_generate_context.connect(fetch_goodreads_activity)
+    try:
+        signals.article_generator_init.connect(initialize_feedparser)
+        signals.article_generate_context.connect(fetch_goodreads_activity)
+    except ImportError:
+        logger.warning('`goodreads_activity` failed to load dependency `feedparser`.'
+                       '`goodreads_activity` plugin not loaded.')