Merge lp:~pete-woods/qtcreator-plugin-ubuntu/new-scope-template into lp:qtcreator-plugin-ubuntu

[Pete Woods]

New scope template that talks to openweather API

New scope template that talks to openweather API

[lp:~pete-woods/qtcreator-plugin-ubuntu/new-scope-template]

253. By Pete Woods on 2014-09-03

Process-cpp is used only for testing

254. By Pete Woods on 2014-09-03

Update images

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/406/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/174

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/407/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/175

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

review: Approve (continuous-integration)

[lp:~pete-woods/qtcreator-plugin-ubuntu/new-scope-template]

255. By Pete Woods on 2014-09-03

Add documentation to the examples

256. By Pete Woods on 2014-09-03

Document the CMakeLists.txt code

257. By Pete Woods on 2014-09-03

It's a png

258. By Pete Woods on 2014-09-03

Typo

259. By Pete Woods on 2014-09-03

The scope is your own :)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:256
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/408/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/176

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:259
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/177

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

review: Approve (continuous-integration)

[Benjamin Zeller (zeller-benjamin)]

Ok

review: Approve

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2014-08-18 15:29:28 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2014-09-03 15:09:42 +0000
@@ -1,23 +1,69 @@
 project(%ProjectName:l% CXX)
 cmake_minimum_required(VERSION 2.8.10)
-set(SCOPE_NAME %ClickHookName:l%)
-set(SCOPE_LIB_TARGET_NAME %ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pedantic -Wall -Wextra")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+
+# We require g++ 4.9, to avoid ABI breakage with earlier version.
+set(cxx_version_required 4.9)
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if (NOT CMAKE_CXX_COMPILER_VERSION MATCHES "^${cxx_version_required}")
+        message(FATAL_ERROR "g++ version must be ${cxx_version_required}!")
+    endif()
+endif()
+
+# Set strict and naggy C++ compiler flags, and enable C++11
+add_definitions(
+  -fno-permissive
+  -std=c++11
+  -pedantic
+  -Wall
+  -Wextra
+  -fPIC
+)
+
+include(GNUInstallDirs)
+find_package(PkgConfig)
+
+# We depend on Boost for string trimming
+find_package(
+  Boost
+  REQUIRED
+)
+
+# Search for our dependencies
+pkg_check_modules(
+  SCOPE
+  libunity-scopes>=0.6.0
+  jsoncpp
+  net-cpp>=1.1.0
+  REQUIRED
+)
+
+# Add our dependencies to the include paths
+include_directories(
+  "${CMAKE_SOURCE_DIR}/include"
+  ${Boost_INCLUDE_DIRS}
+  ${SCOPE_INCLUDE_DIRS}
+)
+
 set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")
-
-set(INI_INSTALLDIR "/${SCOPE_NAME}")
-set(SCOPE_INSTALLDIR "/${SCOPE_NAME}")
-
-include(FindPkgConfig)
-pkg_check_modules(UNITY_SCOPES libunity-scopes>=0.5.0 REQUIRED)
-
+set(SCOPE_INSTALL_DIR "/%ClickHookName:l%")
+
+# If we need to refer to the scope's name or package in code, these definitions will help
+add_definitions(-DPACKAGE_NAME="%ClickDomain:l%.%ProjectName:l%")
+add_definitions(-DSCOPE_NAME="%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%")
+
+# Install the click manifest
+install(FILES manifest.json DESTINATION "/")
+install(FILES "%ClickHookName:l%.apparmor" DESTINATION "/")
+
+# Add our main directories
 add_subdirectory(src)
 add_subdirectory(data)
+
+# Set up the tests
 enable_testing()
-add_subdirectory(test)
-
-install(FILES manifest.json DESTINATION "/")
-install(FILES "%ClickHookName:l%.apparmor" DESTINATION "/")
-
-add_custom_target("%ProjectName:l%_ClickFiles" ALL SOURCES "%ClickHookName:l%.apparmor" "manifest.json")
+add_subdirectory(tests)
+add_custom_target(
+  check
+  ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
+)

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/cmake'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindGMock.cmake'
--- share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindGMock.cmake	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindGMock.cmake	2014-09-03 15:09:42 +0000
@@ -0,0 +1,12 @@
+# Build with system gmock and embedded gtest
+set (GMOCK_INCLUDE_DIRS "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
+set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
+set (GTEST_INCLUDE_DIRS "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
+
+add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+
+set(GTEST_LIBRARIES gtest)
+set(GTEST_MAIN_LIBRARIES gtest_main)
+set(GMOCK_LIBRARIES gmock gmock_main)
+
+set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/data/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/data/CMakeLists.txt	2014-08-04 07:25:56 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/data/CMakeLists.txt	2014-09-03 15:09:42 +0000
@@ -1,11 +1,16 @@
-# Put the ini file in the build directory next to the scope
-# .so file so test tools can find both easily.
-configure_file(
-  "%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini.in"
-  "${CMAKE_BINARY_DIR}/src/%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini"
+
+# Install the scope ini file
+install(
+  FILES "%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini"
+  DESTINATION ${SCOPE_INSTALL_DIR}
 )
 
-INSTALL(
-  FILES "${CMAKE_BINARY_DIR}/src/%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini"
-  DESTINATION "${INI_INSTALLDIR}"
+# Install the scope images
+install(
+  FILES
+    "icon.png"
+    "logo.png"
+    "screenshot.png"
+  DESTINATION
+    "${SCOPE_INSTALL_DIR}"
 )

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/data/displayName.ini'
--- share/qtcreator/templates/wizards/ubuntu/scope/data/displayName.ini	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/data/displayName.ini	2014-09-03 15:09:42 +0000
@@ -0,0 +1,9 @@
+[ScopeConfig]
+DisplayName = %ProjectName:c% Scope
+Description = This is a %ProjectName:c% scope
+Art = screenshot.png
+Author = Firstname Lastname
+Icon = icon.png
+
+[Appearance]
+PageHeader.Logo = logo.png

=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/data/displayName.ini.in'
--- share/qtcreator/templates/wizards/ubuntu/scope/data/displayName.ini.in	2014-08-04 08:14:53 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/data/displayName.ini.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[ScopeConfig]
-DisplayName = %ProjectName:c% Scope
-Description = This is a %ProjectName:c% scope
-Author = Firstname Lastname
-Art = %ProjectName:l%.Art
-Icon = %ProjectName:l%.Icon
-SearchHint = %ProjectName:l%.SearchHint
-HotKey = %ProjectName:l%.HotKey

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/data/icon.png'
Binary files share/qtcreator/templates/wizards/ubuntu/scope/data/icon.png	1970-01-01 00:00:00 +0000 and share/qtcreator/templates/wizards/ubuntu/scope/data/icon.png	2014-09-03 15:09:42 +0000 differ
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/data/logo.png'
Binary files share/qtcreator/templates/wizards/ubuntu/scope/data/logo.png	1970-01-01 00:00:00 +0000 and share/qtcreator/templates/wizards/ubuntu/scope/data/logo.png	2014-09-03 15:09:42 +0000 differ
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/data/screenshot.png'
Binary files share/qtcreator/templates/wizards/ubuntu/scope/data/screenshot.png	1970-01-01 00:00:00 +0000 and share/qtcreator/templates/wizards/ubuntu/scope/data/screenshot.png	2014-09-03 15:09:42 +0000 differ
=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/include'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/include/api'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/include/api/client.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/api/client.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/include/api/client.h	2014-09-03 15:09:42 +0000
@@ -0,0 +1,121 @@
+#ifndef API_CLIENT_H_
+#define API_CLIENT_H_
+
+#include <api/config.h>
+
+#include <atomic>
+#include <deque>
+#include <map>
+#include <string>
+#include <core/net/http/request.h>
+#include <core/net/uri.h>
+
+namespace Json {
+class Value;
+}
+
+namespace api {
+
+/**
+ * Provide a nice way to access the HTTP API.
+ *
+ * We don't want our scope's code to be mixed together with HTTP and JSON handling.
+ */
+class Client {
+public:
+    /**
+     * Information about a City
+     */
+    struct City {
+        unsigned int id;
+        std::string name;
+        std::string country;
+    };
+
+    /**
+     * Temperature information for a day.
+     */
+    struct Temp {
+        double max;
+        double min;
+        double cur;
+    };
+
+    /**
+     * Weather information for a day.
+     */
+    struct Weather {
+        unsigned int id;
+        std::string main;
+        std::string description;
+        std::string icon;
+        Temp temp;
+    };
+
+    /**
+     * A list of weather information
+     */
+    typedef std::deque<Weather> WeatherList;
+
+    /**
+     * Weather information about the current day
+     */
+    struct Current {
+        City city;
+        Weather weather;
+    };
+
+    /**
+     * Forecast information about a city
+     */
+    struct Forecast {
+        City city;
+        WeatherList weather;
+    };
+
+    Client(Config::Ptr config);
+
+    virtual ~Client() = default;
+
+    /**
+     * Get the current weather for the specified location
+     */
+    virtual Current weather(const std::string &query);
+
+    /**
+     * Get the weather forecast for the specified location and duration
+     */
+    virtual Forecast forecast_daily(const std::string &query, unsigned int days = 7);
+
+    /**
+     * Cancel any pending queries (this method can be called from a different thread)
+     */
+    virtual void cancel();
+
+    virtual Config::Ptr config();
+
+protected:
+    void get(const core::net::Uri::Path &path,
+            const core::net::Uri::QueryParameters &parameters,
+            Json::Value &root);
+
+    /**
+     * Progress callback that allows the query to cancel pending HTTP requests.
+     */
+    core::net::http::Request::Progress::Next progress_report(
+            const core::net::http::Request::Progress& progress);
+
+    /**
+     * Hang onto the configuration information
+     */
+    Config::Ptr config_;
+
+    /**
+     * Thread-safe cancelled flag
+     */
+    std::atomic<bool> cancelled_;
+};
+
+}
+
+#endif // API_CLIENT_H_

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/include/api/config.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/api/config.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/include/api/config.h	2014-09-03 15:09:42 +0000
@@ -0,0 +1,25 @@
+#ifndef API_CONFIG_H_
+#define API_CONFIG_H_
+
+#include <memory>
+#include <string>
+
+namespace api {
+
+struct Config {
+    typedef std::shared_ptr<Config> Ptr;
+
+    /*
+     * The root of all API request URLs
+     */
+    std::string apiroot { "http://api.openweathermap.org" };
+
+    /*
+     * The custom HTTP user agent string for this library
+     */
+    std::string user_agent { "example-network-scope 0.1; (foo)" };
+};
+
+}
+
+#endif /* API_CONFIG_H_ */

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope/preview.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/scope/preview.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/include/scope/preview.h	2014-09-03 15:09:42 +0000
@@ -0,0 +1,37 @@
+#ifndef SCOPE_PREVIEW_H_
+#define SCOPE_PREVIEW_H_
+
+#include <unity/scopes/PreviewQueryBase.h>
+
+namespace unity {
+namespace scopes {
+class Result;
+}
+}
+
+namespace scope {
+
+/**
+ * Represents an individual preview request.
+ *
+ * Each time a result is previewed in the UI a new Preview
+ * object is created.
+ */
+class Preview: public unity::scopes::PreviewQueryBase {
+public:
+    Preview(const unity::scopes::Result &result,
+            const unity::scopes::ActionMetadata &metadata);
+
+    ~Preview() = default;
+
+    void cancelled() override;
+
+    /**
+     * Populates the reply object with preview information.
+     */
+    void run(unity::scopes::PreviewReplyProxy const& reply) override;
+};
+
+}
+
+#endif // SCOPE_PREVIEW_H_

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope/query.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/scope/query.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/include/scope/query.h	2014-09-03 15:09:42 +0000
@@ -0,0 +1,36 @@
+#ifndef SCOPE_QUERY_H_
+#define SCOPE_QUERY_H_
+
+#include <api/client.h>
+
+#include <unity/scopes/SearchQueryBase.h>
+#include <unity/scopes/ReplyProxyFwd.h>
+
+namespace scope {
+
+/**
+ * Represents an individual query.
+ *
+ * A new Query object will be constructed for each query. It is
+ * given query information, metadata about the search, and
+ * some scope-specific configuration.
+ */
+class Query: public unity::scopes::SearchQueryBase {
+public:
+    Query(const unity::scopes::CannedQuery &query,
+            const unity::scopes::SearchMetadata &metadata, api::Config::Ptr config);
+
+    ~Query() = default;
+
+    void cancelled() override;
+
+    void run(const unity::scopes::SearchReplyProxy &reply) override;
+
+private:
+    api::Client client_;
+};
+
+}
+
+#endif // SCOPE_QUERY_H_
+

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope/scope.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/scope/scope.h	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/include/scope/scope.h	2014-09-03 15:09:42 +0000
@@ -0,0 +1,53 @@
+#ifndef SCOPE_SCOPE_H_
+#define SCOPE_SCOPE_H_
+
+#include <api/config.h>
+
+#include <unity/scopes/ScopeBase.h>
+#include <unity/scopes/QueryBase.h>
+#include <unity/scopes/ReplyProxyFwd.h>
+#include <unity/scopes/QueryBase.h>
+#include <unity/scopes/PreviewQueryBase.h>
+
+namespace scope {
+
+/**
+ * Defines the lifecycle of scope plugin, and acts as a factory
+ * for Query and Preview objects.
+ *
+ * Note that the #preview and #search methods are each called on
+ * different threads, so some form of interlocking is required
+ * if shared data structures are used.
+ */
+class Scope: public unity::scopes::ScopeBase {
+public:
+    /**
+     * Called once at startup
+     */
+    void start(std::string const&) override;
+
+    /**
+     * Called at shutdown
+     */
+    void stop() override;
+
+    /**
+     * Called each time a new preview is requested
+     */
+    unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&,
+            const unity::scopes::ActionMetadata&) override;
+
+    /**
+     * Called each time a new query is requested
+     */
+    unity::scopes::SearchQueryBase::UPtr search(
+            unity::scopes::CannedQuery const& q,
+            unity::scopes::SearchMetadata const&) override;
+
+protected:
+    api::Config::Ptr config_;
+};
+
+}
+
+#endif // SCOPE_SCOPE_H_

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/src/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/CMakeLists.txt	2014-07-01 10:09:49 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/CMakeLists.txt	2014-09-03 15:09:42 +0000
@@ -1,12 +1,51 @@
-add_library(
-  ${SCOPE_LIB_TARGET_NAME} SHARED
-  %ClickHookName:l%-preview.cpp
-  %ClickHookName:l%-query.cpp
-  %ClickHookName:l%-scope.cpp
-)
-target_link_libraries(${SCOPE_LIB_TARGET_NAME} ${UNITY_SCOPES_LDFLAGS})
-set_property(TARGET ${SCOPE_LIB_TARGET_NAME} PROPERTY COMPILE_FLAGS ${UNITY_SCOPES_CFLAGS})
-
-install(TARGETS ${SCOPE_LIB_TARGET_NAME}
-LIBRARY DESTINATION "${SCOPE_INSTALLDIR}"
+
+# Put the ini file in the build directory next to the scope
+# .so file so test tools can find both easily.
+configure_file(
+  "${CMAKE_SOURCE_DIR}/data/%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini"
+  "${CMAKE_CURRENT_BINARY_DIR}/%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini"
+  @ONLY
+)
+
+# Build an object library for the scope code
+add_library(
+  scope-static OBJECT
+  api/client.cpp
+  scope/preview.cpp
+  scope/query.cpp
+  scope/scope.cpp
+)
+
+# Ensure we export all the symbols
+set_target_properties(
+  scope-static
+  PROPERTIES
+    LINK_FLAGS "-Wl,--export-all-symbols"
+)
+
+# Build a shared library containing our scope code.
+# This will be the actual plugin that is loaded.
+add_library(
+  scope SHARED
+  $<TARGET_OBJECTS:scope-static>
+)
+
+# Link against the object library and our external library dependencies
+target_link_libraries(
+  scope
+  ${SCOPE_LDFLAGS}
+  ${Boost_LIBRARIES}
+)
+
+# Set the correct library output name to conform to the securiry policy 
+set_target_properties(
+  scope
+  PROPERTIES
+    OUTPUT_NAME "%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%"
+)
+
+# Install the scope shared library
+install(
+  TARGETS scope
+  LIBRARY DESTINATION ${SCOPE_INSTALL_DIR}
 )

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/src/api'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/src/api/client.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/api/client.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/api/client.cpp	2014-09-03 15:09:42 +0000
@@ -0,0 +1,157 @@
+#include <api/client.h>
+
+#include <core/net/error.h>
+#include <core/net/http/client.h>
+#include <core/net/http/content_type.h>
+#include <core/net/http/response.h>
+#include <json/json.h>
+
+namespace http = core::net::http;
+namespace json = Json;
+namespace net = core::net;
+
+using namespace api;
+using namespace std;
+
+Client::Client(Config::Ptr config) :
+        config_(config), cancelled_(false) {
+}
+
+void Client::get(const net::Uri::Path &path,
+        const net::Uri::QueryParameters &parameters, json::Value &root) {
+    // Create a new HTTP client
+    auto client = http::make_client();
+
+    // Start building the request configuration
+    http::Request::Configuration configuration;
+
+    // Build the URI from its components
+    net::Uri uri = net::make_uri(config_->apiroot, path, parameters);
+    configuration.uri = client->uri_to_string(uri);
+
+    // Give out a user agent string
+    configuration.header.add("User-Agent", config_->user_agent);
+
+    // Build a HTTP request object from our configuration
+    auto request = client->head(configuration);
+
+    try {
+        // Synchronously make the HTTP request
+        // We bind the cancellable callback to #progress_report
+        auto response = request->execute(
+                bind(&Client::progress_report, this, placeholders::_1));
+
+        // Check that we got a sensible HTTP status code
+        if (response.status != http::Status::ok) {
+            throw domain_error(root["error"].asString());
+        }
+
+        // Parse the JSON from the response
+        json::Reader reader;
+        reader.parse(response.body, root);
+
+        // Open weather map API error code can either be a string or int
+        json::Value cod = root["cod"];
+        if ((cod.isString() && cod.asString() != "200")
+                || (cod.isUInt() && cod.asUInt() != 200)) {
+            throw domain_error(root["message"].asString());
+        }
+    } catch (net::Error &) {
+    }
+}
+
+Client::Current Client::weather(const string& query) {
+    json::Value root;
+
+    // Build a URI and get the contents.
+    // The fist parameter forms the path part of the URI.
+    // The second parameter forms the CGI parameters.
+    get( { "data", "2.5", "weather" },
+            { { "q", query }, { "units", "metric" } }, root);
+    // e.g. http://api.openweathermap.org/data/2.5/weather?q=QUERY&units=metric
+
+    Current result;
+
+    // Read out the city we found
+    json::Value sys = root["sys"];
+    result.city.id = sys["id"].asUInt();
+    result.city.name = root["name"].asString();
+    result.city.country = sys["country"].asString();
+
+    // Read the weather
+    json::Value weather = root["weather"].get(json::ArrayIndex(0),
+            json::Value());
+    result.weather.id = weather["id"].asUInt();
+    result.weather.main = weather["main"].asString();
+    result.weather.description = weather["description"].asString();
+    result.weather.icon = "http://openweathermap.org/img/w/"
+            + weather["icon"].asString() + ".png";
+
+    // Read the temps
+    json::Value main = root["main"];
+    result.weather.temp.cur = main["temp"].asDouble();
+    result.weather.temp.max = main["temp_max"].asDouble();
+    result.weather.temp.min = main["temp_min"].asDouble();
+
+    return result;
+}
+
+Client::Forecast Client::forecast_daily(const string& query, unsigned int cnt) {
+    json::Value root;
+
+    // Build a URI and get the contents
+    // The fist parameter forms the path part of the URI.
+    // The second parameter forms the CGI parameters.
+    get( { "data", "2.5", "forecast", "daily" }, { { "q", query }, { "units",
+            "metric" }, { "cnt", to_string(cnt) } }, root);
+    // e.g. http://api.openweathermap.org/data/2.5/forecast/daily/?q=QUERY&units=metric&cnt=7
+
+    Forecast result;
+
+    // Read out the city we found
+    json::Value city = root["city"];
+    result.city.id = city["id"].asUInt();
+    result.city.name = city["name"].asString();
+    result.city.country = city["country"].asString();
+
+    // Iterate through the weather data
+    json::Value list = root["list"];
+    for (json::ArrayIndex index = 0; index < list.size(); ++index) {
+        json::Value item = list.get(index, json::Value());
+
+        // Extract the first weather item
+        json::Value weather_list = item["weather"];
+        json::Value weather = weather_list.get(json::ArrayIndex(0),
+                json::Value());
+
+        // Extract the temperature data
+        json::Value temp = item["temp"];
+
+        // Add a result to the weather list
+        result.weather.emplace_back(
+                Weather { weather["id"].asUInt(), weather["main"].asString(),
+                        weather["description"].asString(),
+                        "http://openweathermap.org/img/w/"
+                                + weather["icon"].asString() + ".png", Temp {
+                                temp["max"].asDouble(), temp["min"].asDouble(),
+                                0.0 } });
+    }
+
+    return result;
+}
+
+http::Request::Progress::Next Client::progress_report(
+        const http::Request::Progress&) {
+
+    return cancelled_ ?
+            http::Request::Progress::Next::abort_operation :
+            http::Request::Progress::Next::continue_operation;
+}
+
+void Client::cancel() {
+    cancelled_ = true;
+}
+
+Config::Ptr Client::config() {
+    return config_;
+}

=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-preview.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-preview.cpp	2014-07-01 11:02:41 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-preview.cpp	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-#include"%ClickHookName:l%-preview.h"
-
-#include<unity/scopes/PreviewWidget.h>
-#include<unity/scopes/ColumnLayout.h>
-#include<unity/scopes/PreviewReply.h>
-
-using namespace unity::scopes;
-
-%ClickHookName:s%Preview::%ClickHookName:s%Preview(Result const& result, ActionMetadata const& metadata) :
-        PreviewQueryBase(result, metadata)
-{
-}
-
-%ClickHookName:s%Preview::~%ClickHookName:s%Preview()
-{
-}
-
-void %ClickHookName:s%Preview::cancelled()
-{
-}
-
-void %ClickHookName:s%Preview::run(unity::scopes::PreviewReplyProxy const& reply)
-{
-    PreviewWidgetList widgets;
-    widgets.emplace_back(PreviewWidget(R"({"id": "header", "type": "header", "components" : { "title": "title", "subtitle": "author" } })"));
-    widgets.emplace_back(PreviewWidget(R"({"id": "img", "type": "image", "components" : { "source": "screenshot-url" } })"));
-
-    PreviewWidget w("img2", "image");
-    w.add_attribute_value("zoomable", Variant(false));
-    w.add_attribute_mapping("source", "screenshot-url");
-    widgets.emplace_back(w);
-
-    ColumnLayout layout1col(1);
-    layout1col.add_column({"header", "img", "img2"});
-
-    ColumnLayout layout2col(2);
-    layout2col.add_column({"header", "img"});
-    layout2col.add_column({"img2"});
-
-    ColumnLayout layout3col(3);
-    layout3col.add_column({"header"});
-    layout3col.add_column({"img"});
-    layout3col.add_column({"img2"});
-
-    reply->register_layout({layout1col, layout2col, layout3col});
-    reply->push(widgets);
-    reply->push("author", Variant("Foo"));
-    reply->push("screenshot-url", Variant("/path/to/image.png"));
-}

=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-preview.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-preview.h	2014-07-01 11:02:41 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-preview.h	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#ifndef DEMOPREVIEW_H
-#define DEMOPREVIEW_H
-
-#include<unity/scopes/PreviewQueryBase.h>
-#include<unity/scopes/Result.h>
-#include<unity/scopes/ActionMetadata.h>
-
-class %ClickHookName:s%Preview : public unity::scopes::PreviewQueryBase
-{
-public:
-    %ClickHookName:s%Preview(unity::scopes::Result const& result, unity::scopes::ActionMetadata const& metadata);
-    ~%ClickHookName:s%Preview();
-
-    virtual void cancelled() override;
-    virtual void run(unity::scopes::PreviewReplyProxy const& reply) override;
-};
-
-#endif

=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-query.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-query.cpp	2014-07-01 15:07:36 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-query.cpp	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-#include "%ClickHookName:l%-query.h"
-#include <unity/scopes/Annotation.h>
-#include <unity/scopes/CategorisedResult.h>
-#include <unity/scopes/CategoryRenderer.h>
-#include <unity/scopes/QueryBase.h>
-#include <unity/scopes/SearchReply.h>
-
-using namespace unity::scopes;
-
-namespace
-{
-const static std::string CATEGORY_TEMPLATE =
-        R"(
-{
-  "schema-version": 1,
-  "template": {
-    "category-layout": "grid",
-    "card-size": "medium"
-  },
-  "components": {
-    "title": "title",
-    "art" : {
-      "field": "art"
-    },
-    "subtitle": "subtitle"
-  }
-}
-)";
-}
-
-%ClickHookName:s%Query::%ClickHookName:s%Query(CannedQuery const& query, SearchMetadata const& metadata) :
- SearchQueryBase(query, metadata)
-{
-}
-
-%ClickHookName:s%Query::~%ClickHookName:s%Query()
-{
-}
-
-void %ClickHookName:s%Query::cancelled()
-{
-}
-
-void %ClickHookName:s%Query::run(unity::scopes::SearchReplyProxy const& reply)
-{
-    CategoryRenderer rdr(CATEGORY_TEMPLATE);
-    auto cat = reply->register_category("cat1", "Category 1", "", rdr);
-    CategorisedResult res(cat);
-    res.set_uri("uri");
-    res.set_title("scope-A: result 1 for query \"" + query().query_string() + "\"");
-    res.set_art("http://design.ubuntu.com/wp-content/uploads/ubuntu-logo32.png");
-    res.set_dnd_uri("dnd_uri");
-    reply->push(res);
-}

=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-query.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-query.h	2014-07-01 11:02:41 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-query.h	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#ifndef DEMOQUERY_H
-#define DEMOQUERY_H
-
-#include <unity/scopes/SearchQueryBase.h>
-#include <unity/scopes/ReplyProxyFwd.h>
-
-class %ClickHookName:s%Query : public unity::scopes::SearchQueryBase
-{
-public:
-    %ClickHookName:s%Query(unity::scopes::CannedQuery const& query, unity::scopes::SearchMetadata const& metadata);
-    ~%ClickHookName:s%Query();
-    virtual void cancelled() override;
-
-    virtual void run(unity::scopes::SearchReplyProxy const& reply) override;
-};
-
-#endif

=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-scope.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-scope.cpp	2014-08-05 11:35:58 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-scope.cpp	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-#include "%ClickHookName:l%-scope.h"
-#include "%ClickHookName:l%-query.h"
-#include "%ClickHookName:l%-preview.h"
-#include <unity-scopes.h>
-
-using namespace unity::scopes;
-
-void %ClickHookName:s%Scope::start(std::string const&)
-{
-}
-
-void %ClickHookName:s%Scope::stop()
-{
-}
-
-SearchQueryBase::UPtr %ClickHookName:s%Scope::search(CannedQuery const &q, SearchMetadata const& metadata)
-{
-    SearchQueryBase::UPtr query(new %ClickHookName:s%Query(q, metadata));
-    return query;
-}
-
-
-PreviewQueryBase::UPtr %ClickHookName:s%Scope::preview(Result const& result, ActionMetadata const& metadata) {
-    PreviewQueryBase::UPtr preview(new %ClickHookName:s%Preview(result, metadata));
-    return preview;
-}
-
-#define EXPORT __attribute__ ((visibility ("default")))
-
-extern "C"
-{
-
-    EXPORT
-    unity::scopes::ScopeBase*
-    // cppcheck-suppress unusedFunction
-    UNITY_SCOPE_CREATE_FUNCTION()
-    {
-        return new %ClickHookName:s%Scope();
-    }
-
-    EXPORT
-    void
-    // cppcheck-suppress unusedFunction
-    UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
-    {
-        delete scope_base;
-    }
-
-}

=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-scope.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-scope.h	2014-08-05 11:35:58 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/displayName-scope.h	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-#ifndef DEMOSCOPE_H
-#define DEMOSCOPE_H
-
-#include <unity/scopes/ScopeBase.h>
-#include <unity/scopes/QueryBase.h>
-#include <unity/scopes/ReplyProxyFwd.h>
-#include <unity/scopes/QueryBase.h>
-#include <unity/scopes/PreviewQueryBase.h>
-
-class %ClickHookName:s%Scope : public unity::scopes::ScopeBase
-{
-public:
-    virtual void start(std::string const&) override;
-
-    virtual void stop() override;
-
-    unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result& result,
-            unity::scopes::ActionMetadata const& metadata) override;
-
-    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& q,
-            unity::scopes::SearchMetadata const& metadata) override;
-};
-
-#endif

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope/preview.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/scope/preview.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/scope/preview.cpp	2014-09-03 15:09:42 +0000
@@ -0,0 +1,60 @@
+#include <scope/preview.h>
+
+#include <unity/scopes/ColumnLayout.h>
+#include <unity/scopes/PreviewWidget.h>
+#include <unity/scopes/PreviewReply.h>
+#include <unity/scopes/Result.h>
+#include <unity/scopes/VariantBuilder.h>
+
+#include <iostream>
+
+namespace sc = unity::scopes;
+
+using namespace std;
+using namespace scope;
+
+Preview::Preview(const sc::Result &result, const sc::ActionMetadata &metadata) :
+        sc::PreviewQueryBase(result, metadata) {
+}
+
+void Preview::cancelled() {
+}
+
+void Preview::run(sc::PreviewReplyProxy const& reply) {
+    // Support three different column layouts
+    sc::ColumnLayout layout1col(1), layout2col(2), layout3col(3);
+
+    // Single column layout
+    layout1col.add_column( { "image", "header", "summary" });
+
+    // Two column layout
+    layout2col.add_column( { "image" });
+    layout2col.add_column( { "header", "summary" });
+
+    // Three cokumn layout
+    layout3col.add_column( { "image" });
+    layout3col.add_column( { "header", "summary" });
+    layout3col.add_column( { });
+
+    // Register the layouts we just created
+    reply->register_layout( { layout1col, layout2col, layout3col });
+
+    // Define the header section
+    sc::PreviewWidget header("header", "header");
+    // It has title and a subtitle properties
+    header.add_attribute_mapping("title", "title");
+    header.add_attribute_mapping("subtitle", "subtitle");
+
+    // Define the image section
+    sc::PreviewWidget image("image", "image");
+    // It has a single source property, mapped to the result's art property
+    image.add_attribute_mapping("source", "art");
+
+    // Define the summary section
+    sc::PreviewWidget description("summary", "text");
+    // It has a text property, mapped to the result's description property
+    description.add_attribute_mapping("text", "description");
+
+    // Push each of the sections
+    reply->push( { image, header, description });
+}

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope/query.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/scope/query.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/scope/query.cpp	2014-09-03 15:09:42 +0000
@@ -0,0 +1,177 @@
+#include <boost/algorithm/string/trim.hpp>
+
+#include <scope/query.h>
+
+#include <unity/scopes/Annotation.h>
+#include <unity/scopes/CategorisedResult.h>
+#include <unity/scopes/CategoryRenderer.h>
+#include <unity/scopes/QueryBase.h>
+#include <unity/scopes/SearchReply.h>
+
+#include <iomanip>
+#include <sstream>
+
+namespace sc = unity::scopes;
+namespace alg = boost::algorithm;
+
+using namespace std;
+using namespace api;
+using namespace scope;
+
+/**
+ * Define the layout for the forecast results
+ *
+ * The icon size is small, and ask for the card layout
+ * itself to be horizontal. I.e. the text will be placed
+ * next to the image.
+ */
+const static string WEATHER_TEMPLATE =
+        R"(
+{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-layout": "horizontal",
+    "card-size": "small"
+  },
+  "components": {
+    "title": "title",
+    "art" : {
+      "field": "art"
+    },
+    "subtitle": "subtitle"
+  }
+}
+)";
+
+/**
+ * Define the larger "current weather" layout.
+ *
+ * The icons are larger.
+ */
+const static string CITY_TEMPLATE =
+        R"(
+{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-size": "medium"
+  },
+  "components": {
+    "title": "title",
+    "art" : {
+      "field": "art"
+    },
+    "subtitle": "subtitle"
+  }
+}
+)";
+
+Query::Query(const sc::CannedQuery &query, const sc::SearchMetadata &metadata,
+        Config::Ptr config) :
+        sc::SearchQueryBase(query, metadata), client_(config) {
+}
+
+void Query::cancelled() {
+    client_.cancel();
+}
+
+void Query::run(sc::SearchReplyProxy const& reply) {
+    try {
+        // Start by getting information about the query
+        const sc::CannedQuery &query(sc::SearchQueryBase::query());
+
+        // Trim the query string of whitespace
+        string query_string = alg::trim_copy(query.query_string());
+
+        Client::Current current;
+        if (query_string.empty()) {
+            // If the string is empty, get the current weather for London
+            current = client_.weather("London,uk");
+        } else {
+            // otherwise, get the current weather for the search string
+            current = client_.weather(query_string);
+        }
+
+        // Build up the description for the city
+        stringstream ss(stringstream::in | stringstream::out);
+        ss << current.city.name << ", " << current.city.country;
+
+        // Register a category for the current weather, with the title we just built
+        auto location_cat = reply->register_category("current", ss.str(), "",
+                sc::CategoryRenderer(CITY_TEMPLATE));
+
+        {
+            // Create a single result for the current weather category
+            sc::CategorisedResult res(location_cat);
+
+            // We must have a URI
+            res.set_uri(to_string(current.city.id));
+
+            // Build up the description for the current weather
+            stringstream ss(stringstream::in | stringstream::out);
+            ss << setprecision(3) << current.weather.temp.cur;
+            ss << "°C";
+            res.set_title(ss.str());
+
+            // Set the rest of the attributes, art, description, etc
+            res.set_art(current.weather.icon);
+            res["subtitle"] = current.weather.description;
+            res["description"] = "A description of the result";
+
+            // Push the result
+            if (!reply->push(res)) {
+                // If we fail to push, it means the query has been cancelled.
+                // So don't continue;
+                return;
+            }
+        }
+
+        Client::Forecast forecast;
+        if (query_string.empty()) {
+            // If there is no search string, get the forecast for London
+            forecast = client_.forecast_daily("London,uk");
+        } else {
+            // otherwise, get the forecast for the search string
+            forecast = client_.forecast_daily(query_string);
+        }
+
+        // Register a category for the forecast
+        auto forecast_cat = reply->register_category("forecast",
+                "7 day forecast", "", sc::CategoryRenderer(WEATHER_TEMPLATE));
+
+        // For each of the forecast days
+        for (const auto &weather : forecast.weather) {
+            // Create a result
+            sc::CategorisedResult res(forecast_cat);
+
+            // We must have a URI
+            res.set_uri(to_string(weather.id));
+
+            // Build the description for the result
+            stringstream ss(stringstream::in | stringstream::out);
+            ss << setprecision(3) << weather.temp.max;
+            ss << "°C to ";
+            ss << setprecision(3) << weather.temp.min;
+            ss << "°C";
+            res.set_title(ss.str());
+
+            // Set the rest of the attributes
+            res.set_art(weather.icon);
+            res["subtitle"] = weather.description;
+            res["description"] = "A description of the result";
+
+            // Push the result
+            if (!reply->push(res)) {
+                // If we fail to push, it means the query has been cancelled.
+                // So don't continue;
+                return;
+            }
+        }
+
+    } catch (domain_error &e) {
+        // Handle exceptions being thrown by the client API
+        cerr << e.what() << endl;
+        reply->error(current_exception());
+    }
+}

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope/scope.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/scope/scope.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/scope/scope.cpp	2014-09-03 15:09:42 +0000
@@ -0,0 +1,58 @@
+#include <scope/scope.h>
+#include <scope/query.h>
+#include <scope/preview.h>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+namespace sc = unity::scopes;
+using namespace std;
+using namespace api;
+using namespace scope;
+
+void Scope::start(string const&) {
+    config_ = make_shared<Config>();
+
+    // Under test we set a different API root
+    char *apiroot = getenv("NETWORK_SCOPE_APIROOT");
+    if (apiroot) {
+        config_->apiroot = apiroot;
+    }
+}
+
+void Scope::stop() {
+}
+
+sc::SearchQueryBase::UPtr Scope::search(const sc::CannedQuery &query,
+        const sc::SearchMetadata &metadata) {
+    // Boilerplate construction of Query
+    return sc::SearchQueryBase::UPtr(new Query(query, metadata, config_));
+}
+
+sc::PreviewQueryBase::UPtr Scope::preview(sc::Result const& result,
+        sc::ActionMetadata const& metadata) {
+    // Boilerplate construction of Preview
+    return sc::PreviewQueryBase::UPtr(new Preview(result, metadata));
+}
+
+#define EXPORT __attribute__ ((visibility ("default")))
+
+// These functions define the entry points for the scope plugin
+extern "C" {
+
+EXPORT
+unity::scopes::ScopeBase*
+// cppcheck-suppress unusedFunction
+UNITY_SCOPE_CREATE_FUNCTION() {
+    return new Scope();
+}
+
+EXPORT
+void
+// cppcheck-suppress unusedFunction
+UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base) {
+    delete scope_base;
+}
+
+}

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/test'
=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/test/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/test/CMakeLists.txt	2014-05-15 10:14:07 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/test/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-add_executable(simpletest simpletest.cpp)
-add_test(simpletest simpletest)

=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/test/simpletest.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/test/simpletest.cpp	2014-05-15 10:14:07 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/test/simpletest.cpp	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-int main(int, char**) {
-    return 0;
-}

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/tests'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt	2014-09-03 15:09:42 +0000
@@ -0,0 +1,25 @@
+
+# Google Mock unfortunately has to be compiled from source
+include(FindGMock)
+
+# We need process-cpp to launch the python test server
+pkg_check_modules(
+  TEST
+  process-cpp
+  REQUIRED
+)
+
+# Include our test library headers
+include_directories(
+  ${GTEST_INCLUDE_DIRS}
+  ${GMOCK_INCLUDE_DIRS}
+  ${TEST_INCLUDE_DIRS}
+)
+
+# Where to find the test server binary
+add_definitions(
+  -DFAKE_SERVER="${CMAKE_CURRENT_SOURCE_DIR}/server/server.py"
+)
+
+# Add the unit tests
+add_subdirectory(unit)

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/London,uk.json'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/London,uk.json	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/London,uk.json	2014-09-03 15:09:42 +0000
@@ -0,0 +1,1 @@
+{"cod":"200","message":0.1117,"city":{"id":2643743,"name":"London","coord":{"lon":-0.12574,"lat":51.50853},"country":"GB","population":0,"sys":{"population":0}},"cnt":7,"list":[{"dt":1407412800,"temp":{"day":23.33,"min":18.84,"max":25.09,"night":18.84,"eve":24.17,"morn":20.76},"pressure":1018.23,"humidity":83,"weather":[{"id":500,"main":"Rain","description":"light rain","icon":"10d"}],"speed":1.87,"deg":295,"clouds":12,"rain":0.5},{"dt":1407499200,"temp":{"day":19.44,"min":15.54,"max":20.86,"night":15.54,"eve":18.28,"morn":16.21},"pressure":1010.57,"humidity":97,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":4.01,"deg":143,"clouds":92,"rain":8},{"dt":1407585600,"temp":{"day":18.78,"min":13.19,"max":19.58,"night":13.19,"eve":18.95,"morn":14.03},"pressure":1010.78,"humidity":83,"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"}],"speed":5.46,"deg":281,"clouds":32},{"dt":1407672000,"temp":{"day":18.09,"min":13.46,"max":18.09,"night":13.46,"eve":16.58,"morn":13.91},"pressure":1002.33,"humidity":67,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.68,"deg":162,"clouds":92,"rain":4},{"dt":1407758400,"temp":{"day":17.38,"min":15.39,"max":17.38,"night":16.3,"eve":17.03,"morn":15.39},"pressure":1008.2,"humidity":0,"weather":[{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"}],"speed":13.52,"deg":245,"clouds":74,"rain":12.63},{"dt":1407844800,"temp":{"day":18.44,"min":16.17,"max":18.44,"night":16.83,"eve":18.02,"morn":16.17},"pressure":1009.94,"humidity":0,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.93,"deg":251,"clouds":60,"rain":5.25},{"dt":1407931200,"temp":{"day":18.8,"min":16.67,"max":19.02,"night":16.77,"eve":19.02,"morn":16.67},"pressure":1013.17,"humidity":0,"weather":[{"id":500,"main":"Rain","description":"light rain","icon":"10d"}],"speed":9.88,"deg":275,"clouds":85,"rain":1.35}]}

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/Manchester,uk.json'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/Manchester,uk.json	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/Manchester,uk.json	2014-09-03 15:09:42 +0000
@@ -0,0 +1,1 @@
+{"cod":"200","message":0.0056,"city":{"id":2643123,"name":"Manchester","coord":{"lon":-2.23743,"lat":53.480949},"country":"GB","population":0,"sys":{"population":0}},"cnt":7,"list":[{"dt":1407412800,"temp":{"day":17.91,"min":11.96,"max":18.83,"night":11.96,"eve":18.01,"morn":16.13},"pressure":1014.82,"humidity":77,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"}],"speed":3.32,"deg":303,"clouds":0},{"dt":1407499200,"temp":{"day":18.59,"min":12.33,"max":18.59,"night":12.33,"eve":14.55,"morn":14.69},"pressure":1008.22,"humidity":79,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":3.46,"deg":163,"clouds":92,"rain":11},{"dt":1407585600,"temp":{"day":15.8,"min":10.79,"max":17.11,"night":10.79,"eve":16.89,"morn":13.19},"pressure":1005.76,"humidity":92,"weather":[{"id":803,"main":"Clouds","description":"broken clouds","icon":"04d"}],"speed":5.61,"deg":279,"clouds":56},{"dt":1407672000,"temp":{"day":15.29,"min":12.21,"max":15.98,"night":12.41,"eve":15.98,"morn":12.21},"pressure":995.36,"humidity":95,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.75,"deg":137,"clouds":92,"rain":5},{"dt":1407758400,"temp":{"day":15.73,"min":12.99,"max":15.73,"night":13.8,"eve":15.23,"morn":12.99},"pressure":990.16,"humidity":0,"weather":[{"id":500,"main":"Rain","description":"light rain","icon":"10d"}],"speed":9.02,"deg":239,"clouds":99,"rain":1.15},{"dt":1407844800,"temp":{"day":17.64,"min":14.08,"max":17.64,"night":14.08,"eve":14.92,"morn":14.12},"pressure":992.52,"humidity":0,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.36,"deg":240,"clouds":45,"rain":4.84},{"dt":1407931200,"temp":{"day":14.35,"min":13.37,"max":15.52,"night":13.77,"eve":15.52,"morn":13.37},"pressure":999.39,"humidity":0,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":7.79,"deg":285,"clouds":92,"rain":5.98}]}

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/server.py'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/server/server.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/server/server.py	2014-09-03 15:09:42 +0000
@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+
+import http.server
+import os
+import socketserver
+import sys
+from urllib.parse import urlparse,parse_qs
+
+def read_file(path):
+    file = os.path.join(os.path.dirname(__file__), path)
+    if os.path.isfile(file):
+        with open(file, 'r') as fp:
+            content = fp.read()
+    else:
+        content = ''
+
+    return content
+
+class MyRequestHandler(http.server.BaseHTTPRequestHandler):
+    def do_GET(self):
+        sys.stderr.write("GET: %s\n" % self.path)
+        sys.stderr.flush()
+
+        parse = urlparse(self.path)
+        path = parse.path
+        query = parse_qs(parse.query)
+        
+        if path == '/data/2.5/weather':
+            self.send_response(200)
+            self.send_header("Content-type", "text/html")
+            self.end_headers()
+            self.wfile.write(bytes(read_file('weather/%s.json' % query['q'][0]), 'UTF-8'))
+        elif path == '/data/2.5/forecast/daily':
+            self.send_response(200)
+            self.send_header("Content-type", "text/html")
+            self.end_headers()
+            self.wfile.write(bytes(read_file('forecast/daily/%s.json' % query['q'][0]), 'UTF-8'))
+        else:
+            self.send_response(404)
+            self.send_header("Content-type", "text/html")
+            self.end_headers()
+            self.wfile.write(bytes('ERROR', 'UTF-8'))
+
+if __name__ == "__main__":
+    Handler = MyRequestHandler
+    httpd = socketserver.TCPServer(("127.0.0.1", 0), Handler)
+
+    sys.stdout.write('%d\n' % httpd.server_address[1])
+    sys.stdout.flush()
+
+    httpd.serve_forever()

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/weather'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/weather/London,uk.json'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/server/weather/London,uk.json	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/server/weather/London,uk.json	2014-09-03 15:09:42 +0000
@@ -0,0 +1,1 @@
+{"coord":{"lon":-0.13,"lat":51.51},"sys":{"type":1,"id":5091,"message":0.29,"country":"GB","sunrise":1407386057,"sunset":1407440289},"weather":[{"id":801,"main":"Clouds","description":"few clouds","icon":"02d"}],"base":"cmc stations","main":{"temp":21.83,"pressure":1014,"humidity":53,"temp_min":20,"temp_max":24},"wind":{"speed":1.5,"deg":0},"clouds":{"all":20},"dt":1407408276,"id":2643743,"name":"London","cod":200}
\ No newline at end of file

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/weather/Manchester,uk.json'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/server/weather/Manchester,uk.json	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/server/weather/Manchester,uk.json	2014-09-03 15:09:42 +0000
@@ -0,0 +1,1 @@
+{"coord":{"lon":-2.24,"lat":53.48},"sys":{"type":1,"id":5060,"message":0.2423,"country":"GB","sunrise":1407386141,"sunset":1407441219},"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"}],"base":"cmc stations","main":{"temp":17.35,"pressure":1016,"humidity":77,"temp_min":17,"temp_max":18},"wind":{"speed":2.6,"deg":20,"var_beg":330,"var_end":80},"clouds":{"all":40},"dt":1407408600,"id":2643123,"name":"Manchester","cod":200}

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/CMakeLists.txt	2014-09-03 15:09:42 +0000
@@ -0,0 +1,24 @@
+
+# Our test executable.
+# It includes the object code from the scope
+add_executable(
+  scope-unit-tests
+  scope/test-scope.cpp
+  $<TARGET_OBJECTS:scope-static>
+)
+
+# Link against the scope, and all of our test lib dependencies
+target_link_libraries(
+  scope-unit-tests
+  ${GTEST_BOTH_LIBRARIES}
+  ${GMOCK_LIBRARIES}
+  ${SCOPE_LDFLAGS}
+  ${TEST_LDFLAGS}
+  ${Boost_LIBRARIES}
+)
+
+# Register the test with CTest
+add_test(
+  scope-unit-tests
+  scope-unit-tests
+)

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp	2014-09-03 15:09:42 +0000
@@ -0,0 +1,225 @@
+#include <scope/scope.h>
+
+#include <core/posix/exec.h>
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <string>
+#include <unity/scopes/SearchReply.h>
+#include <unity/scopes/SearchReplyProxyFwd.h>
+#include <unity/scopes/Variant.h>
+#include <unity/scopes/testing/Category.h>
+#include <unity/scopes/testing/MockSearchReply.h>
+#include <unity/scopes/testing/TypedScopeFixture.h>
+
+using namespace std;
+using namespace testing;
+using namespace scope;
+
+namespace posix = core::posix;
+namespace sc = unity::scopes;
+namespace sct = unity::scopes::testing;
+
+/**
+ * Keep the tests in an anonymous namespace
+ */
+namespace {
+
+/**
+ * Custom matcher to check the properties of search results
+ */
+MATCHER_P2(ResultProp, prop, value, "") {
+    if (arg.contains(prop)) {
+        *result_listener << "result[" << prop << "] is " << arg[prop].serialize_json();
+    } else {
+        *result_listener << "result[" << prop << "] is not set";
+    }
+    return arg.contains(prop) && arg[prop] == sc::Variant(value);
+}
+
+/**
+ * Custom matcher to check the presence of departments
+ */
+MATCHER_P(IsDepartment, department, "") {
+    return arg->serialize() == department->serialize();
+}
+
+typedef sct::TypedScopeFixture<Scope> TypedScopeFixtureScope;
+
+class TestScope: public TypedScopeFixtureScope {
+protected:
+    void SetUp() override
+    {
+        // Start up Python-based fake OpenWeatherMap server
+        fake_server_ = posix::exec("/usr/bin/python3", { FAKE_SERVER }, { },
+                posix::StandardStream::stdout);
+
+        // Check it's running
+        ASSERT_GT(fake_server_.pid(), 0);
+        string port;
+        // The server will print out the random port it is using
+        fake_server_.cout() >> port;
+        // Check we have a port
+        ASSERT_FALSE(port.empty());
+
+        // Build up the API root
+        string apiroot = "http://127.0.0.1:" + port;
+        // Override the API root that the scope will use
+        setenv("NETWORK_SCOPE_APIROOT", apiroot.c_str(), true);
+
+        // Do the parent SetUp
+        TypedScopeFixtureScope::SetUp();
+    }
+
+    /**
+     * Start by assuming the server is invalid
+     */
+    posix::ChildProcess fake_server_ = posix::ChildProcess::invalid();
+};
+
+TEST_F(TestScope, empty_search_string) {
+    const sc::CategoryRenderer renderer;
+    NiceMock<sct::MockSearchReply> reply;
+
+    // Build a query with an empty search string
+    sc::CannedQuery query(SCOPE_NAME, "", "");
+
+    // Expect the current weather category
+    EXPECT_CALL(reply, register_category("current", "London, GB", "", _)).Times(1)
+            .WillOnce(Return(make_shared<sct::Category>("current", "London, GB", "", renderer)));
+
+    // With one result
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "21.8°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/02d.png"),
+            ResultProp("subtitle", "few clouds")
+            )))).WillOnce(
+            Return(true));
+
+    // Expect the forecast category
+    EXPECT_CALL(reply, register_category("forecast", "7 day forecast", "", _)).Times(1)
+            .WillOnce(Return(make_shared<sct::Category>("forecast", "7 day forecast", "", renderer)));
+
+    // With seven results
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "25.1°C to 18.8°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "light rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "20.9°C to 15.5°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "19.6°C to 13.2°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/03d.png"),
+            ResultProp("subtitle", "scattered clouds")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "18.1°C to 13.5°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "17.4°C to 15.4°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "heavy intensity rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "18.4°C to 16.2°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "19°C to 16.7°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "light rain")
+        )))).WillOnce(Return(true));
+
+    sc::SearchReplyProxy reply_proxy(&reply, [](sc::SearchReply*) {}); // note: this is a std::shared_ptr with empty deleter
+    sc::SearchMetadata meta_data("en_EN", "phone");
+
+    // Create a query object
+    auto search_query = scope->search(query, meta_data);
+    ASSERT_NE(nullptr, search_query);
+
+    // Run the search
+    search_query->run(reply_proxy);
+
+    // Google Mock will make assertions when the mocks are destructed.
+}
+
+TEST_F(TestScope, search) {
+    const sc::CategoryRenderer renderer;
+    NiceMock<sct::MockSearchReply> reply;
+
+    // Build a query with a non-empty search string
+    sc::CannedQuery query(SCOPE_NAME, "Manchester,uk", "");
+
+    // Expect the current weather category
+    EXPECT_CALL(reply, register_category("current", "Manchester, GB", "", _)).Times(1)
+            .WillOnce(Return(make_shared<sct::Category>("current", "Manchester, GB", "", renderer)));
+
+    // With one result
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "17.4°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/03d.png"),
+            ResultProp("subtitle", "scattered clouds")
+            )))).WillOnce(
+            Return(true));
+
+    // Expect the forecast category
+    EXPECT_CALL(reply, register_category("forecast", "7 day forecast", "", _)).Times(1)
+            .WillOnce(Return(make_shared<sct::Category>("forecast", "7 day forecast", "", renderer)));
+
+    // With seven results
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "18.8°C to 12°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/01d.png"),
+            ResultProp("subtitle", "sky is clear")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "18.6°C to 12.3°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "17.1°C to 10.8°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/04d.png"),
+            ResultProp("subtitle", "broken clouds")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "16°C to 12.2°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "15.7°C to 13°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "light rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "17.6°C to 14.1°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
+            ResultProp("title", "15.5°C to 13.4°C"),
+            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
+            ResultProp("subtitle", "moderate rain")
+        )))).WillOnce(Return(true));
+
+    sc::SearchReplyProxy reply_proxy(&reply, [](sc::SearchReply*) {}); // note: this is a std::shared_ptr with empty deleter
+    sc::SearchMetadata meta_data("en_EN", "phone");
+
+    // Create a query object
+    auto search_query = scope->search(query, meta_data);
+    ASSERT_NE(nullptr, search_query);
+
+    // Run the search
+    search_query->run(reply_proxy);
+
+    // Google Mock will make assertions when the mocks are destructed.
+}
+
+} // namespace

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2014-08-18 12:29:43 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2014-09-03 15:09:42 +0000
@@ -2,28 +2,46 @@
 <wizard version="1" kind="project" firstpage="10" id="UbuntuUnityScope" category="A.UbuntuProject"
         platformIndependent="true" 
         class="ubuntu-project-cmake"
-				featuresRequired=""
+        featuresRequired=""
         >
     <icon>../share/ubuntu.png</icon>
     <description>A simple C++ based Unity Scope</description>
     <displayname>Unity Scope</displayname>
     <displaycategory>Ubuntu</displaycategory>
     <files>
-			<file source="data/displayName.ini.in"   	target="data/%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini.in" openeditor="false"/>
-			<file source="data/CMakeLists.txt"   			target="data/CMakeLists.txt" openeditor="false"/>
-			<file source="displayName.apparmor"   				target="%ClickHookName:l%.apparmor" openeditor="false"/>
-			<file source="test/simpletest.cpp"   			target="test/simpletest.cpp" openeditor="false"/>
-			<file source="test/CMakeLists.txt"   			target="test/CMakeLists.txt" openeditor="false"/>
-			<file source="manifest.json"   						target="manifest.json" openeditor="true"/>
-			<file source="src/displayName-preview.h"  target="src/%ClickHookName:l%-preview.h" openeditor="false"/>
-			<file source="src/displayName-query.h"   	target="src/%ClickHookName:l%-query.h" openeditor="false"/>
-			<file source="src/displayName-preview.cpp"	target="src/%ClickHookName:l%-preview.cpp" openeditor="false"/>
-			<file source="src/displayName-query.cpp"   	target="src/%ClickHookName:l%-query.cpp" openeditor="false"/>
-			<file source="src/CMakeLists.txt"   				target="src/CMakeLists.txt" openeditor="false"/>
-			<file source="src/displayName-scope.h"   		target="src/%ClickHookName:l%-scope.h" openeditor="false"/>
-			<file source="src/displayName-scope.cpp"  	target="src/%ClickHookName:l%-scope.cpp" openeditor="false"/>
-			<file source="readme.txt"                  	target="readme.txt" openeditor="true"/>
-			<file source="CMakeLists.txt"   					target="CMakeLists.txt" openeditor="true" openproject="true"/>
+        <file source="cmake/FindGMock.cmake"/>
+
+        <file source="data/CMakeLists.txt"/>
+        <file source="data/displayName.ini" target="data/%ClickDomain:l%.%ProjectName:l%_%ClickHookName:l%.ini"/>
+        <file source="data/icon.png" binary="true"/>
+        <file source="data/logo.png" binary="true"/>
+        <file source="data/screenshot.png" binary="true"/>
+
+        <file source="include/api/config.h"/>
+        <file source="include/api/client.h"/>
+        <file source="include/scope/preview.h"/>
+        <file source="include/scope/query.h"/>
+        <file source="include/scope/scope.h"/>
+
+        <file source="src/CMakeLists.txt"/>
+        <file source="src/api/client.cpp"/>
+        <file source="src/scope/query.cpp"/>
+        <file source="src/scope/scope.cpp" openeditor="true"/>
+        <file source="src/scope/preview.cpp"/>
+
+        <file source="tests/server/forecast/daily/Manchester,uk.json"/>
+        <file source="tests/server/forecast/daily/London,uk.json"/>
+        <file source="tests/server/weather/Manchester,uk.json"/>
+        <file source="tests/server/weather/London,uk.json"/>
+        <file source="tests/server/server.py"/>
+        <file source="tests/CMakeLists.txt"/>
+        <file source="tests/unit/CMakeLists.txt"/>
+        <file source="tests/unit/scope/test-scope.cpp"/>
+
+        <file source="CMakeLists.txt" openproject="true"/>
+        <file source="displayName.apparmor" target="%ClickHookName:l%.apparmor"/>
+        <file source="manifest.json" openeditor="true"/>
+        <file source="readme.txt"/>
     </files>
 
 	  <!-- Create a 2nd wizard page with click package parameters -->