Merge lp:~jamesh/snappy-hub/test-snapd-dbus-service into lp:~snappy-dev/snappy-hub/test-snapd-dbus-service

[James Henstridge]

Integrate changes from https://github.com/snapcore/snapd/pull/6258

Integrate changes from https://github.com/snapcore/snapd/pull/6258.

Namely:

 * switch from "service: true" to "activatable: true"
 * Provide both a system and session service
 * make the system service a daemon
 * use a setup.py script so environment is set up correctly for the script.
 * update service so it can connect to either bus

[Zygmunt Krynicki (zyga)]

Looks good, +1

review: Approve

[lp:~jamesh/snappy-hub/test-snapd-dbus-service]

2. By Zygmunt Krynicki on 2018-12-05

Merge https://code.launchpad.net/~jamesh/snappy-hub/test-snapd-dbus-service/+merge/360118

=== modified file 'bin/test-snapd-dbus-service'
--- bin/test-snapd-dbus-service	2017-01-16 16:31:25 +0000
+++ bin/test-snapd-dbus-service	2018-12-05 12:13:07 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 import os
-import os.path
+import sys
 import glob
 # ensure that typelib path points to the right directory,
 # eg. $SNAP/usr/lib/x86_64-linux-gnu/girepository-1.0 on amd64
@@ -15,18 +15,34 @@
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 
+BUS_NAME = 'io.snapcraft.SnapDbusService'
+OBJECT_PATH = '/io/snapcraft/SnapDbusService'
+
 
 class ServerObject(dbus.service.Object):
-    def __init__(self):
-        bus_name = dbus.service.BusName(
-            'io.snapcraft.SnapDbusService',bus=dbus.SessionBus())
-        dbus.service.Object.__init__(self, bus_name, '/io/snapcraft/SnapDbusService')
     @dbus.service.method('io.snapcraft.ExampleInterface')
     def ExampleMethod(self):
-	    return "hello world"
+        return "hello world"
 
 
 if __name__ == "__main__":
-    server = ServerObject()
-    loop = GLib.MainLoop()
-    loop.run()
+    if sys.argv[1] == 'session':
+        bus = dbus.SessionBus()
+    elif sys.argv[1] == 'system':
+        bus = dbus.SystemBus()
+    else:
+        sys.stderr.write("Unknown D-Bus bus: {}\n".format(sys.argv[1]))
+        sys.exit(1)
+
+    main_loop = GLib.MainLoop()
+    # Make sure we quit when the bus shuts down
+    bus.add_signal_receiver(
+        main_loop.quit, signal_name="Disconnected",
+        path="/org/freedesktop/DBus/Local",
+        dbus_interface="org.freedesktop.DBus.Local")
+
+    server = ServerObject(bus, OBJECT_PATH)
+    bus_name = dbus.service.BusName(
+        BUS_NAME, bus, allow_replacement=True, replace_existing=True,
+        do_not_queue=True)
+    main_loop.run()

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2018-12-05 12:13:07 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+
+import setuptools
+
+setuptools.setup(
+    name="test-snapd-dbus-serice",
+    version="1.0",
+    scripts=[
+        "bin/test-snapd-dbus-service"
+    ],
+)

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2017-01-16 16:31:25 +0000
+++ snapcraft.yaml	2018-12-05 12:13:07 +0000
@@ -3,26 +3,37 @@
 summary: Python based example dbus service
 description: ...
 slots:
-  test-snapd-dbus-service-slot:
+  dbus-session-slot:
     interface: dbus
     bus: session
-    service: true
+    activatable: true
+    name: io.snapcraft.SnapDbusService
+  dbus-system-slot:
+    interface: dbus
+    bus: system
+    activatable: true
     name: io.snapcraft.SnapDbusService
 apps:
-  test-snapd-dbus-service:
-    command: bin/test-snapd-dbus-service
-    plugs:
-      - network
-      - network-bind
-    slots:
-      - test-snapd-dbus-service-slot
+  session:
+    command: bin/test-snapd-dbus-service session
+    plugs:
+      - network
+    slots:
+      - dbus-session-slot
+  system:
+    command: bin/test-snapd-dbus-service system
+    passthrough:
+      daemon: dbus
+      bus-name: io.snapcraft.SnapDbusService
+    plugs:
+      - network
+    slots:
+      - dbus-system-slot
 parts:
   test-snapd-dbus-service:
+    source: .
     plugin: python3
     stage-packages:
       - python3-dbus
       - python3-gi
       - gir1.2-glib-2.0
-  copy:
-    plugin: dump
-    source: .