Move plugin base classes to kayleevc.plugins

No reason to have them in a module of their own.  And oh, the new
Handler base class exists, and the PluginBase has been revised as per
issue #18.

kayleevc/plugins/__init__.py

@@ -0,0 +1,63 @@
+# This is part of Kaylee
+# -- this code is licensed GPLv3
+# Copyright 2015-2017 Clayton G. Hobbs
+# Portions Copyright 2013 Jezra
+
+
+class PluginBase():
+    """Base class for Kaylee plugins
+
+    Each Kaylee plugin module must define a subclass of this class, named
+    ``Plugin``.
+    """
+
+    def __init__(self, config, name):
+        """Initialize the plugin
+
+        All strings to be included in the corpus should be elements of
+        ``corpus_strings`` by the end of __init__'s execution.  Note however
+        that the words required for number support are automatically included,
+        so they need not be listed explicitly on a per-plugin basis.
+        """
+        super().__init__()
+        self.config = config
+        self.name = name
+        self.options = config.plugins[name]
+        self.corpus_strings = set()
+
+    def get_handler(self, text):
+        """Return a handler for the given text
+
+        This method returns a Handler object which handles the command when
+        called.  If the plugin does not recognize the command at all, this
+        method must return None instead.  The method must also return None if
+        the command is recognized, but for some reason would not perform any
+        action currently, e.g. "pause music" when no music player is running.
+        """
+        return None
+
+
+class Handler:
+    """Base class for Kaylee plugin handlers
+
+    Plugins should subclass this for their own command handlers.
+    """
+
+    def __init__(self, confidence):
+        """Initialize the handler
+
+        The confidence with which this handler will handle the command must be
+        passed as ``confidence``, a floating-point number in (0, 1].  A
+        confidence of 1 indicates that the handler is definitely supposed to
+        handle the command it was created for.  Values between 0 and 1 may be
+        used to indicate that the plugin may be able to handle the command,
+        but it was misunderstood by the speech recognition system.
+        """
+        self.confidence = confidence
+
+    def __call__(self, tts):
+        """Handle the command
+
+        When called, ``tts`` is a function which takes a string as its only
+        parameter and passes it to Kaylee's configured text-to-speech system.
+        """

kayleevc/plugins/pluginbase.py

@@ -1,57 +0,0 @@
-# This is part of Kaylee
-# -- this code is licensed GPLv3
-# Copyright 2015-2017 Clayton G. Hobbs
-# Portions Copyright 2013 Jezra
-
-from gi.repository import GObject
-
-
-class PluginBase(GObject.Object):
-    """Base class for Kaylee plugins
-
-    Each Kaylee plugin module must define a subclass of this class, named
-    ``Plugin``.
-    """
-
-    __gsignals__ = {
-        'tts' : (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE,
-                (GObject.TYPE_STRING,))
-    }
-
-    def __init__(self, config, name):
-        """Initialize the plugin
-
-        All strings to be included in the corpus should be elements of
-        ``corpus_strings`` by the end of __init__'s execution.  Note however
-        that the words required for number support are automatically included,
-        so they need not be listed explicitly on a per-plugin basis.
-        """
-        super().__init__()
-        self.config = config
-        self.name = name
-        self.options = config.plugins[name]
-        self.corpus_strings = set()
-
-    def confidence(self, text):
-        """Return the confidence (0-1) with which this plugin can handle text
-
-        This method must return 1 if the command is definitely supposed to be
-        handled by this plugin (text is exactly a sentence configured to
-        perform some action) and must return 0 if the command is not recognized
-        at all.  The method must also return 0 if the command is recognized,
-        but for some reason would not perform any action currently, e.g. "pause
-        music" when no music player is running.  Intermediate values may be
-        used to indicate that text may be a command this plugin should handle,
-        but was misunderstood by the speech recognition system.
-        """
-        return 0
-
-    def handle(self, text):
-        """Process a recognized voice command
-
-        This method must return True if the command was handled by the plugin,
-        and False otherwise.  If the plugin wants to speak some words to the
-        user, it can do so by emitting a ``tts`` signal with the words to be
-        spoken as its parameter.
-        """
-        return False