Merge lp:~ted/url-dispatcher/dump-tool into lp:url-dispatcher/15.10

[Ted Gould]

Provide a small tool to dump the URL DB in a readable form

I keep having to ask people to do this when we're debugging things, so I figure this is a little easier way to get the info from them.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/165/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-wily-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-wily-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-wily-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/165/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/url-dispatcher/dump-tool]

89. By Ted Gould on 2015-06-08

Grab Upstart dep

90. By Ted Gould on 2015-06-08

Fix CMake file to use PROGRAMS

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-08-20 18:41:41 +0000
+++ debian/control	2015-06-08 15:26:40 +0000
@@ -22,6 +22,7 @@
                python3-nose,
                python3-testtools,
                sqlite3,
+               upstart,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/url-dispatcher
 # If you aren't a member of ~indicator-applet-developers but need to upload

=== modified file 'debian/source_url-dispatcher.py'
--- debian/source_url-dispatcher.py	2014-06-06 16:11:22 +0000
+++ debian/source_url-dispatcher.py	2015-06-08 15:26:40 +0000
@@ -15,6 +15,4 @@
 
 	dbpath = os.path.join(xdg_cache_home, 'url-dispatcher', 'urls-1.db')
 	if os.path.exists(dbpath):
-		attach_command_output(report, ['sqlite3', dbpath, '.tables'], 'CacheDBTables')
-		attach_command_output(report, ['sqlite3', dbpath, 'select * from urls'], 'CacheDBURLS')
-		attach_command_output(report, ['sqlite3', dbpath, 'select * from configfiles'], 'CacheDBFiles')
+		attach_command_output(report, ['url-dispatcher-dump'], 'URLDispatcherDB')

=== modified file 'debian/url-dispatcher-crashdb.conf'
--- debian/url-dispatcher-crashdb.conf	2014-06-06 16:06:24 +0000
+++ debian/url-dispatcher-crashdb.conf	2015-06-08 15:26:40 +0000
@@ -1,6 +1,7 @@
 
 url_dispatcher = {
 	'impl': 'launchpad',
-	'project': 'url-dispatcher',
+	'distro': 'ubuntu',
+	'package': 'url-dispatcher',
 	'bug_pattern_base': None,
 }

=== modified file 'debian/url-dispatcher-tools.install'
--- debian/url-dispatcher-tools.install	2013-06-28 16:35:12 +0000
+++ debian/url-dispatcher-tools.install	2015-06-08 15:26:40 +0000
@@ -1,1 +1,1 @@
-usr/bin
+usr/bin/url-dispatcher

=== modified file 'debian/url-dispatcher.install'
--- debian/url-dispatcher.install	2013-06-28 16:35:12 +0000
+++ debian/url-dispatcher.install	2015-06-08 15:26:40 +0000
@@ -1,3 +1,4 @@
 usr/lib/*/url-dispatcher
 usr/share/dbus-1
 usr/share/upstart/sessions
+usr/bin/url-dispatcher-dump

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2013-06-28 15:55:27 +0000
+++ tools/CMakeLists.txt	2015-06-08 15:26:40 +0000
@@ -16,3 +16,8 @@
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
 )
 
+install(
+  SCRIPT url-dispatcher-dump
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+)
+

=== added file 'tools/url-dispatcher-dump'
--- tools/url-dispatcher-dump	1970-01-01 00:00:00 +0000
+++ tools/url-dispatcher-dump	2015-06-08 15:26:40 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo .quit | sqlite3 -batch -csv -cmd "select urls.protocol, urls.domainsuffix, configfiles.name from urls, configfiles where urls.sourcefile = configfiles.rowid;" ~/.cache/url-dispatcher/urls-1.db