Merge lp:~mikemc/unity-scope-click/add-invalidate-signal into lp:unity-scope-click

[Mike McCracken]

- Add dbus invalidation signal to post-download command sent to UDM.

- Add dbus invalidation signal to post-download command sent to UDM.

Uses dbus-send to trigger dash invalidation.
Using UDM makes this more robust to preview and scope lifetimes.

To run the (disabled due to ARM Jenkins fun) tests, use
% GTEST_ALSO_RUN_DISABLED_TESTS=1 make test

To test IRL, try this from your scope build dir:
% U1_DEBUG=1 scope/tests/download_manager_tool/download_manager_tool https://public.apps.ubuntu.com/download/com.ubuntu.developer.mzanetti/fahrplan2/com.ubuntu.developer.mzanetti.fahrplan2_2.0.14.1_unknown.click com.ubuntu.developer.mzanetti.fahrplan2 && tail -f ~/.cache/ubuntu-download-manager/UNKNOWN.INFO

If you wait like 10 seconds, you should see a failed installation (assuming you're running on x86). This means that the pkcon part of the command ran as expected.

Q: Error handling: currently I am sending the signal whether or not pkcon succeeds. This is an easy change if that's not the right thing to do.

NOTE:
I haven't been able to test the invalidation command. I need help with this.
Just running the scope with the scope test tool doesn't work, the tool doesn't appear to listen for that signal.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/190
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/190/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/292/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good, I'd like to see some IRL testing for this.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/297/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/195
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/195/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/297/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:139
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mikemc/unity-scope-click/add-invalidate-signal/+merge/206813/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/311/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/209
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/209/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/311/rebuild

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

Rubberstamp on the resubmitted branch.

review: Approve

=== modified file 'scope/click/download-manager.cpp'
--- scope/click/download-manager.cpp	2014-02-12 18:01:06 +0000
+++ scope/click/download-manager.cpp	2014-02-17 21:34:33 +0000
@@ -32,6 +32,7 @@
 #include <QDebug>
 #include <QObject>
 #include <QString>
+#include <QStringBuilder>
 #include <QTimer>
 
 namespace u1 = UbuntuOne;
@@ -48,9 +49,22 @@
 
 static const QString DOWNLOAD_APP_ID_KEY = "app_id";
 static const QString DOWNLOAD_COMMAND_KEY = "post-download-command";
+
+// Pass two commands using sh -c because UDM expects a single
+// executable.
+// Use a single string for both commands because the
+// list is eventually given to QProcess, which adds quotes around each
+// argument, while -c expects a single quoted string.
+// Then, use the $0 positional variable in the pkcon command to let us
+// pass "$file" as a separate list element, which UDM requires for
+// substitution.
+static const QString DOWNLOAD_COMMAND = QStringLiteral("pkcon -p install-local $0 && ")
+    % "dbus-send" % " /com/canonical/unity/scopes" % " com.canonical.unity.scopes.InvalidateResults"
+    % " string:clickscope";
 static const QVariant DOWNLOAD_CMDLINE = QVariant(QStringList()
-                                                  << "pkcon" << "-p"
-                                                  << "install-local" << "$file");
+                                                  << "/bin/sh" << "-c" <<
+                                                  DOWNLOAD_COMMAND << "$file");
+
 static const QString DOWNLOAD_MANAGER_DO_NOT_HASH = "";
 static const QString DOWNLOAD_MANAGER_IGNORE_HASH_ALGORITHM = "";
 }

=== modified file 'scope/tests/test_download_manager.cpp'
--- scope/tests/test_download_manager.cpp	2014-02-12 20:46:36 +0000
+++ scope/tests/test_download_manager.cpp	2014-02-17 21:34:33 +0000
@@ -322,13 +322,16 @@
                             ));
 
 
-MATCHER(DownloadStructIsValid, "Struct is not valid")
+MATCHER(DownloadStructIsValid, "Download Struct does not match expected")
 {
+    auto commandList = arg.getMetadata()["post-download-command"].toStringList();
     return arg.getUrl() == TEST_URL
         && arg.getHash() == "" 
         && arg.getAlgorithm() == ""
         && arg.getMetadata()["app_id"] == QVariant(TEST_APP_ID)
-        && arg.getMetadata()["post-download-command"].toStringList().length() == 4
+        && commandList[0] == "/bin/sh"
+        && commandList[1] == "-c"
+        && commandList[3] == "$files"
         && arg.getHeaders()["X-Click-Token"] == TEST_CLICK_TOKEN_VALUE;
 }