Merge pull request #163 from mottosso/master

Fixes #152

pyblish/plugin.py

@@ -987,10 +987,11 @@ def plugins_by_family(plugins, family):
     compatible = list()
 
     for plugin in plugins:
-        if hasattr(plugin, 'families') and family not in plugin.families:
+        if not hasattr(plugin, "families"):
             continue
 
-        compatible.append(plugin)
+        if any(x in plugin.families for x in (family, "*")):
+            compatible.append(plugin)
 
     return compatible
 
@@ -1010,12 +1011,12 @@ def plugins_by_host(plugins, host):
     compatible = list()
 
     for plugin in plugins:
-        # Basic accept wildcards
-        # Todo: Expand to take partial wildcards e.g. '*Mesh'
-        if '*' not in plugin.hosts and host not in plugin.hosts:
+        if not hasattr(plugin, "hosts"):
             continue
 
-        compatible.append(plugin)
+        # TODO(marcus): Expand to take partial wildcards e.g. '*Mesh'
+        if any(x in plugin.hosts for x in (host, '*')):
+            compatible.append(plugin)
 
     return compatible
 
@@ -1038,10 +1039,11 @@ def instances_by_plugin(instances, plugin):
     compatible = list()
 
     for instance in instances:
-        if hasattr(plugin, 'families'):
-            if instance.data('family') in plugin.families:
-                compatible.append(instance)
-            elif '*' in plugin.families:
-                compatible.append(instance)
+        if not hasattr(plugin, 'families'):
+            continue
+
+        family = instance.data("family")
+        if any(x in plugin.families for x in (family, "*")):
+            compatible.append(instance)
 
     return compatible

pyblish/tests/test_plugins.py

@@ -9,12 +9,12 @@
 import pyblish.plugin
 
 from pyblish.vendor import mock
-from pyblish.vendor import yaml
 
 from pyblish.tests.lib import (
     setup, teardown, setup_failing, HOST, FAMILY,
     setup_duplicate, setup_invalid, setup_wildcard)
-from pyblish.vendor.nose.tools import raises, with_setup, assert_raises
+from pyblish.vendor.nose.tools import (
+    raises, with_setup, assert_raises)
 
 
 config = pyblish.plugin.Config()
@@ -441,3 +441,16 @@ def test():
 
     compatible.reverse()
     assert_raises(AssertionError, test)
+
+
+def test_plugins_by_family_wildcard():
+    """Plug-ins with wildcard family is included in every query"""
+    Plugin1 = type("Plugin1",
+                   (pyblish.api.Validator,),
+                   {"families": ["myFamily"]})
+    Plugin2 = type("Plugin2",
+                   (pyblish.api.Validator,),
+                   {"families": ["*"]})
+
+    assert Plugin2 in pyblish.api.plugins_by_family(
+        [Plugin1, Plugin2], "myFamily")