Merge lp:~townsend/libertine/1.6-release into lp:libertine/trunk

[Christopher Townsend]

* Get libertine-container-manager and libertine-launch working in a confined environment.
* Create a special desktop file to satisfy the snappy store.
* Update snap definition to include aliases, renamed commands, and internal desktop file.
* Ensure absolute path lxd bind-mounts have a valid name by using the full path as a backup.
* Refactor liblibertine as a client wrapper for libertined and bump version to 1.5.2.
* Protect against containers that aren't started when running commands.
* Migrate the list-apps subcommand to list application ids. (LP: #1657877)
* Run the libertined integration test with its own dbus sesison to prevent collisions with running service.
* Discover if a session is running and if so, use it's dbus session to start the container manager. (LP: #1657490)
* Replace all pylxd execute()'s with calls to 'lxc exec' as pylxd has performance issues in execute().
* Add ability to freeze and unfreeze LXC/LXD containers. This is disabled by default for now. (LP: #1654355)
* Add ability to enable and disable the freezing of LXC/LXD containers when not in use. (LP: #1654355)
* Deprecate the lx[cd] managers and use libertined for managing the containers and move the actual starting and stopping of containers to the respective backends. (LP: #1660685)
* Add a restart subcommand to libertine-container-manager. Also try to restart the container when adding/removing bind-mounts, if appropriate. (LP: #1654355)
* Enable Xmir '-rootless' mode by default and remove using Matchbox for the window manager. (LP: #1662555)
* Bump release version to 1.6.

[lp:~townsend/libertine/1.6-release]

186. By Christopher Townsend on 2017-02-08

Fix CMake file typo.

187. By Christopher Townsend on 2017-02-08

Change when the libertine-xmir Upstart gets started to account for Unity 8 now directly starting apps.

188. By Christopher Townsend on 2017-02-09

Return True instead of pass for start_container() in the base class. Fixes running operation in chroot's.

[Stephen M. Webb (bregma)]

Sane.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-01-13 20:11:25 +0000
+++ CMakeLists.txt	2017-02-09 16:08:46 +0000
@@ -2,12 +2,11 @@
 cmake_policy(SET CMP0048 NEW)
 
 project(libertine
-        VERSION 1.5.1)
+        VERSION 1.6)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 
 find_package(PkgConfig REQUIRED)
-find_package(GObjectIntrospection REQUIRED)
 include(GNUInstallDirs)
 include(CheckIncludeFile)
 include(CheckFunctionExists)
@@ -17,6 +16,7 @@
 include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 
 find_package(Qt5Core      REQUIRED)
+find_package(Qt5DBus      REQUIRED)
 find_package(Qt5Gui       REQUIRED)
 find_package(Qt5Quick     REQUIRED)
 find_package(Qt5Widgets   REQUIRED)

=== removed directory 'cmake'
=== removed file 'cmake/FindGObjectIntrospection.cmake'
--- cmake/FindGObjectIntrospection.cmake	2015-08-17 20:42:31 +0000
+++ cmake/FindGObjectIntrospection.cmake	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# - try to find gobject-introspection
-#
-# Once done this will define
-#
-#  INTROSPECTION_FOUND - system has gobject-introspection
-#  INTROSPECTION_SCANNER - the gobject-introspection scanner, g-ir-scanner
-#  INTROSPECTION_COMPILER - the gobject-introspection compiler, g-ir-compiler
-#  INTROSPECTION_GENERATE - the gobject-introspection generate, g-ir-generate
-#  INTROSPECTION_GIRDIR
-#  INTROSPECTION_TYPELIBDIR
-#  INTROSPECTION_CFLAGS
-#  INTROSPECTION_LIBS
-#
-# Copyright (C) 2010, Pino Toscano, <[e-mail]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname)
-  execute_process(
-    COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=${_varname} gobject-introspection-1.0
-    OUTPUT_VARIABLE _result
-    RESULT_VARIABLE _null
-  )
-
-  if (_null)
-  else()
-    string(REGEX REPLACE "[\r\n]" " " _result "${_result}")
-    string(REGEX REPLACE " +$" ""  _result "${_result}")
-    separate_arguments(_result)
-    set(${_outvar} ${_result} CACHE INTERNAL "")
-  endif()
-endmacro(_GIR_GET_PKGCONFIG_VAR)
-
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
-  if(PACKAGE_FIND_VERSION_COUNT GREATER 0)
-    set(_gir_version_cmp ">=${PACKAGE_FIND_VERSION}")
-  endif()
-  pkg_check_modules(_pc_gir gobject-introspection-1.0${_gir_version_cmp})
-  if(_pc_gir_FOUND)
-    set(INTROSPECTION_FOUND TRUE)
-    _gir_get_pkgconfig_var(INTROSPECTION_SCANNER "g_ir_scanner")
-    _gir_get_pkgconfig_var(INTROSPECTION_COMPILER "g_ir_compiler")
-    _gir_get_pkgconfig_var(INTROSPECTION_GENERATE "g_ir_generate")
-    _gir_get_pkgconfig_var(INTROSPECTION_GIRDIR "girdir")
-    _gir_get_pkgconfig_var(INTROSPECTION_TYPELIBDIR "typelibdir")
-    set(INTROSPECTION_CFLAGS "${_pc_gir_CFLAGS}")
-    set(INTROSPECTION_LIBS "${_pc_gir_LIBS}")
-  endif()
-endif()
-
-mark_as_advanced(
-  INTROSPECTION_SCANNER
-  INTROSPECTION_COMPILER
-  INTROSPECTION_GENERATE
-  INTROSPECTION_GIRDIR
-  INTROSPECTION_TYPELIBDIR
-  INTROSPECTION_CFLAGS
-  INTROSPECTION_LIBS
-)

=== removed file 'cmake/ListOperations.cmake'
--- cmake/ListOperations.cmake	2015-08-17 20:42:31 +0000
+++ cmake/ListOperations.cmake	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-
-macro(list_prefix _outvar _listvar _prefix)
-  set(${_outvar})
-  foreach(_item IN LISTS ${_listvar})
-    list(APPEND ${_outvar} ${_prefix}${_item})
-  endforeach()
-endmacro(list_prefix)
-
-macro(list_make_absolute _outvar _listvar _prefix)
-  set(${_outvar})
-  foreach(_item IN LISTS ${_listvar})
-    if(IS_ABSOLUTE ${_item})
-      list(APPEND ${_outvar} ${_item})
-    else()
-      list(APPEND ${_outvar} ${_prefix}${_item})
-    endif()
-  endforeach()
-endmacro(list_make_absolute)

=== removed file 'cmake/UseGObjectIntrospection.cmake'
--- cmake/UseGObjectIntrospection.cmake	2015-08-17 20:42:31 +0000
+++ cmake/UseGObjectIntrospection.cmake	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-# Copyright (C) 2010, Pino Toscano, <[e-mail]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(ListOperations)
-
-macro(_gir_list_prefix _outvar _listvar _prefix)
-  set(${_outvar})
-  foreach(_item IN LISTS ${_listvar})
-    list(APPEND ${_outvar} ${_prefix}${_item})
-  endforeach()
-endmacro(_gir_list_prefix)
-
-macro(gir_add_introspections introspections_girs)
-
-  foreach(gir IN LISTS ${introspections_girs})
-
-    set(_gir_name "${gir}")
-
-    ## Transform the gir filename to something which can reference through a variable
-    ## without automake/make complaining, eg Gtk-2.0.gir -> Gtk_2_0_gir
-    string(REPLACE "-" "_" _gir_name "${_gir_name}")
-    string(REPLACE "." "_" _gir_name "${_gir_name}")
-
-    # Namespace and Version is either fetched from the gir filename
-    # or the _NAMESPACE/_VERSION variable combo
-    set(_gir_namespace "${${_gir_name}_NAMESPACE}")
-    if (_gir_namespace STREQUAL "")
-      string(REGEX REPLACE "([^-]+)-.*" "\\1" _gir_namespace "${gir}")
-    endif ()
-    set(_gir_version "${${_gir_name}_VERSION}")
-    if (_gir_version STREQUAL "")
-      string(REGEX REPLACE ".*-([^-]+).gir" "\\1" _gir_version "${gir}")
-    endif ()
-
-    # _PROGRAM is an optional variable which needs it's own --program argument
-    set(_gir_program "${${_gir_name}_PROGRAM}")
-    if (NOT _gir_program STREQUAL "")
-      set(_gir_program "--program=${_gir_program}")
-    endif ()
-
-    # Variables which provides a list of things
-    _gir_list_prefix(_gir_libraries ${_gir_name}_LIBS "--library=")
-    _gir_list_prefix(_gir_packages ${_gir_name}_PACKAGES "--pkg=")
-    _gir_list_prefix(_gir_includes ${_gir_name}_INCLUDES "--include=")
-    _gir_list_prefix(_gir_export_packages ${_gir_name}_EXPORT_PACKAGES "--pkg-export=")
-
-    # Reuse the LIBTOOL variable from by automake if it's set
-    set(_gir_libtool "--no-libtool")
-
-    add_custom_command(
-      COMMAND ${INTROSPECTION_SCANNER}
-              ${INTROSPECTION_SCANNER_ARGS}
-              --quiet
-              --warn-all
-              --namespace=${_gir_namespace}
-              --nsversion=${_gir_version}
-              ${_gir_libtool}
-              ${_gir_program}
-              ${_gir_libraries}
-              ${_gir_packages}
-              ${_gir_includes}
-              ${_gir_export_packages}
-              ${${_gir_name}_SCANNERFLAGS}
-              ${${_gir_name}_CFLAGS}
-              ${${_gir_name}_FILES}
-              --output ${CMAKE_CURRENT_BINARY_DIR}/${gir}
-      DEPENDS ${${_gir_name}_FILES}
-              ${${_gir_name}_LIBS}
-      OUTPUT ${gir}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      VERBATIM
-    )
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${gir} DESTINATION share/gir-1.0)
-
-    string(REPLACE ".gir" ".typelib" _typelib "${gir}")
-    add_custom_command(
-      COMMAND ${INTROSPECTION_COMPILER}
-              ${INTROSPECTION_COMPILER_ARGS}
-              --includedir=.
-              ${CMAKE_CURRENT_BINARY_DIR}/${gir}
-              -o ${CMAKE_CURRENT_BINARY_DIR}/${_typelib}
-      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${gir}
-      OUTPUT ${_typelib}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_typelib} DESTINATION ${CMAKE_INSTALL_LIBDIR}/girepository-1.0)
-
-    add_custom_target(gir-${gir} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${gir})
-    add_custom_target(gir-typelibs-${_typelib} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_typelib})
-  endforeach()
-
-endmacro(gir_add_introspections)
-
-macro(gir_get_cflags _output)
-  get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
-  list_prefix(_includes _tmp_includes "-I")
-  get_directory_property(_tmp_compile_definitions COMPILE_DEFINITIONS)
-  list_prefix(_compile_definitions _tmp_compile_definitions "-D")
-  set(${_output} ${_includes} ${_compile_definitions})
-endmacro(gir_get_cflags)

=== modified file 'common/LibertineConfig.cpp'
--- common/LibertineConfig.cpp	2016-09-26 18:17:07 +0000
+++ common/LibertineConfig.cpp	2017-02-09 16:08:46 +0000
@@ -3,7 +3,7 @@
  * @brief Libertine Manager application-wide configuration module
  */
 /*
- * Copyright 2015 Canonical Ltd
+ * Copyright 2015-2017 Canonical Ltd
  *
  * Libertine is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3, as published by the
@@ -18,6 +18,7 @@
  */
 #include "common/LibertineConfig.h"
 
+#include <cstdlib>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QStandardPaths>
@@ -27,6 +28,14 @@
 containers_config_file_name() const
 {
   QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/libertine";
+
+  // if running from a snap
+  auto snap_common = std::getenv("SNAP_USER_COMMON");
+  if (snap_common != nullptr)
+  {
+    path.replace(std::getenv("HOME"), snap_common);
+  }
+
   QDir dir(path);
 
   if (!dir.exists())

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-12-21 20:57:15 +0000
+++ data/CMakeLists.txt	2017-02-09 16:08:46 +0000
@@ -8,7 +8,5 @@
         DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
 install(FILES libertine-lxc-sudo libertine-lxd-sudo
         DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sudoers.d)
-install(FILES com.canonical.libertine.ContainerManager.service
-              com.canonical.libertine.LxcManager.service
-              com.canonical.libertine.LxdManager.service
+install(FILES com.canonical.libertine.Service.service
         DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services)

=== removed file 'data/com.canonical.libertine.LxcManager.service'
--- data/com.canonical.libertine.LxcManager.service	2016-08-19 14:02:31 +0000
+++ data/com.canonical.libertine.LxcManager.service	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.libertine.LxcManager
-Exec=/usr/bin/libertine-lxc-manager

=== removed file 'data/com.canonical.libertine.LxdManager.service'
--- data/com.canonical.libertine.LxdManager.service	2016-12-20 20:23:16 +0000
+++ data/com.canonical.libertine.LxdManager.service	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.libertine.LxdManager
-Exec=/usr/bin/libertine-lxd-manager

=== renamed file 'data/com.canonical.libertine.ContainerManager.service' => 'data/com.canonical.libertine.Service.service'
--- data/com.canonical.libertine.ContainerManager.service	2016-11-01 20:10:58 +0000
+++ data/com.canonical.libertine.Service.service	2017-02-09 16:08:46 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.canonical.libertine.ContainerManager
+Name=com.canonical.libertine.Service
 Exec=/usr/bin/libertined --cache-output

=== modified file 'data/libertine-xmir.conf'
--- data/libertine-xmir.conf	2016-02-18 15:49:20 +0000
+++ data/libertine-xmir.conf	2017-02-09 16:08:46 +0000
@@ -1,7 +1,7 @@
 description "Set global environment variable to tell u-a-l where to look to start Xmir"
 author "Christopher Townsend <[e-mail]>"
 
-start on started unity8
+start on starting unity8
 
 pre-start script
 	initctl set-env --global UBUNTU_APP_LAUNCH_XMIR_PATH="/usr/bin/libertine-xmir"

=== modified file 'data/snap-runner.wrapper'
--- data/snap-runner.wrapper	2016-12-06 16:14:42 +0000
+++ data/snap-runner.wrapper	2017-02-09 16:08:46 +0000
@@ -3,9 +3,10 @@
 
 export LD_LIBRARY_PATH=$SNAP/usr/lib/$ARCH/fakechroot:$LD_LIBRARY_PATH
 export DEBOOTSTRAP_DIR=$SNAP/usr/share/debootstrap
+export LXD_DIR=/var/snap/lxd/common/lxd
 
 # Useful debug variables
 # export FAKECHROOT_DEBUG=1
 # export LIBERTINE_DEBUG=1
 
-exec $SNAP/bin/desktop-launch $@
+exec $SNAP/bin/desktop-launch "$@"

=== modified file 'debian/changelog'
--- debian/changelog	2017-01-18 14:50:33 +0000
+++ debian/changelog	2017-02-09 16:08:46 +0000
@@ -1,3 +1,43 @@
+libertine (1.6-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Larry Price ]
+  * Get libertine-container-manager and libertine-launch working in a confined
+    environment.
+  * Create a special desktop file to satisfy the snappy store.
+  * Update snap definition to include aliases, renamed commands, and internal
+    desktop file.
+  * Ensure absolute path lxd bind-mounts have a valid name by using the full
+    path as a backup.
+  * Refactor liblibertine as a client wrapper for libertined and bump version
+    to 1.5.2.
+  * Protect against containers that aren't started when running commands.
+  * Migrate the list-apps subcommand to list application ids. (LP: #1657877)
+  * Run the libertined integration test with its own dbus sesison to prevent
+    collisions with running service.
+
+  [ Chris Townsend ]
+  * Discover if a session is running and if so, use it's dbus session to start
+    the container manager. (LP: #1657490)
+  * Replace all pylxd execute()'s with calls to 'lxc exec' as pylxd has
+    performance issues in execute().
+  * Add ability to freeze and unfreeze LXC/LXD containers. This is disabled by
+    default for now. (LP: #1654355)
+  * Add ability to enable and disable the freezing of LXC/LXD containers when
+    not in use. (LP: #1654355)
+  * Deprecate the lx[cd] managers and use libertined for managing the containers
+    and move the actual starting and stopping of containers to the respective
+    backends. (LP: #1660685)
+  * Add a restart subcommand to libertine-container-manager. Also try to restart
+    the container when adding/removing bind-mounts, if appropriate.
+    (LP: #1654355)
+  * Enable Xmir '-rootless' mode by default and remove using Matchbox for the
+    window manager. (LP: #1662555)
+  * Change when the libertine-xmir Upstart gets started to account for Unity 8
+    now directly starting apps.
+  * Bump release version to 1.6.
+
+ -- Chris Townsend <[e-mail]>  Wed, 08 Feb 2017 13:36:05 -0500
+
 libertine (1.5.1+17.04.20170118-0ubuntu1) zesty; urgency=medium
 
   [ Chris Townsend ]

=== modified file 'debian/control'
--- debian/control	2016-12-07 17:45:28 +0000
+++ debian/control	2017-02-09 16:08:46 +0000
@@ -23,6 +23,7 @@
                python3-distro-info,
                python3-gi,
                python3-lxc,
+               python3-pexpect,
                python3-psutil,
                python3-pytest,
                python3-testtools,
@@ -84,7 +85,6 @@
 Architecture: any
 Depends: libglib2.0-bin,
          lsb-release,
-         python3-apt,
          python3-dbus,
          python3-distro-info,
          python3-libertine,
@@ -104,7 +104,6 @@
          libqt5core5a,
          libqt5gui5,
          libqt5widgets5,
-         matchbox-window-manager,
          xmir [amd64 armhf arm64 i386],
          ${misc:Depends},
          ${python3:Depends},
@@ -115,15 +114,33 @@
  Helper applications for using and interacting with Xmir such as launching
  Xmir and allowing copy and paste.
 
+Package: libertined
+Architecture: any
+Multi-Arch: same
+Depends: python3-libertine,
+         python3-apt,
+         python3-dbus,
+         python3-gi,
+         ${misc:Depends},
+         ${shlibs:Depends},
+         ${python3:Depends}
+Breaks: libertine-tools (<< 1.5.2)
+Replaces: libertine-tools (<< 1.5.2)
+Description: d-bus service for managing libertine containers
+ D-Bus service for asynchronously discovering and managing classic applications
+ using libertine containers. Allows installation and removal of deb-packaged
+ X11 apps within an isolated sandbox.
+
 Package: liblibertine1
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
+Depends: libertined,
+         ${misc:Depends},
          ${shlibs:Depends}
 Description: runtime for running deb-packaged X11 apps on Ubuntu Personal
  Runtime library for creating and using the Ubuntu Personal sandbox for legacy
  Deb-packaged X11 applicatons.  This library is used by the Libertine tools
- and other software interacting wit hthe Libertine container, such as scopes
+ and other software interacting with the Libertine container, such as scopes
  or application launchers.
 
 Package: liblibertine-dev
@@ -137,24 +154,11 @@
  Headers and shared libraries used to create the tools for creating and using
  the Ubuntu Personal sandbox for legacy Deb-packaged X11 applicatons.
 
-Package: gir1.2-libertine
-Architecture: any
-Multi-Arch: same
-Depends: liblibertine1 (= ${binary:Version}),
-         ${gir:Depends},
-         ${misc:Depends}
-Description: GObject introspection files for the Libertine application sandbox
- The GObject introspection description files for the Libertine application
- sandbox runtime.  This package allows the Libertine API to be used from
- GIR-compliant languages such as Python.
-
 Package: python3-libertine
 Architecture: any
 Section: python
 Multi-Arch: allowed
-Depends: gir1.2-libertine,
-         python3-gi,
-         python3-psutil,
+Depends: python3-psutil,
          python3-xdg,
          xdg-user-dirs,
          ${misc:Depends},

=== removed file 'debian/gir1.2-libertine.install'
--- debian/gir1.2-libertine.install	2015-08-24 16:54:54 +0000
+++ debian/gir1.2-libertine.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/girepository-1.0/Libertine-1.typelib
-usr/share/gir-1.0/Libertine-1.gir

=== modified file 'debian/libertine-tools.install'
--- debian/libertine-tools.install	2016-11-01 20:10:58 +0000
+++ debian/libertine-tools.install	2017-02-09 16:08:46 +0000
@@ -1,6 +1,4 @@
 usr/bin/libertine-container-manager
 usr/bin/libertine-launch
-usr/bin/libertined
-usr/share/dbus-1/services/com.canonical.libertine.ContainerManager.service
 usr/share/bash-completion/completions/libertine-container-manager
 usr/share/man

=== added file 'debian/libertined.install'
--- debian/libertined.install	1970-01-01 00:00:00 +0000
+++ debian/libertined.install	2017-02-09 16:08:46 +0000
@@ -0,0 +1,3 @@
+usr/bin/libertined
+usr/lib/python*/*/libertine/service
+usr/share/dbus-1/services/com.canonical.libertine.Service.service

=== modified file 'debian/python3-libertine-lxc.install'
--- debian/python3-libertine-lxc.install	2016-10-07 21:09:41 +0000
+++ debian/python3-libertine-lxc.install	2017-02-09 16:08:46 +0000
@@ -1,6 +1,4 @@
 etc/sudoers.d/libertine-lxc-sudo
-usr/bin/libertine-lxc-manager
 usr/bin/libertine-lxc-setup
 usr/lib/python*/*/libertine/LxcContainer.py
-usr/share/dbus-1/services/com.canonical.libertine.LxcManager.service
 usr/share/libertine/libertine-lxc.conf

=== modified file 'debian/python3-libertine-lxd.install'
--- debian/python3-libertine-lxd.install	2016-12-21 20:37:57 +0000
+++ debian/python3-libertine-lxd.install	2017-02-09 16:08:46 +0000
@@ -1,5 +1,3 @@
 etc/sudoers.d/libertine-lxd-sudo
 usr/bin/libertine-lxd-setup
-usr/bin/libertine-lxd-manager
 usr/lib/python*/*/libertine/LxdContainer.py
-usr/share/dbus-1/services/com.canonical.libertine.LxdManager.service

=== modified file 'debian/python3-libertine.install'
--- debian/python3-libertine.install	2016-12-21 18:07:07 +0000
+++ debian/python3-libertine.install	2017-02-09 16:08:46 +0000
@@ -1,9 +1,6 @@
-usr/lib/python*/*/libertine/AppDiscovery.py
 usr/lib/python*/*/libertine/ContainersConfig.py
 usr/lib/python*/*/libertine/HostInfo.py
 usr/lib/python*/*/libertine/Libertine.py
 usr/lib/python*/*/libertine/__init__.py
 usr/lib/python*/*/libertine/launcher
-usr/lib/python*/*/libertine/lifecycle
-usr/lib/python*/*/libertine/service
 usr/lib/python*/*/libertine/utils.py

=== modified file 'debian/rules'
--- debian/rules	2016-12-06 20:52:55 +0000
+++ debian/rules	2017-02-09 16:08:46 +0000
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python3,gir
-
-override_dh_auto_test:
-	dbus-run-session -- dh_auto_test
+	dh $@ --with python3

=== modified file 'liblibertine/CMakeLists.txt'
--- liblibertine/CMakeLists.txt	2016-11-03 19:19:40 +0000
+++ liblibertine/CMakeLists.txt	2017-02-09 16:08:46 +0000
@@ -1,15 +1,12 @@
 set(API_VERSION 1)
 set(ABI_VERSION 1)
 
-set(COMMON_DIR ${CMAKE_SOURCE_DIR}/common)
-
 add_library(
   ${LIBERTINE_CORE} SHARED
   libertine.cpp
 
-  ${COMMON_DIR}/ContainerConfig.cpp
-  ${COMMON_DIR}/ContainerConfigList.cpp
-  ${COMMON_DIR}/LibertineConfig.cpp
+  # libertined client
+  libertined.cpp
 )
 
 set_target_properties(${LIBERTINE_CORE} PROPERTIES
@@ -22,6 +19,7 @@
   ${GLIB2_LIBRARIES}
   ${PYTHON3_LIBRARIES}
   Qt5::Core
+  Qt5::DBus
 )
 
 # "liblibertine_headers_path" is used in libertine.pc.in
@@ -32,28 +30,3 @@
 configure_file(libertine.pc.in ${CMAKE_BINARY_DIR}/libertine.pc @ONLY)
 install(FILES ${CMAKE_BINARY_DIR}/libertine.pc
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
-##########################
-# Introspection
-##########################
-
-include(UseGObjectIntrospection)
-
-set(INTROSPECTION_GIRS)
-set(_introspection_files libertine.h)
-set(Libertine_1_gir "libertine")
-set(Libertine_1_gir_INCLUDES GObject-2.0)
-
-gir_get_cflags(_cflags)
-set(Libertine_1_gir_CFLAGS ${c_flags})
-set(Libertine_1_gir_LIBS libertine)
-
-list_make_absolute(_abs_introspection_files _introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/")
-set(Libertine_1_gir_FILES ${_abs_introspection_files})
-set(Libertine_1_gir_SCANNERFLAGS --c-include "libertine.h")
-set(Libertine_1_gir_EXPORT_PACKAGES "libertine-${API_VERSION}")
-
-list(APPEND INTROSPECTION_GIRS Libertine-1.gir)
-gir_add_introspections(INTROSPECTION_GIRS)
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Libertine-1.typelib" DESTINATION "${CMAKE_INSTALL_LIBDIR}/girepository-1.0")

=== modified file 'liblibertine/libertine.cpp'
--- liblibertine/libertine.cpp	2017-01-12 18:18:49 +0000
+++ liblibertine/libertine.cpp	2017-02-09 16:08:46 +0000
@@ -1,9 +1,9 @@
 /**
- * @file libertine_common.cpp
+ * @file libertine.cpp
  * @brief The Libertine Common shared library
  */
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2017 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3, as published by the
@@ -17,103 +17,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "liblibertine/libertine.h"
-
-#include "common/ContainerConfigList.h"
-#include "common/LibertineConfig.h"
-
-
-namespace
-{
-constexpr auto DESKTOP_EXTENSION   = ".desktop";
-constexpr auto GLOBAL_APPLICATIONS = "usr/share/applications";
-constexpr auto LOCAL_APPLICATIONS  = ".local/share/applications";
-
-
-GError*
-list_apps_from_path(gchar* path, const gchar* container_id, GArray* apps)
-{
-  GError* error = nullptr;
-  GDir* dir = g_dir_open(path, 0, &error);
-  if (error != nullptr)
-  {
-    return error;
-  }
-
-  const gchar * files;
-  while ((files = g_dir_read_name(dir)) != nullptr)
-  {
-    gchar *file = g_build_filename(path, files, nullptr);
-    if (g_file_test(file, G_FILE_TEST_IS_REGULAR) && g_str_has_suffix(files, DESKTOP_EXTENSION))
-    {
-      auto name = g_strdup(files);
-      name[strlen(name)-strlen(DESKTOP_EXTENSION)] = 0; // truncate the file extension
-
-      gchar * app_id = g_strjoin("_", g_strdup(container_id), name, "0.0", nullptr);
-      g_array_append_val(apps, app_id);
-      g_free(name);
-    }
-    else if (g_file_test(file, G_FILE_TEST_IS_DIR))
-    {
-      error = list_apps_from_path(file, container_id, apps);
-      if (error != nullptr)
-      {
-        return error;
-      }
-    }
-    g_free(file);
-  }
-
-  g_dir_close(dir);
-  return nullptr;
-}
-
-
-gchar*
-id_from_list_index(const ContainerConfigList& container_list, guint index)
-{
-  return (gchar*)container_list.data(container_list.index(index, 0),
-                                     (int)ContainerConfigList::DataRole::ContainerId)
-                               .toString().toStdString().c_str();
-}
-}
+#include "liblibertine/libertined.h"
+
 
 gchar**
 libertine_list_apps_for_container(const gchar* container_id)
 {
   g_return_val_if_fail(container_id != nullptr, nullptr);
-  gchar* path = libertine_container_path(container_id);
-  GError* error = nullptr;
   GArray* apps = g_array_new(TRUE, TRUE, sizeof(gchar*));
-
-  if (path != nullptr)
-  {
-      auto global_path = g_build_filename("/", g_strdup(path), GLOBAL_APPLICATIONS, nullptr);
-      error = list_apps_from_path(global_path, container_id, apps);
-      if (error != nullptr)
-      {
-        g_free(global_path);
-        g_free(path);
-        g_error_free(error);
-        return (gchar**)g_array_free(apps, FALSE);
-      }
-      g_free(global_path);
-  }
-  g_free(path);
-
-  auto home_path = libertine_container_home_path(container_id);
-  if (home_path != nullptr)
-  {
-      auto local_path = g_build_filename(home_path, LOCAL_APPLICATIONS, nullptr);
-
-      error = list_apps_from_path(local_path, container_id, apps);
-      if (error != nullptr)
-      {
-        g_error_free(error); // free error, but return previously found apps
-      }
-      g_free(local_path);
-  }
-  g_free(home_path);
+  for (auto const& app: libertined_list_app_ids(container_id))
+  {
+    auto app_id = g_strdup((gchar *)app.toString().toStdString().c_str());
+    g_array_append_val(apps, app_id);
+  }
 
   return (gchar**)g_array_free(apps, FALSE);
 }
@@ -122,22 +40,12 @@
 gchar **
 libertine_list_containers(void)
 {
-  guint container_count;
-  guint i;
-  LibertineConfig config;
-  ContainerConfigList container_list(&config);
-  GArray * containers = g_array_new(TRUE, TRUE, sizeof(gchar *));
-  QVariant id;
-
-  container_count = (guint)container_list.size();
-
-  for (i = 0; i < container_count; ++i)
+  auto containers = g_array_new(TRUE, TRUE, sizeof(gchar *));
+  for (auto const& container: libertined_list())
   {
-    id = container_list.data(container_list.index(i, 0), (int)ContainerConfigList::DataRole::ContainerId);
-    gchar * container_id = g_strdup((gchar *)id.toString().toStdString().c_str());
+    auto container_id = g_strdup((gchar *)container.toString().toStdString().c_str());
     g_array_append_val(containers, container_id);
   }
-
   return (gchar **)g_array_free(containers, FALSE);
 }
 
@@ -146,11 +54,8 @@
 libertine_container_path(const gchar * container_id)
 {
   g_return_val_if_fail(container_id != nullptr, nullptr);
-  LibertineConfig config;
-  ContainerConfigList container_list(&config);
-
-  gchar * path = g_build_filename(g_get_user_cache_dir(), "libertine-container", container_id, "rootfs", nullptr);
-
+
+  gchar* path = g_strdup((gchar *)libertined_container_path(container_id).toStdString().c_str());
   if (g_file_test(path, G_FILE_TEST_EXISTS))
   {
     return path;
@@ -165,11 +70,8 @@
 libertine_container_home_path(const gchar * container_id)
 {
   g_return_val_if_fail(container_id != nullptr, nullptr);
-  LibertineConfig config;
-  ContainerConfigList container_list(&config);
-
-  gchar * path =  g_build_filename(g_get_user_data_dir(), "libertine-container", "user-data", container_id, nullptr);
-
+
+  gchar* path = g_strdup((gchar *)libertined_container_home_path(container_id).toStdString().c_str());
   if (g_file_test(path, G_FILE_TEST_EXISTS))
   {
     return path;
@@ -183,20 +85,7 @@
 gchar *
 libertine_container_name(const gchar * container_id)
 {
-  gchar * container_name = nullptr;
-  LibertineConfig config;
-  ContainerConfigList container_list(&config);
-  guint container_count = (guint)container_list.size();
-
-  for (guint i = 0; i < container_count; ++i)
-  {
-    if (g_strcmp0(id_from_list_index(container_list, i), container_id) == 0)
-    {
-      QVariant name = container_list.data(container_list.index(i, 0), (int)ContainerConfigList::DataRole::ContainerName);
-      container_name = g_strdup(name.toString().toStdString().c_str());
-      break;
-    }
-  }
-
-  return container_name;
+  g_return_val_if_fail(container_id != nullptr, nullptr);
+
+  return g_strdup((gchar *)libertined_container_name(container_id).toStdString().c_str());
 }

=== modified file 'liblibertine/libertine.h'
--- liblibertine/libertine.h	2016-09-06 12:36:47 +0000
+++ liblibertine/libertine.h	2017-02-09 16:08:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2017 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3, as published by the
@@ -15,8 +15,8 @@
  */
 #include <glib.h>
 
-#ifndef _LIBERTINE_COMMON_H_
-#define _LIBERTINE_COMMON_H_
+#ifndef _LIBLIBERTINE_H_
+#define _LIBLIBERTINE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -80,4 +80,4 @@
 }
 #endif
 
-#endif /* _LIBERTINE_COMMON_H_ */
+#endif /* _LIBLIBERTINE_H_ */

=== added file 'liblibertine/libertined.cpp'
--- liblibertine/libertined.cpp	1970-01-01 00:00:00 +0000
+++ liblibertine/libertined.cpp	2017-02-09 16:08:46 +0000
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2017 Canonical Ltd
+ *
+ * Libertine is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3, as published by the
+ * Free Software Foundation.
+ *
+ * Libertine 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "libertined.h"
+
+#include <QDBusMessage>
+#include <QDBusInterface>
+#include <QDebug>
+#include <thread>
+#include <chrono>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+
+namespace
+{
+static const auto SERVICE_INTERFACE = "com.canonical.libertine.Service";
+static const auto PROGRESS_INTERFACE = "com.canonical.libertine.Service.Progress";
+
+static QVariantList
+dbusCall(QDBusConnection const& bus, QString const& iface, QString const& path,
+         QString const& method, QVariantList const& args = QVariantList())
+{
+  auto message = QDBusMessage::createMethodCall(SERVICE_INTERFACE, path, iface, method);
+  message.setArguments(args);
+  auto response = bus.call(message);
+  if (response.type() == QDBusMessage::ErrorMessage)
+  {
+    qWarning() << "error calling result" << response.errorMessage();
+    return QVariantList();
+  }
+
+  return response.arguments();
+}
+
+static bool
+isRunning(QDBusConnection const& bus, QString const& path)
+{
+  auto args = dbusCall(bus, PROGRESS_INTERFACE, path, "running", QVariantList());
+
+  if (args.isEmpty())
+  {
+    qWarning() << "lastError - no arguments?";
+    return false;
+  }
+
+  return args.first().toBool();
+}
+
+static QString
+result(QDBusConnection const& bus, QString const& path)
+{
+  auto args = dbusCall(bus, PROGRESS_INTERFACE, path, "result");
+
+  if (args.isEmpty())
+  {
+    qWarning() << "lastError - no arguments?";
+    return "";
+  }
+
+  return args.first().toString();
+}
+
+static QString
+lastError(QDBusConnection const& bus, QString const& path)
+{
+  auto args = dbusCall(bus, PROGRESS_INTERFACE, path, "last_error");
+
+  if (args.isEmpty())
+  {
+    qWarning() << "lastError - no arguments?";
+    return "";
+  }
+
+  return args.first().toString();
+}
+
+static QString
+call(QDBusConnection const& bus, QString const& method, QVariantList const& args)
+{
+  auto results = dbusCall(bus, SERVICE_INTERFACE, "/Manager", method, args);
+
+  if (results.isEmpty())
+  {
+    return QString();
+  }
+
+  return qvariant_cast<QDBusObjectPath>(results.first()).path();
+}
+
+static bool
+waitForFinish(QDBusConnection const& bus, QString const& path)
+{
+  std::chrono::microseconds wait(500);
+  for (auto i = 0; i < 2000; ++i)
+  {
+    if (!isRunning(bus, path))
+    {
+      return true;
+    }
+    std::this_thread::sleep_for(wait);
+  }
+  return !isRunning(bus, path);
+}
+
+QString
+container_info(char const* container_id, QString const& key)
+{
+  auto bus = QDBusConnection::sessionBus();
+  auto path = call(bus, "container_info", QVariantList{QVariant(container_id)});
+
+  if (!waitForFinish(bus, path))
+  {
+    return QString();
+  }
+
+  auto error = lastError(bus, path);
+  if (!error.isEmpty())
+  {
+    qWarning() << "error:" << error;
+    return QString();
+  }
+
+  return QJsonDocument::fromJson(result(bus, path).toLatin1()).object().value(key).toString();
+}
+}
+
+QJsonArray
+libertined_list()
+{
+  auto bus = QDBusConnection::sessionBus();
+  auto path = call(bus, "list", QVariantList());
+
+  if (!waitForFinish(bus, path))
+  {
+    return QJsonArray();
+  }
+
+  auto error = lastError(bus, path);
+  if (!error.isEmpty())
+  {
+    qWarning() << "error:" << error;
+    return QJsonArray();
+  }
+
+  return QJsonDocument::fromJson(result(bus, path).toLatin1()).array();
+}
+
+QJsonArray
+libertined_list_app_ids(char const* container_id)
+{
+  auto bus = QDBusConnection::sessionBus();
+  auto path = call(bus, "list_app_ids", QVariantList{QVariant(container_id)});
+
+  if (!waitForFinish(bus, path))
+  {
+    return QJsonArray();
+  }
+
+  auto error = lastError(bus, path);
+  if (!error.isEmpty())
+  {
+    qWarning() << "error:" << error;
+    return QJsonArray();
+  }
+
+  return QJsonDocument::fromJson(result(bus, path).toLatin1()).array();
+}
+
+QString
+libertined_container_path(char const* container_id)
+{
+  return container_info(container_id, "root");
+}
+
+QString
+libertined_container_home_path(char const* container_id)
+{
+  return container_info(container_id, "home");
+}
+
+QString
+libertined_container_name(char const* container_id)
+{
+  return container_info(container_id, "name");
+}

=== added file 'liblibertine/libertined.h'
--- liblibertine/libertined.h	1970-01-01 00:00:00 +0000
+++ liblibertine/libertined.h	2017-02-09 16:08:46 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017 Canonical Ltd
+ *
+ * Libertine is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3, as published by the
+ * Free Software Foundation.
+ *
+ * Libertine 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QDBusConnection>
+#include <QJsonArray>
+
+QJsonArray libertined_list();
+QString    libertined_container_path(char const* container_id);
+QString    libertined_container_home_path(char const* container_id);
+QString    libertined_container_name(char const* container_id);
+QJsonArray libertined_list_app_ids(char const* container_id);

=== removed file 'python/libertine/AppDiscovery.py'
--- python/libertine/AppDiscovery.py	2016-12-07 21:50:36 +0000
+++ python/libertine/AppDiscovery.py	1970-01-01 00:00:00 +0000
@@ -1,220 +0,0 @@
-# Copyright 2015 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from . import utils
-from xdg.BaseDirectory import xdg_data_dirs
-import configparser
-import glob
-import io
-import json
-import os
-import re
-import sys
-
-
-class IconCache(object):
-    """
-    Caches the names of all icon files available in the standard places (possibly
-    in a container) and provides a search function to deliver icon file names
-    matching a given icon name.
-
-    See the `Freedesktop.org icon theme specification
-    <http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html>`_
-    for the detailed specification.
-    """
-
-    def __init__(self, root_path, file_loader=None):
-        """
-        :param root_path: Where to start the file scan.
-        :type root_path: A valid filesystem path string.
-        :param file_loader: A function that builds a cache of filenames.
-        :type file_loader: Function returning a list of filenames.
-        """
-        if file_loader:
-            self._icon_cache = file_loader(root_path)
-        else:
-            self._icon_cache = self._file_loader(root_path)
-
-    def _get_icon_search_paths(self, root_path):
-        """
-        Gets a list of paths on which to search for icons.
-
-        :param root_path: Where to start the file scan.
-        :type root_path: A valid filesystem path string.
-        :rtype: A list of filesystem patch to serarch for qualifying icon files.
-        """
-        icon_search_paths = []
-        icon_search_paths.append(os.path.join(root_path, os.environ['HOME'], ".icons"))
-        for d in reversed(xdg_data_dirs):
-            icon_search_paths.append(os.path.join(root_path, d.lstrip('/'), "icons"))
-        icon_search_paths.append(os.path.join(root_path, "usr/share/pixmaps"))
-        return icon_search_paths
-
-    def _file_loader(self, root_path):
-        """
-        Loads a cache of file names by scanning the filesystem rooted at
-        ``root_path``.
-
-        :param root_path: Where to start the file scan.
-        :type root_path: A valid filesystem path.
-        :rtype: A list of fully-qualified file paths.
-        """
-        file_names = []
-        pattern = re.compile(r".*\.(png|svg|xpm)")
-        for path in self._get_icon_search_paths(root_path):
-            for base, dirs, files in os.walk(path):
-                for file in files:
-                    if pattern.match(file):
-                        file_names.append(os.path.join(base, file))
-        return file_names
-
-    def _find_icon_files(self, icon_name):
-        """
-        Finds a list of file name strings matching the given icon name.
-
-        :param icon_name: An icon name, pobably from a .desktop file.
-        :rtype: A list of filename strings matching the icon name.
-        """
-        icon_file_names = []
-        match_string = r"/" + os.path.splitext(icon_name)[0] + r"\....$"
-        pattern = re.compile(match_string)
-        for icon_file in self._icon_cache:
-            if pattern.search(icon_file):
-                icon_file_names.append(icon_file)
-        return icon_file_names
-
-    def expand_icons(self, desktop_icon_list):
-        """
-        Expands a string containing a list of icon names into a list of matching
-        file names.
-
-        :param desktop_icon_list: A string containing a list of icon names
-        separated by semicolons.
-        :rtype: A list of filename stings matching the icon names passed in.
-
-        See `the Freedesktop.org desktop file specification
-        <http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#recognized-keys>`_
-        for more information.
-        """
-        if desktop_icon_list:
-            icon_list = desktop_icon_list.split(';')
-            if icon_list[0][0] == '/':
-                return icon_list
-            icon_files = []
-            for i in icon_list:
-                icon_files += self._find_icon_files(i)
-            return icon_files
-        return []
-
-
-def expand_mime_types(desktop_mime_types):
-    if desktop_mime_types:
-        return desktop_mime_types.split(';')
-    return []
-
-
-class AppInfo(object):
-
-    def __init__(self, desktop_file_name, config_entry, icon_cache):
-        self.desktop_file_name = desktop_file_name
-        self.name = config_entry.get('Name')
-        if not self.name:
-            raise RuntimeError("required Name attribute is missing")
-        d = config_entry.get('NoDisplay')
-        self.no_display = (d != None and d == 'true')
-        self.exec_line = config_entry.get('Exec')
-        if not self.exec_line:
-            raise RuntimeError("required Exec attribute is missing")
-        self.icons = icon_cache.expand_icons(config_entry.get('Icon'))
-        self.mime_types = expand_mime_types(config_entry.get('MimeType'))
-
-    def __str__(self):
-        with io.StringIO() as ostr:
-            print(self.name, file=ostr)
-            print("  desktop_file={}".format(self.desktop_file_name), file=ostr)
-            print("  no-display={}".format(self.no_display), file=ostr)
-            print("  exec='{}'".format(self.exec_line), file=ostr)
-            for icon in self.icons:
-                print("  icon: {}".format(icon), file=ostr)
-            for mime in self.mime_types:
-                print("  mime: {}".format(mime), file=ostr)
-            return ostr.getvalue()
-
-    def to_json(self):
-        return json.dumps(self.__dict__)
-
-
-def desktop_file_is_showable(desktop_entry):
-    """
-    Determines if a particular application entry should be reported:  the entry
-    can not be hidden and must be showable in Unity.
-    """
-    t = desktop_entry.get('Type')
-    if t != 'Application':
-        return False
-    n = desktop_entry.get('Hidden')
-    if n and n == 'true':
-        return False
-    n = desktop_entry.get('NoShowIn')
-    if n:
-        targets = n.split(';')
-        if 'Unity' in targets:
-            return False
-    n = desktop_entry.get('OnlyShowIn')
-    if n:
-        targets = n.split(';')
-        if 'Unity' not in targets:
-            return False
-    return True
-
-
-def get_app_info(desktop_path, icon_cache):
-    for desktop_file_name in glob.glob(desktop_path):
-        desktop_file = configparser.ConfigParser(strict=False, interpolation=None)
-        try:
-            desktop_file.read(desktop_file_name)
-            desktop_entry = desktop_file['Desktop Entry']
-            if desktop_file_is_showable(desktop_entry):
-                    yield AppInfo(desktop_file_name, desktop_entry, icon_cache)
-        except Exception as ex:
-            utils.get_logger().error("error processing {}: {}".format(desktop_file_name, ex))
-
-
-class AppLauncherCache(object):
-    """
-    Caches a list of application launcher information (derived from .desktop
-    files installed in a container.
-    """
-
-    def __init__(self, name, root_path):
-        self.name = name
-        self.app_launchers = []
-        icon_cache = IconCache(root_path)
-        for dir in reversed(xdg_data_dirs):
-            path = os.path.join(root_path, dir.lstrip('/'), "applications")
-            for app_info in get_app_info(os.path.join(path, "*.desktop"), icon_cache):
-                self.app_launchers.append(app_info)
-
-    def __str__(self):
-        with io.StringIO() as ostr:
-            print("{}\n".format(self.name), file=ostr)
-            for app_info in self.app_launchers:
-                print("  {}".format(app_info), file=ostr)
-            return ostr.getvalue()
-
-    def to_json(self):
-        return json.dumps(self,
-                          default=lambda o: o.__dict__,
-                          sort_keys=True,
-                          indent=4)

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2017-01-17 20:19:30 +0000
+++ python/libertine/ChrootContainer.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Canonical Ltd.
+# Copyright 2015-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -47,10 +47,8 @@
     A concrete container type implemented using a plain old chroot.
     """
 
-    def __init__(self, container_id):
-        super().__init__(container_id)
-        self.container_type = "chroot"
-        self._window_manager = None
+    def __init__(self, container_id, config):
+        super().__init__(container_id, 'chroot', config)
         # FIXME: Disabling seccomp is a temporary measure until we fully understand why we need
         #        it or figure out when we need it.
         os.environ['PROOT_NO_SECCOMP'] = '1'
@@ -112,7 +110,7 @@
             fd.write(archive + self.installed_release + " multiverse\n")
             fd.write(archive + self.installed_release + "-updates multiverse\n")
 
-        utils.create_libertine_user_data_dir(self.container_id)
+        self._create_libertine_user_data_dir()
 
         self.update_locale()
 
@@ -140,7 +138,7 @@
             self.update_packages()
 
         # Check if the container was created as root and chown the user directories as necessary
-        chown_recursive_dirs(utils.get_libertine_container_userdata_dir_path(self.container_id))
+        chown_recursive_dirs(utils.get_libertine_container_home_dir(self.container_id))
 
         super().create_libertine_container()
 
@@ -186,7 +184,7 @@
         # Bind-mount common XDG direcotries
         bind_mounts = (
             " -b %s:%s"
-            % (utils.get_libertine_container_userdata_dir_path(self.container_id), home_path)
+            % (utils.get_libertine_container_home_dir(self.container_id), home_path)
         )
 
         mounts = self._sanitize_bind_mounts(utils.get_common_xdg_user_directories() + \
@@ -227,15 +225,10 @@
         proot_cmd = self._build_proot_command()
 
         args = shlex.split(proot_cmd)
-        args.extend(self.setup_window_manager(enable_toolbars=True))
-        self._window_manager = psutil.Popen(args, env=environ)
-
-        args = shlex.split(proot_cmd)
         args.extend(app_exec_line)
         return psutil.Popen(args, env=environ)
 
     def finish_application(self, app):
-        utils.terminate_window_manager(self._window_manager)
         app.wait()
 
     def _run_ldconfig(self):

=== modified file 'python/libertine/ContainersConfig.py'
--- python/libertine/ContainersConfig.py	2017-01-12 20:46:05 +0000
+++ python/libertine/ContainersConfig.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -102,7 +102,8 @@
         if not container:
             return
 
-        if type(value) is str:
+        if (type(value) is str or
+            type(value) is bool):
             container[key] = value
         elif type(value) is dict:
             if key not in container:
@@ -241,6 +242,9 @@
         if write_json:
             write_container_config_file(self.container_list)
 
+    def get_containers(self):
+        return [c["id"] for c in self.container_list.get('containerList', [])]
+
     """
     Operations for the container itself.
     """
@@ -302,6 +306,12 @@
     def get_container_locale(self, container_id):
         return self._get_value_by_key(container_id, 'locale')
 
+    def get_container_name(self, container_id):
+        return self._get_value_by_key(container_id, 'name')
+
+    def get_container_install_status(self, container_id):
+        return self._get_value_by_key(container_id, 'installStatus')
+
     """
     Operations for archive (PPA) maintenance in a Libertine container.
     """
@@ -375,6 +385,15 @@
         self._delete_array_object_by_value(container_id, 'bindMounts', mount_path)
 
     """
+    Operations for setting container freeze on stop command.
+    """
+    def update_freeze_on_stop(self, container_id, freeze_on_stop=True):
+        self._set_value_by_key(container_id, 'freezeOnStop', freeze_on_stop)
+
+    def get_freeze_on_stop(self, container_id):
+        return self._get_value_by_key(container_id, 'freezeOnStop') or False
+
+    """
     Fetcher functions for various configuration information.
     """
     def get_container_distro(self, container_id):

=== modified file 'python/libertine/HostInfo.py'
--- python/libertine/HostInfo.py	2017-01-12 20:46:05 +0000
+++ python/libertine/HostInfo.py	2017-02-09 16:08:46 +0000
@@ -12,6 +12,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import libertine.utils
 import locale
 import lsb_release
 import os
@@ -25,7 +26,10 @@
 
     def select_container_type_by_kernel(self):
         if self.has_lxc_support():
-            return "lxc"
+            if libertine.utils.is_snap_environment():
+                return "lxd"
+            else:
+                return "lxc"
         else:
             return "chroot"
 
@@ -64,6 +68,9 @@
         return None
 
     def get_host_architecture(self):
+        if 'ARCH' in os.environ:
+            return os.environ['ARCH']
+
         dpkg = subprocess.Popen(['dpkg', '--print-architecture'],
                                 stdout=subprocess.PIPE,
                                 universal_newlines=True)

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2017-01-17 20:28:15 +0000
+++ python/libertine/Libertine.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Canonical Ltd.
+# Copyright 2015-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -12,8 +12,6 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from .AppDiscovery import AppLauncherCache
-from gi.repository import Libertine
 import abc
 import contextlib
 import os
@@ -81,17 +79,14 @@
 
     :param container_id: The machine-readable container name.
     """
-    def __init__(self, container_id, containers_config=None):
-        if containers_config is None:
-            containers_config = ContainersConfig()
-
-        self.container_type = 'unknown'
+    def __init__(self, container_id, container_type, config):
+        self.container_type = container_type
         self.container_id = container_id
+        self._config = config
         self.root_path = utils.get_libertine_container_rootfs_path(self.container_id)
-        self.locale = containers_config.get_container_locale(container_id)
+        self.locale = self._config.get_container_locale(container_id)
         self.language = self._get_language_from_locale()
-        self.default_packages = ['matchbox-window-manager',
-                                 'libnss-extrausers',
+        self.default_packages = ['libnss-extrausers',
                                  'humanity-icon-theme',
                                  'maliit-inputcontext-gtk2',
                                  'maliit-inputcontext-gtk3',
@@ -126,16 +121,6 @@
             utils.get_logger().error("%s" % e)
             return False
 
-    def setup_window_manager(self, enable_toolbars=False):
-        if self._binary_exists('matchbox-window-manager'):
-            if enable_toolbars:
-                return ['matchbox-window-manager']
-
-            return ['matchbox-window-manager', '-use_titlebar', 'no']
-        else:
-            return ['compiz']
-
-
     def check_language_support(self):
         if not self._binary_exists('check-language-support'):
             self.install_package('language-selector-common', update_cache=False)
@@ -185,7 +170,7 @@
         'running' state, the meaning of which depends on the type of the
         container.
         """
-        pass
+        return True
 
     def stop_container(self):
         """
@@ -193,6 +178,12 @@
         """
         pass
 
+    def restart_container(self):
+        """
+        Restarts the container.
+        """
+        pass
+
     @abc.abstractmethod
     def run_in_container(self, command_string):
         """
@@ -247,10 +238,10 @@
                 self.delete_file_in_container(dest)
 
             return ret
-        else:
-            if no_dialog:
-                os.environ['DEBIAN_FRONTEND'] = 'teletype'
-            ret = self.run_in_container(_apt_command_prefix() + " install '" + package_name + "'") == 0
+
+        if no_dialog:
+            os.environ['DEBIAN_FRONTEND'] = 'teletype'
+        ret = self.run_in_container(_apt_command_prefix() + " install '" + package_name + "'") == 0
 
         self.check_language_support()
 
@@ -313,19 +304,26 @@
         """
         The human-readable name of the container.
         """
-        name = Libertine.container_name(self.container_id)
-        if not name:
-            name = 'Unknown'
-        return name
+        return self._config.get_container_name(self.container_id) or 'Unknown'
+
+    def _create_libertine_user_data_dir(self):
+        user_data = utils.get_libertine_container_home_dir(self.container_id)
+
+        if not os.path.exists(user_data):
+            os.makedirs(user_data)
+
+        config_path = os.path.join(user_data, ".config", "dconf")
+
+        if not os.path.exists(config_path):
+            os.makedirs(config_path)
 
 
 class LibertineMock(BaseContainer):
     """
     A concrete mock container type.  Used for unit testing.
     """
-    def __init__(self, container_id, containers_config=None):
-        super().__init__(container_id, containers_config)
-        self.container_type = "mock"
+    def __init__(self, container_id, config):
+        super().__init__(container_id, 'mock', config)
 
     def create_libertine_container(self, password=None, multiarch=False):
         return True
@@ -354,6 +352,9 @@
     def finish_application(self, app):
         app.wait()
 
+    def start_container(self):
+        return True
+
 
 class ContainerRunning(contextlib.ExitStack):
     """
@@ -364,7 +365,9 @@
     """
     def __init__(self, container):
         super().__init__()
-        container.start_container()
+        if not container.start_container():
+            raise RuntimeError("Container failed to start.")
+
         self.callback(lambda: container.stop_container())
 
 
@@ -389,13 +392,13 @@
 
         if container_type == "lxc":
             from  libertine.LxcContainer import LibertineLXC
-            self.container = LibertineLXC(container_id)
+            self.container = LibertineLXC(container_id, self.containers_config)
         elif container_type == "lxd":
             from libertine.LxdContainer import LibertineLXD
             self.container = LibertineLXD(container_id, self.containers_config)
         elif container_type == "chroot":
             from  libertine.ChrootContainer import LibertineChroot
-            self.container = LibertineChroot(container_id)
+            self.container = LibertineChroot(container_id, self.containers_config)
         elif container_type == "mock":
             self.container = LibertineMock(container_id, self.containers_config)
         else:
@@ -480,6 +483,12 @@
         except RuntimeError as e:
             return handle_runtime_error(e)
 
+    def restart_libertine_container(self):
+        """
+        Restarts a frozen container.
+        """
+        return self.container.restart_container()
+
     def connect(self):
         """
         Connects to the container in preparation to launch an application.  May
@@ -509,22 +518,23 @@
         """
         self.container.finish_application(app)
 
-    def list_app_launchers(self, use_json=False):
-        """
-        Enumerates all application launchers (based on .desktop files) available
-        in the container.
-
-        :param use_json: Indicates the returned string should be i JSON format.
-            The default format is some human-readble format.
-        :rtype: A printable string containing a list of application launchers
-            available in the container.
-        """
-        if use_json:
-            return AppLauncherCache(self.container.name,
-                                    self.container.root_path).to_json()
-        else:
-            return str(AppLauncherCache(self.container.name,
-                                        self.container.root_path))
+    def list_app_ids(self):
+        """
+        Finds application ids (based on .desktop files) available in the
+        container.
+
+        :rtype: A list of app ids consumable by tools such as ubuntu-app-launch
+        """
+        home = utils.get_libertine_container_home_dir(self.container_id)
+        app_ids = []
+        for apps_dir in ["{}/usr/share/applications".format(self.root_path),
+                         "{}/usr/local/share/applications".format(self.root_path),
+                         "{}/.local/share/applications".format(home)]:
+            if os.path.exists(apps_dir):
+                for root, dirs, files in os.walk(apps_dir):
+                    app_ids.extend(["{}_{}_0.0".format(self.container_id, f[:-8]) for f in files if f.endswith(".desktop")])
+
+        return app_ids
 
     def exec_command(self, exec_line):
         """

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2017-01-17 15:41:51 +0000
+++ python/libertine/LxcContainer.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Canonical Ltd.
+# Copyright 2015-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -22,17 +22,15 @@
 import subprocess
 import sys
 import tempfile
+import time
 
-from .lifecycle import LifecycleResult
 from .Libertine import BaseContainer
+from .service.manager import LIBERTINE_MANAGER_NAME, LIBERTINE_STORE_PATH
 from . import utils, HostInfo
 
 
 home_path = os.environ['HOME']
 
-LIBERTINE_LXC_MANAGER_NAME = "com.canonical.libertine.LxcManager"
-LIBERTINE_LXC_MANAGER_PATH = "/LxcManager"
-
 
 def _check_lxc_net_entry(entry):
     lxc_net_file = open('/etc/lxc/lxc-usernet')
@@ -57,14 +55,6 @@
     return os.path.join(home_path, '.config', 'lxc')
 
 
-def get_lxc_manager_dbus_name():
-    return LIBERTINE_LXC_MANAGER_NAME
-
-
-def get_lxc_manager_dbus_path():
-    return LIBERTINE_LXC_MANAGER_PATH
-
-
 def lxc_container(container_id):
     config_path = utils.get_libertine_containers_dir_path()
     if not os.path.exists(config_path):
@@ -101,22 +91,43 @@
 def lxc_start(container):
     lxc_log_file = get_logfile(container)
 
-    if not container.start():
-        return LifecycleResult("Container failed to start.")
+    if container.state == 'STOPPED':
+        if not container.start():
+            utils.get_logger().error("Container failed to start.")
+            return False
+    elif container.state == 'FROZEN':
+        if not container.unfreeze():
+            utils.get_logger().error("Container failed to unfreeze.")
+            return False
 
     if not container.wait("RUNNING", 10):
-        return LifecycleResult("Container failed to enter the RUNNING state.")
+        utils.get_logger().error("Container failed to enter the RUNNING state.")
+        return False
 
     if not container.get_ips(timeout=30):
         lxc_stop(container)
-        return LifecycleResult("Not able to connect to the network.")
-
-    return LifecycleResult()
-
-
-def lxc_stop(container):
-    if container.running:
+        utils.get_logger().error("Not able to connect to the network.")
+        return False
+
+    return True
+
+
+def lxc_stop(container, freeze_on_stop=False):
+    if container.state == 'STOPPED' or not container.running:
+        return True
+
+    if freeze_on_stop:
+        container.freeze()
+        if not container.wait("FROZEN", 10):
+            utils.get_logger().error("Container failed to enter the FROZEN state.")
+            return False
+    else:
         container.stop()
+        if not container.wait("STOPPED", 10):
+            utils.get_logger().error("Container failed to enter the STOPPED state.")
+            return False
+
+    return True
 
 
 class EnvLxcSettings(contextlib.ExitStack):
@@ -149,21 +160,62 @@
     A concrete container type implemented using an LXC container.
     """
 
-    def __init__(self, container_id):
-        super().__init__(container_id)
-        self.container_type = "lxc"
+    def __init__(self, container_id, config):
+        super().__init__(container_id, 'lxc', config)
         self.container = lxc_container(container_id)
         self.lxc_manager_interface = None
-        self.window_manager = None
         self.host_info = HostInfo.HostInfo()
-
-        utils.set_session_dbus_env_var()
-
-        try:
-            bus = dbus.SessionBus()
-            self.lxc_manager_interface = bus.get_object(get_lxc_manager_dbus_name(), get_lxc_manager_dbus_path())
-        except dbus.exceptions.DBusException:
-            pass
+        self._freeze_on_stop = config.get_freeze_on_stop(self.container_id)
+
+        if utils.set_session_dbus_env_var():
+            try:
+                bus = dbus.SessionBus()
+                self.lxc_manager_interface = bus.get_object(LIBERTINE_MANAGER_NAME, LIBERTINE_STORE_PATH)
+            except dbus.exceptions.DBusException:
+                pass
+
+    def _setup_pulse(self):
+        pulse_socket_path = os.path.join(utils.get_libertine_runtime_dir(), 'pulse_socket')
+
+        os.environ['PULSE_SERVER'] = pulse_socket_path
+
+        lsof_cmd = 'lsof -n %s' % pulse_socket_path
+        args = shlex.split(lsof_cmd)
+        lsof = subprocess.Popen(args, stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
+        lsof.wait()
+
+        if not os.path.exists(pulse_socket_path) or lsof.returncode == 1:
+            pactl_cmd = (
+                'pactl load-module module-native-protocol-unix auth-anonymous=1 socket=%s'
+                % pulse_socket_path)
+            args = shlex.split(pactl_cmd)
+            subprocess.Popen(args).wait()
+
+    def _dynamic_bind_mounts(self):
+        self._config.refresh_database()
+        mounts = self._sanitize_bind_mounts(utils.get_common_xdg_user_directories() + \
+                                            self._config.get_container_bind_mounts(self.container_id))
+
+        data_dir = utils.get_libertine_container_home_dir(self.container_id)
+        for user_dir in utils.generate_binding_directories(mounts, home_path):
+            if os.path.isabs(user_dir[1]):
+                path = user_dir[1].strip('/')
+                fullpath = os.path.join(utils.get_libertine_container_rootfs_path(self.container_id), path)
+            else:
+                path = "{}/{}".format(home_path.strip('/'), user_dir[1])
+                fullpath = os.path.join(data_dir, user_dir[1])
+
+            os.makedirs(fullpath, exist_ok=True)
+
+            utils.get_logger().debug("Mounting {}:{} in container {}".format(user_dir[0], path, self.container_id))
+            xdg_user_dir_entry = (
+                "%s %s none bind,create=dir,optional"
+                % (user_dir[0], path)
+            )
+            self.container.append_config_item("lxc.mount.entry", xdg_user_dir_entry)
+
+    def _sanitize_bind_mounts(self, mounts):
+        return [mount.replace(" ", "\\040") for mount in mounts]
 
     def timezone_needs_update(self):
         with open(os.path.join(self.root_path, 'etc', 'timezone'), 'r') as fd:
@@ -171,19 +223,54 @@
 
     def start_container(self):
         if self.lxc_manager_interface:
-            result = LifecycleResult.from_dict(self.lxc_manager_interface.operation_start(self.container_id))
-        else:
-            result = lxc_start(self.container)
-
-        if not result.success:
-            _dump_lxc_log(result.logfile)
-            raise RuntimeError(result.error)
+            retries = 0
+            while not self.lxc_manager_interface.container_operation_start(self.container_id):
+                retries += 1
+                if retries > 5:
+                    return False
+                time.sleep(.5)
+             
+        if self.container.state == 'RUNNING':
+            return True
+
+        if self.container.state == 'STOPPED':
+            self._dynamic_bind_mounts()
+            self._setup_pulse()
+
+        if not lxc_start(self.container):
+            _dump_lxc_log(get_logfile(self.container))
+            return False
+
+        return True
 
     def stop_container(self):
         if self.lxc_manager_interface:
-            self.lxc_manager_interface.operation_stop(self.container_id)
+            if self.lxc_manager_interface.container_operation_finished(self.container_id):
+                if not lxc_stop(self.container, self._freeze_on_stop):
+                   return False
+                self.lxc_manager_interface.container_stopped(self.container_id)
+                return True
+            else:
+                return False
         else:
-            lxc_stop(self.container)
+            return lxc_stop(self.container, self._freeze_on_stop)
+
+    def restart_container(self):
+        if self.container.state != 'FROZEN':
+            utils.get_logger().warning("Container {} is not frozen. Cannot restart.".format(self.container_id))
+            return False
+
+        orig_freeze = self._freeze_on_stop
+        self._freeze_on_stop = False
+
+        # We never want to use the manager when restarting.
+        self.lxc_manager_interface = None
+
+        if not (self.stop_container() and self.start_container()):
+            return False
+
+        self._freeze_on_stop = orig_freeze
+        return self.stop_container()
 
     def run_in_container(self, command_string):
         cmd_args = shlex.split(command_string)
@@ -238,7 +325,7 @@
 
         self.container.load_config(config_file)
 
-        utils.create_libertine_user_data_dir(self.container_id)
+        self._create_libertine_user_data_dir()
 
         with EnvLxcSettings():
             lxc_logfile = get_logfile(self.container)
@@ -253,10 +340,7 @@
         self.create_libertine_config()
 
         utils.get_logger().info("starting container ...")
-        try:
-            self.start_container()
-        except RuntimeError as e:
-            utils.get_logger().error("Container failed to start: %s" % e)
+        if not self.start_container():
             self.destroy_libertine_container()
             return False
 
@@ -290,7 +374,7 @@
         user_id = os.getuid()
         home_entry = (
             "%s %s none bind,create=dir"
-            % (utils.get_libertine_container_userdata_dir_path(self.container_id),
+            % (utils.get_libertine_container_home_dir(self.container_id),
                home_path.strip('/'))
         )
 
@@ -325,19 +409,10 @@
         os.environ.clear()
         os.environ.update(environ)
 
-        result = LifecycleResult.from_dict(self.lxc_manager_interface.app_start(self.container_id))
-
-        if not result.success:
-            _dump_lxc_log(get_logfile(self.container))
-            utils.get_logger().error("%s" % result.error)
+        if not self.start_container():
+            self.lxc_manager_interface.container_stopped(self.container_id)
             return
 
-        self.window_manager = self.container.attach(lxc.attach_run_command,
-                                                    self.setup_window_manager())
-
-        # Setup pulse to work inside the container
-        os.environ['PULSE_SERVER'] = utils.get_libertine_lxc_pulse_socket_path()
-
         app_launch_cmd = "sudo -E -u " + os.environ['USER'] + " env PATH=" + os.environ['PATH']
         cmd = shlex.split(app_launch_cmd)
         app = self.container.attach(lxc.attach_run_command,
@@ -347,7 +422,4 @@
     def finish_application(self, app):
         os.waitpid(app.pid, 0)
 
-        utils.terminate_window_manager(psutil.Process(self.window_manager))
-
-        # Tell libertine-lxc-manager that the app has stopped.
-        self.lxc_manager_interface.app_stop(self.container_id)
+        self.stop_container()

=== modified file 'python/libertine/LxdContainer.py'
--- python/libertine/LxdContainer.py	2017-01-17 20:35:37 +0000
+++ python/libertine/LxdContainer.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -22,20 +22,8 @@
 import subprocess
 import time
 
-from .lifecycle import LifecycleResult
 from libertine import Libertine, utils, HostInfo
-
-
-LIBERTINE_LXC_MANAGER_NAME = "com.canonical.libertine.LxdManager"
-LIBERTINE_LXC_MANAGER_PATH = "/LxdManager"
-
-
-def get_lxd_manager_dbus_name():
-    return LIBERTINE_LXC_MANAGER_NAME
-
-
-def get_lxd_manager_dbus_path():
-    return LIBERTINE_LXC_MANAGER_PATH
+from .service.manager import LIBERTINE_MANAGER_NAME, LIBERTINE_STORE_PATH
 
 
 def _get_devices_map():
@@ -74,6 +62,10 @@
     return source
 
 def _setup_lxd():
+    if utils.is_snap_environment():
+        utils.get_logger().warning("Running in snap environment, skipping automatic lxd setup.")
+        return True
+
     utils.get_logger().info("Running LXD setup.")
     import pexpect
     child = pexpect.spawnu('sudo libertine-lxd-setup {}'.format(os.environ['USER']), env={'TERM': 'dumb'})
@@ -113,7 +105,7 @@
 [ -n /dev/video0 ] && chgrp video /dev/video0
 '''[1:-1]
     container.files.put('/usr/bin/libertine-lxd-mount-update', script.format(uid=uid, username=username).encode('utf-8'))
-    container.execute(shlex.split('chmod 755 /usr/bin/libertine-lxd-mount-update'))
+    subprocess.Popen(shlex.split("lxc exec {} -- chmod 755 /usr/bin/libertine-lxd-mount-update".format(container.name)))
 
 
 def lxd_container(client, container_id):
@@ -125,7 +117,9 @@
 
 def _wait_for_network(container):
     for retries in range(0, 10):
-        out, err = container.execute(shlex.split('ping -c 1 ubuntu.com'))
+        ping = subprocess.Popen(shlex.split("lxc exec {} -- ping -c 1 ubuntu.com".format(container.name)),
+                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, err = ping.communicate()
         if out:
             utils.get_logger().info("Network connection active")
             return True
@@ -134,28 +128,40 @@
 
 
 def lxd_start(container):
-    if container.status != 'Running':
+    if container.status == 'Stopped':
         container.start(wait=True)
+    elif container.status == 'Frozen':
+        container.unfreeze(wait=True)
 
     container.sync(rollback=True) # required for pylxd=2.0.x
 
     if container.status != 'Running':
-        return LifecycleResult("Container {} failed to start".format(container.name))
-
-    return LifecycleResult()
-
-
-def lxd_stop(container, wait):
+        utils.get_logger().error("Container {} failed to start".format(container.name))
+        return False
+
+    return True
+
+
+def lxd_stop(container, wait=True, freeze_on_stop=False):
     if container.status == 'Stopped':
-        return LifecycleResult()
-
-    container.stop(wait=wait)
+        return True
+
+    if freeze_on_stop:
+        container.freeze(wait=wait)
+    else:
+        container.stop(wait=wait)
+
     container.sync(rollback=True) # required for pylxd=2.0.x
 
-    if wait and container.status != 'Stopped':
-        return LifecycleResult("Container {} failed to stop".format(container.name))
+    if wait:
+        if freeze_on_stop and container.status != 'Frozen':
+            utils.get_logger().error("Container {} failed to freeze".format(container.name))
+            return False
+        elif not freeze_on_stop and container.status != 'Stopped':
+            utils.get_logger().error("Container {} failed to stop".format(container.name))
+            return False
 
-    return LifecycleResult()
+    return True
 
 
 def _lxd_save(entity, error, wait=True):
@@ -210,9 +216,8 @@
                             f.write(container.files.get(filepath))
 
 
-def update_bind_mounts(container, config):
-    home_path = os.environ['HOME']
-    userdata_dir = utils.get_libertine_container_userdata_dir_path(container.name)
+def update_bind_mounts(container, config, home_path):
+    userdata_dir = utils.get_libertine_container_home_dir(container.name)
 
     container.devices.clear()
     container.devices['root'] = {'type': 'disk', 'path': '/'}
@@ -235,9 +240,13 @@
     run_user = '/run/user/{}'.format(os.getuid())
     container.devices[run_user] = {'source': run_user, 'path': '/var/tmp{}'.format(run_user), 'type': 'disk'}
 
-    mounts = utils.get_common_xdg_user_directories() + \
-             config.get_container_bind_mounts(container.name)
-    for user_dir in utils.generate_binding_directories(mounts, home_path):
+    mounts = config.get_container_bind_mounts(container.name)
+    if utils.is_snap_environment():
+        mounts += [os.path.join(home_path, d) for d in ["Documents", "Downloads", "Music", "Videos", "Pictures"]]
+    else:
+        mounts += utils.get_common_xdg_user_directories()
+
+    for user_dir in utils.generate_binding_directories(mounts, home_path.rstrip('/')):
         if not os.path.exists(user_dir[0]):
             utils.get_logger().warning('Bind-mount path \'{}\' does not exist.'.format(user_dir[0]))
             continue
@@ -251,7 +260,7 @@
 
         utils.get_logger().debug("Mounting {}:{} in container {}".format(user_dir[0], path, container.name))
 
-        container.devices[user_dir[1]] = {
+        container.devices[user_dir[1] or user_dir[0]] = {
                 'source': _readlink(user_dir[0]),
                 'path': path,
                 'optional': 'true',
@@ -275,29 +284,33 @@
         client.profiles.create('libertine', config={'raw.idmap': 'both 1000 1000'}, devices=_get_devices_map())
 
 
+def env_home_path():
+    if utils.is_snap_environment():
+        return '/home/{}'.format(os.environ['USER'])
+    return os.environ['HOME']
+
+
 class LibertineLXD(Libertine.BaseContainer):
     def __init__(self, name, config):
-        super().__init__(name)
-        self._id = name
-        self._config = config
+        super().__init__(name, 'lxd', config)
         self._host_info = HostInfo.HostInfo()
         self._container = None
-        self._matchbox_pid = None
+        self._manager = None
+        self._freeze_on_stop = config.get_freeze_on_stop(self.container_id)
 
         if not _setup_lxd():
             raise Exception("Failed to setup lxd.")
 
         self._client = pylxd.Client()
-        self._window_manager = None
 
-        utils.set_session_dbus_env_var()
         try:
-            bus = dbus.SessionBus()
-            self._manager = bus.get_object(get_lxd_manager_dbus_name(), get_lxd_manager_dbus_path())
+            if utils.set_session_dbus_env_var():
+                bus = dbus.SessionBus()
+                self._manager = bus.get_object(LIBERTINE_MANAGER_NAME, LIBERTINE_STORE_PATH)
+        except PermissionError as e:
+            utils.get_logger().warning("Failed to set dbus session env var")
         except dbus.exceptions.DBusException:
             utils.get_logger().warning("D-Bus Service not found.")
-            self._manager = None
-
 
     def create_libertine_container(self, password=None, multiarch=False):
         if self._try_get_container():
@@ -306,17 +319,17 @@
 
         update_libertine_profile(self._client)
 
-        utils.get_logger().info("Creating container '%s' with distro '%s'" % (self._id, self.installed_release))
+        utils.get_logger().info("Creating container '%s' with distro '%s'" % (self.container_id, self.installed_release))
         create = subprocess.Popen(shlex.split('lxc launch ubuntu-daily:{distro} {id} --profile '
                                               'default --profile libertine'.format(
-                                              distro=self.installed_release, id=self._id)))
+                                              distro=self.installed_release, id=self.container_id)))
         if create.wait() is not 0:
-            utils.get_logger().error("Creating container '{}' failed with code '{}'".format(self._id, create.returncode))
+            utils.get_logger().error("Creating container '{}' failed with code '{}'".format(self.container_id, create.returncode))
             return False
 
         self._try_get_container()
         _sync_application_dirs_to_host(self._container)
-        update_bind_mounts(self._container, self._config)
+        update_bind_mounts(self._container, self._config, env_home_path())
 
         self.update_locale()
 
@@ -328,18 +341,18 @@
         self.run_in_container("mkdir -p /home/{}".format(username))
         self.run_in_container("chown {0}:{0} /home/{0}".format(username))
 
-        utils.create_libertine_user_data_dir(self._id)
+        self._create_libertine_user_data_dir()
 
         _setup_bind_mount_service(self._container, uid, username)
 
         if multiarch and self.architecture == 'amd64':
-            utils.get_logger().info("Adding i386 multiarch support to container '{}'".format(self._id))
+            utils.get_logger().info("Adding i386 multiarch support to container '{}'".format(self.container_id))
             self.run_in_container("dpkg --add-architecture i386")
 
         self.update_packages()
 
         for package in self.default_packages:
-            utils.get_logger().info("Installing package '%s' in container '%s'" % (package, self._id))
+            utils.get_logger().info("Installing package '%s' in container '%s'" % (package, self.container_id))
             if not self.install_package(package, no_dialog=True, update_cache=False):
                 utils.get_logger().error("Failure installing '%s' during container creation" % package)
                 self.destroy_libertine_container()
@@ -357,13 +370,13 @@
             self.run_in_container("dpkg-reconfigure -f noninteractive tzdata")
 
         _sync_application_dirs_to_host(self._container)
-        update_bind_mounts(self._container, self._config)
+        update_bind_mounts(self._container, self._config, env_home_path())
 
         return super().update_packages(update_locale)
 
     def destroy_libertine_container(self):
         if not self._try_get_container():
-            utils.get_logger().error("No such container '%s'" % self._id)
+            utils.get_logger().error("No such container '%s'" % self.container_id)
             return False
 
         if not self.stop_container(wait=True):
@@ -384,7 +397,7 @@
         for k, v in environ.items():
             env_as_args += '--env {}="{}" '.format(k, v)
 
-        return shlex.split('lxc exec {}{}-- {}'.format(self._id,
+        return shlex.split('lxc exec {}{}-- {}'.format(self.container_id,
                                                        env_as_args,
                                                        command))
 
@@ -392,108 +405,95 @@
         proc = subprocess.Popen(self._lxc_args(command))
         return proc.wait()
 
-    def start_container(self):
+    def start_container(self, home=env_home_path()):
         if not self._try_get_container():
             return False
 
         if self._manager:
-            result = LifecycleResult.from_dict(self._manager.operation_start(self._id))
-        else:
-            result = lxd_start(self._container)
-
-        if not result.success:
-            utils.get_logger().error(result.error)
+            retries = 0
+            while not self._manager.container_operation_start(self.container_id):
+                retries += 1
+                if retries > 5:
+                    return False
+                time.sleep(.5)
+
+        if self._container.status == 'Running':
+            return True
+
+        requires_remount = self._container.status == 'Stopped'
+
+        if requires_remount:
+            update_libertine_profile(self._client)
+            update_bind_mounts(self._container, self._config, home)
+
+        if not lxd_start(self._container):
+            if self._manager:
+                self._manager.container_stopped(self.container_id)
             return False
 
         if not _wait_for_network(self._container):
-            utils.get_logger().warning("Network unavailable in container '{}'".format(self._id))
-
-        return result.success
+            utils.get_logger().warning("Network unavailable in container '{}'".format(self.container_id))
+
+        if requires_remount:
+            self.run_in_container("/usr/bin/libertine-lxd-mount-update")
+
+        return True
 
     def stop_container(self, wait=False):
         if not self._try_get_container():
             return False
 
         if self._manager:
-            result = LifecycleResult.from_dict(self._manager.operation_stop(self._id, {'wait': wait}))
+            if self._manager.container_operation_finished(self.container_id):
+                if not lxd_stop(self._container, freeze_on_stop=self._freeze_on_stop):
+                    return False
+                self._manager.container_stopped(self.container_id)
+                return True
+            else:
+                return False
         else:
-            result = lxd_stop(self._container, wait)
-
-        if not result.success:
-            utils.get_logger().error(result.error)
-
-        return result.success
-
-    def _get_matchbox_pids(self):
-        p = subprocess.Popen(self._lxc_args('pgrep matchbox'), stdout=subprocess.PIPE)
-        out, err = p.communicate()
-        return out.decode('utf-8').split('\n')
-
-    # FIXME: Remove once window management logic has been moved to the host
-    def _start_window_manager(self, args):
-        args.extend(self.setup_window_manager())
-
-        if 'matchbox-window-manager' in args:
-            pids = self._get_matchbox_pids()
-
-        self._window_manager = psutil.Popen(args)
-
-        time.sleep(.25) # Give matchbox a moment to start in the container
-        if self._window_manager.poll() is not None:
-            utils.get_logger().warning("Window manager terminated prematurely with exit code '{}'".format(
-                                       self._window_manager.returncode))
-            self._window_manager = None
-        elif 'matchbox-window-manager' in args:
-            after_pids = self._get_matchbox_pids()
-            if len(after_pids) > len(pids):
-                self._matchbox_pid = (set(after_pids) - set(pids)).pop()
-
+            return lxd_stop(self._container, freeze_on_stop=self._freeze_on_stop)
+
+    def restart_container(self, wait=True):
+        if not self._try_get_container():
+            return False
+
+        if self._container.status != 'Frozen':
+            utils.get_logger().warning("Container {} is not frozen. Cannot restart.".format(self._container.name))
+            return False
+
+        orig_freeze = self._freeze_on_stop
+        self._freeze_on_stop = False
+
+        # We never want to use the manager when restarting.
+        self._manager = None
+
+        if not (self.stop_container(wait=True) and self.start_container()):
+            return False
+
+        self._freeze_on_stop = orig_freeze
+        return self.stop_container(wait=True)
+ 
     def start_application(self, app_exec_line, environ):
         if not self._try_get_container():
-            utils.get_logger().error("Could not get container '{}'".format(self._id))
+            utils.get_logger().error("Could not get container '{}'".format(self.container_id))
             return None
 
-        requires_remount = self._container.status != 'Running'
-
-        if self._manager:
-            result = LifecycleResult.from_dict(self._manager.app_start(self._id))
-        else:
-            update_libertine_profile(self._client)
-            update_bind_mounts(self._container, self._config)
-            result = lxd_start(self._container)
-
-        if not result.success:
-            utils.get_logger().error(result.error)
+        if utils.is_snap_environment():
+            environ['HOME'] = '/home/{}'.format(environ['USER'])
+
+        if not self.start_container(home=environ['HOME']):
             return False
 
-        if requires_remount:
-            self._container.execute(shlex.split('/usr/bin/libertine-lxd-mount-update'))
-
         args = self._lxc_args("sudo -E -u {} env PATH={}".format(environ['USER'], environ['PATH']), environ)
 
-        self._start_window_manager(args.copy())
-
         args.extend(app_exec_line)
         return psutil.Popen(args)
 
     def finish_application(self, app):
-        if self._window_manager is not None:
-            utils.terminate_window_manager(self._window_manager)
-            self._window_manager = None
-
-            # This is a workaround for an issue on xenial where the process
-            # running the window manager is not killed with the application
-            if self._matchbox_pid is not None:
-                utils.get_logger().debug("Manually killing matchbox-window-manager")
-                self.run_in_container("kill -9 {}".format(self._matchbox_pid))
-                self._matchbox_pid = None
-
         app.wait()
 
-        if self._manager:
-            self._manager.app_stop(self.container_id)
-        else:
-            lxd_stop(self._container, False)
+        self.stop_container()
 
     def copy_file_to_container(self, source, dest):
         with open(source, 'rb') as f:
@@ -504,6 +504,6 @@
 
     def _try_get_container(self):
         if self._container is None:
-            self._container = lxd_container(self._client, self._id)
+            self._container = lxd_container(self._client, self.container_id)
 
         return self._container is not None

=== modified file 'python/libertine/launcher/config.py'
--- python/libertine/launcher/config.py	2016-12-05 18:33:47 +0000
+++ python/libertine/launcher/config.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -215,9 +215,6 @@
         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):

=== removed directory 'python/libertine/lifecycle'
=== removed file 'python/libertine/lifecycle/ContainerLifecycleService.py'
--- python/libertine/lifecycle/ContainerLifecycleService.py	2017-01-12 16:09:37 +0000
+++ python/libertine/lifecycle/ContainerLifecycleService.py	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016 Canonical Ltd.
-
-# This program 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; version 3 of the License.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-import dbus.exceptions
-import dbus.service
-
-from .LifecycleResult import LifecycleResult
-from collections import Counter
-from dbus.mainloop.glib import DBusGMainLoop
-from libertine import utils
-
-
-LIBERTINE_CONTAINER_LIFECYCLE_INTERFACE = 'com.canonical.libertine.ContainerLifecycle'
-
-
-class ContainerLifecycleService(dbus.service.Object):
-    def __init__(self, service_name, service_path):
-        self._apps = Counter()
-        self._operations = Counter()
-
-        DBusGMainLoop(set_as_default=True)
-        try:
-            bus_name = dbus.service.BusName(service_name,
-                                            bus=dbus.SessionBus(),
-                                            do_not_queue=True)
-        except dbus.exceptions.NameExistsException:
-            utils.get_logger().error("service is already running")
-            raise
-        super().__init__(bus_name, service_path)
-
-    def start(self, container):
-        raise NotImplementedError("Subclasses must implement start(container)")
-
-    def stop(self, container, options={}):
-        raise NotImplementedError("Subclasses must implement stop(container)")
-
-    @dbus.service.method(LIBERTINE_CONTAINER_LIFECYCLE_INTERFACE,
-                         in_signature='s',
-                         out_signature='a{ss}')
-    def app_start(self, container):
-        utils.get_logger().debug("app_start({})".format(container))
-        if self._operations[container] != 0:
-            return LifecycleResult("Libertine container operation already running: cannot launch application.").to_dict()
-
-        result = self.start(container, True)
-
-        if result.success:
-            self._apps[container] += 1
-
-        return result.to_dict()
-
-    @dbus.service.method(LIBERTINE_CONTAINER_LIFECYCLE_INTERFACE,
-                         in_signature='s',
-                         out_signature='a{ss}')
-    def app_stop(self, container):
-        utils.get_logger().debug("app_stop({})".format(container))
-        self._apps[container] -= 1
-        result = LifecycleResult()
-
-        if self._apps[container] == 0:
-            result = self.stop(container)
-            del self._apps[container]
-
-        return result.to_dict()
-
-    @dbus.service.method(LIBERTINE_CONTAINER_LIFECYCLE_INTERFACE,
-                         in_signature='s',
-                         out_signature='a{ss}')
-    def operation_start(self, container):
-        utils.get_logger().debug("operation_start({})".format(container))
-        if self._apps[container] != 0:
-            return LifecycleResult("Application already running in container: cannot run operation.").to_dict()
-
-        result = self.start(container, False)
-
-        if result.success:
-            self._operations[container] += 1
-
-        return result.to_dict()
-
-    @dbus.service.method(LIBERTINE_CONTAINER_LIFECYCLE_INTERFACE,
-                         in_signature='sa{ss}',
-                         out_signature='a{ss}')
-    def operation_stop(self, container, options={}):
-        utils.get_logger().debug("operation_stop({}, {})".format(container, options))
-        self._operations[container] -= 1
-        result = LifecycleResult()
-
-        if self._operations[container] == 0:
-            result = self.stop(container, options)
-            del self._operations[container]
-
-        return result.to_dict()

=== removed file 'python/libertine/lifecycle/ContainerLifecycleServiceRunner.py'
--- python/libertine/lifecycle/ContainerLifecycleServiceRunner.py	2016-12-21 20:39:40 +0000
+++ python/libertine/lifecycle/ContainerLifecycleServiceRunner.py	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016 Canonical Ltd.
-
-# This program 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; version 3 of the License.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import signal
-
-from gi.repository import GLib
-from libertine import utils
-
-
-class ContainerLifecycleServiceRunner(object):
-    def __init__(self, service):
-        self._service = service
-
-    def _sigterm(self, sig):
-        utils.get_logger().warning("Received SIGTERM")
-        self._shutdown()
-
-    def _shutdown(self):
-        utils.get_logger().info("Shutting down")
-        GLib.MainLoop().quit()
-
-    def run(self):
-        GLib.unix_signal_add(GLib.PRIORITY_HIGH,
-                             signal.SIGTERM,
-                             self._sigterm,
-                             None)
-
-        try:
-            utils.get_logger().info("Starting main loop")
-            GLib.MainLoop().run()
-        except KeyboardInterrupt:
-            self._shutdown()

=== removed file 'python/libertine/lifecycle/LifecycleResult.py'
--- python/libertine/lifecycle/LifecycleResult.py	2016-12-21 18:26:51 +0000
+++ python/libertine/lifecycle/LifecycleResult.py	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016 Canonical Ltd.
-
-# This program 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; version 3 of the License.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-class LifecycleResult(object):
-    def __init__(self, error=''):
-        self._error = error
-
-    @property
-    def error(self):
-        return self._error or ''
-
-    @property
-    def success(self):
-        return self.error == ''
-
-    @classmethod
-    def from_dict(kls, d):
-        return LifecycleResult(d.get('error', None))
-
-    def to_dict(self):
-        return {
-            'error': self.error
-        }

=== removed file 'python/libertine/lifecycle/__init__.py'
--- python/libertine/lifecycle/__init__.py	2016-12-21 18:26:51 +0000
+++ python/libertine/lifecycle/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from .ContainerLifecycleServiceRunner import ContainerLifecycleServiceRunner
-from .ContainerLifecycleService import ContainerLifecycleService
-from .LifecycleResult import LifecycleResult
-
-__all__ = [
-          'ContainerLifecycleServiceRunner',
-          'ContainerLifecycleService',
-          'LifecycleResult'
-          ]

=== modified file 'python/libertine/service/apt.py'
--- python/libertine/service/apt.py	2016-11-08 15:37:58 +0000
+++ python/libertine/service/apt.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,10 +15,6 @@
 import apt
 import re
 
-import gi
-gi.require_version('Libertine', '1')
-from gi.repository import Libertine
-
 from libertine import utils
 from os import path
 from threading import Lock
@@ -67,7 +63,7 @@
             if self._cache is None:
                 try:
                     utils.get_logger().debug("Trying aptcache for container %s" % self._container)
-                    container_path = Libertine.container_path(self._container)
+                    container_path = utils.get_libertine_container_rootfs_path(self._container)
                     if not container_path or not path.exists(container_path):
                         raise PermissionError
 

=== modified file 'python/libertine/service/container.py'
--- python/libertine/service/container.py	2016-11-08 15:37:58 +0000
+++ python/libertine/service/container.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,18 +14,27 @@
 
 from libertine.service.tasks import *
 from libertine import utils
-from libertine.service import apt
+from threading import Lock
+
+
+if not utils.is_snap_environment():
+    from libertine.service import apt
 
 
 class Container(object):
-    def __init__(self, container_id, config, lock, connection, callback):
+    def __init__(self, container_id, config, connection, callback):
         self._id = container_id
         self._connection = connection
         self._callback = callback
         self._config = config
-        self._lock = lock
+        self._lock = Lock()
         self._tasks = []
-        self._cache = apt.AptCache(self.id)
+
+        if utils.is_snap_environment():
+            utils.get_logger().warning("Using AptCache not currently supported in snap environment")
+            self._cache = None
+        else:
+            self._cache = apt.AptCache(self.id)
 
     def _cleanup_task(self, task):
         utils.get_logger().debug("cleaning up tasks for container '%s'" % self.id)
@@ -47,6 +56,9 @@
     def search(self, query):
         utils.get_logger().debug("search container '%s' for package '%s'" % (self.id, query))
 
+        if utils.is_snap_environment():
+            raise Exception("This operation is not currently supported within the snap")
+
         task = SearchTask(self.id, self._cache, query, self._connection, self._cleanup_task)
         self._tasks.append(task)
         task.start()
@@ -56,6 +68,9 @@
     def app_info(self, package_name):
         utils.get_logger().debug("get info for package '%s' in container '%s'" % (package_name, self.id))
 
+        if utils.is_snap_environment():
+            raise Exception("This operation is not currently supported within the snap")
+
         related_task_ids = [t.id for t in self._tasks if t.package == package_name and t.running]
         task = AppInfoTask(self.id, self._cache, package_name, related_task_ids, self._config, self._connection, self._cleanup_task)
 
@@ -129,10 +144,10 @@
         task.start()
         return task.id
 
-    def list_apps(self):
-        utils.get_logger().debug("List all apps in container '%s'" % self.id)
+    def list_app_ids(self):
+        utils.get_logger().debug("List all app ids in container '%s'" % self.id)
 
-        task = ListAppsTask(self.id, self._config, self._connection, self._cleanup_task)
+        task = ListAppIdsTask(self.id, self._config, self._connection, self._cleanup_task)
 
         self._tasks.append(task)
         task.start()

=== modified file 'python/libertine/service/manager.py'
--- python/libertine/service/manager.py	2016-10-31 18:31:00 +0000
+++ python/libertine/service/manager.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
 import dbus
 import dbus.service
 import libertine.service.task_dispatcher
+from collections import Counter
 from dbus.mainloop.glib import DBusGMainLoop
 from libertine.service import container
 from libertine import utils
@@ -28,6 +29,7 @@
 class Manager(dbus.service.Object):
     def __init__(self):
         utils.get_logger().debug("creating service")
+        self._operations = Counter()
         DBusGMainLoop(set_as_default=True)
         try:
             bus_name = dbus.service.BusName(LIBERTINE_MANAGER_NAME,
@@ -67,9 +69,9 @@
     @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
                          in_signature='s',
                          out_signature='o')
-    def list_apps(self, container_id):
-        utils.get_logger().debug("list_apps('{}')".format(container_id))
-        return self._dispatcher.list_apps(container_id)
+    def list_app_ids(self, container_id):
+        utils.get_logger().debug("list_app_ids('{}')".format(container_id))
+        return self._dispatcher.list_app_ids(container_id)
 
     @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
                          out_signature='o')
@@ -113,3 +115,37 @@
     def remove(self, container_id, package_name):
         utils.get_logger().debug("remove('%s', '%s')" % (container_id, package_name))
         return self._dispatcher.remove(container_id, package_name)
+
+    # Container Lifecycle
+
+    @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
+                         in_signature='s',
+                         out_signature='b')
+    def container_operation_start(self, container):
+        utils.get_logger().debug("container_operation_start({})".format(container))
+
+        if self._operations[container] == -1:
+            return False
+
+        self._operations[container] += 1
+        return True
+
+    @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
+                         in_signature='s',
+                         out_signature='b')
+    def container_operation_finished(self, container):
+        utils.get_logger().debug("container_operation_finished({})".format(container))
+        stop = False
+        self._operations[container] -= 1
+
+        if self._operations[container] == 0:
+            self._operations[container] -= 1
+            stop = True
+
+        return stop
+
+    @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
+                         in_signature='s')
+    def container_stopped(self, container):
+        utils.get_logger().debug("container_stopped({})".format(container))
+        del self._operations[container]

=== modified file 'python/libertine/service/progress.py'
--- python/libertine/service/progress.py	2016-11-29 17:38:38 +0000
+++ python/libertine/service/progress.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 from time import time
 
 DOWNLOAD_INTERFACE = "com.canonical.applications.Download"
-PROGRESS_INTERFACE = "com.canonical.libertine.Progress"
+PROGRESS_INTERFACE = "com.canonical.libertine.Service.Progress"
 
 class Progress(dbus.service.Object):
     def __init__(self, connection):
@@ -28,7 +28,7 @@
         self._error = ''
         dbus.service.Object.__init__(self, conn=connection, object_path=("/Progress/%s" % hex(int(time()*10000000))[2:]))
 
-        self.emit_processing()
+        # self.emit_processing() # Disabled until something requires the Download interface
 
     @property
     def id(self):

=== modified file 'python/libertine/service/task_dispatcher.py'
--- python/libertine/service/task_dispatcher.py	2016-11-01 18:50:32 +0000
+++ python/libertine/service/task_dispatcher.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
     def __init__(self, connection):
         self._connection = connection
         self._config = libertine.ContainersConfig.ContainersConfig()
-        self._lock = Lock()
         self._containerless_tasks = []
         self._tasks = []
         self._containers = []
@@ -35,7 +34,7 @@
             self._tasks.remove(task)
 
     def _cleanup_container(self, container):
-        utils.get_logger().debug("cleaning up container '%s'" % container)
+        utils.get_logger().debug("cleaning up container '%s'" % container.id)
         if container in self._containers:
             self._containers.remove(container)
 
@@ -45,7 +44,7 @@
         if container is not None:
             utils.get_logger().debug("using existing container '%s'" % container_id)
             return container
-        container = Container(container_id, self._config, self._lock, self._connection, self._cleanup_container)
+        container = Container(container_id, self._config, self._connection, self._cleanup_container)
         self._containers.append(container)
 
         return container
@@ -85,9 +84,9 @@
         utils.get_logger().debug("dispatching update container '%s'" % container_id)
         return self._find_or_create_container(container_id).update()
 
-    def list_apps(self, container_id):
-        utils.get_logger().debug("dispatching list all apps in container '%s'" % container_id)
-        return self._find_or_create_container(container_id).list_apps()
+    def list_app_ids(self, container_id):
+        utils.get_logger().debug("dispatching list apps ids in container '%s'" % container_id)
+        return self._find_or_create_container(container_id).list_app_ids()
 
     # Containerless Tasks
 
@@ -107,7 +106,7 @@
     def list(self):
         utils.get_logger().debug("dispatching list all containers")
 
-        task = ListTask(self._connection, self._cleanup_task)
+        task = ListTask(self._config, self._connection, self._cleanup_task)
         self._tasks.append(task)
         task.start()
 

=== modified file 'python/libertine/service/tasks/__init__.py'
--- python/libertine/service/tasks/__init__.py	2016-11-01 17:38:38 +0000
+++ python/libertine/service/tasks/__init__.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -22,7 +22,7 @@
 from .search_task import SearchTask
 from .update_task import UpdateTask
 from .list_task import ListTask
-from .list_apps_task import ListAppsTask
+from .list_app_ids_task import ListAppIdsTask
 
 __all__ = [
           'AppInfoTask',
@@ -35,5 +35,5 @@
           'SearchTask',
           'UpdateTask',
           'ListTask',
-          'ListAppsTask'
+          'ListAppIdsTask'
           ]

=== modified file 'python/libertine/service/tasks/base_task.py'
--- python/libertine/service/tasks/base_task.py	2016-11-07 20:37:54 +0000
+++ python/libertine/service/tasks/base_task.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 import libertine.service.progress
 import threading
 from abc import ABCMeta, abstractmethod
-from libertine import utils
 
 
 class BaseTask(metaclass=ABCMeta):
@@ -60,7 +59,7 @@
         if self._instant_callback:
             self._callback(self)
         else:
-            threading.Timer(30, lambda: self._callback(self)).start()
+            threading.Timer(10, lambda: self._callback(self)).start()
 
     def start(self):
         self._progress = libertine.service.progress.Progress(self._connection)
@@ -82,7 +81,6 @@
 
         if self.running:
             self._progress.finished(self.container)
-            utils.refresh_libertine_scope()
 
         self._delayed_callback()
 

=== modified file 'python/libertine/service/tasks/container_info_task.py'
--- python/libertine/service/tasks/container_info_task.py	2016-11-01 17:38:38 +0000
+++ python/libertine/service/tasks/container_info_task.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,6 +13,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+import json
+
 from .base_task import BaseTask
 from libertine import utils
 
@@ -23,7 +25,21 @@
         self._tasks = tasks
 
     def _run(self):
-        container = {'id': str(self._container)}
-        container['status'] = self._config._get_value_by_key(self._container, 'installStatus') or ''
-        container['task_ids'] = self._tasks
-        self._progress.data(str(container))
+        utils.get_logger().debug("Gathering info for container '{}'".format(self._container))
+        container = {'id': str(self._container), 'task_ids': self._tasks}
+
+        container['status'] = self._config.get_container_install_status(self._container) or ''
+        container['name'] = self._config.get_container_name(self._container) or ''
+
+        container_type = self._config.get_container_type(self._container)
+        container['root'] = utils.get_libertine_container_rootfs_path(self._container)
+        container['home'] = utils.get_libertine_container_home_dir(self._container)
+
+        self._progress.data(json.dumps(container))
+
+    def _before(self):
+        if not self._config.container_exists(self._container):
+            self._progress.error("Container '%s' does not exist, ignoring info request" % self._container)
+            return False
+
+        return True

=== added file 'python/libertine/service/tasks/list_app_ids_task.py'
--- python/libertine/service/tasks/list_app_ids_task.py	1970-01-01 00:00:00 +0000
+++ python/libertine/service/tasks/list_app_ids_task.py	2017-02-09 16:08:46 +0000
@@ -0,0 +1,35 @@
+# Copyright 2017 Canonical Ltd.
+#
+# This program 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; version 3 of the License.
+#
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import json
+from .base_task import BaseTask
+from libertine import LibertineContainer, utils
+import time
+
+
+class ListAppIdsTask(BaseTask):
+    def __init__(self, container_id, config, connection, callback):
+        super().__init__(lock=None, container_id=container_id, config=config, connection=connection, callback=callback)
+
+    def _run(self):
+        utils.get_logger().debug("Listing app ids from container '%s'" % self._container)
+        self._progress.data(json.dumps(LibertineContainer(self._container, self._config).list_app_ids()))
+
+    def _before(self):
+        if not self._config.container_exists(self._container):
+            self._progress.error("Container '%s' does not exist, skipping list" % self._container)
+            return False
+
+        return True

=== removed file 'python/libertine/service/tasks/list_apps_task.py'
--- python/libertine/service/tasks/list_apps_task.py	2016-11-01 17:38:38 +0000
+++ python/libertine/service/tasks/list_apps_task.py	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-#
-# This program 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; version 3 of the License.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-from .base_task import BaseTask
-from libertine import LibertineContainer, utils
-
-
-class ListAppsTask(BaseTask):
-    def __init__(self, container_id, config, connection, callback):
-        super().__init__(lock=None, container_id=container_id, config=config, connection=connection, callback=callback)
-
-    def _run(self):
-        utils.get_logger().debug("Listing apps in container '%s'" % self._container)
-        if not self._config.container_exists(self._container):
-            self._progress.error("Container '%s' does not exist, skipping list" % self._container)
-        else:
-            container = LibertineContainer(self._container, self._config)
-            self._progress.data(str(container.list_app_launchers(use_json=True)))

=== modified file 'python/libertine/service/tasks/list_task.py'
--- python/libertine/service/tasks/list_task.py	2016-11-01 18:50:32 +0000
+++ python/libertine/service/tasks/list_task.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,13 +13,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+import json
+
 from .base_task import BaseTask
 from libertine import utils
 
 
 class ListTask(BaseTask):
-    def __init__(self, connection, callback):
-        super().__init__(lock=None, container_id=None, config=None, connection=connection, callback=callback)
+    def __init__(self, config, connection, callback):
+        super().__init__(lock=None, container_id=None, config=config, connection=connection, callback=callback)
 
     def _run(self):
-        self._progress.data(str(utils.Libertine.list_containers()))
+        self._progress.data(json.dumps(self._config.get_containers()))

=== modified file 'python/libertine/utils.py'
--- python/libertine/utils.py	2017-01-17 15:41:51 +0000
+++ python/libertine/utils.py	2017-02-09 16:08:46 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2015-2016 Canonical Ltd.
+# Copyright (C) 2015-2017 Canonical Ltd.
 # Author: Christopher Townsend <[e-mail]>
 
 # This program is free software: you can redistribute it and/or modify
@@ -17,14 +17,11 @@
 
 import logging
 import os
+import psutil
 import shlex
 import subprocess
 import xdg.BaseDirectory as basedir
 
-from gi import require_version
-require_version('Libertine', '1')
-from gi.repository import Libertine
-
 
 def get_logger():
     logger = logging.getLogger('__libertine_logger__')
@@ -63,12 +60,7 @@
 
 
 def get_libertine_container_rootfs_path(container_id):
-    path = Libertine.container_path(container_id)
-
-    if path is None:
-        path = os.path.join(get_libertine_containers_dir_path(), container_id, 'rootfs')
-
-    return path
+    return os.path.join(get_libertine_containers_dir_path(), container_id, 'rootfs')
 
 
 def get_libertine_containers_dir_path():
@@ -82,13 +74,15 @@
 
 
 def get_libertine_database_dir_path():
-    xdg_data_home = os.getenv('XDG_DATA_HOME',
-                              os.path.join(os.getenv('HOME'), '.local', 'share'))
+    if is_snap_environment():
+        xdg_data_home = os.path.join(os.getenv('SNAP_USER_COMMON'), '.local', 'share')
+    else:
+        xdg_data_home = os.getenv('XDG_DATA_HOME',
+                            os.path.join(os.getenv('HOME'), '.local', 'share'))
 
     libertine_database_dir = os.path.join(xdg_data_home, 'libertine')
 
-    if not os.path.exists(libertine_database_dir):
-        os.makedirs(libertine_database_dir)
+    os.makedirs(libertine_database_dir, exist_ok=True)
 
     return libertine_database_dir
 
@@ -97,11 +91,8 @@
     return os.path.join(get_libertine_database_dir_path(), 'ContainersConfig.json')
 
 
-def get_libertine_container_userdata_dir_path(container_id):
-    path = Libertine.container_home_path(container_id)
-
-    if path is None:
-        path = os.path.join(basedir.xdg_data_home, 'libertine-container', 'user-data', container_id)
+def get_libertine_container_home_dir(container_id):
+    path = os.path.join(basedir.xdg_data_home, 'libertine-container', 'user-data', container_id)
 
     if is_snap_environment():
         path = path.replace(os.environ['HOME'], os.getenv('SNAP_USER_COMMON'))
@@ -150,31 +141,10 @@
     return dirs
 
 
-def create_libertine_user_data_dir(container_id):
-    user_data = get_libertine_container_userdata_dir_path(container_id)
-
-    if not os.path.exists(user_data):
-        os.makedirs(user_data)
-
-    config_path = os.path.join(user_data, ".config", "dconf")
-
-    if not os.path.exists(config_path):
-        os.makedirs(config_path)
-
-
 def get_libertine_lxc_pulse_socket_path():
     return os.path.join(get_libertine_runtime_dir(), 'pulse_socket')
 
 
-def terminate_window_manager(window_manager):
-    for child in window_manager.children():
-        child.terminate()
-        child.wait()
-
-    window_manager.terminate()
-    window_manager.wait()
-
-
 def refresh_libertine_scope():
     scopes_object_path = "/com/canonical/unity/scopes"
     invalidate_signal = "com.canonical.unity.scopes.InvalidateResults"
@@ -187,27 +157,27 @@
 
 
 def set_session_dbus_env_var():
-    if not 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
-        dbus_session_path = os.path.join('/', 'run', 'user', str(os.getuid()), 'dbus-session')
-
-        if os.path.exists(dbus_session_path):
-            with open(dbus_session_path, 'r') as fd:
-                dbus_session_str = fd.read()
-
-                os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_str.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
-
-                return True
-        else:
-            return False
-
-    return True
+    dbus_session_set = 'SESSION' in os.environ
+
+    if not dbus_session_set:
+        for p in psutil.process_iter():
+            try:
+                if p.name() == 'unity8' or p.name() == 'compiz':
+                    p_environ = subprocess.check_output(["cat", "/proc/{}/environ".format(p.pid)])
+                    for line in p_environ.decode().split('\0'):
+                        if line.startswith('DBUS_SESSION_BUS_ADDRESS'):
+                            os.environ['DBUS_SESSION_BUS_ADDRESS'] = line.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
+                            dbus_session_set = True
+                            break
+                    break
+            except psutil.NoSuchProcess as e:
+                get_logger().warning(str(e))
+
+    return dbus_session_set
 
 
 def is_snap_environment():
-    if 'SNAP' in os.environ:
-        return True
-    else:
-        return False
+    return 'SNAP' in os.environ
 
 
 def get_deb_package_name(package):

=== added directory 'setup'
=== added directory 'setup/gui'
=== added file 'setup/gui/libertine-manager-app.desktop'
--- setup/gui/libertine-manager-app.desktop	1970-01-01 00:00:00 +0000
+++ setup/gui/libertine-manager-app.desktop	2017-02-09 16:08:46 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=Libertine Manager
+Comment=Legacy Application Sandbox
+Exec=libertine.manager-app %U
+Terminal=false
+Type=Application
+Icon=${SNAP}/usr/share/libertine/libertine_64.png
+Categories=
+GenericName=Application Sandbox
+X-Ubuntu-Touch=true
+

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2017-01-18 14:50:33 +0000
+++ snapcraft.yaml	2017-02-09 16:08:46 +0000
@@ -1,18 +1,52 @@
 name: libertine
-version: 1.5.1+17.04.20170118-0ubuntu1
+version: 1.6
 summary: Libertine suite
 description: |
     Suite for maintaining deb-based applications in a non-deb environment
-confinement: devmode
+confinement: strict # devmode # TODO: update to 'strict'
 grade: devel
 
+slots:
+  libertined:
+    interface: dbus
+    name: com.canonical.libertine.Service
+    bus: session
+
 apps:
-  libertine-container-manager:
+  launch:
+    command: usr/bin/snap-runner.wrapper libertine-launch
+    aliases:
+      - libertine-launch
+    plugs:
+      - lxd
+      - network
+      - network-bind
+      - home
+      - mir
+      - x11
+      - unity7
+      - opengl
+      - pulseaudio
+      - alsa
+  libertined:
+    command: usr/bin/snap-runner.wrapper libertined
+    plugs:
+      - lxd
+      - network-bind
+    # daemon: simple # Waiting on LP:1613420
+  container-manager:
     command: usr/bin/snap-runner.wrapper libertine-container-manager
-  libertine-manager-app:
+    aliases:
+      - libertine-container-manager
+    plugs:
+      - lxd
+      - network
+  manager-app:
     command: usr/bin/snap-runner.wrapper libertine-manager-app
-  libertine-launch:
-    command: usr/bin/snap-runner.wrapper libertine-launch
+    # desktop command currently being labeled unknown by app store, restore with snapcraft 2.26 release
+    # desktop: usr/share/applications/libertine-manager-app.desktop
+    aliases:
+      - libertine-manager-app
 
   # For debugging purposes
   bash:

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2016-11-07 17:08:16 +0000
+++ tests/integration/CMakeLists.txt	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-add_test(test_libertine_service /usr/bin/python3 -m testtools.run test_libertine_service)
+add_test(test_libertine_service dbus-run-session -- /usr/bin/python3 -m testtools.run test_libertine_service)
 set_tests_properties(test_libertine_service
                      PROPERTIES ENVIRONMENT
                    "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;LIBERTINE_DATA_DIR=${CMAKE_CURRENT_SOURCE_DIR};PATH=${CMAKE_SOURCE_DIR}/tools:$ENV{PATH};")

=== modified file 'tests/integration/test_libertine_service.py'
--- tests/integration/test_libertine_service.py	2016-11-29 17:38:38 +0000
+++ tests/integration/test_libertine_service.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -12,20 +12,26 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+import ast
 import dbus
 import dbus.mainloop.glib
+import os
+import pexpect
+import sys
+import tempfile
+import threading
+import time
 import unittest.mock
-from unittest import TestCase
+
+from gi.repository import GLib
+from gi.repository import GObject
+from libertine import utils
 from libertine.service import tasks, apt
 from libertine.ContainersConfig import ContainersConfig
 from subprocess import Popen, PIPE
-import time
-from gi.repository import GLib
-from gi.repository import GObject
-import os
-import tempfile
-import threading
-import ast
+from unittest import TestCase
+
 
 class TestLibertineService(TestCase):
     _process = None
@@ -39,7 +45,17 @@
 
         environ = os.environ.copy()
         environ['XDG_DATA_HOME'] = cls._tempdir.name
-        cls._process = Popen(['libertined', '--debug'], stdout=PIPE, stderr=PIPE, env=environ)
+
+        cls._process = pexpect.spawnu('libertined --debug', env=environ)
+        cls._process.logfile = sys.stdout
+
+        # give libertined enough time to start the whole process
+        verbosity = environ.get('LIBERTINE_DEBUG', '1')
+        if verbosity == '1':
+            cls._process.expect(['.+\n', pexpect.TIMEOUT], timeout=1)
+        elif environ['LIBERTINE_DEBUG'] == '2':
+            cls._process.expect(['.+\n.+\n.+\n', pexpect.TIMEOUT], timeout=1)
+
         dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
         cls._loop = GObject.MainLoop()
 
@@ -49,9 +65,7 @@
     @classmethod
     def tearDownClass(cls):
         cls._loop.quit()
-        cls._process.kill()
-        out, err = cls._process.communicate()
-        print(err)
+        cls._process.close()
         cls._tempdir.cleanup()
 
     def setUp(self):
@@ -91,7 +105,7 @@
         signals.append(self._bus.add_signal_receiver(path=obj_path, handler_function=self._finished_handler,
                                 dbus_interface='com.canonical.applications.Download', signal_name='finished'))
         signals.append(self._bus.add_signal_receiver(path=obj_path, handler_function=self._data_handler,
-                                 dbus_interface='com.canonical.libertine.Progress', signal_name='data'))
+                                 dbus_interface='com.canonical.libertine.Service.Progress', signal_name='data'))
         signals.append(self._bus.add_signal_receiver(path=obj_path, handler_function=self._error_handler,
                                  dbus_interface='com.canonical.applications.Download', signal_name='error'))
 
@@ -110,20 +124,25 @@
 
     def test_container_management(self):
         try:
-            self.assertEqual('[]', self._send(lambda: self._libertined.list()))
+            self.assertEqual([], ast.literal_eval(self._send(lambda: self._libertined.list())))
             self._send(lambda: self._libertined.create('rey', 'Rey', 'xenial', 'mock'))
-            self.assertEqual('[\'rey\']', self._send(lambda: self._libertined.list()))
+            self.assertEqual(['rey'], ast.literal_eval(self._send(lambda: self._libertined.list())))
 
             self._send(lambda: self._libertined.create('kylo', 'Kylo Ren', 'xenial', 'mock'))
-            self.assertEqual('[\'rey\', \'kylo\']', self._send(lambda: self._libertined.list()))
+            self.assertEqual(['rey', 'kylo'], ast.literal_eval(self._send(lambda: self._libertined.list())))
 
             self._send(lambda: self._libertined.update('kylo'))
 
-            self.assertEqual({'id': 'rey', 'status': 'ready', 'task_ids': []},
-                             ast.literal_eval(self._send(lambda: self._libertined.container_info('rey'))))
+            self.assertEqual({'id': 'rey',
+                              'status': 'ready',
+                              'name': 'Rey',
+                              'task_ids': [],
+                              'root': utils.get_libertine_container_rootfs_path('rey'),
+                              'home': '{}/libertine-container/user-data/rey'.format(TestLibertineService._tempdir.name)
+                             }, ast.literal_eval(self._send(lambda: self._libertined.container_info('rey'))))
 
             self._send(lambda: self._libertined.destroy('kylo'))
-            self.assertEqual('[\'rey\']', self._send(lambda: self._libertined.list()))
+            self.assertEqual(['rey'], ast.literal_eval(self._send(lambda: self._libertined.list())))
         except AssertionError as e:
             raise
         except Exception as e:
@@ -137,8 +156,7 @@
             config = ContainersConfig()
 
             self._send(lambda: self._libertined.create('jarjar', 'JarJar Binks', 'xenial', 'mock'))
-            self.assertEqual({'name': 'JarJar Binks', 'app_launchers': []},
-                             ast.literal_eval(self._send(lambda: self._libertined.list_apps('jarjar'))))
+            self.assertEqual([], ast.literal_eval(self._send(lambda: self._libertined.list_app_ids('jarjar'))))
 
             self._send(lambda: self._libertined.install('jarjar', 'the-force'))
             config.refresh_database()

=== added directory 'tests/unit/service/containerroot/libertine-container'
=== added directory 'tests/unit/service/containerroot/libertine-container/palpatine'
=== added directory 'tests/unit/service/containerroot/libertine-container/palpatine/rootfs'
=== modified file 'tests/unit/service/tasks/CMakeLists.txt'
--- tests/unit/service/tasks/CMakeLists.txt	2016-11-01 19:49:32 +0000
+++ tests/unit/service/tasks/CMakeLists.txt	2017-02-09 16:08:46 +0000
@@ -4,7 +4,7 @@
 create_service_unit_test(test_destroy_task)
 create_service_unit_test(test_install_task)
 create_service_unit_test(test_list_task)
-create_service_unit_test(test_list_apps_task)
+create_service_unit_test(test_list_app_ids_task)
 create_service_unit_test(test_remove_task)
 create_service_unit_test(test_search_task)
 create_service_unit_test(test_update_task)

=== modified file 'tests/unit/service/tasks/test_container_info_task.py'
--- tests/unit/service/tasks/test_container_info_task.py	2016-11-07 18:51:17 +0000
+++ tests/unit/service/tasks/test_container_info_task.py	2017-02-09 16:08:46 +0000
@@ -13,8 +13,10 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+import ast
 import unittest.mock
 from unittest import TestCase
+from libertine import utils
 from libertine.service import tasks
 from libertine.ContainersConfig import ContainersConfig
 
@@ -33,12 +35,22 @@
             progress = MockProgress.return_value
             progress.done = False
 
-            self.config._get_value_by_key.return_value = 'ready'
+            self.config.get_container_install_status.return_value = 'ready'
+            self.config.get_container_name.return_value = 'Palpatine'
             task = tasks.ContainerInfoTask('palpatine', [1, 2, 3], self.config, self.connection, callback)
             task._instant_callback = True
             task.start().join()
 
-            progress.data.assert_called_once_with(str({'id': 'palpatine', 'status': 'ready', 'task_ids': [1, 2, 3]}))
+            progress.data.assert_called_once_with(unittest.mock.ANY)
+            args, kwargs = progress.data.call_args
+            self.assertEqual({'id': 'palpatine',
+                              'status': 'ready',
+                              'task_ids': [1, 2, 3],
+                              'name': 'Palpatine',
+                              'root': utils.get_libertine_container_rootfs_path('palpatine'),
+                              'home': utils.get_libertine_container_home_dir('palpatine')},
+                        ast.literal_eval(args[0]))
+
             progress.finished.assert_called_once_with('palpatine')
 
             self.assertEqual(task, self.called_with)

=== added file 'tests/unit/service/tasks/test_list_app_ids_task.py'
--- tests/unit/service/tasks/test_list_app_ids_task.py	1970-01-01 00:00:00 +0000
+++ tests/unit/service/tasks/test_list_app_ids_task.py	2017-02-09 16:08:46 +0000
@@ -0,0 +1,59 @@
+# Copyright 2017 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import json
+import unittest.mock
+from unittest import TestCase
+from libertine.service import tasks
+from libertine.ContainersConfig import ContainersConfig
+
+
+class TestListAppIdsTask(TestCase):
+    def setUp(self):
+        self.config      = unittest.mock.create_autospec(ContainersConfig)
+        self.connection  = unittest.mock.Mock()
+        self.lock      = unittest.mock.MagicMock()
+        self.called_with = None
+
+    def callback(self, task):
+        self.called_with = task
+
+    def test_sends_error_on_non_existent_container(self):
+        self.config.container_exists.return_value = False
+        with unittest.mock.patch('libertine.service.tasks.base_task.libertine.service.progress.Progress') as MockProgress:
+            progress = MockProgress.return_value
+            task = tasks.ListAppIdsTask('palpatine', self.config, self.connection, self.callback)
+            task._instant_callback = True
+
+            with unittest.mock.patch('libertine.service.tasks.list_app_ids_task.LibertineContainer') as MockContainer:
+                task.start().join()
+
+            progress.error.assert_called_once_with('Container \'palpatine\' does not exist, skipping list')
+            self.assertEqual(task, self.called_with)
+
+    def test_successfully_lists_apps(self):
+        self.config.container_exists.return_value = True
+        with unittest.mock.patch('libertine.service.tasks.base_task.libertine.service.progress.Progress') as MockProgress:
+            progress = MockProgress.return_value
+            progress.done = False
+            task = tasks.ListAppIdsTask('palpatine', self.config, self.connection, self.callback)
+            task._instant_callback = True
+
+            with unittest.mock.patch('libertine.service.tasks.list_app_ids_task.LibertineContainer') as MockContainer:
+                MockContainer.return_value.list_app_ids.return_value = '["palpatine_gedit_0.0","palpatine_xterm_0.0"]'
+                task.start().join()
+
+            progress.finished.assert_called_once_with('palpatine')
+            progress.data.assert_called_once_with(json.dumps('["palpatine_gedit_0.0","palpatine_xterm_0.0"]'))
+            self.assertEqual(task, self.called_with)

=== removed file 'tests/unit/service/tasks/test_list_apps_task.py'
--- tests/unit/service/tasks/test_list_apps_task.py	2016-11-07 18:51:17 +0000
+++ tests/unit/service/tasks/test_list_apps_task.py	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-import unittest.mock
-from unittest import TestCase
-from libertine.service import tasks
-from libertine.ContainersConfig import ContainersConfig
-
-
-class TestListAppsTask(TestCase):
-    def setUp(self):
-        self.config      = unittest.mock.create_autospec(ContainersConfig)
-        self.connection  = unittest.mock.Mock()
-        self.lock      = unittest.mock.MagicMock()
-        self.called_with = None
-
-    def callback(self, task):
-        self.called_with = task
-
-    def test_sends_error_on_non_existent_container(self):
-        self.config.container_exists.return_value = False
-        with unittest.mock.patch('libertine.service.tasks.base_task.libertine.service.progress.Progress') as MockProgress:
-            progress = MockProgress.return_value
-            task = tasks.ListAppsTask('palpatine', self.config, self.connection, self.callback)
-            task._instant_callback = True
-
-            with unittest.mock.patch('libertine.service.tasks.list_apps_task.LibertineContainer') as MockContainer:
-                task.start().join()
-
-            progress.error.assert_called_once_with('Container \'palpatine\' does not exist, skipping list')
-            self.assertEqual(task, self.called_with)
-
-    def test_successfully_lists_apps(self):
-        self.config.container_exists.return_value = True
-        with unittest.mock.patch('libertine.service.tasks.base_task.libertine.service.progress.Progress') as MockProgress:
-            progress = MockProgress.return_value
-            progress.done = False
-            task = tasks.ListAppsTask('palpatine', self.config, self.connection, self.callback)
-            task._instant_callback = True
-
-            with unittest.mock.patch('libertine.service.tasks.list_apps_task.LibertineContainer') as MockContainer:
-                MockContainer.return_value.list_app_launchers.return_value = 'jarjar\nsidius'
-                task.start().join()
-
-            progress.finished.assert_called_once_with('palpatine')
-            progress.data.assert_called_once_with('jarjar\nsidius')
-            self.assertEqual(task, self.called_with)

=== modified file 'tests/unit/service/tasks/test_list_task.py'
--- tests/unit/service/tasks/test_list_task.py	2016-11-07 18:51:17 +0000
+++ tests/unit/service/tasks/test_list_task.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -13,7 +13,9 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+import json
 import unittest.mock
+
 from unittest import TestCase
 from libertine.service import tasks
 from libertine.ContainersConfig import ContainersConfig
@@ -32,14 +34,14 @@
         with unittest.mock.patch('libertine.service.tasks.base_task.libertine.service.progress.Progress') as MockProgress:
             progress = MockProgress.return_value
             progress.done = False
-            task = tasks.ListTask(self.connection, callback)
+
+            task = tasks.ListTask(self.config, self.connection, callback)
             task._instant_callback = True
 
-            with unittest.mock.patch('libertine.service.tasks.list_task.utils.Libertine') as MockLibertine:
-                MockLibertine.list_containers.return_value = 'palpatine\nvader\nmaul'
-                task.start().join()
+            self.config.get_containers.return_value = ['palatine', 'vader', 'maul']
+            task.start().join()
 
-            progress.data.assert_called_once_with('palpatine\nvader\nmaul')
+            progress.data.assert_called_once_with(json.dumps(['palatine', 'vader', 'maul']))
             progress.finished.assert_called_once_with('')
 
             self.assertEqual(task, self.called_with)

=== modified file 'tests/unit/service/test_apt.py'
--- tests/unit/service/test_apt.py	2016-11-03 20:10:47 +0000
+++ tests/unit/service/test_apt.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -14,8 +14,9 @@
 
 import os
 import unittest.mock
+from libertine import utils
+from libertine.service import apt
 from unittest import TestCase
-from libertine.service import apt
 
 
 def build_mock_app(name, summary, website, description):
@@ -30,13 +31,13 @@
 
 
 class TestAptCache(TestCase):
+    def setUp(self):
+        os.environ['XDG_CACHE_HOME'] = "{}/containerroot".format(os.environ['LIBERTINE_DATA_DIR'])
+
     def test_search_returns_empty_when_no_matching_results(self):
         with unittest.mock.patch('libertine.service.apt.apt.Cache') as MockCache:
             MockCache.return_value.keys.return_value = []
-
-            with unittest.mock.patch('libertine.service.apt.Libertine') as MockLibertine:
-                MockLibertine.container_path.return_value = '/some/junk'
-                self.assertEqual(apt.AptCache('palpatine').search('vim'), [])
+            self.assertEqual(apt.AptCache('palpatine').search('vim'), [])
 
     def test_search_returns_matching_results(self):
         with unittest.mock.patch('libertine.service.apt.apt.Cache') as MockCache:
@@ -47,9 +48,7 @@
                 "vim-common": build_mock_app("vim-common", "common vim stuff", "vim.common", "dependencies")
             }
 
-            with unittest.mock.patch('libertine.service.apt.Libertine') as MockLibertine:
-                MockLibertine.container_path.return_value = '/some/junk'
-                results = apt.AptCache('palpatine').search('vim')
+            results = apt.AptCache('palpatine').search('vim')
 
             self.assertEqual(len(results), 2)
             results = sorted(results, key=lambda xx: xx['id'])
@@ -67,15 +66,13 @@
             self.assertEqual(results[1]['website'], 'vim.common')
             self.assertEqual(results[1]['package'], 'vim-common')
 
-            MockCache.assert_called_once_with()
+            MockCache.assert_called_once_with(rootdir=utils.get_libertine_container_rootfs_path('palpatine'))
 
     def test_app_info_returns_empty_dict_when_no_such_app_exists(self):
         with unittest.mock.patch('libertine.service.apt.apt.Cache') as MockCache:
             MockCache.return_value = {}
-            with unittest.mock.patch('libertine.service.apt.Libertine') as MockLibertine:
-                MockLibertine.container_path.return_value = '/some/junk'
-                self.assertEqual(apt.AptCache('palpatine').app_info("vim"), {})
-            MockCache.assert_called_once_with()
+            self.assertEqual(apt.AptCache('palpatine').app_info("vim"), {})
+            MockCache.assert_called_once_with(rootdir=utils.get_libertine_container_rootfs_path('palpatine'))
 
     def test_app_info_returns_values_for_app(self):
         with unittest.mock.patch('libertine.service.apt.apt.Cache') as MockCache:
@@ -83,17 +80,15 @@
                 "vim": build_mock_app("vim", "vi improved", "vim.com", "who even uses raw vi"),
                 "gimp": build_mock_app("gimp", "foss photoshop", "gimp.com", "visual text editor"),
             }
-            with unittest.mock.patch('libertine.service.apt.Libertine') as MockLibertine:
-                MockLibertine.container_path.return_value = '/some/junk'
-                self.assertEqual(apt.AptCache('palpatine').app_info("vim"), {
-                    'name': 'vim',
-                    'id': 'vim',
-                    'package': 'vim',
-                    'summary': 'vi improved',
-                    'description': 'who even uses raw vi',
-                    'website': 'vim.com'
-                })
-            MockCache.assert_called_once_with()
+            self.assertEqual(apt.AptCache('palpatine').app_info("vim"), {
+                'name': 'vim',
+                'id': 'vim',
+                'package': 'vim',
+                'summary': 'vi improved',
+                'description': 'who even uses raw vi',
+                'website': 'vim.com'
+            })
+            MockCache.assert_called_once_with(rootdir=utils.get_libertine_container_rootfs_path('palpatine'))
 
     def test_loads_cache_from_container_directory(self):
         with unittest.mock.patch('libertine.service.apt.apt.Cache') as MockCache:
@@ -101,19 +96,17 @@
                 "vim": build_mock_app("vim", "vi improved", "vim.com", "who even uses raw vi"),
                 "gimp": build_mock_app("gimp", "foss photoshop", "gimp.com", "visual text editor"),
             }
-            with unittest.mock.patch('libertine.service.apt.Libertine') as MockLibertine:
-                containerpath = "%s/containerroot" % os.path.dirname(os.path.realpath(__file__))
-                MockLibertine.container_path.return_value = containerpath
-                self.assertEqual(apt.AptCache('palpatine').app_info("vim"), {
-                    'name': 'vim',
-                    'id': 'vim',
-                    'package': 'vim',
-                    'summary': 'vi improved',
-                    'description': 'who even uses raw vi',
-                    'website': 'vim.com'
-                })
-
-            MockCache.assert_called_once_with(rootdir=containerpath)
+
+            self.assertEqual(apt.AptCache('palpatine').app_info("vim"), {
+                'name': 'vim',
+                'id': 'vim',
+                'package': 'vim',
+                'summary': 'vi improved',
+                'description': 'who even uses raw vi',
+                'website': 'vim.com'
+            })
+
+            MockCache.assert_called_once_with(rootdir=utils.get_libertine_container_rootfs_path('palpatine'))
 
     def test_loads_cache_only_once(self):
         with unittest.mock.patch('libertine.service.apt.apt.Cache') as MockCache:
@@ -121,13 +114,12 @@
                 "vim": build_mock_app("vim", "vi improved", "vim.com", "who even uses raw vi"),
                 "gimp": build_mock_app("gimp", "foss photoshop", "gimp.com", "visual text editor"),
             }
-            with unittest.mock.patch('libertine.service.apt.Libertine') as MockLibertine:
-                MockLibertine.container_path.return_value = '/some/junk'
-                cache = apt.AptCache('palpatine')
-                cache.app_info("vim")
-                cache.app_info("vim")
-
-            MockCache.assert_called_once_with()
+
+            cache = apt.AptCache('palpatine')
+            cache.app_info("vim")
+            cache.app_info("vim")
+
+            MockCache.assert_called_once_with(rootdir=utils.get_libertine_container_rootfs_path('palpatine'))
 
 
 if __name__ == '__main__':

=== modified file 'tests/unit/service/test_container.py'
--- tests/unit/service/test_container.py	2016-11-04 15:54:34 +0000
+++ tests/unit/service/test_container.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -22,12 +22,11 @@
     def setUp(self):
         self._connection = unittest.mock.Mock()
         self._config = unittest.mock.Mock()
-        self._lock = unittest.mock.Mock()
 
     def test_search_creates_search_task(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
             cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.SearchTask') as MockSearchTask:
                 c.search('darkseid')
                 MockSearchTask.assert_called_once_with('palpatine', cache, 'darkseid', self._connection, unittest.mock.ANY)
@@ -36,7 +35,7 @@
     def test_app_info_creates_app_info_task(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
             cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.AppInfoTask') as MockAppInfoTask:
                 c.app_info('force')
                 MockAppInfoTask.assert_called_once_with('palpatine', cache, 'force', [], self._config, self._connection, unittest.mock.ANY)
@@ -45,7 +44,7 @@
     def test_app_info_gets_related_task_info(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
             cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.InstallTask') as MockInstallTask:
                 MockInstallTask.return_value.package = 'darkside'
                 MockInstallTask.return_value.matches.return_value = False
@@ -60,119 +59,107 @@
 
     def test_install_creates_install_task(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.InstallTask') as MockInstallTask:
                 c.install('force')
-                MockInstallTask.assert_called_once_with('force', 'palpatine', self._config, self._lock, self._connection, unittest.mock.ANY)
+                MockInstallTask.assert_called_once_with('force', 'palpatine', self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockInstallTask.return_value.start.assert_called_once_with()
 
     def test_install_only_calls_once_when_unfinished(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.InstallTask') as MockInstallTask:
                 c.install('darkside')
                 c.install('darkside')
                 c.install('darkside')
-                # MockInstallTask.assert_called_once_with('darkside', 'palpatine', self._config, self._lock, self._connection, unittest.mock.ANY)
+                MockInstallTask.assert_called_once_with('darkside', 'palpatine', self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockInstallTask.return_value.start.assert_called_once_with()
 
     def test_remove_creates_remove_task(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.RemoveTask') as MockRemoveTask:
                 c.remove('force')
-                MockRemoveTask.assert_called_once_with('force', 'palpatine', self._config, self._lock, self._connection, unittest.mock.ANY)
+                MockRemoveTask.assert_called_once_with('force', 'palpatine', self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockRemoveTask.return_value.start.assert_called_once_with()
 
     def test_remove_only_calls_once_when_unfinished(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.RemoveTask') as MockRemoveTask:
                 c.remove('darkside')
                 c.remove('darkside')
                 c.remove('darkside')
-                # MockRemoveTask.assert_called_once_with('darkside', 'palpatine', self._config, self._lock, self._connection, unittest.mock.ANY)
+                MockRemoveTask.assert_called_once_with('darkside', 'palpatine', self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockRemoveTask.return_value.start.assert_called_once_with()
 
     def test_create_creates_create_task(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.CreateTask') as MockCreateTask:
                 c.create('Emperor Palpatine', 'zesty', 'lxd', False)
                 MockCreateTask.assert_called_once_with('palpatine', 'Emperor Palpatine', 'zesty', 'lxd', False,
-                                                       self._config, self._lock, self._connection, unittest.mock.ANY)
+                                                       self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockCreateTask.return_value.start.assert_called_once_with()
 
     def test_create_only_calls_once_when_unfinished(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.CreateTask') as MockCreateTask:
                 c.create('Emperor Palpatine', 'zesty', 'lxd', False)
                 c.create('Emperor Palpatine', 'zesty', 'lxd', False)
                 c.create('Emperor Palpatine', 'zesty', 'lxd', False)
-                # MockCreateTask.assert_called_once_with('palpatine', 'Emperor Palpatine', 'zesty', 'lxd', False,
-                #                                        self._config, self._lock, self._connection, unittest.mock.ANY)
+                MockCreateTask.assert_called_once_with('palpatine', 'Emperor Palpatine', 'zesty', 'lxd', False,
+                                                       self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockCreateTask.return_value.start.assert_called_once_with()
 
     def test_destroy_creates_destroy_task(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.DestroyTask') as MockDestroyTask:
                 c.destroy()
-                # MockDestroyTask.assert_called_once_with('palpatine', self._config, self._lock, self._connection, unittest.mock.ANY)
+                MockDestroyTask.assert_called_once_with('palpatine', self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockDestroyTask.return_value.start.assert_called_once_with()
 
     def test_destroy_only_calls_once_when_unfinished(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.DestroyTask') as MockDestroyTask:
                 c.destroy()
                 c.destroy()
                 c.destroy()
-                # MockDestroyTask.assert_called_once_with('palpatine', self._config, self._lock, self._connection, unittest.mock.ANY)
+                MockDestroyTask.assert_called_once_with('palpatine', self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockDestroyTask.return_value.start.assert_called_once_with()
 
     def test_update_creates_update_task(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.UpdateTask') as MockUpdateTask:
                 c.update()
-                MockUpdateTask.assert_called_once_with('palpatine', self._config, self._lock, self._connection, unittest.mock.ANY)
+                MockUpdateTask.assert_called_once_with('palpatine', self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockUpdateTask.return_value.start.assert_called_once_with()
 
     def test_update_only_calls_once_when_unfinished(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.UpdateTask') as MockUpdateTask:
                 c.update()
                 c.update()
                 c.update()
-                # MockUpdateTask.assert_called_once_with('palpatine', self._config, self._lock, self._connection, unittest.mock.ANY)
+                MockUpdateTask.assert_called_once_with('palpatine', self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockUpdateTask.return_value.start.assert_called_once_with()
 
-    def test_list_apps_creates_list_apps_task(self):
+    def test_list_app_ids_creates_list_app_ids_task(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
-            with unittest.mock.patch('libertine.service.container.ListAppsTask') as MockListAppsTask:
-                c.list_apps()
-                MockListAppsTask.assert_called_once_with('palpatine', self._config, self._connection, unittest.mock.ANY)
-                MockListAppsTask.return_value.start.assert_called_once_with()
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
+            with unittest.mock.patch('libertine.service.container.ListAppIdsTask') as MockListAppIdsTask:
+                c.list_app_ids()
+                MockListAppIdsTask.assert_called_once_with('palpatine', self._config, self._connection, unittest.mock.ANY)
+                MockListAppIdsTask.return_value.start.assert_called_once_with()
 
     def test_removes_task_during_callback(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
-            c = container.Container('palpatine', self._config, self._lock, self._connection, lambda task: task)
+            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
             with unittest.mock.patch('libertine.service.container.InstallTask') as MockInstallTask:
                 MockInstallTask.return_value.package = 'force'
                 c.install('force')
@@ -186,11 +173,10 @@
 
     def test_completing_all_tasks_fires_callback(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            cache = MockCache.return_value
             self._container_id = None
             def callback(container):
                 self._container_id = container.id
-            c = container.Container('palpatine', self._config, self._lock, self._connection, callback)
+            c = container.Container('palpatine', self._config, self._connection, callback)
             with unittest.mock.patch('libertine.service.container.InstallTask') as MockInstallTask:
                 c.install('force')
                 name, args, kwargs = MockInstallTask.mock_calls[0]

=== modified file 'tests/unit/service/test_task_dispatcher.py'
--- tests/unit/service/test_task_dispatcher.py	2016-11-03 20:20:15 +0000
+++ tests/unit/service/test_task_dispatcher.py	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -76,34 +76,34 @@
             self.assertEqual(123, self._dispatcher.update('palpatine'))
             c.update.assert_called_once_with()
 
-    def test_list_apps_calls_list_apps_on_container(self):
+    def test_list_app_ids_calls_list_app_ids_on_container(self):
         with unittest.mock.patch('libertine.service.task_dispatcher.Container') as MockContainer:
             c = MockContainer.return_value
-            c.list_apps.return_value = 123
-            self.assertEqual(123, self._dispatcher.list_apps('palpatine'))
-            c.list_apps.assert_called_once_with()
+            c.list_app_ids.return_value = 123
+            self.assertEqual(123, self._dispatcher.list_app_ids('palpatine'))
+            c.list_app_ids.assert_called_once_with()
 
     def test_containers_reused_on_subsequent_calls(self):
         with unittest.mock.patch('libertine.service.task_dispatcher.Container') as MockContainer:
             c = MockContainer.return_value
             c.id = 'palpatine'
-            self._dispatcher.list_apps('palpatine')
-            self._dispatcher.list_apps('palpatine')
-            self._dispatcher.list_apps('palpatine')
-            MockContainer.assert_called_once_with('palpatine', unittest.mock.ANY, unittest.mock.ANY, self._connection, unittest.mock.ANY)
+            self._dispatcher.list_app_ids('palpatine')
+            self._dispatcher.list_app_ids('palpatine')
+            self._dispatcher.list_app_ids('palpatine')
+            MockContainer.assert_called_once_with('palpatine', unittest.mock.ANY, self._connection, unittest.mock.ANY)
 
     def test_container_callback_removes_container(self):
         with unittest.mock.patch('libertine.service.task_dispatcher.Container') as MockContainer:
             c = MockContainer.return_value
             c.id = 'palpatine'
-            self._dispatcher.list_apps('palpatine')
-            MockContainer.assert_called_once_with('palpatine', unittest.mock.ANY, unittest.mock.ANY, self._connection, unittest.mock.ANY)
+            self._dispatcher.list_app_ids('palpatine')
+            MockContainer.assert_called_once_with('palpatine', unittest.mock.ANY, self._connection, unittest.mock.ANY)
             name, args, kwargs = MockContainer.mock_calls[0]
             args[len(args)-1](MockContainer.return_value)
-            self._dispatcher.list_apps('palpatine')
+            self._dispatcher.list_app_ids('palpatine')
             MockContainer.assert_has_calls([ # verify container constructed twice
-                unittest.mock.call('palpatine', unittest.mock.ANY, unittest.mock.ANY, self._connection, unittest.mock.ANY),
-                unittest.mock.call('palpatine', unittest.mock.ANY, unittest.mock.ANY, self._connection, unittest.mock.ANY)
+                unittest.mock.call('palpatine', unittest.mock.ANY, self._connection, unittest.mock.ANY),
+                unittest.mock.call('palpatine', unittest.mock.ANY, self._connection, unittest.mock.ANY)
             ], any_order=True)
 
     def test_container_info_creates_container_info_task(self):
@@ -121,7 +121,7 @@
                 c = MockContainer.return_value
                 c.tasks = [1, 2, 3]
                 c.id = 'palpatine'
-                self._dispatcher.list_apps('palpatine') # creates container
+                self._dispatcher.list_app_ids('palpatine') # creates container
                 self._dispatcher.container_info('palpatine')
             MockContainerInfoTask.assert_called_once_with('palpatine', [1, 2, 3], unittest.mock.ANY, self._connection, unittest.mock.ANY)
             task.start.assert_called_once_with()
@@ -131,13 +131,13 @@
             task = MockListTask.return_value
             task.id = 123
             self.assertEqual(123, self._dispatcher.list())
-            MockListTask.assert_called_once_with(self._connection, unittest.mock.ANY)
+            MockListTask.assert_called_once_with(unittest.mock.ANY, self._connection, unittest.mock.ANY)
             task.start.assert_called_once_with()
 
     def test_containerless_tasks_are_cleaned_up(self):
         with unittest.mock.patch('libertine.service.task_dispatcher.ListTask') as MockListTask:
             self._dispatcher.list()
-            MockListTask.assert_called_once_with(self._connection, unittest.mock.ANY)
+            MockListTask.assert_called_once_with(unittest.mock.ANY, self._connection, unittest.mock.ANY)
             name, args, kwargs = MockListTask.mock_calls[0]
             self.assertEqual(1, len(self._dispatcher._tasks))
             args[len(args)-1](MockListTask.return_value)

=== removed file 'tests/unit/test_app_discovery.py'
--- tests/unit/test_app_discovery.py	2015-12-22 17:28:10 +0000
+++ tests/unit/test_app_discovery.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-"""Unit tests for the AppLauncher module."""
-# Copyright 2015 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from libertine.AppDiscovery import IconCache
-from testtools import TestCase
-from testtools.matchers import Equals
-
-
-class TestIconSearching(TestCase):
-
-    def mock_file_loader(self, root_path):
-        return [
-            "/some/path/128x128/icon.png",
-            "/somepath/icon.png",
-            "/somepath/testme.png"
-            ];
-
-    def test_full_path(self):
-        some_root = "/some_root"
-        icon_cache = IconCache(some_root, file_loader=self.mock_file_loader)
-
-        some_full_path = "/this/is/a/full/path"
-        self.assertThat(icon_cache.expand_icons(some_full_path)[0],
-                        Equals(some_full_path))
-
-    def test_icon_name(self):
-        some_root = "/some_root"
-        icon_cache = IconCache(some_root, file_loader=self.mock_file_loader)
-
-        some_icon_list = "testme"
-        self.assertThat(icon_cache.expand_icons(some_icon_list)[0],
-                        Equals("/somepath/testme.png"))
-
-    def test_edge_case_relative_file_name(self):
-        some_root = "/some_root"
-        icon_cache = IconCache(some_root, file_loader=self.mock_file_loader)
-
-        some_icon_list = "testme.png"
-        self.assertThat(icon_cache.expand_icons(some_icon_list)[0],
-                        Equals("/somepath/testme.png"))

=== modified file 'tests/unit/test_libertine_container.py'
--- tests/unit/test_libertine_container.py	2016-11-10 17:40:14 +0000
+++ tests/unit/test_libertine_container.py	2017-02-09 16:08:46 +0000
@@ -1,5 +1,5 @@
 """Unit tests for the LibertineContainer interface."""
-# Copyright 2015 Canonical Ltd.
+# Copyright 2015-2017 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -52,6 +52,7 @@
 
     def test_container_name_default(self):
         container_id = "test-id-3"
+        self._config.get_container_name.return_value = None
         container = Libertine.LibertineContainer(container_id, self._config)
 
         self.assertThat(container.name, Equals("Unknown"))

=== removed file 'tests/unit/test_libertine_gir.py'
--- tests/unit/test_libertine_gir.py	2016-11-21 19:54:35 +0000
+++ tests/unit/test_libertine_gir.py	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-# Copyright 2015 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-from testtools import TestCase
-from testtools.matchers import Equals
-from gi.repository import Libertine
-from unittest import skip
-from unittest.mock import patch
-
-
-class TestLibertineGir(TestCase):
-
-    def setUp(self):
-        super(TestLibertineGir, self).setUp()
-        self.cmake_source_dir = os.environ['LIBERTINE_DATA_DIR']
-
-    def test_list_containers(self):
-        with patch.dict('os.environ', {'XDG_DATA_HOME': self.cmake_source_dir + '/libertine-config'}):
-            containers = Libertine.list_containers()
-
-            self.assertThat(containers[0], Equals('wily'))
-            self.assertThat(containers[1], Equals('wily-2'))
-
-    @skip("need to work around cached globals in glib")
-    def test_container_path(self):
-        container_id = 'wily'
-        with patch.dict('os.environ', {'XDG_CACHE_HOME': self.cmake_source_dir + '/libertine-data'}):
-            container_path = Libertine.container_path(container_id)
-
-            self.assertThat(container_path, Equals(self.cmake_source_dir + '/libertine-data/libertine-container/wily/rootfs'))
-
-    def test_container_home_path(self):
-        container_id = 'wily'
-        with patch.dict('os.environ', {'XDG_DATA_HOME': self.cmake_source_dir + '/libertine-home'}):
-            container_home_path = Libertine.container_home_path(container_id)
-
-            self.assertThat(container_home_path, Equals(self.cmake_source_dir + '/libertine-home/libertine-container/user-data/wily'))
-
-    def test_container_name(self):
-        with patch.dict('os.environ', {'XDG_DATA_HOME': self.cmake_source_dir + '/libertine-config'}):
-            container_name = Libertine.container_name('wily')
-
-            self.assertThat(container_name, Equals("Ubuntu 'Wily Werewolf'"))
-
-            container_name = Libertine.container_name('wily-2')
-
-            self.assertThat(container_name, Equals("Ubuntu 'Wily Werewolf' (2)"))
-
-    def test_list_apps_for_container(self):
-        with patch.dict('os.environ', {'XDG_DATA_HOME': self.cmake_source_dir + '/libertine-config'}):
-            apps = Libertine.list_apps_for_container('wily')
-
-            self.assertThat(len(apps), Equals(0))

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2016-12-21 20:57:15 +0000
+++ tools/CMakeLists.txt	2017-02-09 16:08:46 +0000
@@ -1,8 +1,8 @@
-install(PROGRAMS libertine-container-manager libertine-launch libertine-lxc-manager libertine-lxd-manager
+install(PROGRAMS libertine-container-manager libertine-launch
                  libertine-xmir libertine-lxc-setup libertine-lxd-setup libertined
         DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES libertine-launch.1 libertine-container-manager.1 libertine-lxc-manager.1
-              libertine-lxd-manager.1 libertine-xmir.1
+install(FILES libertine-launch.1 libertine-container-manager.1
+              libertine-xmir.1
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
         COMPONENT doc)
 install(FILES completions/libertine-container-manager

=== modified file 'tools/completions/libertine-container-manager'
--- tools/completions/libertine-container-manager	2016-10-14 14:44:17 +0000
+++ tools/completions/libertine-container-manager	2017-02-09 16:08:46 +0000
@@ -1,5 +1,6 @@
-# Copyright (C) 2016 Canonical Ltd.
-# Author: Larry Price <[e-mail]>
+# Copyright (C) 2016-2017 Canonical Ltd.
+# Authors: Larry Price <[e-mail]>
+#          Chris Townsend <[e-mail]>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,11 +49,14 @@
         opts="--help"
         ;;
       "configure" )
-        opts="--help --id --multiarch --archive --bind-mount"
+        opts="--help --id --multiarch --archive --bind-mount --freeze"
         ;;
       "set-default" )
         opts="--help --id --clear"
         ;;
+      "restart" )
+        opts="--help --id"
+        ;;
       * )
         opts="--help --quiet --verbose"
         ;;
@@ -60,7 +64,7 @@
     fi
 
     if [[ ${cmd} == "configure" ]]; then
-      if [[ "${COMP_WORDS[COMP_CWORD-1]}" == "--multiarch" ]]; then
+      if [[ "${COMP_WORDS[COMP_CWORD-1]}" == "--multiarch" ]] || [ "${COMP_WORDS[COMP_CWORD-1]}" == "--freeze" ]; then
         opts="enable disable"
       elif [ "${COMP_WORDS[COMP_CWORD-1]}" == "--archive" ] || [ "${COMP_WORDS[COMP_CWORD-1]}" == "--bind-mount" ]; then
         opts="add remove"
@@ -72,7 +76,7 @@
     fi
 
     if [[ -z ${opts} && "${COMP_CWORD}" == "1" ]]; then
-      opts="create destroy install-package remove-package search-cache update list list-apps configure set-default"
+      opts="create destroy install-package remove-package search-cache update list list-apps configure set-default restart"
     fi
 
     if [[ -n "${opts}" ]]; then

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2017-01-13 19:03:19 +0000
+++ tools/libertine-container-manager	2017-02-09 16:08:46 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2014-2016 Canonical Ltd.
+# Copyright (C) 2014-2017 Canonical Ltd.
 # Author: Christopher Townsend <[e-mail]>
 
 # This program is free software: you can redistribute it and/or modify
@@ -17,8 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
+import getpass
+import json
 import libertine.utils
-import getpass
 import os
 import sys
 import re
@@ -36,7 +37,7 @@
 
     def _get_updated_locale(self, container_id):
         host_locale = self.host_info.get_host_locale()
-        
+
         if host_locale == self.containers_config.get_container_locale(container_id):
             return None
         else:
@@ -218,15 +219,18 @@
         self.containers_config.update_container_install_status(container_id, "ready")
 
     def list(self, args):
-        containers = libertine.utils.Libertine.list_containers()
-        for container in containers:
+        for container in ContainersConfig().get_containers():
             print("%s" % container)
 
     def list_apps(self, args):
         container_id = self.containers_config.check_container_id(args.id)
 
-        container = LibertineContainer(container_id)
-        print(container.list_app_launchers(use_json=args.json))
+        app_ids = LibertineContainer(container_id).list_app_ids()
+        if args.json:
+            print(json.dumps(app_ids))
+        else:
+            for app in app_ids:
+                print(app)
 
     def exec(self, args):
         container_id = self.containers_config.check_container_id(args.id)
@@ -249,8 +253,6 @@
     def configure(self, args):
         container_id = self.containers_config.check_container_id(args.id)
 
-        container = LibertineContainer(container_id)
-
         if args.multiarch and self.host_info.get_host_architecture() == 'amd64':
             multiarch = 'disabled'
             if args.multiarch == 'enable':
@@ -261,7 +263,7 @@
                 libertine.utils.get_logger().error("i386 multiarch support is already %s" % multiarch)
                 sys.exit(1)
 
-            if container.configure_multiarch(args.multiarch) is not 0:
+            if LibertineContainer(container_id).configure_multiarch(args.multiarch) is not 0:
                 sys.exit(1)
 
             self.containers_config.update_container_multiarch_support(container_id, multiarch)
@@ -281,7 +283,7 @@
 
                 self.containers_config.add_container_archive(container_id, archive_name)
                 self.containers_config.update_archive_install_status(container_id, archive_name, 'installing')
-                if container.configure_add_archive(archive_name_esc, args.public_key_file) is not 0:
+                if LibertineContainer(container_id).configure_add_archive(archive_name_esc, args.public_key_file) is not 0:
                     self.containers_config.delete_container_archive(container_id, archive_name)
                     sys.exit(1)
 
@@ -328,6 +330,27 @@
                     sys.exit(1)
                 self.containers_config.delete_bind_mount(container_id, mount_path)
 
+            container_type = self.containers_config.get_container_type(container_id)
+
+            if (container_type == 'lxc' or container_type == 'lxd' and
+                self.containers_config.get_freeze_on_stop(container_id)):
+                if not LibertineContainer(container_id).restart_libertine_container():
+                    libertine.utils.get_logger().warning("Container cannot be restarted at this time.  You will need to "
+                                                         "restart the container at a later time using the \'restart\' subcommand.")
+
+        elif args.freeze is not None:
+            container_type = self.containers_config.get_container_type(container_id)
+
+            if container_type != 'lxc' and container_type != 'lxd':
+                libertine.utils.get_logger().error("Configuring freeze is only valid on LXC and LXD container types.")
+                sys.exit(1)
+
+            current_freeze = self.containers_config.get_freeze_on_stop(container_id)
+            config_freeze = args.freeze == 'enable'
+
+            if current_freeze != config_freeze:
+               self.containers_config.update_freeze_on_stop(container_id, config_freeze)
+
         else:
             libertine.utils.get_logger().error("Configure called with no subcommand. See configure --help for usage.")
             sys.exit(1)
@@ -362,6 +385,19 @@
 
         self.containers_config.set_default_container_id(container_id, True)
 
+    def restart(self, args):
+        container_id = self.containers_config.check_container_id(args.id)
+
+        container_type = self.containers_config.get_container_type(container_id)
+
+        if container_type != 'lxc' and container_type != 'lxd':
+            libertine.utils.get_logger().error("The restart subcommand is only valid for LXC and LXD type containers.")
+            sys.exit(1)
+
+        container = LibertineContainer(container_id)
+
+        container.restart_libertine_container()
+
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="Legacy X application support for Unity 8")
@@ -552,6 +588,14 @@
       metavar='Mount path',
       help=("The absolute host path to bind-mount."))
 
+    freeze_group = parser_configure.add_argument_group("Freeze container support",
+                   "Enable or disable freezing LXC/LXD containers when not in use.")
+    freeze_group.add_argument(
+        '-f', '--freeze',
+        choices=['enable', 'disable'],
+        help=("Enables or disables freezing of LXC/LXD containers when not in use."
+              " When disabled, the container will stop."))
+
     parser_configure.set_defaults(func=container_manager.configure)
 
     # Handle merging another ContainersConfig.json file into the main ContainersConfig.json file
@@ -582,6 +626,16 @@
         help=("Clear the default container."))
     parser_default.set_defaults(func=container_manager.set_default)
 
+    # Handle the restart command and its options
+    parser_update = subparsers.add_parser(
+        'restart',
+        help=("Restart a frozen Libertine container.  This only works on LXC "
+              "and LXD type containers."))
+    parser_update.add_argument(
+        '-i', '--id',
+        help=("Container identifier.  Default container is used if omitted."))
+    parser_update.set_defaults(func=container_manager.restart)
+
     # Actually parse the args
     args = parser.parse_args()
 

=== modified file 'tools/libertine-container-manager.1'
--- tools/libertine-container-manager.1	2017-01-12 20:46:05 +0000
+++ tools/libertine-container-manager.1	2017-02-09 16:08:46 +0000
@@ -1,4 +1,4 @@
-.TH libertine-container-manager "1" " April 2016" "libertine-container-manager 0.99" "User Commands"
+.TH libertine-container-manager "1" " February 2017" "libertine-container-manager 1.5.2" "User Commands"
 
 .SH NAME
 libertine-container-manager \- Manage Libertine containers for supporting legacy X applications on Unity 8
@@ -68,6 +68,9 @@
 .TP
 .B libertine-container-manager set-default [options]
 Sets default container.
+.TP
+.B libertine-container-manager restart [options]
+Restarts a frozen LXC or LXD Libertine container.
 
 .SH COMMAND REFERENCE
 .TP
@@ -275,7 +278,7 @@
 Enable i386 support.
 .RE
 .IP
-.BR \-a " {add,remove}, " \-\-archive "{add,remove}" ""
+.BR \-a " {add,remove}, " \-\-archive " {add,remove}" ""
 .RS 14
 Adds or removes an archive in the specified container.
 .RE
@@ -290,7 +293,7 @@
 File containing public key used to sign new archive.
 .RE
 .IP
-.BR \-b " {add,remove}, " \-\-bind-mount "{add,remove}" ""
+.BR \-b " {add,remove}, " \-\-bind-mount " {add,remove}" ""
 .RS 14
 Adds or removes a bind-mount in the specified container.
 .RE
@@ -299,6 +302,11 @@
 .RS 14
 Absolute host path to be added or removed.
 .RE
+.IP
+.BR \-f " {enable,disable}, " \-\-freeze " {enable,disable}" ""
+.RS 14
+Enable or disable freezing LXC/LXD containers when not in use.
+.RE
 .TP
 
 .B libertine-container-manager set-default [options]
@@ -319,6 +327,20 @@
 Clear default container.
 .RE
 .TP
+
+.B libertine-container-manager restart [options]
+.TP
+.SS Options:
+.BR \-h ", " \-\-help ""
+.RS 14
+Prints help for this command and exits.
+.RE
+.IP
+.BR \-i " ID, " \-\-id " ID" ""
+.RS 14
+Container identifier.
+.RE
+.TP
 .BR
 
 .SH ENVIRONMENT VARIABLES

=== removed file 'tools/libertine-lxc-manager'
--- tools/libertine-lxc-manager	2017-01-12 16:09:37 +0000
+++ tools/libertine-lxc-manager	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016 Canonical Ltd.
-# Author: Christopher Townsend <[e-mail]>
-
-# This program 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; version 3 of the License.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import libertine.LxcContainer
-import libertine.utils
-import os
-import shlex
-import subprocess
-
-from libertine.ContainersConfig import ContainersConfig
-from libertine.lifecycle import *
-
-
-LIBERTINE_LXC_MANAGER_NAME = libertine.LxcContainer.get_lxc_manager_dbus_name()
-LIBERTINE_LXC_MANAGER_PATH = libertine.LxcContainer.get_lxc_manager_dbus_path()
-
-
-class Service(ContainerLifecycleService):
-
-    def __init__(self):
-        super().__init__(LIBERTINE_LXC_MANAGER_NAME, LIBERTINE_LXC_MANAGER_PATH)
-        self._home = os.environ['HOME']
-        self._containers_config = ContainersConfig()
-        self._is_pulse_setup = False
-
-    def start(self, container_id, launchable):
-        container = libertine.LxcContainer.lxc_container(container_id)
-
-        if not container.defined:
-            return LifecycleResult("Container {} is not valid".format(container_id))
-
-        if launchable and not self._is_pulse_setup:
-            self._setup_pulse()
-
-        if not container.running:
-            if launchable:
-                self._dynamic_bind_mounts(container, container_id)
-
-            return libertine.LxcContainer.lxc_start(container)
-
-        return LifecycleResult()
-
-    def stop(self, container_id, options={}):
-        container = libertine.LxcContainer.lxc_container(container_id)
-        libertine.LxcContainer.lxc_stop(container)
-
-        return LifecycleResult() # no error case
-
-    def _setup_pulse(self):
-        pulse_socket_path = os.path.join(libertine.utils.get_libertine_runtime_dir(), 'pulse_socket')
-
-        lsof_cmd = 'lsof -n %s' % pulse_socket_path
-        args = shlex.split(lsof_cmd)
-        lsof = subprocess.Popen(args, stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
-        lsof.wait()
-
-        if not os.path.exists(pulse_socket_path) or lsof.returncode == 1:
-            pactl_cmd = (
-                'pactl load-module module-native-protocol-unix auth-anonymous=1 socket=%s'
-                % pulse_socket_path)
-            args = shlex.split(pactl_cmd)
-            subprocess.Popen(args).wait()
-
-        self.is_pulse_setup = True
-
-    def _dynamic_bind_mounts(self, container, container_id):
-        self._containers_config.refresh_database()
-        mounts = self._sanitize_bind_mounts(libertine.utils.get_common_xdg_user_directories() + \
-                                            self._containers_config.get_container_bind_mounts(container_id))
-
-        data_dir = libertine.utils.get_libertine_container_userdata_dir_path(container_id)
-        for user_dir in libertine.utils.generate_binding_directories(mounts, self._home):
-            if os.path.isabs(user_dir[1]):
-                path = user_dir[1].strip('/')
-                fullpath = os.path.join(libertine.utils.get_libertine_container_rootfs_path(container_id), path)
-            else:
-                path = "{}/{}".format(self._home.strip('/'), user_dir[1])
-                fullpath = os.path.join(data_dir, user_dir[1])
-
-            os.makedirs(fullpath, exist_ok=True)
-
-            libertine.utils.get_logger().debug("Mounting {}:{} in container {}".format(user_dir[0], path, container_id))
-            xdg_user_dir_entry = (
-                "%s %s none bind,create=dir,optional"
-                % (user_dir[0], path)
-            )
-            container.append_config_item("lxc.mount.entry", xdg_user_dir_entry)
-
-    def _sanitize_bind_mounts(self, mounts):
-        return [mount.replace(" ", "\\040") for mount in mounts]
-
-
-if __name__ == '__main__':
-    ContainerLifecycleServiceRunner(Service()).run()

=== removed file 'tools/libertine-lxc-manager.1'
--- tools/libertine-lxc-manager.1	2016-04-06 12:31:26 +0000
+++ tools/libertine-lxc-manager.1	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-.TH libertine-lxc-manager "1" "April 2016" "libertine-lxc-manager 0.99" "User Commands"
-
-.SH NAME
-libertine-lxc-manager \- monitors LXC activity performed by libertine
-
-.SH DESCRIPTION
-usage: libertine\-lxc\-manager
-.PP
-monitors LXC activity performed by libertine

=== removed file 'tools/libertine-lxd-manager'
--- tools/libertine-lxd-manager	2017-01-12 16:09:37 +0000
+++ tools/libertine-lxd-manager	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016 Canonical Ltd.
-
-# This program 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; version 3 of the License.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import libertine.LxdContainer
-import libertine.utils
-import pylxd
-
-from libertine.ContainersConfig import ContainersConfig
-from libertine.lifecycle import *
-
-
-LIBERTINE_LXD_MANAGER_NAME = libertine.LxdContainer.get_lxd_manager_dbus_name()
-LIBERTINE_LXD_MANAGER_PATH = libertine.LxdContainer.get_lxd_manager_dbus_path()
-
-
-class Service(ContainerLifecycleService):
-
-    def __init__(self):
-        super().__init__(LIBERTINE_LXD_MANAGER_NAME, LIBERTINE_LXD_MANAGER_PATH)
-        self._config = ContainersConfig()
-        self._client = pylxd.Client()
-
-    def start(self, container_id, launchable):
-        container = libertine.LxdContainer.lxd_container(self._client, container_id)
-
-        if not container:
-            return LifecycleResult("Container {} is not valid".format(container_id))
-
-        if container.status != 'Running':
-            libertine.LxdContainer.update_libertine_profile(self._client)
-            if launchable:
-                libertine.LxdContainer.update_bind_mounts(container, self._config)
-
-            return libertine.LxdContainer.lxd_start(container)
-
-        return LifecycleResult()
-
-    def stop(self, container_id, options={}):
-        return libertine.LxdContainer.lxd_stop(libertine.LxdContainer.lxd_container(self._client, container_id), options.get('wait', False))
-
-
-if __name__ == '__main__':
-    ContainerLifecycleServiceRunner(Service()).run()

=== removed file 'tools/libertine-lxd-manager.1'
--- tools/libertine-lxd-manager.1	2016-12-21 20:57:15 +0000
+++ tools/libertine-lxd-manager.1	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-.TH libertine-lxd-manager "1" "Dec 2016" "libertine-lxd-manager 0.99" "User Commands"
-
-.SH NAME
-libertine-lxd-manager \- monitors LXD activity performed by libertine
-
-.SH DESCRIPTION
-usage: libertine\-lxd\-manager
-.PP
-monitors LXD activity performed by libertine

=== modified file 'tools/libertine-lxd-setup'
--- tools/libertine-lxd-setup	2017-01-05 15:25:21 +0000
+++ tools/libertine-lxd-setup	2017-02-09 16:08:46 +0000
@@ -32,7 +32,7 @@
 fi
 
 # Run lxd init if there are no containers already on the system
-if [ 3 -ge `${lxc} list | wc -l` ]; then
+if [ 2 -ge `${lxc} list | grep -e "^+" | wc -l` ]; then
   lxd init
 fi
 

=== modified file 'tools/libertine-xmir'
--- tools/libertine-xmir	2016-02-18 15:49:20 +0000
+++ tools/libertine-xmir	2017-02-09 16:08:46 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2016 Canonical Ltd.
+# Copyright (C) 2016-2017 Canonical Ltd.
 # Author: Christopher Townsend <[e-mail]>
 
 # This program is free software: you can redistribute it and/or modify
@@ -16,4 +16,4 @@
 
 
 # Add and/or remove Xmir options here
-exec Xmir -title @ $@
+exec Xmir -rootless $@