Merge to release 1.0.9

Author: dmptrluke

.travis.yml

@@ -22,6 +22,7 @@ notifications:
     channels:
       - "irc.esper.net#cloudbot"
     template:
-      - "%{repository}#%{build_number} (%{branch} - %{commit}) %{author}: %{message}"
+      - "%{repository}#%{build_number} (%{branch} - %{commit}) %{author}: %{message} - %{build_url}"
   on_failure: always
   on_success: change
+  skip_join: true

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## Changelog
+
+## 1.0.9
+TBA
+
 ### 1.0.8
 This update is pretty big. Be warned.
  * Improved flip command.

cloudbot/__init__.py

@@ -10,7 +10,7 @@
 import logging
 import os
 
-__version__ = "1.0.8"
+__version__ = "1.0.9"
 
 __all__ = ["util", "bot", "connection", "config", "permissions", "plugin", "event", "hook", "log_dir"]
 

cloudbot/bot.py

@@ -8,6 +8,7 @@
 from sqlalchemy import create_engine
 
 from sqlalchemy.orm import scoped_session, sessionmaker
+from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.schema import MetaData
 
 import cloudbot
@@ -16,9 +17,15 @@
 from cloudbot.reloader import PluginReloader
 from cloudbot.plugin import PluginManager
 from cloudbot.event import Event, CommandEvent, RegexEvent, EventType
-from cloudbot.util import botvars, formatting
+from cloudbot.util import database, formatting
 from cloudbot.clients.irc import IrcClient
 
+try:
+    from cloudbot.web.main import WebInterface
+    web_installed = True
+except ImportError:
+    web_installed = False
+
 logger = logging.getLogger("cloudbot")
 
 
@@ -89,10 +96,15 @@ def __init__(self, loop=asyncio.get_event_loop()):
         self.db_factory = sessionmaker(bind=self.db_engine)
         self.db_session = scoped_session(self.db_factory)
         self.db_metadata = MetaData()
+        self.db_base = declarative_base(metadata=self.db_metadata, bind=self.db_engine)
+
+        # create web interface
+        if self.config.get("web", {}).get("enabled", False) and web_installed:
+            self.web = WebInterface(self)
 
         # set botvars so plugins can access when loading
-        botvars.metadata = self.db_metadata
-        botvars.user_agent = self.user_agent
+        database.metadata = self.db_metadata
+        database.base = self.db_base
 
         logger.debug("Database system initialised.")
 
@@ -193,6 +205,10 @@ def _init_routine(self):
         # Connect to servers
         yield from asyncio.gather(*[conn.connect() for conn in self.connections.values()], loop=self.loop)
 
+        # Activate web interface.
+        if self.config.get("web", {}).get("enabled", False) and web_installed:
+            self.web.start()
+
         # Run a manual garbage collection cycle, to clean up any unused objects created during initialization
         gc.collect()
 

cloudbot/event.py

@@ -240,6 +240,7 @@ def reply(self, *messages, target=None):
         :type message: str
         :type target: str
         """
+        reply_ping = self.conn.config.get("reply_ping", True)
         if target is None:
             if self.chan is None:
                 raise ValueError("Target must be specified when chan is not assigned")
@@ -248,7 +249,7 @@ def reply(self, *messages, target=None):
         if not messages:  # if there are no messages specified, don't do anything
             return
 
-        if target == self.nick:
+        if target == self.nick or not reply_ping:
             self.conn.message(target, *messages)
         else:
             self.conn.message(target, "({}) {}".format(self.nick, messages[0]), *messages[1:])

cloudbot/plugin.py

@@ -9,7 +9,7 @@
 import sqlalchemy
 
 from cloudbot.event import Event
-from cloudbot.util import botvars
+from cloudbot.util import database
 
 logger = logging.getLogger("cloudbot")
 
@@ -52,7 +52,7 @@ def find_tables(code):
     """
     tables = []
     for name, obj in code.__dict__.items():
-        if isinstance(obj, sqlalchemy.Table) and obj.metadata == botvars.metadata:
+        if isinstance(obj, sqlalchemy.Table) and obj.metadata == database.metadata:
             # if it's a Table, and it's using our metadata, append it to the list
             tables.append(obj)
 

cloudbot/util/botvars.py cloudbot/util/database.pycloudbot/util/botvars.py renamed to cloudbot/util/database.py

@@ -1,7 +1,7 @@
 """
-botvars - contains variables set by cloudbot to be easily access
+database - contains variables set by cloudbot to be easily access
 """
 
 # this is assigned in the CloudBot so that its recreated when the bot restarts
 metadata = None
-user_agent = None
+base = None

cloudbot/util/dictionaries.py

@@ -0,0 +1,6 @@
+from cloudbot.util.database import metadata, base
+
+
+def test_database():
+    assert metadata is None
+    assert base is None