Merge lp:~townsend/libertine/launch-containerless-helpers into lp:libertine

[Christopher Townsend]

Add support for starting pasted and matchbox for snap based/containerless apps in U8.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:323
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/195/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/439
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/347
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/347
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/347
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/347
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/347
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/347
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/336/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/441
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/422
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/422
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/422
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/421
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/421/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/421
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/421/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/421
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/421/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/421
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/421/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/421
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/421/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/421
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/421/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/195/rebuild

review: Approve (continuous-integration)

[lp:~townsend/libertine/launch-containerless-helpers]

324. By Christopher Townsend on 2016-10-28

Add dependency on matchbox-window-manager in the libertine-xmir-tools package.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:324
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/196/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/440
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/348
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/348
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/348
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/348
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/348
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/348
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/337/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/442
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/423
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/423
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/423
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/422
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/422/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/422
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/422/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/422
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/422/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/422
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/422/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/422
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/422/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/422
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/422/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/196/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

lgtm! thanks for the quick update

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-10-27 15:44:44 +0000
+++ debian/control	2016-10-28 18:53:32 +0000
@@ -106,6 +106,7 @@
          libqt5core5a,
          libqt5gui5,
          libqt5widgets5,
+         matchbox-window-manager,
          xmir,
          ${misc:Depends},
          ${python3:Depends},

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2016-10-27 20:51:21 +0000
+++ python/libertine/Libertine.py	2016-10-28 18:53:32 +0000
@@ -48,6 +48,32 @@
     return False
 
 
+class NoContainer(object):
+    """
+    A containerless class used for launching apps with libertine-launch.
+    """
+    def connect(self):
+        """
+        A no-op function used by the Session class.
+        """
+        pass
+
+    def disconnect(self):
+        """
+        A no-op function used by the Session class.
+        """
+        pass 
+
+    def start_application(self, app_exec_line, environ):
+        import psutil
+
+        app = psutil.Popen(app_exec_line, env=environ)
+        return app
+
+    def finish_application(self, app):
+        app.wait()
+
+
 class BaseContainer(metaclass=abc.ABCMeta):
     """
     An abstract base container to provide common functionality for all

=== modified file 'python/libertine/__init__.py'
--- python/libertine/__init__.py	2016-10-27 15:19:35 +0000
+++ python/libertine/__init__.py	2016-10-28 18:53:32 +0000
@@ -23,9 +23,11 @@
 __all__ = [
           # from Libertine
           'LibertineContainer',
+          'NoContainer',
           'utils',
           ]
 
 __docformat__ = "restructuredtext en"
 
 from libertine.Libertine import LibertineContainer
+from libertine.Libertine import NoContainer

=== modified file 'python/libertine/launcher/config.py'
--- python/libertine/launcher/config.py	2016-10-25 16:55:51 +0000
+++ python/libertine/launcher/config.py	2016-10-28 18:53:32 +0000
@@ -214,17 +214,24 @@
         """Create a collection of pre-launch tasks."""
         tasks = []
         tasks.append(TaskConfig(TaskType.LAUNCH_SERVICE, ["pasted"]))
+
+        if self.container_id is None:
+            tasks.append(TaskConfig(TaskType.LAUNCH_SERVICE, ['matchbox-window-manager', '-use_titlebar', 'no']))
+
         return tasks
 
     def _create_socket_bridges(self):
         """Create the required socket bridge configs."""
         bridges = []
-        maliit_host_bridge = self._create_maliit_host_bridge()
-        if maliit_host_bridge:
-            bridges.append(maliit_host_bridge)
-        dbus_host_bridge = self._create_dbus_host_bridge()
-        if dbus_host_bridge:
-            bridges.append(dbus_host_bridge)
+
+        if self.container_id:
+            maliit_host_bridge = self._create_maliit_host_bridge()
+            if maliit_host_bridge:
+                bridges.append(maliit_host_bridge)
+            dbus_host_bridge = self._create_dbus_host_bridge()
+            if dbus_host_bridge:
+                bridges.append(dbus_host_bridge)
+
         return bridges
 
     def _generate_session_socket_name(self, socket_target):

=== modified file 'tests/unit/test_launcher_with_dbus.py'
--- tests/unit/test_launcher_with_dbus.py	2016-08-28 00:17:54 +0000
+++ tests/unit/test_launcher_with_dbus.py	2016-10-28 18:53:32 +0000
@@ -75,7 +75,7 @@
         super().setUp()
         fake_maliit_host_address = 'unix:abstract=/tmp/maliit-host-socket'
         self._dbus_server = self.useFixture(MockDBusServer(maliit_server_address=fake_maliit_host_address))
-        self._cli = [ self.getUniqueString(), self.getUniqueString() ]
+        self._cli = [ '-i', self.getUniqueString(), self.getUniqueString() ]
 
     def test_maliit_socket_bridge_from_dbus(self):
         """

=== modified file 'tools/libertine-launch'
--- tools/libertine-launch	2016-10-26 13:58:19 +0000
+++ tools/libertine-launch	2016-10-28 18:53:32 +0000
@@ -18,18 +18,23 @@
 
 import os
 
-from libertine import launcher, LibertineContainer
+from libertine import launcher
 
 def main():
     config = launcher.Config()
 
     if config.container_id:
+        from libertine import LibertineContainer
+
         container = LibertineContainer(container_id=config.container_id)
-        with launcher.Session(config, container) as session:
-            session.start_application()
-            session.run()
     else:
-        os.execvp(config.exec_line[0], config.exec_line[0:])
+        from libertine import NoContainer
+
+        container = NoContainer()
+
+    with launcher.Session(config, container) as session:
+        session.start_application()
+        session.run()
 
 if __name__ == '__main__':
     main()