Merge lp:~zyga/checkbox/plainbox-dbus into lp:checkbox

[Zygmunt Krynicki]

Work in progress on the DBus service for PlainBox

[lp:~zyga/checkbox/plainbox-dbus]

2197. By Zygmunt Krynicki on 2013-06-18

plainbox:logging: honour debug_console when trace_list is specified

Previously adjust_logging(debug_console=True) would be used only when
level=DEBUG was passed as well. This makes it impossible to use it with
selective logging possible with trace_list. This patch corrects this
issue.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2198. By Zygmunt Krynicki on 2013-06-18

plainbox:logging: adjust formatting of console_info

Signed-off-by: Zygmunt Krynicki <email address hidden>

2199. By Zygmunt Krynicki on 2013-06-18

plainbox:box: add -C --debug-console argument

This argument switches on the handler that displays DEBUG messages on
the console. It can be useful when logging selectively.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2200. By Zygmunt Krynicki on 2013-06-18

plainbox:provider: add IProvider1.name and DummyProvider.name

Signed-off-by: Zygmunt Krynicki <email address hidden>

2201. By Zygmunt Krynicki on 2013-06-18

plainbox:checkbox: fix get_builtin_whitelists()

This method incorrectly would try to load whitelists from the jobs
directory after properly enumerating them in the whitelists directory.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2202. By Zygmunt Krynicki on 2013-06-18

plainbox:checkbox: add a name property to CheckBox

This property is required by the IProvider1 interface. While CheckBox
does not yet implement it it's good to add it now.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2203. By Zygmunt Krynicki on 2013-06-18

plainbox:checkbox: add a name property to WhiteList

This property is inferred from the name of the file a whitelist was
loaded from. It is useful in DBus service where each whitelist can
be exported as a distinct object on the bus

Signed-off-by: Zygmunt Krynicki <email address hidden>

2204. By Zygmunt Krynicki on 2013-06-18

plainbox:checkbox: fix PEP8 issue

Signed-off-by: Zygmunt Krynicki <email address hidden>

2205. By Zygmunt Krynicki on 2013-06-18

plainbox:dbus: add DBus utility module

This module holds code that aids in implementation of standard DBus
interfaces such as Properties or ObjectManager. It mirrors the
dbus.service package and providers an enhanced Object class and the
dbus-specific property decorator.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2206. By Zygmunt Krynicki on 2013-06-18

plainbox:dbus: add support for property introspection

This branch as a bit of other code but it's mostly designed to be squashed
anyway so it should not matter much.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2207. By Zygmunt Krynicki on 2013-06-18

plainbox:dbus: add some extra imports from vanilla dbus

Signed-off-by: Zygmunt Krynicki <email address hidden>

2208. By Zygmunt Krynicki on 2013-06-18

plainbox:service: add DBus service for PlainBox

This service is in initial stages of development. It has a version, can
expose provider objects, each of which has a name, and not much else.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2209. By Zygmunt Krynicki on 2013-06-18

plainbox:service: export JobDefinition and WhiteList with many properties

Work in progress on exporting many properties of both jobs and whitelists.
Jobs are now exported by name, not by checksum, but this is not imperfect
and probably will revert back later on. Whitelists have just the name
property (exporting actual patterns is probably not going to be needed
as we shall later see when session code gets written). The idea is
to use both whitelists and jobs as data sources to drive a bit of the GUI
and as identifiers (particular job, particular whitelist) when interacting
with Session methods (select those jobs, select that whitelist).

Signed-off-by: Zygmunt Krynicki <email address hidden>

2210. By Zygmunt Krynicki on 2013-06-18

plainbox:commands:service: add 'service' command to spawn DBus service

The service command can be used to start a PlainBox service on the
session bus. It is currently intended as a development helper for GUI
developers.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2211. By Zygmunt Krynicki on 2013-06-18

plainbox:commands:service: export checkbox object on the bus

Signed-off-by: Zygmunt Krynicki <email address hidden>

2212. By Zygmunt Krynicki on 2013-06-18

plainbox:commands:service: claim bus name after exporting all objects

Claiming bus name equals to saying 'this thing is ready to use' so let's
claim our well-known-name after adding all objects to the bus

Signed-off-by: Zygmunt Krynicki <email address hidden>

2213. By Zygmunt Krynicki on 2013-06-18

plainbox:commands:service: export a dummy job definition if requested

Signed-off-by: Zygmunt Krynicki <email address hidden>

2214. By Zygmunt Krynicki on 2013-06-18

plainbox:box: enable 'service' command

Signed-off-by: Zygmunt Krynicki <email address hidden>

2215. By Zygmunt Krynicki on 2013-06-18

plainbox:box: ignore KeyboardInterrupt around main()

This is orthogonal to the existing support for handling KeyboardInterrupt
while a command is being executed. Instead the main focus here is to
allow user to interrupt some of the startup code without causing
a backtrace to be printed.

Signed-off-by: Zygmunt Krynicki <email address hidden>

[Daniel Manrique (roadmr)]

Looks like use of variant properties isn't too widespread. I wasn't able to find any examples in the default Ubuntu services (there are *so* many though, that I may be missing it). This was using d-feet, so using a GUI to click around is somewhat cumbersome.

Anyway, the point of this comment is as an introduction to this bug:

https://bugs.launchpad.net/d-feet/+bug/1192296

To be fair, the bug is in d-feet itself, as the underlying infrastructure seems to handle variants just fine, and the d-feet patch is trivial. Just a reminder for people trying to debug this and running into trouble when looking at a job's "origin" property.

Other than that, this looks fine, the only thing I want to comment on is the jobs, the way we expose them looks fine in principle since there's access to methods related to each job (whereas, if we presented them as an array or dictionary it would be just the data with no methods and no 2-way interactivity), but the amount of jobs is huge which looks a bit overwhelming.

I wouldn't reverse a sound technical decision for aesthetic concerns though, so I don't think there's anything to fix here.

[Zygmunt Krynicki (zyga)]

I'm not sure we'll keep the current design. It remains to be seen.
18 cze 2013 22:36, "Daniel Manrique" <email address hidden>
napisał(a):

> Looks like use of variant properties isn't too widespread. I wasn't able
> to find any examples in the default Ubuntu services (there are *so* many
> though, that I may be missing it). This was using d-feet, so using a GUI to
> click around is somewhat cumbersome.
>
> Anyway, the point of this comment is as an introduction to this bug:
>
> https://bugs.launchpad.net/d-feet/+bug/1192296
>
> To be fair, the bug is in d-feet itself, as the underlying infrastructure
> seems to handle variants just fine, and the d-feet patch is trivial. Just a
> reminder for people trying to debug this and running into trouble when
> looking at a job's "origin" property.
>
> Other than that, this looks fine, the only thing I want to comment on is
> the jobs, the way we expose them looks fine in principle since there's
> access to methods related to each job (whereas, if we presented them as an
> array or dictionary it would be just the data with no methods and no 2-way
> interactivity), but the amount of jobs is huge which looks a bit
> overwhelming.
>
> I wouldn't reverse a sound technical decision for aesthetic concerns
> though, so I don't think there's anything to fix here.
>
> --
> https://code.launchpad.net/~zkrynicki/checkbox/plainbox-dbus/+merge/169865
> You are the owner of lp:~zkrynicki/checkbox/plainbox-dbus.
>

Unmerged revisions

2215. By Zygmunt Krynicki on 2013-06-18

plainbox:box: ignore KeyboardInterrupt around main()

This is orthogonal to the existing support for handling KeyboardInterrupt
while a command is being executed. Instead the main focus here is to
allow user to interrupt some of the startup code without causing
a backtrace to be printed.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2214. By Zygmunt Krynicki on 2013-06-18

plainbox:box: enable 'service' command

Signed-off-by: Zygmunt Krynicki <email address hidden>

2213. By Zygmunt Krynicki on 2013-06-18

plainbox:commands:service: export a dummy job definition if requested

Signed-off-by: Zygmunt Krynicki <email address hidden>

2212. By Zygmunt Krynicki on 2013-06-18

plainbox:commands:service: claim bus name after exporting all objects

Claiming bus name equals to saying 'this thing is ready to use' so let's
claim our well-known-name after adding all objects to the bus

Signed-off-by: Zygmunt Krynicki <email address hidden>

2211. By Zygmunt Krynicki on 2013-06-18

plainbox:commands:service: export checkbox object on the bus

Signed-off-by: Zygmunt Krynicki <email address hidden>

2210. By Zygmunt Krynicki on 2013-06-18

plainbox:commands:service: add 'service' command to spawn DBus service

The service command can be used to start a PlainBox service on the
session bus. It is currently intended as a development helper for GUI
developers.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2209. By Zygmunt Krynicki on 2013-06-18

plainbox:service: export JobDefinition and WhiteList with many properties

Work in progress on exporting many properties of both jobs and whitelists.
Jobs are now exported by name, not by checksum, but this is not imperfect
and probably will revert back later on. Whitelists have just the name
property (exporting actual patterns is probably not going to be needed
as we shall later see when session code gets written). The idea is
to use both whitelists and jobs as data sources to drive a bit of the GUI
and as identifiers (particular job, particular whitelist) when interacting
with Session methods (select those jobs, select that whitelist).

Signed-off-by: Zygmunt Krynicki <email address hidden>

2208. By Zygmunt Krynicki on 2013-06-18

plainbox:service: add DBus service for PlainBox

This service is in initial stages of development. It has a version, can
expose provider objects, each of which has a name, and not much else.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2207. By Zygmunt Krynicki on 2013-06-18

plainbox:dbus: add some extra imports from vanilla dbus

Signed-off-by: Zygmunt Krynicki <email address hidden>

2206. By Zygmunt Krynicki on 2013-06-18

plainbox:dbus: add support for property introspection

This branch as a bit of other code but it's mostly designed to be squashed
anyway so it should not matter much.

Signed-off-by: Zygmunt Krynicki <email address hidden>

=== modified file 'checkbox-ng/checkbox_ng/test_main.py'
--- checkbox-ng/checkbox_ng/test_main.py	2013-06-14 16:32:07 +0000
+++ checkbox-ng/checkbox_ng/test_main.py	2013-06-18 18:07:29 +0000
@@ -49,8 +49,8 @@
         self.assertEqual(call.exception.args, (0,))
         self.maxDiff = None
         expected = """
-        usage: checkbox [-h] [--version] [-c {src,deb,auto}] [-v] [-D] [-T LOGGER]
-                        [-P] [-I]
+        usage: checkbox [-h] [--version] [-c {src,deb,auto}] [-v] [-D] [-C]
+                        [-T LOGGER] [-P] [-I]
                         {sru,check-config,script,dev} ...
 
         positional arguments:
@@ -69,6 +69,7 @@
         logging and debugging:
           -v, --verbose         be more verbose (same as --log-level=INFO)
           -D, --debug           enable DEBUG messages on the root logger
+          -C, --debug-console   display DEBUG messages in the console
           -T LOGGER, --trace LOGGER
                                 enable DEBUG messages on the specified logger (can be
                                 used multiple times)
@@ -84,8 +85,8 @@
                 main([])
             self.assertEqual(call.exception.args, (2,))
         expected = """
-        usage: checkbox [-h] [--version] [-c {src,deb,auto}] [-v] [-D] [-T LOGGER]
-                        [-P] [-I]
+        usage: checkbox [-h] [--version] [-c {src,deb,auto}] [-v] [-D] [-C]
+                        [-T LOGGER] [-P] [-I]
                         {sru,check-config,script,dev} ...
         checkbox: error: too few arguments
         """

=== modified file 'plainbox/plainbox/impl/box.py'
--- plainbox/plainbox/impl/box.py	2013-06-14 16:32:07 +0000
+++ plainbox/plainbox/impl/box.py	2013-06-18 18:07:29 +0000
@@ -40,6 +40,7 @@
 from plainbox.impl.commands.run import RunCommand
 from plainbox.impl.commands.selftest import SelfTestCommand
 from plainbox.impl.commands.sru import SRUCommand
+from plainbox.impl.commands.service import ServiceCommand
 from plainbox.impl.logging import setup_logging, adjust_logging
 
 
@@ -112,6 +113,8 @@
         SRUCommand(self._checkbox, self._config).register_parser(subparsers)
         CheckConfigCommand(self._config).register_parser(subparsers)
         DevCommand(self._checkbox, self._config).register_parser(subparsers)
+        ServiceCommand(self._checkbox, self._config).register_parser(
+            subparsers)
 
     def early_init(self):
         """
@@ -124,7 +127,9 @@
         """
         Initialize with early command line arguments being already parsed
         """
-        adjust_logging(level=early_ns.log_level, trace_list=early_ns.trace)
+        adjust_logging(
+            level=early_ns.log_level, trace_list=early_ns.trace,
+            debug_console=early_ns.debug_console)
         # Load plainbox configuration
         self._config = self.get_config_cls().get()
         # Load and initialize checkbox provider
@@ -207,6 +212,11 @@
             action="store_const",
             const="DEBUG",
             help="enable DEBUG messages on the root logger")
+        # Add the --debug flag
+        group.add_argument(
+            "-C", "--debug-console",
+            action="store_true",
+            help="display DEBUG messages in the console")
         # Add the --trace flag
         group.add_argument(
             "-T", "--trace",
@@ -294,7 +304,15 @@
 
 
 def main(argv=None):
-    raise SystemExit(PlainBox().main(argv))
+    # Another try/catch block for catching KeyboardInterrupt
+    # This one is really only meant for the early init abort
+    # (when someone runs main but bails out before we really
+    # get to the point when we do something useful and setup
+    # all the exception handlers).
+    try:
+        raise SystemExit(PlainBox().main(argv))
+    except KeyboardInterrupt:
+        pass
 
 
 def get_builtin_jobs():

=== modified file 'plainbox/plainbox/impl/checkbox.py'
--- plainbox/plainbox/impl/checkbox.py	2013-06-06 11:23:51 +0000
+++ plainbox/plainbox/impl/checkbox.py	2013-06-18 18:07:29 +0000
@@ -58,7 +58,7 @@
     and appended (respectively) to the actual pattern specified in the file.
     """
 
-    def __init__(self, pattern_list):
+    def __init__(self, pattern_list, name=None):
         """
         Initialize a whitelist object with the specified list of patterns.
 
@@ -67,6 +67,14 @@
         inclusive = [RegExpJobQualifier(pattern) for pattern in pattern_list]
         exclusive = ()
         super(WhiteList, self).__init__(inclusive, exclusive)
+        self._name = name
+
+    @property
+    def name(self):
+        """
+        name of this WhiteList (might be None)
+        """
+        return self._name
 
     @classmethod
     def from_file(cls, pathname):
@@ -77,7 +85,8 @@
         :returns: a fresh WhiteList object
         """
         pattern_list = cls._load_patterns(pathname)
-        return cls(pattern_list)
+        name = os.path.splitext(os.path.basename(pathname))[0]
+        return cls(pattern_list, name=name)
 
     @classmethod
     def _load_patterns(self, pathname):
@@ -126,7 +135,8 @@
 
     Historically plainbox used a git submodule with checkbox tree (converted to
     git). This ended with the merge of plainbox into the checkbox tree.
-    
+
+
     Now it's the other way around and the checkbox tree can be located two
     directories "up" from the plainbox module, in a checkbox-old directory.
     """
@@ -281,7 +291,8 @@
         for name in os.listdir(self.whitelists_dir):
             if name.endswith(".whitelist"):
                 whitelist_list.append(
-                    WhiteList.from_file(os.path.join(self.jobs_dir, name)))
+                    WhiteList.from_file(os.path.join(
+                        self.whitelists_dir, name)))
         return whitelist_list
 
     def get_builtin_jobs(self):
@@ -318,3 +329,10 @@
             raise TypeError(
                 "Unsupported type of 'somewhere': {!r}".format(
                     type(somewhere)))
+
+    @property
+    def name(self):
+        """
+        name of this provider (always checkbox)
+        """
+        return "checkbox"

=== added file 'plainbox/plainbox/impl/commands/service.py'
--- plainbox/plainbox/impl/commands/service.py	1970-01-01 00:00:00 +0000
+++ plainbox/plainbox/impl/commands/service.py	2013-06-18 18:07:29 +0000
@@ -0,0 +1,136 @@
+# This file is part of Checkbox.
+#
+# Copyright 2013 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+:mod:`plainbox.impl.commands.dev` -- service sub-command
+========================================================
+
+"""
+
+import logging
+
+from dbus import SessionBus
+from dbus.mainloop.glib import DBusGMainLoop
+from dbus.service import BusName
+from gi.repository import GObject
+
+from plainbox.impl.commands import PlainBoxCommand
+from plainbox.impl.job import JobDefinition
+from plainbox.impl.provider import DummyProvider1
+from plainbox.impl.service import Service
+
+
+logger = logging.getLogger("plainbox.commands.service")
+
+
+def connect_to_session_bus():
+    """
+    Connect to the session bus properly.
+
+    Returns a tuple (session_bus, loop) where loop is a GObject.MainLoop
+    instance. The loop is there so that you can listen to signals.
+    """
+    # We'll need an event loop to observe signals. We will need the instance
+    # later below so let's keep it. Note that we're not passing it directly
+    # below as DBus needs specific API. The DBusGMainLoop class that we
+    # instantiate and pass is going to work with this instance transparently.
+    #
+    # NOTE: DBus tutorial suggests that we should create the loop _before_
+    # connecting to the bus.
+    logger.debug("Setting up glib-based event loop")
+    loop = GObject.MainLoop()
+    # Let's get the system bus object. We need that to access UDisks2 object
+    logger.debug("Connecting to DBus session bus")
+    session_bus = SessionBus(mainloop=DBusGMainLoop())
+    return session_bus, loop
+
+
+class ServiceInvocation:
+
+    def __init__(self, checkbox, config, ns):
+        self.checkbox = checkbox
+        self.config = config
+        self.ns = ns
+
+    def run(self):
+        bus, loop = connect_to_session_bus()
+        logger.info("Setting up DBus objects...")
+        service_obj = Service(on_exit=lambda: loop.quit(), conn=bus)
+        if self.ns.dummy:
+            logger.debug("Adding a DummyProvider")
+            job_list = [
+                JobDefinition({
+                    "name": "example-job",
+                    "description": "This is an example dummy job",
+                    "plugin": "manual",
+                }),
+            ]
+            provider = DummyProvider1(job_list, name="dummy")
+            service_obj.add_provider(provider)
+        service_obj.add_provider(self.checkbox)
+        logger.debug("Attempting to claim bus name: %s", self.ns.bus_name)
+        bus_name = BusName(self.ns.bus_name, bus)
+        logger.info(
+            "PlainBox DBus service ready, claimed name: %s",
+            bus_name.get_name())
+        try:
+            loop.run()
+        except KeyboardInterrupt:
+            logger.warning((
+                "Main loop interrupted!"
+                " It is recommended to call the Exit() method on the"
+                " exported service object instead"))
+        finally:
+            logger.debug("Main loop terminated, exiting...")
+            # TODO: move cleanup to service, maybe?
+            for provider_obj in service_obj._provider_list:
+                logger.debug("Removing %s", provider_obj)
+                provider_obj.remove_from_connection()
+            logger.debug("Removing %s", service_obj)
+            service_obj.remove_from_connection()
+            logger.debug("Releasing %s", bus_name)
+            # XXX: ugly but that's how one can reliably release a bus name
+            del bus_name
+            logger.debug("Closing %s", bus)
+            bus.close()
+
+
+class ServiceCommand(PlainBoxCommand):
+    """
+    DBus service for PlainBox
+    """
+
+    # XXX: Maybe drop checkbox / config and handle them differently
+    def __init__(self, checkbox, config):
+        self.checkbox = checkbox
+        self.config = config
+
+    def invoked(self, ns):
+        return ServiceInvocation(self.checkbox, self.config, ns).run()
+
+    def register_parser(self, subparsers):
+        parser = subparsers.add_parser("service", help="spawn dbus service")
+        parser.add_argument(
+            '--bus-name', action="store",
+            default="com.canonical.certification.PlainBox",
+            help="Use the specified DBus bus name")
+        parser.add_argument(
+            '--dummy', action="store_true", default=False,
+            help="Add a dummy job provider")
+        parser.set_defaults(command=self)

=== added directory 'plainbox/plainbox/impl/dbus'
=== added file 'plainbox/plainbox/impl/dbus/__init__.py'
--- plainbox/plainbox/impl/dbus/__init__.py	1970-01-01 00:00:00 +0000
+++ plainbox/plainbox/impl/dbus/__init__.py	2013-06-18 18:07:29 +0000
@@ -0,0 +1,30 @@
+# This file is part of Checkbox.
+#
+# Copyright 2013 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+:mod:`plainbox.impl.dbus` -- DBus support code for PlainBox
+===========================================================
+"""
+
+__all__ = ['service', 'Signature', 'Struct']
+
+from dbus import Struct
+from dbus import Signature
+
+from plainbox.impl.dbus import service

=== added file 'plainbox/plainbox/impl/dbus/service.py'
--- plainbox/plainbox/impl/dbus/service.py	1970-01-01 00:00:00 +0000
+++ plainbox/plainbox/impl/dbus/service.py	2013-06-18 18:07:29 +0000
@@ -0,0 +1,351 @@
+# This file is part of Checkbox.
+#
+# Copyright 2013 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+:mod:`plainbox.impl.dbus.service` -- DBus Service support code for PlainBox
+===========================================================================
+"""
+
+import logging
+
+import _dbus_bindings
+import dbus
+import dbus.service
+import dbus.exceptions
+
+from dbus.service import method, signal
+
+__all__ = ['signal', 'method', 'property', 'Object', 'Interface']
+
+logger = logging.getLogger("plainbox.dbus")
+
+
+class InterfaceType(dbus.service.InterfaceType):
+    """
+    Subclass of :class:`dbus.service.InterfaceType` that also handles
+    properties.
+    """
+
+    def _reflect_on_property(cls, func):
+        reflection_data = (
+            '    <property name="{}" type="{}" access="{}"/>\n').format(
+                func._dbus_property, func._dbus_signature,
+                func.dbus_access_flag)
+        return reflection_data
+
+
+#Subclass of :class:`dbus.service.Interface` that also handles properties
+Interface = InterfaceType('Interface', (dbus.service.Interface,), {})
+
+
+class property:
+    """
+    property that handles DBus stuff
+    """
+
+    def __init__(self, dbus_signature, dbus_interface, dbus_property=None,
+                 setter=False):
+        """
+        Initialize new dbus_property with the given interface name.
+
+        If dbus_property is not specified it is set to the name of the
+        decorated method. In special circumstances you may wish to specify
+        alternate dbus property name explicitly.
+
+        If setter is set to True then the implicit decorated function is a
+        setter, not the default getter. This allows to define write-only
+        properties.
+        """
+        self.__name__ = None
+        self.__doc__ = None
+        self._dbus_signature = dbus_signature
+        self._dbus_interface = dbus_interface
+        self._dbus_property = dbus_property
+        self._getf = None
+        self._setf = None
+        self._implicit_setter = setter
+
+    @property
+    def dbus_access_flag(self):
+        """
+        access flag of this DBus property
+
+        :returns: either "readwrite", "read" or "write"
+        :raises TypeError: if the property is ill-defined
+        """
+        if self._getf and self._setf:
+            return "readwrite"
+        elif self._getf:
+            return "read"
+        elif self._setf:
+            return "write"
+        else:
+            raise TypeError(
+                "property provides neither readable nor writable")
+
+    @property
+    def dbus_interface(self):
+        """
+        name of the DBus interface of this DBus property
+        """
+        return self._dbus_interface
+
+    @property
+    def dbus_property(self):
+        """
+        name of this DBus property
+        """
+        return self._dbus_property
+
+    @property
+    def dbus_signature(self):
+        """
+        signature of this DBus property
+        """
+        return self._dbus_signature
+
+    @property
+    def setter(self):
+        """
+        decorator for setter functions
+
+        This property can be used to decorate additional method that
+        will be used as a property setter. Otherwise properties cannot
+        be assigned.
+        """
+        def decorator(func):
+            self._setf = func
+            return self
+        return decorator
+
+    @property
+    def getter(self):
+        """
+        decorator for getter functions
+
+        This property can be used to decorate additional method that
+        will be used as a property getter. It is only provider for parity
+        as by default, the @dbus.service.property() decorator designates
+        a getter function. This behavior can be controlled by passing
+        setter=True to the property initializer.
+        """
+        def decorator(func):
+            self._getf = func
+            return self
+        return decorator
+
+    def __call__(self, func):
+        """
+        Decorate a getter function and return the property object
+
+        This method sets __name__, __doc__ and _dbus_property.
+        """
+        self.__name__ = func.__name__
+        if self.__doc__ is None:
+            self.__doc__ = func.__doc__
+        if self._dbus_property is None:
+            self._dbus_property = func.__name__
+        if self._implicit_setter:
+            return self.setter(func)
+        else:
+            return self.getter(func)
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        else:
+            if self._getf is None:
+                raise dbus.exceptions.DBusException(
+                    "property is not readable")
+            return self._getf(instance)
+
+    def __set__(self, instance, value):
+        if self._setf is None:
+            raise dbus.exceptions.DBusException(
+                "property is not writable")
+        self._setf(instance, value)
+
+    # This little helper is here is to help :meth:`Object.Introspect()`
+    # figure out how to handle properties.
+    _dbus_is_property = True
+
+
+class Object(Interface, dbus.service.Object):
+    """
+    dbus.service.Object subclass that provides DBus properties interface.
+
+    Implements Get(), Set() and GetAll(). Every actual property needs to
+    be implemented with the @dbus_property decorator.
+
+    This class also overrides Introspect() from the
+    org.freedesktop.DBus.Introspectable interface so that all of the
+    properties are properly accounted for.
+    """
+
+    @method(
+        dbus_interface=dbus.INTROSPECTABLE_IFACE,
+        in_signature='', out_signature='s',
+        path_keyword='object_path', connection_keyword='connection')
+    def Introspect(self, object_path, connection):
+        """
+        Return a string of XML encoding this object's supported interfaces,
+        methods and signals.
+        """
+        logger.debug("Introspect(object_path=%r)", object_path)
+        reflection_data = (
+            _dbus_bindings.DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE)
+        reflection_data += '<node name="%s">\n' % object_path
+        interfaces = self._dbus_class_table[
+            self.__class__.__module__ + '.' + self.__class__.__name__]
+        for (name, funcs) in interfaces.items():
+            reflection_data += '  <interface name="%s">\n' % (name)
+            for func in funcs.values():
+                if getattr(func, '_dbus_is_method', False):
+                    reflection_data += self.__class__._reflect_on_method(func)
+                elif getattr(func, '_dbus_is_signal', False):
+                    reflection_data += self.__class__._reflect_on_signal(func)
+                elif getattr(func, '_dbus_is_property', False):
+                    reflection_data += (
+                        self.__class__._reflect_on_property(func))
+            reflection_data += '  </interface>\n'
+        for name in connection.list_exported_child_objects(object_path):
+            reflection_data += '  <node name="%s"/>\n' % name
+        reflection_data += '</node>\n'
+        logger.debug("Introspect() returns: %s", reflection_data)
+        return reflection_data
+
+    @dbus.service.method(
+        dbus_interface=dbus.PROPERTIES_IFACE,
+        in_signature="ss", out_signature="v")
+    def Get(self, interface_name, property_name):
+        """
+        Get the value of a property @property_name on interface
+        @interface_name.
+        """
+        logger.debug("Get(%r, %r)", interface_name, property_name)
+        property_iface_map = self._get_property_iface_map()
+        if interface_name not in property_iface_map:
+            raise dbus.exceptions.DBusException(
+                dbus.PROPERTIES_IFACE,
+                "No such interface {}".format(interface_name))
+        if property_name not in property_iface_map[interface_name]:
+            raise dbus.exceptions.DBusException(
+                dbus.PROPERTIES_IFACE,
+                "No such property {}:{}".format(
+                    interface_name, property_name))
+        name = property_iface_map[interface_name][property_name]
+        try:
+            return getattr(self, name)
+        except dbus.exceptions.DBusException:
+            raise
+        except Exception as exc:
+            logger.exception(
+                "runaway exception from Get(%r, %r)",
+                interface_name, property_name)
+            raise dbus.exceptions.DBusException(
+                dbus.PROPERTIES_IFACE,
+                "Unable to get property interface/property {}:{}: {!r}".format(
+                    interface_name, property_name, exc))
+
+    @dbus.service.method(
+        dbus_interface=dbus.PROPERTIES_IFACE,
+        in_signature="ssv", out_signature="")
+    def Set(self, interface_name, property_name, value):
+        logger.debug("Set(%r, %r, %r)", interface_name, property_name, value)
+        property_iface_map = self._get_property_iface_map()
+        if interface_name not in property_iface_map:
+            raise dbus.exceptions.DBusException(
+                dbus.PROPERTIES_IFACE,
+                "No such interface {}".format(interface_name))
+        if property_name not in property_iface_map[interface_name]:
+            raise dbus.exceptions.DBusException(
+                dbus.PROPERTIES_IFACE,
+                "No such property {}:{}".format(
+                    interface_name, property_name))
+        name = property_iface_map[interface_name][property_name]
+        try:
+            setattr(self, name, value)
+        except dbus.exceptions.DBusException:
+            raise
+        except Exception as exc:
+            logger.exception(
+                "runaway exception from Set(%r, %r, %r)",
+                interface_name, property_name, value)
+            raise dbus.exceptions.DBusException(
+                dbus.PROPERTIES_IFACE,
+                "Unable to set property {}:{}: {!r}".format(
+                    interface_name, property_name, exc))
+
+    @dbus.service.method(
+        dbus_interface=dbus.PROPERTIES_IFACE,
+        in_signature="s", out_signature="a{sv}")
+    def GetAll(self, interface_name):
+        logger.debug("GetAll(%r)", interface_name)
+        property_iface_map = self._get_property_iface_map()
+        if interface_name not in property_iface_map:
+            raise dbus.exceptions.DBusException(
+                dbus.PROPERTIES_IFACE,
+                "No such interface {}".format(interface_name))
+        else:
+            return {
+                property_name: self.Get(interface_name, property_name)
+                for property_name in property_iface_map[interface_name]
+            }
+
+    @dbus.service.signal(
+        dbus_interface=dbus.PROPERTIES_IFACE,
+        signature='sa{sv}as')
+    def PropertiesChanged(
+            self, interface_name, changed_properties, invalidated_properties):
+        logger.debug(
+            "PropertiesChanged(%r, %r, %r)",
+            interface_name, changed_properties, invalidated_properties)
+
+    # None helper that is overriden per-class in _get_property_iface_map()
+    _property_iface_map = None
+
+    @classmethod
+    def _get_property_iface_map(cls):
+        """
+        Get or construct (once) property-interface map out of methods
+        decorated with @dbus_property decorator.
+        """
+        if cls._property_iface_map is None:
+            property_iface_map = cls._build_property_iface_map()
+            logger.debug("built property_iface_map: %r", property_iface_map)
+            cls._property_iface_map = property_iface_map
+        return cls._property_iface_map
+
+    @classmethod
+    def _build_property_iface_map(cls):
+        """
+        Construct property-interface map out of methods
+        decorated with @dbus_property decorator.
+        """
+        pif = {}  # property_iface_map
+        logger.debug("Looking for dbus_property instances in %r", cls)
+        for name in dir(cls):
+            obj = cls.__dict__.get(name)
+            if not isinstance(obj, property):
+                continue
+            logger.debug("Found DBus property %r", obj)
+            if obj._dbus_interface not in pif:
+                pif[obj._dbus_interface] = {}
+            pif[obj._dbus_interface][obj._dbus_property] = name
+        return pif

=== modified file 'plainbox/plainbox/impl/logging.py'
--- plainbox/plainbox/impl/logging.py	2013-06-14 13:05:27 +0000
+++ plainbox/plainbox/impl/logging.py	2013-06-18 18:07:29 +0000
@@ -36,6 +36,8 @@
 from plainbox.impl.color import ansi_on, ansi_off
 
 
+logger = logging.getLogger("plainbox.logging")
+
 # XXX: enable ansi escape sequences if sys.std{out,err} are both TTYs
 #
 # This is a bad place to take this decision (ideally we'd do that per log
@@ -91,15 +93,20 @@
         # defined for all of the logging subsystem in this python runtime
         logging.config.dictConfig(self.DEFAULT_CONFIG)
 
-    def adjust_logging(self, level=None, trace_list=None):
+    def adjust_logging(self, level=None, trace_list=None, debug_console=False):
         # Bump logging on the root logger if requested
         if level is not None:
             logging.getLogger(None).setLevel(level)
+            logger.debug("Enabled %r on root logger", level)
             logging.getLogger("plainbox").setLevel(level)
         # Enable tracing on specified loggers
         if trace_list is not None:
             for name in trace_list:
                 logging.getLogger(name).setLevel(logging.DEBUG)
+                logger.debug("Enabled debugging on logger %r", name)
+        if debug_console and (level == 'DEBUG' or trace_list):
+            # Enable DEBUG logging to console if explicitly requested
+            logging.config.dictConfig(self.DEBUG_CONSOLE_CONFIG)
 
     @property
     def log_dir(self):
@@ -115,6 +122,22 @@
         return {
             "version": 1,
             "formatters": {
+                "console_debug": {
+                    "()": "plainbox.impl.logging.ANSIFormatter",
+                    "format": (
+                        "{ansi.f.BLACK}{ansi.s.BRIGHT}"
+                        "%(levelname)s"
+                        "{ansi.s.NORMAL}{ansi.f.RESET}"
+                        " "
+                        "{ansi.f.CYAN}{ansi.s.DIM}"
+                        "%(name)s"
+                        "{ansi.f.RESET}{ansi.s.NORMAL}"
+                        ": "
+                        "{ansi.s.DIM}"
+                        "%(message)s"
+                        "{ansi.s.NORMAL}"
+                    ),
+                },
                 "console_info": {
                     "()": "plainbox.impl.logging.ANSIFormatter",
                     "format": (
@@ -122,7 +145,9 @@
                         "%(levelname)s"
                         "{ansi.s.NORMAL}{ansi.f.RESET}"
                         " "
-                        "{ansi.f.CYAN}%(name)s{ansi.f.RESET}"
+                        "{ansi.f.CYAN}{ansi.s.BRIGHT}"
+                        "%(name)s"
+                        "{ansi.f.RESET}{ansi.s.NORMAL}"
                         ": "
                         "%(message)s"
                     ),
@@ -178,6 +203,13 @@
                 },
             },
             "handlers": {
+                "console_debug": {
+                    "class": "logging.StreamHandler",
+                    "stream": "ext://sys.stdout",
+                    "formatter": "console_debug",
+                    "filters": ["only_debug"],
+                    "level": 150,
+                },
                 "console_info": {
                     "class": "logging.StreamHandler",
                     "stream": "ext://sys.stdout",
@@ -229,6 +261,7 @@
                 "plainbox": {
                     "level": "WARNING",
                     "handlers": [
+                        "console_debug",
                         "console_info",
                         "console_warning",
                         "console_error",
@@ -248,6 +281,18 @@
             "disable_existing_loggers": True,
         }
 
+    @property
+    def DEBUG_CONSOLE_CONFIG(self):
+        return {
+            "version": 1,
+            "handlers": {
+                "console_debug": {
+                    "level": "DEBUG",
+                },
+            },
+            "incremental": True,
+        }
+
 
 # Instantiate the helper
 _LoggingHelper = LoggingHelper()

=== modified file 'plainbox/plainbox/impl/plugins.py'
--- plainbox/plainbox/impl/plugins.py	2013-06-05 07:43:07 +0000
+++ plainbox/plainbox/impl/plugins.py	2013-06-18 18:07:29 +0000
@@ -37,7 +37,7 @@
 such as :meth:`PlugInCollection.get_by_name()` or
 :meth:`PlugInCollection.get_all_names()`
 
-The set of loaded plugins can be overriden by mock/patching
+The set of loaded plugins can be overridden by mock/patching
 :meth:`PlugInCollection._get_entry_points()`. This is especially useful for
 testing in isolation from whatever entry points may exist in the system.
 """

=== modified file 'plainbox/plainbox/impl/provider.py'
--- plainbox/plainbox/impl/provider.py	2013-05-17 16:14:38 +0000
+++ plainbox/plainbox/impl/provider.py	2013-06-18 18:07:29 +0000
@@ -1,3 +1,4 @@
+
 # This file is part of Checkbox.
 #
 # Copyright 2013 Canonical Ltd.
@@ -72,6 +73,14 @@
     """
 
     @abc.abstractproperty
+    def name(self):
+        """
+        name of this provider
+
+        This name should be dbus-friendly. It should not be localizable.
+        """
+
+    @abc.abstractproperty
     def CHECKBOX_SHARE(self):
         """
         Return the required value of CHECKBOX_SHARE environment variable.
@@ -134,6 +143,10 @@
                 job._checkbox = self
 
     @property
+    def name(self):
+        return self._extras.get('name', "dummy")
+
+    @property
     def CHECKBOX_SHARE(self):
         return self._extras.get('CHECKBOX_SHARE', "")
 

=== added file 'plainbox/plainbox/impl/service.py'
--- plainbox/plainbox/impl/service.py	1970-01-01 00:00:00 +0000
+++ plainbox/plainbox/impl/service.py	2013-06-18 18:07:29 +0000
@@ -0,0 +1,269 @@
+# This file is part of Checkbox.
+#
+# Copyright 2013 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+:mod:`plainbox.impl.service` -- DBus service for PlainBox
+=========================================================
+"""
+
+import logging
+
+from plainbox import __version__ as plainbox_version
+from plainbox.impl import dbus
+
+
+logger = logging.getLogger("plainbox.service")
+
+
+PLAINBOX_JOB_IFACE = "com.canonical.certification.PlainBox.JobDefinition"
+CHECKBOX_JOB_IFACE = "com.canonical.certification.CheckBox.JobDefinition"
+CHECKBOX_WHITELIST_IFACE = "com.canonical.certification.CheckBox.WhiteList"
+
+
+class JobDefinition(dbus.service.Object):
+    """
+    DBus exported JobDefinition defintion object
+    """
+
+    def __init__(self, job,
+                 conn=None, object_path=None, bus_name=None):
+        self._checksum = job.get_checksum()
+        self._job = job
+        if object_path is None:
+            object_path = (
+                "/com/canonical/certification/plainbox/"
+                "job/{}"
+            ).format(self._get_dbus_friendly_name())
+        super(JobDefinition, self).__init__(conn, object_path, bus_name)
+        logger.debug("Created %r", self)
+
+    def _get_dbus_friendly_name(self):
+        # FIXME: this is very sloppy, either use checksum again or
+        # be better at some sort of defensive coding approach
+        return self._job.name.replace("-", "_").replace(".", "_")
+
+    # PlainBox properties
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=PLAINBOX_JOB_IFACE)
+    def name(self):
+        return self._job.name
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=PLAINBOX_JOB_IFACE)
+    def description(self):
+        return self._job.description or ""
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=PLAINBOX_JOB_IFACE)
+    def checksum(self):
+        return self._checksum
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=PLAINBOX_JOB_IFACE)
+    def requires(self):
+        return self._job.requires or ""
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=PLAINBOX_JOB_IFACE)
+    def depends(self):
+        return self._job.depends or ""
+
+    # PlainBox methods
+
+    @dbus.service.method(
+        dbus_interface=PLAINBOX_JOB_IFACE,
+        in_signature='', out_signature='as')
+    def GetDirectDependencies(self):
+        return self._job.get_direct_dependencies()
+
+    @dbus.service.method(
+        dbus_interface=PLAINBOX_JOB_IFACE,
+        in_signature='', out_signature='as')
+    def GetResourceDependencies(self):
+        return self._job.get_resource_dependencies()
+
+    @dbus.service.method(
+        dbus_interface=CHECKBOX_JOB_IFACE,
+        in_signature='', out_signature='as')
+    def GetEnvironSettings(self):
+        return self._job.get_environ_settings()
+
+    # CheckBox properties
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=CHECKBOX_JOB_IFACE)
+    def plugin(self):
+        return self._job.plugin
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=CHECKBOX_JOB_IFACE)
+    def via(self):
+        return self._job.via or ""
+
+    @dbus.service.property(
+        dbus_signature="v", dbus_interface=CHECKBOX_JOB_IFACE)
+    def origin(self):
+        if self._job.origin is not None:
+            return dbus.Struct([
+                self._job.origin.filename,
+                self._job.origin.line_start,
+                self._job.origin.line_end
+            ], signature=dbus.Signature("(suu)"))
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=CHECKBOX_JOB_IFACE)
+    def command(self):
+        return self._job.command or ""
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=CHECKBOX_JOB_IFACE)
+    def environ(self):
+        return self._job.environ or ""
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=CHECKBOX_JOB_IFACE)
+    def user(self):
+        return self._job.user or ""
+
+
+class WhiteList(dbus.service.Object):
+    """
+    DBus exported WhiteList object
+    """
+
+    def __init__(self, whitelist,
+                 conn=None, object_path=None, bus_name=None):
+        self._whitelist = whitelist
+        if object_path is None:
+            object_path = (
+                "/com/canonical/certification/plainbox/"
+                "whitelist/{}"
+            ).format(self._get_dbus_friendly_name())
+        super(WhiteList, self).__init__(conn, object_path, bus_name)
+        logger.debug("Created %r", self)
+
+    def _get_dbus_friendly_name(self):
+        # FIXME: this is very sloppy, either use checksum again or
+        # be better at some sort of defensive coding approach
+        assert self._whitelist.name is not None
+        return self._whitelist.name.replace("-", "_").replace(".", "_")
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=CHECKBOX_WHITELIST_IFACE)
+    def name(self):
+        """
+        Name of this whitelist
+        """
+        return self._whitelist.name
+
+
+class Provider(dbus.service.Object):
+    """
+    DBus exported Provider object
+
+    This wrapper exports the plainbox IProvider1 interface over DBus.
+    Methods and properties internal to the implementation are *NOT* exported.
+    """
+
+    __dbus_iface__ = "com.canonical.certification.PlainBox.Provider"
+
+    def __init__(self, provider,
+                 conn=None, object_path=None, bus_name=None):
+        if object_path is None:
+            object_path = (
+                "/com/canonical/certification/plainbox/"
+                "providers/{}"
+            ).format(provider.name)
+        super(Provider, self).__init__(conn, object_path, bus_name)
+        self._provider = provider
+        self._job_list = []
+        self._whitelist_list = []
+        logger.debug("Created %r", self)
+        for job in provider.get_builtin_jobs():
+            job_obj = JobDefinition(job, conn=self.connection)
+            self._job_list.append(job_obj)
+        for whitelist in provider.get_builtin_whitelists():
+            whitelist_obj = WhiteList(whitelist, conn=self.connection)
+            self._whitelist_list.append(whitelist_obj)
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=__dbus_iface__)
+    def name(self):
+        """
+        Name of this provider
+        """
+        return self._provider.name
+
+
+class Service(dbus.service.Object):
+    """
+    PlainBox DBus Service
+    """
+
+    __dbus_iface__ = "com.canonical.certification.PlainBox"
+
+    def __init__(self, on_exit,
+                 conn=None, object_path=None, bus_name=None):
+        if object_path is None:
+            object_path = "/com/canonical/certification/plainbox/service"
+        super(Service, self).__init__(conn, object_path, bus_name)
+        self._provider_list = []
+        self._on_exit = on_exit
+        logger.debug("Created %r", self)
+
+    def add_provider(self, provider):
+        """
+        Add and expose a provider
+
+        :param provider:
+            A provider object to expose over DBus
+        """
+        provider_obj = Provider(provider, conn=self.connection)
+        self._provider_list.append(provider_obj)
+
+    @dbus.service.property(
+        dbus_signature="s", dbus_interface=__dbus_iface__)
+    def version(self):
+        """
+        version string of the PlainBox service
+        """
+        return "{}.{}.{}".format(*plainbox_version)
+
+    @dbus.service.method(
+        dbus_interface=__dbus_iface__,
+        in_signature='', out_signature='o')
+    def getCheckBoxProvider(self):
+        """
+        Return the special CheckBox provider.
+
+        This provider is currently always guaranteed to exist.
+        It is a shorthand for calling :meth:`EnumerateProviders()` and
+        filtering the one with the name "checkbox".
+        """
+        return None
+
+    @dbus.service.method(
+        dbus_interface=__dbus_iface__,
+        in_signature='', out_signature='')
+    def Exit(self):
+        """
+        Shut down the service and terminate
+        """
+        self._on_exit()

=== modified file 'plainbox/plainbox/impl/test_box.py'
--- plainbox/plainbox/impl/test_box.py	2013-06-14 16:32:07 +0000
+++ plainbox/plainbox/impl/test_box.py	2013-06-18 18:07:29 +0000
@@ -122,17 +122,18 @@
         self.assertEqual(call.exception.args, (0,))
         self.maxDiff = None
         expected = """
-        usage: plainbox [-h] [--version] [-c {src,deb,auto}] [-v] [-D] [-T LOGGER]
-                        [-P] [-I]
-                        {run,self-test,sru,check-config,dev} ...
+        usage: plainbox [-h] [--version] [-c {src,deb,auto}] [-v] [-D] [-C]
+                        [-T LOGGER] [-P] [-I]
+                        {run,self-test,sru,check-config,dev,service} ...
 
         positional arguments:
-          {run,self-test,sru,check-config,dev}
+          {run,self-test,sru,check-config,dev,service}
             run                 run a test job
             self-test           run integration tests
             sru                 run automated stable release update tests
             check-config        check and display plainbox configuration
             dev                 development commands
+            service             spawn dbus service
 
         optional arguments:
           -h, --help            show this help message and exit
@@ -143,6 +144,7 @@
         logging and debugging:
           -v, --verbose         be more verbose (same as --log-level=INFO)
           -D, --debug           enable DEBUG messages on the root logger
+          -C, --debug-console   display DEBUG messages in the console
           -T LOGGER, --trace LOGGER
                                 enable DEBUG messages on the specified logger (can be
                                 used multiple times)
@@ -159,9 +161,9 @@
                 main([])
             self.assertEqual(call.exception.args, (2,))
         expected = """
-        usage: plainbox [-h] [--version] [-c {src,deb,auto}] [-v] [-D] [-T LOGGER]
-                        [-P] [-I]
-                        {run,self-test,sru,check-config,dev} ...
+        usage: plainbox [-h] [--version] [-c {src,deb,auto}] [-v] [-D] [-C]
+                        [-T LOGGER] [-P] [-I]
+                        {run,self-test,sru,check-config,dev,service} ...
         plainbox: error: too few arguments
         """
         self.assertEqual(io.combined, cleandoc(expected) + "\n")