Merge lp:~cmiller/ubuntu/oneiric/desktopcouch/1.0.8-0u1 into lp:ubuntu/oneiric/desktopcouch

[Chad Miller]

New version:

Behavior change: Preserves Ubuntu One service through longer replication period, 10 minutes changed to 60 minutes.

Feature: Allow COUCH_INI environment variable to override /etc/ default config.

Feature: Install apport hook.

Bug fix: When ubuntuone credentials don't exist, don't wait forever and consume CPU.

Bug fix: Accept "linux3" kernel also.

Bug fix: Clean up all children when service exits.

[lp:~cmiller/ubuntu/oneiric/desktopcouch/1.0.8-0u1]

48. By Chad Miller on 2011-09-12

  - Behavior change: Preserves Ubuntu One service through longer replication
    period, 10 minutes changed to 60 minutes.
  - Feature: Allow COUCH_INI environment variable to override /etc/ default
    config.
  - Feature: Install apport hook.
  - Bug fix: When ubuntuone credentials don't exist, don't wait forever and
    consume CPU.
  - Bug fix: Accept "linux3" kernel also.
  - Bug fix: Clean up all children when service exits.

49. By Chad Miller on 2011-09-13

    consume CPU. (LP: #760236, #787583)
  - Bug fix: Accept "linux3" kernel also. (LP: #803062)
  - Bug fix: Clean up all children when service exits. (LP: #597197)

=== added file 'MANIFEST'
--- MANIFEST	1970-01-01 00:00:00 +0000
+++ MANIFEST	2011-09-13 15:01:24 +0000
@@ -0,0 +1,126 @@
+# file GENERATED by distutils, do NOT edit
+COPYING
+COPYING.LESSER
+MANIFEST
+MANIFEST.in
+README
+desktopcouch-pair.desktop.in
+org.desktopcouch.CouchDB.service
+setup.cfg
+setup.py
+start-desktop-couchdb.sh
+stop-desktop-couchdb.sh
+bin/desktopcouch-get-port
+bin/desktopcouch-pair
+bin/desktopcouch-service
+bin/desktopcouch-stop
+config/desktop-couch/compulsory-auth.ini
+config/desktop-couch/default.ini
+data/couchdb.tmpl
+data/epydoc.conf
+data/source_desktopcouch.py
+desktopcouch/__init__.py
+desktopcouch/local_files.py
+desktopcouch/replication.py
+desktopcouch/service.py
+desktopcouch/start_local_couchdb.py
+desktopcouch/stop_local_couchdb.py
+desktopcouch/util.py
+desktopcouch/application/__init__.py
+desktopcouch/application/local_files.py
+desktopcouch/application/replication.py
+desktopcouch/application/server.py
+desktopcouch/application/service.py
+desktopcouch/application/start_local_couchdb.py
+desktopcouch/application/stop_local_couchdb.py
+desktopcouch/application/util.py
+desktopcouch/application/migration/__init__.py
+desktopcouch/application/migration/tests/__init__.py
+desktopcouch/application/migration/tests/test_migration.py
+desktopcouch/application/pair/__init__.py
+desktopcouch/application/pair/couchdb_pairing/__init__.py
+desktopcouch/application/pair/couchdb_pairing/couchdb_io.py
+desktopcouch/application/pair/couchdb_pairing/dbus_io.py
+desktopcouch/application/pair/couchdb_pairing/network_io.py
+desktopcouch/application/pair/tests/__init__.py
+desktopcouch/application/pair/tests/test_couchdb_io.py
+desktopcouch/application/pair/tests/test_network_io.py
+desktopcouch/application/platform/__init__.py
+desktopcouch/application/platform/linux/__init__.py
+desktopcouch/application/platform/linux/base_dirs.py
+desktopcouch/application/platform/linux/ipc.py
+desktopcouch/application/platform/linux/keyring.py
+desktopcouch/application/platform/linux/tests/__init__.py
+desktopcouch/application/platform/linux/tests/test_keyring.py
+desktopcouch/application/platform/windows/__init__.py
+desktopcouch/application/platform/windows/base_dirs.py
+desktopcouch/application/platform/windows/keyring.py
+desktopcouch/application/platform/windows/tests/__init__.py
+desktopcouch/application/platform/windows/tests/test_base_dirs.py
+desktopcouch/application/platform/windows/tests/test_keyring.py
+desktopcouch/application/plugins/__init__.py
+desktopcouch/application/plugins/ubuntuone_pairing.py
+desktopcouch/application/plugins/tests/__init__.py
+desktopcouch/application/plugins/tests/test_plugins.py
+desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py
+desktopcouch/application/replication_services/__init__.py
+desktopcouch/application/replication_services/example.py
+desktopcouch/application/replication_services/ubuntuone.py
+desktopcouch/application/tests/__init__.py
+desktopcouch/application/tests/test_local_files.py
+desktopcouch/application/tests/test_replication.py
+desktopcouch/application/tests/test_service.py
+desktopcouch/application/tests/test_start_local_couchdb.py
+desktopcouch/bookmarks/__init__.py
+desktopcouch/bookmarks/record.py
+desktopcouch/contacts/__init__.py
+desktopcouch/contacts/record.py
+desktopcouch/contacts/view.py
+desktopcouch/notes/__init__.py
+desktopcouch/notes/record.py
+desktopcouch/pair/__init__.py
+desktopcouch/pair/couchdb_pairing/__init__.py
+desktopcouch/pair/couchdb_pairing/couchdb_io.py
+desktopcouch/pair/couchdb_pairing/dbus_io.py
+desktopcouch/pair/couchdb_pairing/network_io.py
+desktopcouch/pair/couchdb_pairing/ubuntuone_pairing.py
+desktopcouch/records/__init__.py
+desktopcouch/records/database.py
+desktopcouch/records/field_registry.py
+desktopcouch/records/http.py
+desktopcouch/records/record.py
+desktopcouch/records/server.py
+desktopcouch/records/server_base.py
+desktopcouch/records/doc/an_example_application.txt
+desktopcouch/records/doc/field_registry.txt
+desktopcouch/records/doc/records.txt
+desktopcouch/records/tests/__init__.py
+desktopcouch/records/tests/test_field_registry.py
+desktopcouch/records/tests/test_mocked_server.py
+desktopcouch/records/tests/test_record.py
+desktopcouch/records/tests/test_server.py
+desktopcouch/recordtypes/__init__.py
+desktopcouch/recordtypes/bookmarks.py
+desktopcouch/recordtypes/notes.py
+desktopcouch/recordtypes/tasks.py
+desktopcouch/recordtypes/contacts/__init__.py
+desktopcouch/recordtypes/contacts/schema.txt
+desktopcouch/recordtypes/contacts/view.py
+desktopcouch/recordtypes/contacts/testing/__init__.py
+desktopcouch/recordtypes/contacts/testing/create.py
+desktopcouch/recordtypes/contacts/tests/__init__.py
+desktopcouch/recordtypes/contacts/tests/test_create.py
+desktopcouch/recordtypes/contacts/tests/test_record.py
+desktopcouch/recordtypes/contacts/tests/test_view.py
+desktopcouch/recordtypes/tests/__init__.py
+desktopcouch/recordtypes/tests/test_bookmarks.py
+desktopcouch/recordtypes/tests/test_notes.py
+desktopcouch/recordtypes/tests/test_tasks.py
+desktopcouch/replication_services/__init__.py
+desktopcouch/replication_services/example.py
+desktopcouch/replication_services/ubuntuone.py
+desktopcouch/tasks/__init__.py
+desktopcouch/tasks/record.py
+desktopcouch/tests/__init__.py
+docs/man/desktopcouch-pair.1
+po/POTFILES.in

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-04-08 20:42:51 +0000
+++ PKG-INFO	2011-09-13 15:01:24 +0000
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: desktopcouch
-Version: 1.0.7
+Version: 1.0.8
 Summary: A Desktop CouchDB instance.
 Home-page: https://launchpad.net/desktopcouch
 Author: Stuart Langridge
@@ -8,3 +8,22 @@
 License: LGPL-3
 Description: UNKNOWN
 Platform: UNKNOWN
+Requires: avahi
+Requires: couchdb
+Requires: dbus
+Requires: gnomekeyring
+Requires: gobject
+Requires: gtk
+Requires: mocker
+Requires: oauth
+Requires: pango
+Requires: pygtk
+Requires: simplejson
+Requires: twisted.internet
+Requires: twisted.protocols
+Requires: twisted.python.threadable
+Requires: ubuntu_sso
+Requires: ubuntuone.clientdefs
+Requires: ubuntuone.devtools.testcase
+Requires: xdg.BaseDirectory
+Provides: desktopcouch

=== added file 'config/desktop-couch/default.ini'
--- config/desktop-couch/default.ini	1970-01-01 00:00:00 +0000
+++ config/desktop-couch/default.ini	2011-09-13 15:01:24 +0000
@@ -0,0 +1,3 @@
+[replicator]
+max_http_sessions = 1
+

=== added file 'data/epydoc.conf'
--- data/epydoc.conf	1970-01-01 00:00:00 +0000
+++ data/epydoc.conf	2011-09-13 15:01:24 +0000
@@ -0,0 +1,25 @@
+[epydoc] # Epydoc section marker (required by ConfigParser)
+
+# Information about the project.
+name: desktopcouch
+url: http://www.freedesktop.org/wiki/Specifications/desktopcouch
+
+# The list of modules to document.  Modules can be named using
+# dotted names, module filenames, or package directory names.
+# This option may be repeated.
+modules: desktopcouch, desktopcouch.records
+exclude: test
+
+# Write html output to the directory "apidocs"
+output: html
+target: docs/html/api/
+
+
+parse: yes
+introspect: no
+
+# Include all automatically generated graphs.  These graphs are
+# generated using Graphviz dot.
+graph: all
+dotpath: /usr/bin/dot
+

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-25 09:29:15 +0000
+++ debian/changelog	2011-09-13 15:01:24 +0000
@@ -1,3 +1,24 @@
+desktopcouch (1.0.8-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Behavior change: Preserves Ubuntu One service through longer replication
+      period, 10 minutes changed to 60 minutes.
+    - Feature: Allow COUCH_INI environment variable to override /etc/ default
+      config.
+    - Feature: Install apport hook.
+    - Bug fix: When ubuntuone credentials don't exist, don't wait forever and
+      consume CPU. (LP: #760236, #787583)
+    - Bug fix: Accept "linux3" kernel also. (LP: #803062)
+    - Bug fix: Clean up all children when service exits. (LP: #597197)
+  * Update standards-version 3.9.1 to 3.9.2.
+  * Remove brace-expansion from python-desktopcouch-application.install .
+  * Remove brace-expansion from python-desktopcouch-recordtypes.install .
+  * Remove patch
+    - patches/5-defer-dbus-service-for-plugins.patch
+  * Remove deprecated CDBS simple-patch system from rules.
+
+ -- Chad MILLER <[e-mail]>  Mon, 12 Sep 2011 13:08:25 -0400
+
 desktopcouch (1.0.7-0ubuntu3) oneiric; urgency=low
 
   * debian/rules: langpack.mk does not exist any more, call dh_translations

=== modified file 'debian/control'
--- debian/control	2011-01-12 15:08:25 +0000
+++ debian/control	2011-09-13 15:01:24 +0000
@@ -8,7 +8,7 @@
  python-distutils-extra (>= 2.8),
  python-setuptools
 Maintainer: Ubuntu Developers <[e-mail]>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 XS-Python-Version: current
 Homepage: http://launchpad.net/desktopcouch
 
@@ -20,7 +20,7 @@
  couchdb-bin (>= 0.10.0-0ubuntu3),
  python-desktopcouch-application (= ${source:Version})
 Breaks: gwibber-service (<< 2.31.0), gwibber (<< 2.31.0)
-Description: A Desktop CouchDB instance
+Description: Desktop CouchDB instance
  Runs an instance of CouchDB with the user's session.  Includes python library
  for interacting with database.
 

=== removed file 'debian/patches/5-defer-dbus-service-for-plugins.patch'
--- debian/patches/5-defer-dbus-service-for-plugins.patch	2011-04-15 23:48:39 +0000
+++ debian/patches/5-defer-dbus-service-for-plugins.patch	1970-01-01 00:00:00 +0000
@@ -1,249 +0,0 @@
-Description: Make plugins be able to stall dbus service from signaling that
-  couchdb is ready to use.
-Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/desktopcouch/+bug/760236
-Applied-upstream: bzr id [e-mail]-20110412173802-flmya9dma0et83qr
-Author: Chad Miller <[e-mail]>
-
-
-=== modified file 'desktopcouch/application/plugins/__init__.py'
---- desktopcouch/application/plugins/__init__.py	2011-02-02 18:15:53 +0000
-+++ desktopcouch/application/plugins/__init__.py	2011-04-15 23:40:28 +0000
-@@ -19,8 +19,18 @@
- DESKTOPCOUCH_PLUGIN_PATHS = [os.path.join(os.path.dirname(__file__))]
- 
- 
--def load_plugins(couchdb_port):
--    """Load the desktopcouch application plug-ins."""
-+def load_plugins(couchdb_port, blocking_semaphores, gobject):
-+    """Load the desktopcouch application plug-ins.
-+
-+    The blocking_semaphores set is OPTIONALLY mutated by any plugin to signal
-+    that the service is not ready until a plugin has finished its asynchronous
-+    operations.  Plugins may add a distinguishing object to the set, and it
-+    must remove what it adds when it is finished.
-+
-+    couchdb -- the integer of the port number of the running couchdb
-+    blocking_semaphores -- the set() of semaphores, which we will mutate
-+    gobject -- the mainloop module. always 'gobject' except when testing.
-+    """
-     plugin_names = set()
-     for path in DESKTOPCOUCH_PLUGIN_PATHS:
-         try:
-@@ -37,6 +47,6 @@
-         modpath = name.replace(os.path.sep, '.')[:-3]
-         try:
-             plugin = __import__(modpath, None, None, [''])
--            plugin.plugin_init(couchdb_port)
-+            plugin.plugin_init(couchdb_port, blocking_semaphores, gobject)
-         except (ImportError, AttributeError):
-             logging.warning('Failed to load plug-in: %s', modpath)
-
-=== modified file 'desktopcouch/application/plugins/ubuntuone_pairing.py'
---- desktopcouch/application/plugins/ubuntuone_pairing.py	2011-02-02 18:15:53 +0000
-+++ desktopcouch/application/plugins/ubuntuone_pairing.py	2011-04-15 23:41:29 +0000
-@@ -24,6 +24,7 @@
- from desktopcouch.application.server import DesktopDatabase
- from ubuntuone.clientdefs import APP_NAME
- 
-+PLUGIN_NAME = __name__
- U1_PAIR_RECORD = "ubuntu_one_pair_record"
- MAP_JS = """function(doc) {
-     if (doc.service_name == "ubuntuone") {
-@@ -33,48 +34,57 @@
- """
- 
- 
--def pair_with_ubuntuone(couchdb_port, management_db=None,
-+def pair_with_ubuntuone(couchdb_port, blocking_semaphores,
-+                        management_db=None,
-                         db_class=DesktopDatabase,
-                         put_service_fn=put_static_paired_service):
-     """Adds a pairing record with ubuntu one when needed."""
--    # Use explicit uri so that we do not access dbus service.
--    uri = "http://localhost:%s" % (couchdb_port,)
--    if not management_db:
--        management_db = db_class("management", uri=uri, create=True, ctx=None)
--    # we indeed have credentials to add to the pairing records
--    # but first we ensure that the required view is present
--    if not management_db.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD):
--        management_db.add_view(
--            U1_PAIR_RECORD, MAP_JS, design_doc=U1_PAIR_RECORD)
--    view_results = management_db.execute_view(U1_PAIR_RECORD, U1_PAIR_RECORD)
--    pairing_found = False
--    # Results should contain either one row or no rows
--    # If there is one row, its value will be 0, meaning that there is
--    #   already an Ubuntu One pairing record, or 1, meaning that there
--    #   was an Ubuntu One pairing record but it has since been unpaired
--    # Only create a new record if there is not one already. Specifically,
--    #   do not add the record if there is a deleted one, as this means
--    #   that the user explicitly unpaired it!
--    for row in view_results:
--        pairing_found = True
--        if row.value == 1:
--            logging.debug("Not adding desktopcouch pairing since the user "
--                "has explicitly unpaired with Ubuntu One")
--        else:
--            logging.debug("Not adding desktopcouch pairing since we are "
--                "already paired")
--    if not pairing_found:
--        put_service_fn(None, "ubuntuone", uri=uri, ctx=None)
--        logging.debug("Pairing desktopcouch with Ubuntu One")
--
--
--def got_new_credentials(couchdb_port, app_name, credentials):
-+    try:
-+        # Use explicit uri so that we do not access dbus service.
-+        uri = "http://localhost:%s" % (couchdb_port,)
-+        if not management_db:
-+            management_db = db_class("management", uri=uri, create=True,
-+                                     ctx=None)
-+        # we indeed have credentials to add to the pairing records
-+        # but first we ensure that the required view is present
-+        if not management_db.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD):
-+            management_db.add_view(
-+                U1_PAIR_RECORD, MAP_JS, design_doc=U1_PAIR_RECORD)
-+        view_results = management_db.execute_view(U1_PAIR_RECORD,
-+                                                  U1_PAIR_RECORD)
-+        pairing_found = False
-+        # Results should contain either one row or no rows
-+        # If there is one row, its value will be 0, meaning that there is
-+        #   already an Ubuntu One pairing record, or 1, meaning that there
-+        #   was an Ubuntu One pairing record but it has since been unpaired
-+        # Only create a new record if there is not one already. Specifically,
-+        #   do not add the record if there is a deleted one, as this means
-+        #   that the user explicitly unpaired it!
-+        for row in view_results:
-+            pairing_found = True
-+            if row.value == 1:
-+                logging.debug("Not adding desktopcouch pairing since the user "
-+                    "has explicitly unpaired with Ubuntu One")
-+            else:
-+                logging.debug("Not adding desktopcouch pairing since we are "
-+                    "already paired")
-+        if not pairing_found:
-+            put_service_fn(None, "ubuntuone", uri=uri, ctx=None)
-+            logging.debug("Pairing desktopcouch with Ubuntu One")
-+
-+    finally:
-+        logging.info("removing semaphore for %s", PLUGIN_NAME)
-+        blocking_semaphores.discard(PLUGIN_NAME)
-+
-+
-+def got_new_credentials(couchdb_port, blocking_semaphores,
-+                        app_name, credentials):
-     """Pair with Ubuntu One when we get the new credentials."""
-     if app_name == APP_NAME:
--        pair_with_ubuntuone(couchdb_port)
--
--
--def listen_to_dbus(couchdb_port):
-+        pair_with_ubuntuone(couchdb_port, blocking_semaphores)
-+
-+
-+def listen_to_dbus(couchdb_port, blocking_semaphores):
-     """Set up the signal handler on D-Bus for Ubuntu One pairing."""
-     import dbus
-     bus = dbus.SessionBus()
-@@ -82,7 +92,9 @@
-     try:
-         import ubuntu_sso
- 
--        receiver = lambda *args: got_new_credentials(couchdb_port, *args)
-+        receiver = lambda *args: \
-+                got_new_credentials(couchdb_port, blocking_semaphores,
-+                                                     *args)
- 
-         iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
-         bus.add_signal_receiver(handler_function=receiver,
-@@ -96,13 +108,20 @@
-         sso_backend.find_credentials(APP_NAME, {})
-     except ImportError:
-         logging.info('Ubuntu SSO is not available.')
--
--
--def plugin_init(couchdb_port):
-+        blocking_semaphores.discard(PLUGIN_NAME)
-+
-+
-+def plugin_init(couchdb_port, blocking_semaphores, gobject):
-     """Set up the signal handler for pairing with Ubuntu One."""
-     logging.info('Loaded Ubuntu One extension for desktopcouch.')
-     if sys.platform == 'win32':
-         logging.warning('Windows support for Ubuntu One is not yet ready.')
-     else:
--        import gobject
--        gobject.idle_add(listen_to_dbus, couchdb_port)
-+
-+        # Signal that we are critical for desktopcouch usage, and the server
-+        # must not begin until we are finished.  We are responsible for
-+        # removing this item from the list.
-+        logging.info("adding %s to to blocking semaphore list", PLUGIN_NAME)
-+        blocking_semaphores.add(PLUGIN_NAME)
-+
-+        gobject.idle_add(listen_to_dbus, couchdb_port, blocking_semaphores)
-
-=== modified file 'desktopcouch/application/service.py'
---- desktopcouch/application/service.py	2011-02-02 18:15:53 +0000
-+++ desktopcouch/application/service.py	2011-04-15 23:42:17 +0000
-@@ -39,6 +39,7 @@
- import logging
- import logging.handlers
- import signal
-+import gobject
- 
- from desktopcouch.application import local_files
- from desktopcouch.application import replication
-@@ -84,7 +85,8 @@
-                  replication_actions=replication,
-                  advertiser_factory=PortAdvertiser, set_logging=set_up_logging,
-                  fork=os.fork, nice=os.nice,
--                 kill=os.kill, sleep=time.sleep):
-+                 kill=os.kill, sleep=time.sleep, set_type=set,
-+                 gobject_module=gobject):
-         self._mainloop = main_loop
-         self._pid_finder = pid_finder
-         self._port_finder = port_finder
-@@ -97,6 +99,8 @@
-         self._nice = nice
-         self._kill = kill
-         self._sleep = sleep
-+        self._set = set_type
-+        self._gobject = gobject_module
-     # pylint: enable=C0301
- 
-     def _start_replicator_main(self, couchdb_port):
-@@ -112,11 +116,30 @@
-                 replication.tear_down(*replication_runtime)
- 
-     def _start_server_main(self, couchdb_port):
--        """Start server."""
--        self._advertiser_factory(self._mainloop.stop, self._ctx)
-+        """Start server answering DBus calls, and run plugins first."""
-+
-+        def if_all_semaphores_cleared(blocking_semaphores,
-+                func, *args, **kwargs):
-+            """Run a function if no semaphores exist, else try later."""
-+            if blocking_semaphores:
-+                return True  # Make idle call try us again.
-+            else:
-+                func(*args, **kwargs)
-+                return False  # Handled!
-+
-+        blocking_semaphores = self._set()
-+        load_plugins(couchdb_port, blocking_semaphores, self._gobject)
-+
-+        # Answering queries on DBus signals that we are ready for users
-+        # to connect.  We mustn't begin that until every plugin has a chance
-+        # to run to completion if it needs it.
-+        self._gobject.idle_add(if_all_semaphores_cleared, blocking_semaphores,
-+                               self._advertiser_factory,
-+                               self._mainloop.stop,
-+                               self._ctx)
-+
-         logging.debug("starting dbus main loop")
-         try:
--            load_plugins(couchdb_port)
-             self._mainloop.run()
-         finally:
-             logging.debug("ending dbus main loop")
-

=== modified file 'debian/python-desktopcouch-application.install'
--- debian/python-desktopcouch-application.install	2011-01-12 15:08:25 +0000
+++ debian/python-desktopcouch-application.install	2011-09-13 15:01:24 +0000
@@ -1,5 +1,8 @@
 debian/tmp/usr/lib/*/*/desktopcouch/application/*.py
-debian/tmp/usr/lib/*/*/desktopcouch/application/{migration,pair,platform,replication_services}
+debian/tmp/usr/lib/*/*/desktopcouch/application/migration
+debian/tmp/usr/lib/*/*/desktopcouch/application/pair
+debian/tmp/usr/lib/*/*/desktopcouch/application/platform
+debian/tmp/usr/lib/*/*/desktopcouch/application/replication_services
 debian/tmp/usr/lib/*/*/desktopcouch/application/plugins/__init__.py
 debian/tmp/usr/lib/*/*/desktopcouch/local_files.py
 debian/tmp/usr/lib/*/*/desktopcouch/replication.py
@@ -7,4 +10,5 @@
 debian/tmp/usr/lib/*/*/desktopcouch/start_local_couchdb.py
 debian/tmp/usr/lib/*/*/desktopcouch/stop_local_couchdb.py
 debian/tmp/usr/lib/*/*/desktopcouch/util.py
-debian/tmp/usr/lib/*/*/desktopcouch/{pair,replication_services}
+debian/tmp/usr/lib/*/*/desktopcouch/pair
+debian/tmp/usr/lib/*/*/desktopcouch/replication_services

=== modified file 'debian/python-desktopcouch-recordtypes.install'
--- debian/python-desktopcouch-recordtypes.install	2011-01-12 15:08:25 +0000
+++ debian/python-desktopcouch-recordtypes.install	2011-09-13 15:01:24 +0000
@@ -1,2 +1,5 @@
 debian/tmp/usr/lib/*/*/desktopcouch/recordtypes
-debian/tmp/usr/lib/*/*/desktopcouch/{bookmarks,contacts,notes,tasks}
+debian/tmp/usr/lib/*/*/desktopcouch/bookmarks
+debian/tmp/usr/lib/*/*/desktopcouch/contacts
+debian/tmp/usr/lib/*/*/desktopcouch/notes
+debian/tmp/usr/lib/*/*/desktopcouch/tasks

=== modified file 'debian/rules'
--- debian/rules	2011-08-25 09:28:07 +0000
+++ debian/rules	2011-09-13 15:01:24 +0000
@@ -5,7 +5,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 common-binary-post-install-indep::
 	dh_translations

=== removed directory 'desktopcouch.egg-info'
=== removed file 'desktopcouch.egg-info/PKG-INFO'
--- desktopcouch.egg-info/PKG-INFO	2011-04-08 20:42:51 +0000
+++ desktopcouch.egg-info/PKG-INFO	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: desktopcouch
-Version: 1.0.7
-Summary: A Desktop CouchDB instance.
-Home-page: https://launchpad.net/desktopcouch
-Author: Stuart Langridge
-Author-email: [e-mail]
-License: LGPL-3
-Description: UNKNOWN
-Platform: UNKNOWN

=== removed file 'desktopcouch.egg-info/SOURCES.txt'
--- desktopcouch.egg-info/SOURCES.txt	2011-01-12 15:08:25 +0000
+++ desktopcouch.egg-info/SOURCES.txt	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-COPYING
-COPYING.LESSER
-MANIFEST.in
-README
-desktopcouch-pair.desktop.in
-org.desktopcouch.CouchDB.service
-setup.cfg
-setup.py
-start-desktop-couchdb.sh
-stop-desktop-couchdb.sh
-bin/desktopcouch-get-port
-bin/desktopcouch-pair
-bin/desktopcouch-service
-bin/desktopcouch-stop
-config/desktop-couch/compulsory-auth.ini
-data/couchdb.tmpl
-data/source_desktopcouch.py
-desktopcouch/__init__.py
-desktopcouch/local_files.py
-desktopcouch/replication.py
-desktopcouch/service.py
-desktopcouch/start_local_couchdb.py
-desktopcouch/stop_local_couchdb.py
-desktopcouch/util.py
-desktopcouch.egg-info/PKG-INFO
-desktopcouch.egg-info/SOURCES.txt
-desktopcouch.egg-info/dependency_links.txt
-desktopcouch.egg-info/top_level.txt
-desktopcouch/application/__init__.py
-desktopcouch/application/local_files.py
-desktopcouch/application/replication.py
-desktopcouch/application/server.py
-desktopcouch/application/service.py
-desktopcouch/application/start_local_couchdb.py
-desktopcouch/application/stop_local_couchdb.py
-desktopcouch/application/util.py
-desktopcouch/application/migration/__init__.py
-desktopcouch/application/migration/tests/__init__.py
-desktopcouch/application/migration/tests/test_migration.py
-desktopcouch/application/pair/__init__.py
-desktopcouch/application/pair/couchdb_pairing/__init__.py
-desktopcouch/application/pair/couchdb_pairing/couchdb_io.py
-desktopcouch/application/pair/couchdb_pairing/dbus_io.py
-desktopcouch/application/pair/couchdb_pairing/network_io.py
-desktopcouch/application/pair/tests/__init__.py
-desktopcouch/application/pair/tests/test_couchdb_io.py
-desktopcouch/application/pair/tests/test_network_io.py
-desktopcouch/application/platform/__init__.py
-desktopcouch/application/platform/linux/__init__.py
-desktopcouch/application/platform/linux/base_dirs.py
-desktopcouch/application/platform/linux/ipc.py
-desktopcouch/application/platform/linux/keyring.py
-desktopcouch/application/platform/linux/tests/__init__.py
-desktopcouch/application/platform/linux/tests/test_keyring.py
-desktopcouch/application/platform/windows/__init__.py
-desktopcouch/application/platform/windows/base_dirs.py
-desktopcouch/application/platform/windows/keyring.py
-desktopcouch/application/platform/windows/tests/__init__.py
-desktopcouch/application/platform/windows/tests/test_base_dirs.py
-desktopcouch/application/platform/windows/tests/test_keyring.py
-desktopcouch/application/plugins/__init__.py
-desktopcouch/application/plugins/ubuntuone_pairing.py
-desktopcouch/application/plugins/tests/__init__.py
-desktopcouch/application/plugins/tests/test_plugins.py
-desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py
-desktopcouch/application/replication_services/__init__.py
-desktopcouch/application/replication_services/example.py
-desktopcouch/application/replication_services/ubuntuone.py
-desktopcouch/application/tests/__init__.py
-desktopcouch/application/tests/test_local_files.py
-desktopcouch/application/tests/test_replication.py
-desktopcouch/application/tests/test_service.py
-desktopcouch/application/tests/test_start_local_couchdb.py
-desktopcouch/bookmarks/__init__.py
-desktopcouch/bookmarks/record.py
-desktopcouch/contacts/__init__.py
-desktopcouch/contacts/record.py
-desktopcouch/contacts/view.py
-desktopcouch/notes/__init__.py
-desktopcouch/notes/record.py
-desktopcouch/pair/__init__.py
-desktopcouch/pair/couchdb_pairing/__init__.py
-desktopcouch/pair/couchdb_pairing/couchdb_io.py
-desktopcouch/pair/couchdb_pairing/dbus_io.py
-desktopcouch/pair/couchdb_pairing/network_io.py
-desktopcouch/pair/couchdb_pairing/ubuntuone_pairing.py
-desktopcouch/records/__init__.py
-desktopcouch/records/database.py
-desktopcouch/records/field_registry.py
-desktopcouch/records/http.py
-desktopcouch/records/record.py
-desktopcouch/records/server.py
-desktopcouch/records/server_base.py
-desktopcouch/records/doc/an_example_application.txt
-desktopcouch/records/doc/field_registry.txt
-desktopcouch/records/doc/records.txt
-desktopcouch/records/tests/__init__.py
-desktopcouch/records/tests/test_field_registry.py
-desktopcouch/records/tests/test_mocked_server.py
-desktopcouch/records/tests/test_record.py
-desktopcouch/records/tests/test_server.py
-desktopcouch/recordtypes/__init__.py
-desktopcouch/recordtypes/bookmarks.py
-desktopcouch/recordtypes/notes.py
-desktopcouch/recordtypes/tasks.py
-desktopcouch/recordtypes/contacts/__init__.py
-desktopcouch/recordtypes/contacts/schema.txt
-desktopcouch/recordtypes/contacts/view.py
-desktopcouch/recordtypes/contacts/testing/__init__.py
-desktopcouch/recordtypes/contacts/testing/create.py
-desktopcouch/recordtypes/contacts/tests/__init__.py
-desktopcouch/recordtypes/contacts/tests/test_create.py
-desktopcouch/recordtypes/contacts/tests/test_record.py
-desktopcouch/recordtypes/contacts/tests/test_view.py
-desktopcouch/recordtypes/tests/__init__.py
-desktopcouch/recordtypes/tests/test_bookmarks.py
-desktopcouch/recordtypes/tests/test_notes.py
-desktopcouch/recordtypes/tests/test_tasks.py
-desktopcouch/replication_services/__init__.py
-desktopcouch/replication_services/example.py
-desktopcouch/replication_services/ubuntuone.py
-desktopcouch/tasks/__init__.py
-desktopcouch/tasks/record.py
-desktopcouch/tests/__init__.py
-docs/man/desktopcouch-pair.1
-po/POTFILES.in
\ No newline at end of file

=== removed file 'desktopcouch.egg-info/dependency_links.txt'
--- desktopcouch.egg-info/dependency_links.txt	2009-10-22 17:15:57 +0000
+++ desktopcouch.egg-info/dependency_links.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-

=== removed file 'desktopcouch.egg-info/top_level.txt'
--- desktopcouch.egg-info/top_level.txt	2009-10-22 17:15:57 +0000
+++ desktopcouch.egg-info/top_level.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-desktopcouch

=== modified file 'desktopcouch/application/local_files.py'
--- desktopcouch/application/local_files.py	2011-04-08 20:40:53 +0000
+++ desktopcouch/application/local_files.py	2011-09-13 15:01:24 +0000
@@ -83,9 +83,11 @@
             if "-hashed-" in bookmark_file_contents:
                 raise ValueError("Basic-auth cred lost.")
             # trial run, check sanity.
+            # pylint: disable=W0106
             re.findall(
                 "<!-- !!([^!]+)!!([^!]+)!! -->",
                 bookmark_file_contents)[-1]
+            # pylint: enable=W0106
             self._fill_from_file(self.file_name_used)
             return
         except (IOError, ValueError, IndexError):
@@ -196,7 +198,7 @@
         for d in (run_dir, db_dir, config_dir):
             try:
                 os.makedirs(d, 0700)
-            except OSError, ex:
+            except OSError:
                 pass  # Probably that it already exists.
             try:
                 os.chmod(d, 0700)
@@ -257,7 +259,8 @@
     def couch_chain_ini_files(self):
         """Chain couchdb ini files."""
         # Explicitly add default ini file
-        ini_files = ["/etc/couchdb/default.ini"]
+        ini_files = [os.environ.get("COUCHDB_INI") or
+                     "/etc/couchdb/default.ini"]
 
         # find all ini files in the desktopcouch XDG_CONFIG_DIRS and
         # add them to the chain

=== modified file 'desktopcouch/application/platform/linux/tests/test_keyring.py'
--- desktopcouch/application/platform/linux/tests/test_keyring.py	2011-01-12 15:08:25 +0000
+++ desktopcouch/application/platform/linux/tests/test_keyring.py	2011-09-13 15:01:24 +0000
@@ -30,7 +30,7 @@
 try:
     import gnomekeyring
 except ImportError, e:
-    if sys.platform != 'linux2':
+    if not sys.platform.startswith('linux'):
         gnomekeyring = None
     else:
         raise e

=== modified file 'desktopcouch/application/platform/windows/tests/test_base_dirs.py'
--- desktopcouch/application/platform/windows/tests/test_base_dirs.py	2011-02-02 18:15:53 +0000
+++ desktopcouch/application/platform/windows/tests/test_base_dirs.py	2011-09-13 15:01:24 +0000
@@ -63,7 +63,7 @@
         self.mocker.result('hive')
         self._winreg.OpenKey('hive', SHELL_FOLDERS_KEY)
         self.mocker.result('key')
-        self._winreg.QueryInfoKey('key')[1]
+        self._winreg.QueryInfoKey('key')[1]  # pylint: disable=W0106
         self.mocker.throw(Exception('Cannot get info.'))
         self._winreg.CloseKey('hive')
         self._winreg.CloseKey('key')
@@ -78,7 +78,7 @@
         self.mocker.result('hive')
         self._winreg.OpenKey('hive', SHELL_FOLDERS_KEY)
         self.mocker.result('key')
-        self._winreg.QueryInfoKey('key')[1]
+        self._winreg.QueryInfoKey('key')[1]  # pylint: disable=W0106
         self.mocker.result(1)
         self._winreg.EnumValue('key', 0)
         self.mocker.result(('AppData', 'path', 1))

=== modified file 'desktopcouch/application/plugins/__init__.py'
--- desktopcouch/application/plugins/__init__.py	2011-02-02 18:15:53 +0000
+++ desktopcouch/application/plugins/__init__.py	2011-09-13 15:01:24 +0000
@@ -19,8 +19,18 @@
 DESKTOPCOUCH_PLUGIN_PATHS = [os.path.join(os.path.dirname(__file__))]
 
 
-def load_plugins(couchdb_port):
-    """Load the desktopcouch application plug-ins."""
+def load_plugins(couchdb_port, blocking_semaphores, gobject):
+    """Load the desktopcouch application plug-ins.
+
+    The blocking_semaphores set is OPTIONALLY mutated by any plugin to signal
+    that the service is not ready until a plugin has finished its asynchronous
+    operations.  Plugins may add a distinguishing object to the set, and it
+    must remove what it adds when it is finished.
+
+    couchdb -- the integer of the port number of the running couchdb
+    blocking_semaphores -- the set() of semaphores, which we will mutate
+    gobject -- the mainloop module. always 'gobject' except when testing.
+    """
     plugin_names = set()
     for path in DESKTOPCOUCH_PLUGIN_PATHS:
         try:
@@ -37,6 +47,6 @@
         modpath = name.replace(os.path.sep, '.')[:-3]
         try:
             plugin = __import__(modpath, None, None, [''])
-            plugin.plugin_init(couchdb_port)
+            plugin.plugin_init(couchdb_port, blocking_semaphores, gobject)
         except (ImportError, AttributeError):
             logging.warning('Failed to load plug-in: %s', modpath)

=== modified file 'desktopcouch/application/plugins/tests/test_plugins.py'
--- desktopcouch/application/plugins/tests/test_plugins.py	2011-02-02 18:15:53 +0000
+++ desktopcouch/application/plugins/tests/test_plugins.py	2011-09-13 15:01:24 +0000
@@ -28,6 +28,8 @@
 
     def setUp(self):
         self.couchdb_port = platform.find_port(ctx=test_context)
+        self.blockers = set()
+        self.gobject = None
 
     def test_load_plugins(self):
         """Test that plug-ins are loaded correctly."""
@@ -44,7 +46,7 @@
                 self._imported = modname
         old_import = __import__
         __builtins__['__import__'] = _fake_import
-        plugins.load_plugins(self.couchdb_port)
+        plugins.load_plugins(self.couchdb_port, self.blockers, self.gobject)
         __builtins__['__import__'] = old_import
         plugins.DESKTOPCOUCH_PLUGIN_PATHS = old_paths
         self.assertEqual(self._imported, __name__)

=== modified file 'desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py'
--- desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py	2011-02-02 18:15:53 +0000
+++ desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py	2011-09-13 15:01:24 +0000
@@ -38,9 +38,11 @@
         self.couchdb_port = self.mocker.mock()
         self.put_static_paired_service = self.mocker.mock()
         self.database_class = self.mocker.mock()
+        self.blocking_semaphores = self.mocker.mock()
 
     def test_pair_with_ubuntuone_no_view(self):
         """Test that when the view is not present it is indeed created."""
+        # plugin_init adds name to blocking semaphores, but we remove it.
         self.couchdb.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD)
         self.mocker.result(False)
         # we are interested in the fact that the view is created
@@ -50,8 +52,11 @@
         self.couchdb.execute_view(U1_PAIR_RECORD, U1_PAIR_RECORD)
         self.mocker.result([])
         self.put_static_paired_service(None, 'ubuntuone', ctx=None, uri=ANY)
+        self.blocking_semaphores.discard(ANY)
+
         self.mocker.replay()
-        pair_with_ubuntuone(self.couchdb_port, self.couchdb,
+        pair_with_ubuntuone(self.couchdb_port, self.blocking_semaphores,
+                            management_db=self.couchdb,
                             db_class=self.database_class,
                             put_service_fn=self.put_static_paired_service)
         self.mocker.verify()
@@ -59,21 +64,27 @@
     def test_pair_with_ubuntuone_no_record(self):
         """Ensure pairing is not done when there are no records ."""
         # execute the steps when no records are returned by the view
+        # plugin_init adds name to blocking semaphores, but we remove it.
         self.couchdb.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD)
         self.mocker.result(True)
         self.couchdb.execute_view(U1_PAIR_RECORD, U1_PAIR_RECORD)
         self.mocker.result([])
         self.put_static_paired_service(None, 'ubuntuone', ctx=None, uri=ANY)
+        self.blocking_semaphores.discard(ANY)
+
         self.mocker.replay()
-        pair_with_ubuntuone(self.couchdb_port, self.couchdb,
+        pair_with_ubuntuone(self.couchdb_port, self.blocking_semaphores,
+                            management_db=self.couchdb,
                             db_class=self.database_class,
                             put_service_fn=self.put_static_paired_service)
+
         self.mocker.verify()
 
     def test_pair_with_ubuntuone_user_deleted_record(self):
         """Ensure pairing is not done when the user explicitly removed it."""
         # create a mock object that will be the result from the view
         row = self.mocker.mock()
+        # plugin_init adds name to blocking semaphores, but we remove it.
         # execute the steps to show that the user deleted the record
         self.couchdb.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD)
         self.mocker.result(True)
@@ -82,14 +93,18 @@
         # FIXME does this do anything?
         _ = row.value
         self.mocker.result(1)
+        self.blocking_semaphores.discard(ANY)
+
         self.mocker.replay()
-        pair_with_ubuntuone(self.couchdb_port, self.couchdb)
+        pair_with_ubuntuone(self.couchdb_port, self.blocking_semaphores,
+                            management_db=self.couchdb)
         self.mocker.verify()
 
     def test_pair_with_ubuntuone_record_present(self):
         """Ensure pairing is not done when the record is already present."""
         # create a mock object that will be the result from the view
         row = self.mocker.mock()
+        # plugin_init adds name to blocking semaphores, but we remove it.
         # execute the steps to show that the user deleted the record
         self.couchdb.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD)
         self.mocker.result(True)
@@ -98,8 +113,11 @@
         # FIXME does this do anything?
         _ = row.value
         self.mocker.result(0)
+        self.blocking_semaphores.discard(ANY)
+
         self.mocker.replay()
-        pair_with_ubuntuone(self.couchdb_port, self.couchdb)
+        pair_with_ubuntuone(self.couchdb_port, self.blocking_semaphores,
+                            management_db=self.couchdb)
         self.mocker.verify()
 
 
@@ -109,6 +127,7 @@
     def setUp(self):
         super(TestUbuntuOnePlugin, self).setUp()
         self.couchdb_port = self.mocker.mock()
+        self.blocking_semaphores = self.mocker.mock()
         self.called = False
 
     def test_got_new_credentials_other(self):
@@ -117,21 +136,27 @@
             """Fail if we get called."""
             self.called = True
 
+        saved_pair = uone.pair_with_ubuntuone
         uone.pair_with_ubuntuone = fail_if_called
-        uone.got_new_credentials(self.couchdb_port, 'Unknown App', {})
+        uone.got_new_credentials(self.couchdb_port, self.blocking_semaphores,
+                                 'Unknown App', {})
         self.assertFalse(self.called, 'pair_with_ubuntuone was not expected.')
         self.mocker.replay()
+        uone.pair_with_ubuntuone = saved_pair
 
     def test_got_new_credentials(self):
         """Check that pairing is called for Ubuntu One."""
-        def pass_if_called(db=None):
+        def pass_if_called(db=None, semaphores=None):
             """Check that pair_with_ubuntuone was called."""
             self.called = True
 
+        saved_pair = uone.pair_with_ubuntuone
         uone.pair_with_ubuntuone = pass_if_called
-        uone.got_new_credentials(self.couchdb_port, uone.APP_NAME, {})
+        uone.got_new_credentials(self.couchdb_port, self.blocking_semaphores,
+                                 uone.APP_NAME, {})
         self.assertTrue(self.called, 'pair_with_ubuntuone was not called.')
         self.mocker.replay()
+        uone.pair_with_ubuntuone = saved_pair
 
     def test_listen_to_dbus(self):
         """Test that listening to credentails works."""
@@ -144,6 +169,9 @@
 
         iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
         bus.add_signal_receiver(handler_function=ANY,
+                                signal_name='CredentialsNotFound',
+                                dbus_interface=iface)
+        bus.add_signal_receiver(handler_function=ANY,
                                 signal_name='CredentialsFound',
                                 dbus_interface=iface)
 
@@ -161,4 +189,4 @@
 
         self.mocker.replay()
 
-        uone.listen_to_dbus(self.couchdb_port)
+        uone.listen_to_dbus(self.couchdb_port, self.blocking_semaphores)

=== modified file 'desktopcouch/application/plugins/ubuntuone_pairing.py'
--- desktopcouch/application/plugins/ubuntuone_pairing.py	2011-02-02 18:15:53 +0000
+++ desktopcouch/application/plugins/ubuntuone_pairing.py	2011-09-13 15:01:24 +0000
@@ -24,6 +24,8 @@
 from desktopcouch.application.server import DesktopDatabase
 from ubuntuone.clientdefs import APP_NAME
 
+TIMEOUT_SEC = 20
+PLUGIN_NAME = __name__
 U1_PAIR_RECORD = "ubuntu_one_pair_record"
 MAP_JS = """function(doc) {
     if (doc.service_name == "ubuntuone") {
@@ -32,49 +34,57 @@
     }
 """
 
-
-def pair_with_ubuntuone(couchdb_port, management_db=None,
+def pair_with_ubuntuone(couchdb_port, blocking_semaphores,
+                        management_db=None,
                         db_class=DesktopDatabase,
                         put_service_fn=put_static_paired_service):
     """Adds a pairing record with ubuntu one when needed."""
-    # Use explicit uri so that we do not access dbus service.
-    uri = "http://localhost:%s" % (couchdb_port,)
-    if not management_db:
-        management_db = db_class("management", uri=uri, create=True, ctx=None)
-    # we indeed have credentials to add to the pairing records
-    # but first we ensure that the required view is present
-    if not management_db.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD):
-        management_db.add_view(
-            U1_PAIR_RECORD, MAP_JS, design_doc=U1_PAIR_RECORD)
-    view_results = management_db.execute_view(U1_PAIR_RECORD, U1_PAIR_RECORD)
-    pairing_found = False
-    # Results should contain either one row or no rows
-    # If there is one row, its value will be 0, meaning that there is
-    #   already an Ubuntu One pairing record, or 1, meaning that there
-    #   was an Ubuntu One pairing record but it has since been unpaired
-    # Only create a new record if there is not one already. Specifically,
-    #   do not add the record if there is a deleted one, as this means
-    #   that the user explicitly unpaired it!
-    for row in view_results:
-        pairing_found = True
-        if row.value == 1:
-            logging.debug("Not adding desktopcouch pairing since the user "
-                "has explicitly unpaired with Ubuntu One")
-        else:
-            logging.debug("Not adding desktopcouch pairing since we are "
-                "already paired")
-    if not pairing_found:
-        put_service_fn(None, "ubuntuone", uri=uri, ctx=None)
-        logging.debug("Pairing desktopcouch with Ubuntu One")
-
-
-def got_new_credentials(couchdb_port, app_name, credentials):
+    try:
+        # Use explicit uri so that we do not access dbus service.
+        uri = "http://localhost:%s" % (couchdb_port,)
+        if not management_db:
+            management_db = db_class("management", uri=uri, create=True,
+                                     ctx=None)
+        # we indeed have credentials to add to the pairing records
+        # but first we ensure that the required view is present
+        if not management_db.view_exists(U1_PAIR_RECORD, U1_PAIR_RECORD):
+            management_db.add_view(
+                U1_PAIR_RECORD, MAP_JS, design_doc=U1_PAIR_RECORD)
+        view_results = management_db.execute_view(U1_PAIR_RECORD,
+                                                  U1_PAIR_RECORD)
+        pairing_found = False
+        # Results should contain either one row or no rows
+        # If there is one row, its value will be 0, meaning that there is
+        #   already an Ubuntu One pairing record, or 1, meaning that there
+        #   was an Ubuntu One pairing record but it has since been unpaired
+        # Only create a new record if there is not one already. Specifically,
+        #   do not add the record if there is a deleted one, as this means
+        #   that the user explicitly unpaired it!
+        for row in view_results:
+            pairing_found = True
+            if row.value == 1:
+                logging.debug("Not adding desktopcouch pairing since the user "
+                    "has explicitly unpaired with Ubuntu One")
+            else:
+                logging.debug("Not adding desktopcouch pairing since we are "
+                    "already paired")
+        if not pairing_found:
+            put_service_fn(None, "ubuntuone", uri=uri, ctx=None)
+            logging.debug("Pairing desktopcouch with Ubuntu One")
+
+    finally:
+        logging.info("removing semaphore for %s", PLUGIN_NAME)
+        blocking_semaphores.discard(PLUGIN_NAME)
+
+
+def got_new_credentials(couchdb_port, blocking_semaphores,
+                        app_name, credentials):
     """Pair with Ubuntu One when we get the new credentials."""
     if app_name == APP_NAME:
-        pair_with_ubuntuone(couchdb_port)
-
-
-def listen_to_dbus(couchdb_port):
+        pair_with_ubuntuone(couchdb_port, blocking_semaphores)
+
+
+def listen_to_dbus(couchdb_port, blocking_semaphores):
     """Set up the signal handler on D-Bus for Ubuntu One pairing."""
     import dbus
     bus = dbus.SessionBus()
@@ -82,9 +92,20 @@
     try:
         import ubuntu_sso
 
-        receiver = lambda *args: got_new_credentials(couchdb_port, *args)
+        receiver = lambda *args: \
+                got_new_credentials(couchdb_port, blocking_semaphores,
+                                                     *args)
+        def abort_getting_credentials(*args):
+            """Log and remove our semaphore."""
+            logging.warn("Credentials not found for ubuntuone.")
+            blocking_semaphores.discard(PLUGIN_NAME)
 
         iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
+
+        bus.add_signal_receiver(handler_function=abort_getting_credentials,
+                                signal_name='CredentialsNotFound',
+                                dbus_interface=iface)
+
         bus.add_signal_receiver(handler_function=receiver,
                                 signal_name='CredentialsFound',
                                 dbus_interface=iface)
@@ -96,13 +117,23 @@
         sso_backend.find_credentials(APP_NAME, {})
     except ImportError:
         logging.info('Ubuntu SSO is not available.')
-
-
-def plugin_init(couchdb_port):
+        blocking_semaphores.discard(PLUGIN_NAME)
+
+
+def plugin_init(couchdb_port, blocking_semaphores, gobject):
     """Set up the signal handler for pairing with Ubuntu One."""
     logging.info('Loaded Ubuntu One extension for desktopcouch.')
     if sys.platform == 'win32':
         logging.warning('Windows support for Ubuntu One is not yet ready.')
     else:
-        import gobject
-        gobject.idle_add(listen_to_dbus, couchdb_port)
+
+        # Signal that we are critical for desktopcouch usage, and the server
+        # must not begin until we are finished.  We are responsible for
+        # removing this item from the list.
+        logging.info("adding %s to to blocking semaphore list", PLUGIN_NAME)
+        blocking_semaphores.add(PLUGIN_NAME)
+
+        gobject.idle_add(listen_to_dbus, couchdb_port, blocking_semaphores)
+
+        gobject.timeout_add_seconds(TIMEOUT_SEC, blocking_semaphores.discard,
+                PLUGIN_NAME)

=== modified file 'desktopcouch/application/replication.py'
--- desktopcouch/application/replication.py	2011-01-12 15:08:25 +0000
+++ desktopcouch/application/replication.py	2011-09-13 15:01:24 +0000
@@ -246,7 +246,7 @@
     dbus_io.maintain_discovered_servers()
 
     task_running = task.LoopingCall(do_all_replication, int(port))
-    task_running.start(600)
+    task_running.start(3600)
 
     # TODO:  port may change, so every so often, check it and
     # perhaps refresh the beacons.  We return an array of beacons, so we could

=== modified file 'desktopcouch/application/service.py'
--- desktopcouch/application/service.py	2011-02-02 18:15:53 +0000
+++ desktopcouch/application/service.py	2011-09-13 15:01:24 +0000
@@ -39,6 +39,7 @@
 import logging
 import logging.handlers
 import signal
+import gobject
 
 from desktopcouch.application import local_files
 from desktopcouch.application import replication
@@ -84,7 +85,8 @@
                  replication_actions=replication,
                  advertiser_factory=PortAdvertiser, set_logging=set_up_logging,
                  fork=os.fork, nice=os.nice,
-                 kill=os.kill, sleep=time.sleep):
+                 kill=os.kill, sleep=time.sleep, set_type=set,
+                 gobject_module=gobject):
         self._mainloop = main_loop
         self._pid_finder = pid_finder
         self._port_finder = port_finder
@@ -97,6 +99,8 @@
         self._nice = nice
         self._kill = kill
         self._sleep = sleep
+        self._set = set_type
+        self._gobject = gobject_module
     # pylint: enable=C0301
 
     def _start_replicator_main(self, couchdb_port):
@@ -112,25 +116,46 @@
                 replication.tear_down(*replication_runtime)
 
     def _start_server_main(self, couchdb_port):
-        """Start server."""
-        self._advertiser_factory(self._mainloop.stop, self._ctx)
+        """Start server answering DBus calls, and run plugins first."""
+
+        def if_all_semaphores_cleared(blocking_semaphores,
+                func, *args, **kwargs):
+            """Run a function if no semaphores exist, else try later."""
+            if blocking_semaphores:
+                self._sleep(0.2)  # Never peg the CPU
+                return True  # Make idle call try us again.
+            else:
+                func(*args, **kwargs)
+                return False  # Handled!
+
+        blocking_semaphores = self._set()
+        load_plugins(couchdb_port, blocking_semaphores, self._gobject)
+
+        # Answering queries on DBus signals that we are ready for users
+        # to connect.  We mustn't begin that until every plugin has a chance
+        # to run to completion if it needs it.
+        self._gobject.idle_add(if_all_semaphores_cleared, blocking_semaphores,
+                               self._advertiser_factory,
+                               self._mainloop.stop,
+                               self._ctx)
+
         logging.debug("starting dbus main loop")
         try:
-            load_plugins(couchdb_port)
             self._mainloop.run()
         finally:
             logging.debug("ending dbus main loop")
 
     def start(self):
         """Start the services used by desktopcouch."""
-        should_shut_down_couchdb = False
+        maintained_child_pids = list()
         couchdb_pid = self._pid_finder(start_if_not_running=False,
             ctx=self._ctx)
         if couchdb_pid is None:
             logging.warn("Starting up personal couchdb.")
             couchdb_pid = self._pid_finder(start_if_not_running=True,
                 ctx=self._ctx)
-            should_shut_down_couchdb = True
+            if couchdb_pid:
+                maintained_child_pids.append(couchdb_pid)
         else:
             logging.warn("Personal couchdb is already running at PID#%d.",
                     couchdb_pid)
@@ -145,6 +170,7 @@
             return
         else:
             assert child_pid > 0
+            maintained_child_pids.append(child_pid)
             child_pid = self._fork()  # Split!
             if child_pid == 0:
                 # Let's be the migration tool!
@@ -161,8 +187,18 @@
                 return
             else:
                 assert child_pid > 0
+                maintained_child_pids.append(child_pid)
                 # Let's be the dbus server!
                 # This is the parent process.  When we exit, we kill children.
+
+                def receive_signal(signum, stackframe):
+                    """On signal, quit main loop gracefully."""
+                    logging.warn("Received signal %d. Quitting.", signum)
+                    self._mainloop.stop()
+
+                signal.signal(signal.SIGHUP, receive_signal)
+                signal.signal(signal.SIGTERM, receive_signal)
+
                 try:
                     set_up_logging("dbus")
                     # offer the dbus service
@@ -172,14 +208,18 @@
                         "uncaught exception makes us shut down.")
                 finally:
                     logging.info("exiting.")
-                    if should_shut_down_couchdb:
-                        logging.warn("shutting down personal couchdb.")
-                        self._stop_couchdb(ctx=self._ctx)
+                    self._stop_couchdb(ctx=self._ctx)
 
+                    for child_pid in maintained_child_pids:
                         try:
                             self._kill(child_pid, signal.SIGTERM)
-                            self._sleep(1)
+                            logging.warn("Sent SIGTERM to %d", child_pid)
+                        except OSError:
+                            pass
+                    self._sleep(1)
+                    for child_pid in maintained_child_pids:
+                        try:
                             self._kill(child_pid, signal.SIGKILL)
+                            logging.warn("Sent SIGKILL to %d", child_pid)
                         except OSError:
                             pass
-                    return                  # pylint: disable=W0150

=== modified file 'desktopcouch/application/start_local_couchdb.py'
--- desktopcouch/application/start_local_couchdb.py	2011-04-08 20:40:53 +0000
+++ desktopcouch/application/start_local_couchdb.py	2011-09-13 15:01:24 +0000
@@ -166,7 +166,7 @@
             break
         except RuntimeError, ex:
             saved_exception = ex
-            logging.exception("Starting couchdb failed on try %d", (retry,))
+            logging.exception("Starting couchdb failed on try %d", retry)
             time.sleep(1)
             continue
 

=== modified file 'desktopcouch/application/tests/test_service.py'
--- desktopcouch/application/tests/test_service.py	2011-02-02 18:15:53 +0000
+++ desktopcouch/application/tests/test_service.py	2011-09-13 15:01:24 +0000
@@ -37,6 +37,8 @@
         self._replication = self.mocker.mock()
         self._advertiser = self.mocker.mock()
         self._resources = self.mocker.mock()
+        self._set = self.mocker.mock()
+        self._gobject = self.mocker.mock()
         self._service = DesktopcouchService(self._mainloop,
             pid_finder=self._pid_finder,
             port_finder=self._port_finder,
@@ -48,65 +50,97 @@
             fork=self._fork,
             nice=self._nice,
             kill=self._kill,
-            sleep=self._sleep)
-
-    def test_start_new_desktopcouch_no_extensions(self):
-        """Test that desktopcouch is started.
-
-        We test that when the pid cannot be found we ensure
-        that the desktopcouch instance is started and that the
-        start as the dbus service,
-        """
-        self._pid_finder(start_if_not_running=False, ctx=self._ctx)
-        self.mocker.result(None)
-        self._pid_finder(start_if_not_running=True, ctx=self._ctx)
-        self.mocker.result(self._pid_result)
-        self._port_finder(pid=self._pid_result, ctx=self._ctx)
-        self.mocker.result(self._port_result)
-        self._fork()
-        self.mocker.result(234)
-        self._fork()
-        self.mocker.result(234)
-        # XXX: call this?
-        self._mainloop.stop             # pylint: disable=W0104
-        self.mocker.result(ANY)
-        self._advertiser(ANY, self._ctx)
-        self._mainloop.run()
-        self._stop_couchdb(ctx=self._ctx)
-        self._kill(234, signal.SIGTERM)
-        self._sleep(1)
-        self._kill(234, signal.SIGKILL)
-        self.mocker.replay()
-        self._service.start()
-
-    def test_start_new_desktopcouch_extensions(self):
-        """Test that desktopcouch is started.
-
-        We test that when the pid cannot be found we ensure
-        that the desktopcouch instance is started and that the
-        start as the dbus service,
-        """
-        self._pid_finder(start_if_not_running=False, ctx=self._ctx)
-        self.mocker.result(None)
-        self._pid_finder(start_if_not_running=True, ctx=self._ctx)
-        self.mocker.result(self._pid_result)
-        self._port_finder(pid=self._pid_result, ctx=self._ctx)
-        self.mocker.result(self._port_result)
-        self._fork()
-        self.mocker.result(234)
-        self._fork()
-        self.mocker.result(234)
-        # XXX: call this?
-        self._mainloop.stop             # pylint: disable=W0104
-        self.mocker.result(ANY)
-        self._advertiser(ANY, self._ctx)
-        self._mainloop.run()
-        self._stop_couchdb(ctx=self._ctx)
-        self._kill(234, signal.SIGTERM)
-        self._sleep(1)
-        self._kill(234, signal.SIGKILL)
-        self.mocker.replay()
-        self._service.start()
+            sleep=self._sleep,
+            set_type=self._set,
+            gobject_module=self._gobject)
+
+        self.gobject_idle_task_list = list()
+
+    def test_start_new_desktopcouch_with_plugins(self):
+        """Test that desktopcouch is started.
+
+        We test that when the pid cannot be found we ensure
+        that the desktopcouch instance is started and that the
+        start as the dbus service,
+        """
+        self._pid_finder(start_if_not_running=False, ctx=self._ctx)
+        self.mocker.result(None)
+        self._pid_finder(start_if_not_running=True, ctx=self._ctx)
+        self.mocker.result(self._pid_result)
+        self._port_finder(pid=self._pid_result, ctx=self._ctx)
+        self.mocker.result(self._port_result)
+        self._fork()
+        self.mocker.result(234)  # We are parent
+        self._fork()
+        self.mocker.result(345)  # We are parent
+
+        # plugins load
+        semaphores = self.mocker.mock()
+        self._set()
+        self.mocker.result(semaphores)
+
+        self._mainloop.stop             # pylint: disable=W0104
+        self.mocker.result(ANY)
+
+        semaphores.discard              # pylint: disable=W0104
+        self.mocker.result("disc")
+        self._gobject.timeout_add_seconds(ANY, "disc", ANY)
+
+        self._gobject.idle_add(ANY, self._port_result, semaphores)
+        self._gobject.idle_add(ANY, semaphores, self._advertiser, ANY,
+                               self._ctx)
+
+        self._mainloop.run()
+
+        # Tasks are added to the mainloop's idle queue.  With that^
+        # mainloop.run, they'd be called.  Simulate their call.
+
+        # Idle loop to add plugins calls a plugin.  ubuntuone_pairing
+        semaphores.add(ANY)  # A plugin asserts it must be completed.
+
+        # Idle loop calls plugin for ubuntuone_pairing, which fires up DBus
+        # client to get credentials from ubuntu-login app.  When that returns,
+        # it calls got_new_credentials, which calls pair_with_ubuntuone.
+
+        # Mock call to pair_with_ubuntuone
+        management_db = self.mocker.mock()
+        put_service_fn = self.mocker.mock()
+
+        bool(management_db)
+        self.mocker.result(True)
+
+        management_db.view_exists(ANY, ANY)
+        self.mocker.result(False)
+        management_db.add_view(ANY, ANY, design_doc=ANY)
+
+        row = self.mocker.mock()
+        management_db.execute_view(ANY, ANY)
+        self.mocker.result([row])
+
+        row.value               # pylint: disable=W0104
+        self.mocker.result(1)
+
+        semaphores.discard(ANY)
+
+        # and then dbus service is ready to answer queries.
+
+        self._stop_couchdb(ctx=self._ctx)
+        self._kill(self._pid_result, signal.SIGTERM)
+        self._kill(234, signal.SIGTERM)
+        self._kill(345, signal.SIGTERM)
+        self._sleep(1)
+        self._kill(self._pid_result, signal.SIGKILL)
+        self._kill(234, signal.SIGKILL)
+        self._kill(345, signal.SIGKILL)
+
+        self.mocker.replay()
+
+        self._service.start()
+        # Manually do what dbus idle-loop would do.
+        import desktopcouch.application.plugins.ubuntuone_pairing as u_p
+        u_p.pair_with_ubuntuone(self._port_result, semaphores,
+                management_db=management_db,
+                put_service_fn=put_service_fn)
 
     def test_start_desktopcouch_replication(self):
         """ Test that the repliciation works.
@@ -119,7 +153,7 @@
         self._port_finder(pid=self._pid_result, ctx=self._ctx)
         self.mocker.result(self._port_result)
         self._fork()
-        self.mocker.result(0)
+        self.mocker.result(0)  # We are child process
         self._nice(10)
         self._replication.set_up(ANY)
         self._mainloop.run()
@@ -146,9 +180,9 @@
         self._port_finder(pid=self._pid_result, ctx=self._ctx)
         self.mocker.result(self._port_result)
         self._fork()
-        self.mocker.result(567)
+        self.mocker.result(567)  # We are parent process
         self._fork()
-        self.mocker.result(0)
+        self.mocker.result(0)  # We are child process
         self._sleep(ANY)
         self._ctx.db_dir  # searching for files    # pylint: disable=W0104
         self.mocker.result("/tmp/migration-data/does/not/exist")

=== modified file 'desktopcouch/records/tests/test_mocked_server.py'
--- desktopcouch/records/tests/test_mocked_server.py	2011-04-08 20:40:53 +0000
+++ desktopcouch/records/tests/test_mocked_server.py	2011-09-13 15:01:24 +0000
@@ -61,6 +61,7 @@
 
 
 class TestMockedCouchDatabaseCreateStates(MockerTestCase):
+    """Mocked Couch Database tests for create= flag states."""
     def setUp(self):
         """Set up tests."""
         super(TestMockedCouchDatabaseCreateStates, self).setUp()
@@ -85,7 +86,7 @@
         self.mocker.result({'update_seq': []})
 
         self.mocker.replay()
-        database = DesktopDatabase(self.dbname, uri=self.uri,
+        DesktopDatabase(self.dbname, uri=self.uri,
             record_factory=self.record_factory, create=True,
             server_class=self.server_class,
             oauth_tokens=self.oauth_tokens, ctx=self.ctx)
@@ -105,7 +106,7 @@
         info["update_seq"]
         self.mocker.result({})
         self.mocker.replay()
-        database = DesktopDatabase(self.dbname, uri=self.uri,
+        DesktopDatabase(self.dbname, uri=self.uri,
             record_factory=self.record_factory, create=True,
             server_class=self.server_class,
             oauth_tokens=self.oauth_tokens, ctx=self.ctx)
@@ -140,7 +141,7 @@
         self.mocker.result({})
 
         self.mocker.replay()
-        database = DesktopDatabase(self.dbname, uri=self.uri,
+        DesktopDatabase(self.dbname, uri=self.uri,
             record_factory=self.record_factory, create=False,
             server_class=self.server_class,
             oauth_tokens=self.oauth_tokens, ctx=self.ctx)

=== modified file 'desktopcouch/recordtypes/contacts/tests/test_view.py'
--- desktopcouch/recordtypes/contacts/tests/test_view.py	2011-01-12 15:08:25 +0000
+++ desktopcouch/recordtypes/contacts/tests/test_view.py	2011-09-13 15:01:24 +0000
@@ -280,29 +280,29 @@
 
         contacts = list(
             view.find_contacts_starting(self.db, first_name="Frances"))
-        self.assertEqual(len(contacts), 1)
+        self.assertEqual(len(contacts), 1, "Length of 1. %s" % (contacts,))
 
         contacts = list(
             view.find_contacts_starting(self.db, birth_date="1918"))
-        self.assertEqual(len(contacts), 1)
+        self.assertEqual(len(contacts), 1, "Length of 1. %s" % (contacts,))
 
         contacts = list(
             view.find_contacts_starting(self.db, birth_date="1918-08"))
-        self.assertEqual(len(contacts), 1)
+        self.assertEqual(len(contacts), 1, "Length of 1. %s" % (contacts,))
 
         contacts = list(
             view.find_contacts_starting(self.db, wedding_date="1970"))
-        self.assertEqual(len(contacts), 1)
+        self.assertEqual(len(contacts), 1, "Length of 1. %s" % (contacts,))
 
         contacts = list(
             view.find_contacts_starting(
                 self.db, email_addressesaddress="blah.example.com"))
-        self.assertEqual(len(contacts), 1)
+        self.assertEqual(len(contacts), 1, "Length of 1. %s" % (contacts,))
 
         contacts = list(
             view.find_contacts_starting(
                 self.db, email_addressesaddress="berkeley"))
-        self.assertEqual(len(contacts), 1)
+        self.assertEqual(len(contacts), 1, "Length of 1. %s" % (contacts,))
 
         contacts = list(
             view.find_contacts_starting(self.db, first_name="random"))
@@ -317,7 +317,7 @@
 
         contacts = list(
             view.find_contacts_exact(self.db, first_name="Frances"))
-        self.assertEqual(len(contacts), 1)
+        self.assertEqual(len(contacts), 1, "Length of 1. %s" % (contacts,))
 
         contacts = list(view.find_contacts_exact(self.db, birth_date="-08-23"))
-        self.assertEqual(len(contacts), 1)
+        self.assertEqual(len(contacts), 1, "Length of 1. %s" % (contacts,))

=== modified file 'setup.cfg'
--- setup.cfg	2011-01-12 15:08:25 +0000
+++ setup.cfg	2011-09-13 15:01:24 +0000
@@ -4,10 +4,10 @@
 tag_svn_revision = 0
 
 [build]
-i18n = True
-icons = True
+i18n=True
+icons=True
 
 [build_i18n]
-domain = desktopcouch
-desktop_files = [("share/applications", ("desktopcouch-pair.desktop.in",))]
+domain=desktopcouch
+desktop_files=[("share/applications", ("desktopcouch-pair.desktop.in",))]
 

=== modified file 'setup.py'
--- setup.py	2011-04-08 20:42:51 +0000
+++ setup.py	2011-09-13 15:01:24 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2009-2010 Canonical Ltd.
+# Copyright 2009-2011 Canonical Ltd.
 #
 # This file is part of desktopcouch.
 #
@@ -17,12 +17,13 @@
 # along with desktopcouch.  If not, see <http://www.gnu.org/licenses/>.
 """setup.py"""
 
-from setuptools import setup, find_packages
+from setuptools import find_packages
 from DistUtilsExtra.command import build_extra, build_i18n
+from DistUtilsExtra.auto import setup
 
 setup(
     name='desktopcouch',
-    version='1.0.7',
+    version='1.0.8',
     description='A Desktop CouchDB instance.',
     url='https://launchpad.net/desktopcouch',
     license='LGPL-3',
@@ -30,19 +31,23 @@
     author_email='[e-mail]',
     packages=find_packages(),
     scripts=['bin/desktopcouch-pair'],
-    data_files=[('/usr/lib/desktopcouch/', ['bin/desktopcouch-service',
+    data_files=[('lib/desktopcouch/', ['bin/desktopcouch-service',
                                               'bin/desktopcouch-pair',
                                               'bin/desktopcouch-get-port',
                                               'bin/desktopcouch-stop']),
                   # Be sure all additions are reflected in MANIFEST.in !
-                  ('/usr/share/doc/python-desktopcouch-records/api/',
+                  ('share/doc/python-desktopcouch-records/api/',
                       ['desktopcouch/records/doc/records.txt',
+                      'desktopcouch/records/doc/an_example_application.txt',
                       'desktopcouch/records/doc/field_registry.txt',
                       'desktopcouch/recordtypes/contacts/schema.txt']),
                   ('/etc/xdg/desktop-couch/',
-                      ['config/desktop-couch/compulsory-auth.ini']),
-                  ('/usr/share/desktopcouch/', ['data/couchdb.tmpl']),
-                  ('/usr/share/dbus-1/services/', [
+                      ['config/desktop-couch/compulsory-auth.ini',
+                      'config/desktop-couch/default.ini']),
+                  ('share/desktopcouch/', ['data/couchdb.tmpl']),
+                  ('share/apport/package-hooks/', [
+                    'data/source_desktopcouch.py']),
+                  ('share/dbus-1/services/', [
                     'org.desktopcouch.CouchDB.service']),
                   ('share/man/man1/', ['docs/man/desktopcouch-pair.1'])],
     cmdclass={"build": build_extra.build_extra,