Merge pull request #12 from zpriddy/bots_config

Update plugin to pass in config

example/plugins/example/plugin.py

@@ -12,14 +12,15 @@
 from slack.web.classes.actions import ActionButton
 
 from glados import GladosBot, GladosPlugin, GladosRequest, RouteType, EventRoutes
+from glados.plugin import PluginConfig
 
 from .views import HOME_VIEW, SECURITY_MENU_1
 from .countries import COUNTRY_OPTIONS
 
 
 class ExamplePlugin(GladosPlugin):
-    def __init__(self, bot: GladosBot, name="test plugin", **kwargs):
-        super().__init__(name, bot, **kwargs)
+    def __init__(self, config: PluginConfig, bot: GladosBot, **kwargs):
+        super().__init__(config, bot, **kwargs)
 
         self.add_route(RouteType.SendMessage, "test_send_message", self.send_message)
         self.add_route(

src/glados/plugin.py

@@ -176,6 +176,7 @@ def import_discovered_plugins(self, bots: Dict[str, GladosBot]):
             if not plugin_config.enabled:
                 logging.warning(f"plugin {plugin_name} is disabled")
                 continue
+            plugin_config.name = plugin_name
             logging.info(f"importing plugin: {plugin_name}")
             module = importlib.import_module(plugin_config.package)
 
@@ -203,7 +204,7 @@ def get_required_bot(
                 self.plugin_configs[plugin_name]["enabled"] = False
                 continue
 
-            plugin = getattr(module, plugin_config.module)(bot, plugin_name)
+            plugin = getattr(module, plugin_config.module)(plugin_config, bot)
             self.plugins[plugin_name] = plugin
 
 
@@ -218,8 +219,9 @@ class GladosPlugin:
         the GLaDOS bot that this plugin will use
     """
 
-    def __init__(self, name: str, bot: GladosBot, **kwargs):
-        self.name = name
+    def __init__(self, config: PluginConfig, bot: GladosBot, **kwargs):
+        self.config = config
+        self.name = self.config.name
         self.bot = bot
 
         self._routes = dict()  # type: Dict[int, Dict[str, GladosRoute]]

tests/test_glados_plugin.py

@@ -1,5 +1,6 @@
 import pytest
 from glados import GladosPlugin, RouteType, PluginImporter, BotImporter, GladosBot
+from glados.plugin import PluginConfig
 from glados.errors import GladosPathExistsError
 import logging
 from pathlib import Path
@@ -18,8 +19,13 @@ def MockGladosBot():
 
 
 @pytest.fixture
-def MockGladosPlugin(MockGladosBot):
-    return GladosPlugin("mock", MockGladosBot)
+def MockPluginConfig():
+    return PluginConfig("test", "None")
+
+
+@pytest.fixture
+def MockGladosPlugin(MockGladosBot, MockPluginConfig):
+    return GladosPlugin(MockPluginConfig, MockGladosBot)
 
 
 def check_only_one_file():