Merge lp:~ken-vandine/ubuntu-system-settings/click_framework_check into lp:ubuntu-system-settings

[Ken VanDine]

Include supported frameworks and arch when checking for updates

Include supported frameworks and arch when checking for updates

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1407
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2089/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/359
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2540
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2540/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20054

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2089/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1407
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2090/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/360
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2553
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2553/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20065

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2090/rebuild

review: Needs Fixing (continuous-integration)

[Manuel de la Peña (mandel)]

Comments are inline.

review: Needs Fixing

[lp:~ken-vandine/ubuntu-system-settings/click_framework_check]

1408. By Ken VanDine on 2015-04-30

cleaned up based on review feedback

[Manuel de la Peña (mandel)]

Comments are inline.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1407
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2091/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2567
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2565
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2565/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20083

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2091/rebuild

review: Approve (continuous-integration)

[lp:~ken-vandine/ubuntu-system-settings/click_framework_check]

1409. By Ken VanDine on 2015-04-30

Refactored network test to not require ubuntu-sdk-libs

=== modified file 'debian/control'
--- debian/control	2015-04-07 10:46:52 +0000
+++ debian/control	2015-04-30 19:36:05 +0000
@@ -43,7 +43,7 @@
                python3-gi,
                python3-dbus,
                python3-xdg,
-               gir1.2-glib-2.0
+               gir1.2-glib-2.0,
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/ubuntu-system-settings
 # If you aren't a member of ~system-settings-touch but need to upload packaging

=== modified file 'plugins/system-update/network/network.cpp'
--- plugins/system-update/network/network.cpp	2014-09-30 14:40:53 +0000
+++ plugins/system-update/network/network.cpp	2015-04-30 19:36:05 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "network.h"
+#include <sstream>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -25,9 +26,13 @@
 #include <QUrl>
 #include <QProcessEnvironment>
 
-#define URL_APPS "https://myapps.developer.ubuntu.com/dev/api/click-metadata/"
-
-#define APPS_DATA "APPS_DATA"
+namespace {
+    const QString URL_APPS = "https://search.apps.ubuntu.com/api/v1/click-metadata";
+    const QString APPS_DATA = "APPS_DATA";
+    constexpr static const char* FRAMEWORKS_FOLDER {"/usr/share/click/frameworks/"};
+    constexpr static const char* FRAMEWORKS_PATTERN {"*.framework"};
+    constexpr static const int FRAMEWORKS_EXTENSION_LENGTH = 10; // strlen(".framework")
+}
 
 namespace UpdatePlugin {
 
@@ -39,10 +44,55 @@
                      this, SLOT(onReply(QNetworkReply*)));
 }
 
+std::string Network::getArchitecture()
+{
+    static const std::string deb_arch {architectureFromDpkg()};
+    return deb_arch;
+}
+
+std::vector<std::string> Network::getAvailableFrameworks()
+{
+    std::vector<std::string> result;
+    for (auto f: listFolder(getFrameworksDir().toStdString(), FRAMEWORKS_PATTERN)) {
+        result.push_back(f.substr(0, f.size()-FRAMEWORKS_EXTENSION_LENGTH));
+    }
+    return result;
+}
+
+std::string Network::architectureFromDpkg()
+{
+    QString program("dpkg");
+    QStringList arguments;
+    arguments << "--print-architecture";
+    QProcess archDetector;
+    archDetector.start(program, arguments);
+    if(!archDetector.waitForFinished()) {
+        qWarning() << "Architecture detection failed.";
+    }
+    auto output = archDetector.readAllStandardOutput();
+    auto ostr = QString::fromUtf8(output);
+
+    return ostr.trimmed().toStdString();
+}
+
+std::vector<std::string> Network::listFolder(const std::string& folder, const std::string& pattern)
+{
+    std::vector<std::string> result;
+
+    QDir dir(QString::fromStdString(folder), QString::fromStdString(pattern),
+                                    QDir::Unsorted, QDir::Readable | QDir::Files);
+    QStringList entries = dir.entryList();
+    for (int i = 0; i < entries.size(); ++i) {
+        QString filename = entries.at(i);
+        result.push_back(filename.toStdString());
+    }
+
+    return result;
+}
+
 void Network::checkForNewVersions(QHash<QString, Update*> &apps)
 {
     m_apps = apps;
-
     QJsonObject serializer;
     QJsonArray array;
     foreach(QString id, m_apps.keys()) {
@@ -50,13 +100,18 @@
     }
 
     serializer.insert("name", array);
+    std::stringstream frameworks;
+    for (auto f: getAvailableFrameworks()) {
+        frameworks << "," << f;
+    }
     QJsonDocument doc(serializer);
-
     QByteArray content = doc.toJson();
 
     QString urlApps = getUrlApps();
     QNetworkRequest request;
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    request.setRawHeader(QByteArray("X-Ubuntu-Frameworks"), QByteArray::fromStdString(frameworks.str()));
+    request.setRawHeader(QByteArray("X-Ubuntu-Architecture"), QByteArray::fromStdString(getArchitecture()));
     request.setUrl(QUrl(urlApps));
     RequestObject* reqObject = new RequestObject(QString(APPS_DATA));
     request.setOriginatingObject(reqObject);
@@ -70,6 +125,13 @@
     return command;
 }
 
+QString Network::getFrameworksDir()
+{
+    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
+    QString command = environment.value("FRAMEWORKS_FOLDER", QString(FRAMEWORKS_FOLDER));
+    return command;
+}
+
 void Network::onReply(QNetworkReply *reply)
 {
     if (reply->error() == QNetworkReply::NoError) {

=== modified file 'plugins/system-update/network/network.h'
--- plugins/system-update/network/network.h	2014-10-07 17:50:03 +0000
+++ plugins/system-update/network/network.h	2015-04-30 19:36:05 +0000
@@ -51,6 +51,8 @@
     void checkForNewVersions(QHash<QString, Update*> &apps);
     void getClickToken(Update *app, const QString &url,
                        const QString &authHeader);
+    virtual std::vector<std::string> getAvailableFrameworks();
+    virtual std::string getArchitecture();
 
 Q_SIGNALS:
     void updatesFound();
@@ -68,6 +70,12 @@
     QHash<QString, Update*> m_apps;
 
     QString getUrlApps();
+    QString getFrameworksDir();
+
+protected:
+    virtual std::string architectureFromDpkg();
+    virtual std::vector<std::string> listFolder(const std::string &folder, const std::string &pattern);
+
 };
 
 }

=== modified file 'tests/plugins/system-update/CMakeLists.txt'
--- tests/plugins/system-update/CMakeLists.txt	2014-10-23 13:27:05 +0000
+++ tests/plugins/system-update/CMakeLists.txt	2015-04-30 19:36:05 +0000
@@ -25,6 +25,12 @@
     ../../../plugins/system-update/update.cpp
 )
 
+add_executable(tst-network
+    tst_network.cpp
+    ../../../plugins/system-update/update.cpp
+    ../../../plugins/system-update/network/network.cpp
+)
+
 # set the path to the library folder
 include_directories(/usr/include/apt-pkg/)
 
@@ -36,7 +42,18 @@
 target_link_libraries(tst-update apt-pkg update-plugin)
 add_test(NAME tst-update COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-update)
 
+qt5_use_modules(tst-network Qml Quick Core DBus Xml Network Test)
+target_link_libraries(tst-network apt-pkg update-plugin)
+add_test(NAME tst-network COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-network)
+set_tests_properties(tst-network
+    PROPERTIES ENVIRONMENT "FRAMEWORKS_FOLDER=${CMAKE_CURRENT_BINARY_DIR}")
+
 add_custom_command(
     TARGET tst-update-manager
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/click.result ${CMAKE_CURRENT_BINARY_DIR}/click.result
 )
+
+add_custom_command(
+    TARGET tst-network
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/ubuntu-sdk-15.04.framework ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-sdk-15.04.framework
+)

=== added file 'tests/plugins/system-update/tst_network.cpp'
--- tests/plugins/system-update/tst_network.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/system-update/tst_network.cpp	2015-04-30 19:36:05 +0000
@@ -0,0 +1,58 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 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/>.
+ */
+
+#include <QDebug>
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include <QObject>
+#include <QTest>
+#include <QString>
+#include "network/network.h"
+#include "update.h"
+
+using namespace UpdatePlugin;
+
+class NetworkTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    NetworkTest() {};
+
+private Q_SLOTS:
+    void testArch();
+    void testFrameworks();
+
+};
+
+void NetworkTest::testFrameworks()
+{
+    Network net;
+    auto frameworks = net.getAvailableFrameworks();
+    QCOMPARE(frameworks.empty(), false);
+}
+
+void NetworkTest::testArch()
+{
+    Network net;
+    auto arch = net.getArchitecture();
+    QCOMPARE(arch.empty(), false);
+}
+
+QTEST_MAIN(NetworkTest)
+#include "tst_network.moc"

=== added file 'tests/plugins/system-update/ubuntu-sdk-15.04.framework'
--- tests/plugins/system-update/ubuntu-sdk-15.04.framework	1970-01-01 00:00:00 +0000
+++ tests/plugins/system-update/ubuntu-sdk-15.04.framework	2015-04-30 19:36:05 +0000
@@ -0,0 +1,2 @@
+Base-Name: ubuntu-sdk
+Base-Version: 15.04