Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/chroot-agent-cli into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

Add cli interface to the chroot agent

Add cli interface to the chroot agent

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/487/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/487/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

Brilliant

review: Approve

=== modified file 'chroot-agent/chroot-agent.pro'
--- chroot-agent/chroot-agent.pro	2015-01-08 13:08:17 +0000
+++ chroot-agent/chroot-agent.pro	2015-01-08 13:08:17 +0000
@@ -13,7 +13,7 @@
 CONFIG   -= app_bundle
 
 QMAKE_CXXFLAGS += -Werror
-CONFIG += c++11 dbusadaptors
+CONFIG += c++11 dbusadaptors dbusinterfaces
 
 TEMPLATE = app
 
@@ -31,6 +31,7 @@
 QMAKE_EXTRA_TARGETS+=xml_desc
 
 DBUS_ADAPTORS += $$xml_desc.target
+DBUS_INTERFACES += $$xml_desc.target
 
 target.path=/bin
 INSTALLS+=target

=== modified file 'chroot-agent/chrootagent.cpp'
--- chroot-agent/chrootagent.cpp	2015-01-08 13:08:17 +0000
+++ chroot-agent/chrootagent.cpp	2015-01-08 13:08:17 +0000
@@ -130,6 +130,23 @@
     return s;
 }
 
+QStringList ChrootAgent::sessionInfo() const
+{
+    QStringList info;
+    for(auto i = m_knownChroots.constBegin(); i != m_knownChroots.constEnd(); i++) {
+        const Chroot &chroot = i.value();
+        if(chroot.session.isEmpty())
+            continue;
+
+        QString desc = QString(QStringLiteral("Architecture: %1, Framework: %2, Session: %3"))
+                .arg(chroot.architecture)
+                .arg(chroot.framework)
+                .arg(chroot.session);
+        info.append(desc);
+    }
+    return info;
+}
+
 void ChrootAgent::shutdown()
 {
     foreach(const QString &key, m_knownChroots.keys())

=== modified file 'chroot-agent/chrootagent.h'
--- chroot-agent/chrootagent.h	2015-01-08 13:08:17 +0000
+++ chroot-agent/chrootagent.h	2015-01-08 13:08:17 +0000
@@ -5,6 +5,7 @@
 
 #include <QObject>
 #include <QStringList>
+#include <QVariantMap>
 
 class QFileSystemWatcher;
 
@@ -33,6 +34,8 @@
     QString spawnSession   (const QString &framework, const QString &architecture);
     bool releaseSession (const QString &framework, const QString &architecture);
 
+    QStringList sessionInfo () const;
+
     Q_NOREPLY void shutdown ();
     void hangup   ();
 

=== modified file 'chroot-agent/main.cpp'
--- chroot-agent/main.cpp	2015-01-08 13:08:17 +0000
+++ chroot-agent/main.cpp	2015-01-08 13:08:17 +0000
@@ -8,6 +8,8 @@
 #include <signal.h>
 #include <unistd.h>
 #include <pwd.h>
+#include <stdlib.h>
+#include <getopt.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -21,6 +23,14 @@
 #include <QStandardPaths>
 
 #include "chrootagent.h"
+#include "clickchrootagent_interface.h"
+
+int  cliMode (int argc, char *argv[]);
+int  serviceMode (int argc, char *argv[]);
+void log_message (const char *message, int logType = LOG_INFO);
+void signal_handler(int sig);
+void daemonize();
+void useage ();
 
 void syslogMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
@@ -48,7 +58,7 @@
     if(do_abort) abort();
 }
 
-void log_message (const char *message, int logType = LOG_INFO)
+void log_message (const char *message, int logType)
 {
     openlog ("click-chroot-agent", LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
     syslog (logType,  message,0);
@@ -107,7 +117,7 @@
     }
 
     if (lockf(lfp,F_TLOCK,0)<0) {
-        log_message("Can not lock lockfile");
+        log_message("Can not lock lockfile, click-chroot-agent is probably already running.");
         exit(2); /* can not lock, server already running */
     }
 
@@ -122,10 +132,100 @@
     signal(SIGTTIN,SIG_IGN);
 }
 
-int main(int argc, char *argv[])
-{
-    daemonize();
-
+void useage ()
+{
+    puts("Usage: click-chroot-agent [OPTION]");
+    puts("-s, --stop    Stops the currently running instance of the click-chroot-agent");
+    puts("-r, --reload  Recreates sessions for all exising chroots");
+    puts("-i, --info    Shows currently mounted sessions");
+    puts("-h, --help    Shows this text");
+}
+
+/*!
+ * \brief cliMode
+ * Runs the command in CLI mode to allow a more convenient use
+ */
+int cliMode (int argc, char *argv[])
+{
+    if(argc > 2) {
+        puts("Too many arguments.");
+
+        useage();
+        return 0;
+    }
+
+    QCoreApplication a(argc, argv);
+    Q_UNUSED(a);
+
+    static struct option long_options[] = {
+        {"stop",    no_argument,       0, 's'},
+        {"reload",  no_argument,       0, 'r'},
+        {"info",    no_argument,       0, 'i'},
+        {"help",    no_argument,       0, 'h'},
+        {0, 0, 0, 0}
+    };
+
+    ComUbuntuSdkClickChrootAgentInterface clickAgent(QStringLiteral("com.ubuntu.sdk.ClickChrootAgent"),
+                                                     QStringLiteral("/com/ubuntu/sdk/ClickChrootAgent"),
+                                                     QDBusConnection::sessionBus());
+    if(!clickAgent.isValid()) {
+        puts("Could not connect to click-chroot-agent service");
+        return 1;
+    }
+
+    bool cont = true;
+    while(cont) {
+        int option_index = 0;
+        int c = getopt_long (argc, argv, "srih",long_options, &option_index);
+
+        if (c == -1)
+            break;
+
+        switch(c) {
+            case 's': {
+                clickAgent.shutdown();
+                cont = false;
+                break;
+            }
+            case 'r': {
+                QDBusPendingReply<void> ret = clickAgent.hangup();
+                if(ret.isError())
+                    puts(qPrintable(ret.error().message()));
+                else
+                    ret.waitForFinished();
+                cont = false;
+                break;
+            }
+            case 'i': {
+                QDBusPendingReply<QStringList> ret = clickAgent.sessionInfo();
+                if(ret.isError()) {
+                    puts(qPrintable(ret.error().message()));
+                } else {
+                    ret.waitForFinished();
+                    foreach(const QString &desc, ret.value()) {
+                        puts(qPrintable(desc));
+                    }
+                }
+                cont = false;
+                break;
+            }
+            case 'h':
+            case '?': {
+                cont = false;
+                useage();
+                break;
+            }
+        }
+    }
+    return 0;
+}
+
+/*!
+ * \brief serviceMode
+ * starts the click-chroot-agents service and returns only if its shut down
+ */
+int serviceMode (int argc, char *argv[])
+{
     qInstallMessageHandler(syslogMessageHandler);
     QCoreApplication a(argc, argv);
 
@@ -157,3 +257,12 @@
 
     return a.exec();
 }
+
+int main(int argc, char *argv[])
+{
+    if(argc > 1)
+        return cliMode(argc,argv);
+
+    daemonize();
+    return serviceMode(argc,argv);
+}