Merge lp:~mhr3/unity8/extend-scope-tool into lp:unity8

[Michal Hruby]

Change and extend the way non-installed scopes are started with the scope-tool.

Change and extend the way non-installed scopes are started with the scope-tool.

Note that this requires Qt5.2.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:703
http://jenkins.qa.ubuntu.com/job/unity8-ci/2458/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3756/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3344/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1328/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/979/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/983/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/979/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3763/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3346/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2458/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mhr3/unity8/extend-scope-tool]

759. By PS Jenkins bot on 2014-03-14

Resync trunk

760. By Michal Hruby on 2014-03-14

Change and extend the way non-installed scopes are started with the scope-tool

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:703
http://jenkins.qa.ubuntu.com/job/unity8-ci/2501/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3933/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3518/console
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1371/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1022/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1026/console
    None: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1022/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3966/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3520/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2501/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'tools/registry-tracker.cpp'
--- tools/registry-tracker.cpp	2013-12-20 15:27:59 +0000
+++ tools/registry-tracker.cpp	2014-03-14 17:18:47 +0000
@@ -25,8 +25,10 @@
 #include "registry-tracker.h"
 
 
-RegistryTracker::RegistryTracker(QString const& scope_dir):
-    m_scopeDir(scope_dir),
+RegistryTracker::RegistryTracker(QStringList const& scopes, bool systemScopes, bool serverScopes):
+    m_scopes(scopes),
+    m_systemScopes(systemScopes),
+    m_serverScopes(serverScopes),
     m_registry(nullptr),
     m_endpoints_dir(QDir::temp().filePath("scope-dev-endpoints.XXXXXX"))
 {
@@ -56,7 +58,8 @@
 "Zmq.EndpointDir = %2\n" \
 "Zmq.ConfigFile = %3\n" \
 "Scope.InstallDir = %4\n" \
-"Scoperunner.Path = %5\n"
+"Scoperunner.Path = %5\n" \
+"%6"
 
 #define MW_CONFIG \
 "[Zmq]\n" \
@@ -95,7 +98,17 @@
     QString scopeRunnerPath = QDir(scopesLibdir).filePath("scoperunner/scoperunner");
 
     QString runtime_ini = QString(RUNTIME_CONFIG).arg(m_registry_config.fileName()).arg(m_mw_config.fileName());
-    QString registry_ini = QString(REGISTRY_CONFIG).arg(m_endpoints_dir.path()).arg(m_endpoints_dir.path()).arg(m_mw_config.fileName()).arg(m_scopeDir).arg(scopeRunnerPath);
+    // FIXME: keep in sync with the SSRegistry config
+    QString serverRegistryConfig(m_serverScopes ? "SS.Registry.Identity = SSRegistry\nSS.Registry.Endpoint = ipc:///tmp/SSRegistry" : "");
+    QString scopeInstallDir(scopesLibdir + "/unity-scopes");
+    if (!m_systemScopes) {
+        m_scopeInstallDir.reset(new QTemporaryDir(tmp.filePath("scopes.XXXXXX")));
+        if (!m_scopeInstallDir->isValid()) {
+            qWarning("Unable to create temporary scopes directory!");
+        }
+        scopeInstallDir = m_scopeInstallDir->path();
+    }
+    QString registry_ini = QString(REGISTRY_CONFIG).arg(m_endpoints_dir.path()).arg(m_endpoints_dir.path()).arg(m_mw_config.fileName()).arg(scopeInstallDir).arg(scopeRunnerPath).arg(serverRegistryConfig);
     QString mw_ini = QString(MW_CONFIG).arg(m_endpoints_dir.path()).arg(m_endpoints_dir.path());
 
     m_runtime_config.write(runtime_ini.toUtf8());
@@ -111,6 +124,7 @@
     QString registryBin(QDir(scopesLibdir).filePath("scoperegistry/scoperegistry"));
     QStringList arguments;
     arguments << m_runtime_config.fileName();
+    arguments << m_scopes;
 
     m_registry.start(registryBin, arguments);
 }

=== modified file 'tools/registry-tracker.h'
--- tools/registry-tracker.h	2013-12-20 15:27:59 +0000
+++ tools/registry-tracker.h	2014-03-14 17:18:47 +0000
@@ -22,12 +22,14 @@
 #include <QTemporaryFile>
 #include <QTemporaryDir>
 #include <QDebug>
+#include <QStringList>
+#include <QScopedPointer>
 
 
 class RegistryTracker
 {
 public:
-    RegistryTracker(QString const&);
+    RegistryTracker(QStringList const&, bool, bool);
     ~RegistryTracker();
 
     QProcess* registry() const;
@@ -35,10 +37,13 @@
 private:
     void runRegistry();
 
-    QString m_scopeDir;
+    QStringList m_scopes;
+    bool m_systemScopes;
+    bool m_serverScopes;
     QProcess m_registry;
     QTemporaryDir m_endpoints_dir;
     QTemporaryFile m_runtime_config;
     QTemporaryFile m_registry_config;
     QTemporaryFile m_mw_config;
+    QScopedPointer<QTemporaryDir> m_scopeInstallDir;
 };

=== modified file 'tools/scopetool.cpp'
--- tools/scopetool.cpp	2014-01-03 10:26:36 +0000
+++ tools/scopetool.cpp	2014-03-14 17:18:47 +0000
@@ -24,6 +24,8 @@
 #include <QtQml/QQmlContext>
 #include <QScopedPointer>
 #include <QDebug>
+#include <QCommandLineParser>
+#include <QCommandLineOption>
 #include <libintl.h>
 
 
@@ -46,16 +48,33 @@
     QGuiApplication *application;
     application = new QGuiApplication(argc, argv);
 
-    QStringList arguments = application->arguments();
-    QString scopesDir;
-    if (arguments.contains("--scope-dir")) {
-        int idx = arguments.indexOf("--scope-dir");
-        scopesDir = arguments[idx+1];
-    }
+    QCommandLineParser parser;
+    parser.setApplicationDescription("Unity Scope Tool\n\n"
+    "This tool allows development and testing of scopes. Running it without\n"
+    "any arguments will open a session to all scopes available on the system.\n"
+    "Otherwise passing a path to a scope config file will open a session with\n"
+    "only that scope (assuming that the binary implementing the scope can be\n"
+    "found in the same directory as the config file).");
+    parser.addHelpOption();
+    parser.addPositionalArgument("scopes", "Paths to scope config files to spawn, optionally.", "[scopes...]");
+
+    QCommandLineOption includeSystemScopes("include-system-scopes",
+        "Initialize the registry with scopes installed on this system");
+    QCommandLineOption includeServerScopes("include-server-scopes",
+        "Initialize the registry with scopes on the default server");
+
+    parser.addOption(includeServerScopes);
+    parser.addOption(includeSystemScopes);
+
+    parser.process(*application);
+
+    QStringList extraScopes = parser.positionalArguments();
 
     QScopedPointer<RegistryTracker> tracker;
-    if (!scopesDir.isEmpty()) {
-        tracker.reset(new RegistryTracker(scopesDir));
+    if (!extraScopes.isEmpty()) {
+        bool systemScopes = parser.isSet(includeSystemScopes);
+        bool serverScopes = parser.isSet(includeServerScopes);
+        tracker.reset(new RegistryTracker(extraScopes, systemScopes, serverScopes));
     }
 
     resolveIconTheme();