Merge lp:unity-scopes-api/staging into lp:unity-scopes-api

[Paweł Stołowski]

Fix LP: 1446499.
Added is_account_login() method to Result.
Documentation updates.

Merge devel.

[lp:unity-scopes-api/staging]

284. By Paweł Stołowski on 2015-04-23

Updated changelog.

[Pete Woods (pete-woods)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/610/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/135
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/136

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/610/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-10 07:21:29 +0000
+++ CMakeLists.txt	2015-04-23 15:43:14 +0000
@@ -227,7 +227,7 @@
 # API version
 set(UNITY_SCOPES_MAJOR 0)
 set(UNITY_SCOPES_MINOR 6)
-set(UNITY_SCOPES_MICRO 16)
+set(UNITY_SCOPES_MICRO 17)
 set(UNITY_SCOPES_SOVERSION 3)
 
 # Version for testing, with all symbols visible

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2015-04-10 07:21:29 +0000
+++ RELEASE_NOTES.md	2015-04-23 15:43:14 +0000
@@ -1,6 +1,10 @@
 Release notes
 =============
 
+Changes in version 0.6.17
+=========================
+  - Added is_account_login_result() method to Result class.
+
 Changes in version 0.6.16
 =========================
   - Added support for attaching arbitrary data to CannedQuery.

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-10 18:55:46 +0000
+++ debian/changelog	2015-04-23 15:43:14 +0000
@@ -1,3 +1,13 @@
+unity-scopes-api (0.6.17-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Marcus Tomlinson ]
+  * Added is_account_login_result() method to Result class.
+
+  [ Pawel Stolowski ]
+  * Fix LP: #1446499.
+
+ -- Marcus Tomlinson <[e-mail]>  Wed, 15 Apr 2015 17:22:07 +0200
+
 unity-scopes-api (0.6.16+15.04.20150410.3-0ubuntu1) vivid; urgency=medium
 
   [ Pawel Stolowski ]

=== modified file 'debian/libunity-scopes3.symbols'
--- debian/libunity-scopes3.symbols	2015-04-10 18:55:46 +0000
+++ debian/libunity-scopes3.symbols	2015-04-23 15:43:14 +0000
@@ -379,6 +379,7 @@
  (c++)"unity::scopes::internal::JsonSettingsSchema::~JsonSettingsSchema()@Base" 0.5.2+14.10.20140709.2
  (c++)"unity::scopes::internal::JsonSettingsSchema::JsonSettingsSchema()@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
  (c++)"unity::scopes::internal::JsonSettingsSchema::JsonSettingsSchema(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::internal::make_directories(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)@Base" 0replaceme
  (c++)"unity::scopes::internal::MiddlewareBase::~MiddlewareBase()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::MiddlewareBase::MiddlewareBase(unity::scopes::internal::RuntimeImpl*)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::MiddlewareBase::runtime() const@Base" 0.4.0+14.04.20140312.1
@@ -780,6 +781,7 @@
  (c++)"unity::scopes::Result::direct_activation() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Result::dnd_uri() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Result::has_stored_result() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::Result::is_account_login_result() const@Base" 0replaceme
  (c++)"unity::scopes::Result::operator[](std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Result::operator[](std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Result::operator=(unity::scopes::Result&&)@Base" 0.4.0+14.04.20140312.1

=== modified file 'doc/tutorial.dox'
--- doc/tutorial.dox	2015-02-25 05:20:57 +0000
+++ doc/tutorial.dox	2015-04-23 15:43:14 +0000
@@ -217,6 +217,51 @@
 do not return more results than indicated by the cardinality. If you more than the requested number of results, you are
 wasting resources. (The scopes run time ignores the additional results.)
 
+\paragraph handlingaggregation Handling aggregation
+
+As previously stated, SearchMetadata contains additional information about the search requests you receive, including
+the methods:
+
+<ul>
+<li>\link unity::scopes::SearchMetadata::is_aggregated is_aggregated()\endlink - true if the request was initiated by
+    an aggregator,
+<li>and \link unity::scopes::SearchMetadata::aggregated_keywords aggregated_keywords()\endlink - the list of keywords
+    used by the aggregator to find your scope.
+</ul>
+
+\note Please refer to the <a href="https://developer.ubuntu.com/en/scopes/tutorials/scope-keywords/">Scope Keywords</a>
+tutorial document for more detail on using keywords in your scope.
+
+You can use the is_aggregated() method from within
+\link unity::scopes::SearchQueryBase::run SearchQueryBase::run()\endlink in order to ensure that an appropriate set of
+results are returned when queried by an aggregator:
+
+\code{.cpp}
+void MyQuery::run(SearchReplyProxy const& reply)
+{
+    if (metadata_.is_aggregated())
+    {
+        auto category = reply->register_category("agg_cat",
+                                                 "MyScope Featured",
+                                                 agg_icon);
+        do_aggregated_search(reply, category);
+    }
+    else
+    {
+        do_normal_search(reply);
+    }
+}
+\endcode
+
+You may notice in the code snippet above that for each aggregated search we receive, we register a specific results
+category. Although aggregators may be willing to accept more than one category from its child scopes, they are only
+required to accept the first.
+
+Thereafter, an aggregator may choose to ignore any additional categories the child scope registers. It is therefore
+recommended that scope authors follow the above method of handling aggregated searches. It is also recommended that
+your scope provide a decent category title (e.g. "MyScope Featured"). An aggregator is likely to display this category
+title as is within its result set, so try to keep it clean and descriptive.
+
 \paragraph surfacingmode Surfacing mode
 
 The query string may be the empty string. If so, the UI is asking your scope to produce default results
@@ -549,7 +594,7 @@
 of this class to each sub-query; the scopes run time invokes callback methods on this class
 to let you know when a new result or status update arrives, and when a query completes.
 
-\paragraph childscopes Locating child scopes
+\paragraph childscopes Finding child scopes
 
 To send queries to its child scopes, your scope must obtain a proxy for each child scope. The scopes run time
 runs a registry process. The job of the registry (among other things) is to provide information about available
@@ -560,13 +605,55 @@
 \link unity::scopes::ScopeMetadata ScopeMetadata\endlink that describes the scope and also provides access to the
 proxy for the scope.
 
+You can also aggregate scopes indirectly via keyword(s). Keywords describe the type of content a scope provides (e.g.
+a scope with the keyword "music" will return music results, the "video" keyword indicates video content, and so on).
+You can obtain child scopes via keywords by calling \link unity::scopes::Registry::list_if list_if()\endlink on the
+registry, supplying a predicate function. The return value is a map containing only those scopes for which the predicate
+returns true. Therefore, your predicate function should return true for all scopes matching the keyword(s) you wish to
+aggregate.
+
+\note Please refer to the <a href="https://developer.ubuntu.com/en/scopes/tutorials/scope-keywords/">Scope Keywords</a>
+tutorial document for a list of recommended keywords to use.
+
+As an aggregator scope author you must provide an implementation of the virtual
+\link unity::scopes::ScopeBase::find_child_scopes ScopeBase::find_child_scopes()\endlink method. All logic for finding
+your aggregator's child scopes should be implemented within this method. The return value is of type
+\link unity::scopes::ChildScopeList ChildScopeList\endlink and must contain an instance of
+\link unity::scopes::ChildScope ChildScope\endlink for each scope your aggregator may collect results from.
+
+Here is how you could implement find_child_scopes() to return all scopes in the registry that contain the keywords
+"sports" and "news":
+
+\code{.cpp}
+ChildScopeList MyScope::find_child_scopes() const override
+{
+    auto sportsnews_scopes = registry()->list_if([](ScopeMetadata const& item)
+    {
+        auto keywords = item.keywords();
+        return (keywords.find("sports") != keywords.end()) &&
+               (keywords.find("news") != keywords.end());
+    });
+
+    ChildScopeList list;
+    for (auto const& sportsnews_scope : sportsnews_scopes)
+    {
+        list.emplace_back(ChildScope{sportsnews_scope.first,  // Child scope ID
+                                     sportsnews_scope.second, // Child scope metadata
+                                     true,                    // Default enabled state (when first discovered)
+                                     {"sports", "news"}});    // Keywords used to aggregate this scope
+    }
+    return list;
+}
+\endcode
+
 \paragraph subquery Sub-queries
 
 To send a query to another scope, use one of the `subsearch()` overloads of \link unity::scopes::SearchQueryBase\endlink
 inside your implementation of
 \link unity::scopes::SearchQueryBase::run SearchQueryBase::run()\endlink.
-This method requires the proxy to the child scope to query, the query details (\link unity::scopes::CannedQuery CannedQuery\endlink), plus
-an instance of your `SearchListenerBase` implementation that will receive the query results.
+This method requires a handle to the child scope to query (either via proxy or ChildScope handle), the query details
+(\link unity::scopes::CannedQuery CannedQuery\endlink), plus an instance of your `SearchListenerBase` implementation
+that will receive the query results.
 
 \note `subsearch()` is identical to
 \link unity::scopes::ScopeBase::search search()\endlink but, for `subsearch()`, the scopes run time transparently
@@ -575,11 +662,19 @@
 (However, your query class still needs to react to cancellation and should terminate the current query
 is quickly as possible in response to a cancelled message.)
 
+You should always call \link unity::scopes::ScopeBase::child_scopes ScopeBase::child_scopes()\endlink from within your
+aggregator's \link unity::scopes::ScopeBase::search search()\endlink method in order to retrieve the latest child
+scopes list containing the most recent "enabled" states. You can then pass this list into your instantiation of
+SearchQueryBase for later use.
+
+\note An aggregator must respect the "enabled" states of its child scopes, querying only the child scopes that are
+enabled.
+
 Here is how you could implement an aggregating scope that passes a query to a single child scope "scope-A":
 
 \code{.cpp}
 
-void MyScope::start(std::string const& scope_id) override
+ChildScopeList MyScope::find_child_scopes() const override
 {
     auto reg = registry();  // Up-call into base class
     if (!reg)
@@ -587,21 +682,23 @@
         throw ConfigException(scope_id + ": No registry available, cannot locate child scopes");
     }
 
+    ChildScopeList list;
     try
     {
         auto meta = reg->get_metadata("scope-A");
-        scope_to_query_ = meta.proxy(); // store the proxy for passing it further in search 
+        list.emplace_back(ChildScope{"scope-A",  meta});
     }
     catch (NotFoundException const& e)
     {
         ...
     }
+    return list;
 }
 
 QueryBase::UPtr MyScope::search(CannedQuery const& query,
                                 SearchMetadata const& metadata)
 {
-    SearchQueryBase::UPtr q(new MyQuery(query, metadata, scope_to_query_));
+    SearchQueryBase::UPtr q(new MyQuery(query, metadata, child_scopes()));
     return q;
 }
 
@@ -609,9 +706,13 @@
 
 void MyQuery::run(SearchReplyProxy const& upstream_reply) 
 {
-    auto category = reply->register_category("recommended", "Recommended", icon, "");
-    SearchListenerBase::SPtr reply(new MyReceiver(upstream_reply, category));
-    subsearch(scope_to_query_, query_, reply);
+    // Continue only if our child scope is installed AND enabled
+    if (!child_scopes_.empty() && child_scopes_.front().enabled)
+    {
+        auto category = reply->register_category("recommended", "Recommended", icon, "");
+        SearchListenerBase::SPtr reply(new MyReceiver(upstream_reply, category));
+        subsearch(child_scopes_.front(), query_, reply);
+    }
 }
 \endcode
 
@@ -1214,6 +1315,9 @@
 similar type (E.g. The Music scope will aggregate scopes with the keyword "music", and so on). The value of `Keywords` should specify a
 list of keywords your scope falls under. Like `ChildScopes`, this value must be a semicolon separated list (E.g. `Keywords = music;video`).
 
+\note Please refer to the <a href="https://developer.ubuntu.com/en/scopes/tutorials/scope-keywords/">Scope Keywords</a>
+tutorial document for more detail on using keywords in your scope.
+
 \subsection scopetool The scope tool
 
 The Unity Scope Tool is a stand-alone redering tool that allows you

=== modified file 'include/unity/scopes/Result.h'
--- include/unity/scopes/Result.h	2015-02-25 03:59:07 +0000
+++ include/unity/scopes/Result.h	2015-04-23 15:43:14 +0000
@@ -229,6 +229,12 @@
     */
     VariantMap serialize() const;
 
+    /**
+    \brief Check if this result is an online account login result.
+    \return True if this result is an online account login result.
+    */
+    bool is_account_login_result() const;
+
     /// @cond
 protected:
     explicit Result(const VariantMap &variant_map);

=== modified file 'include/unity/scopes/internal/RegistryObject.h'
--- include/unity/scopes/internal/RegistryObject.h	2014-11-26 02:54:41 +0000
+++ include/unity/scopes/internal/RegistryObject.h	2015-04-23 15:43:14 +0000
@@ -29,6 +29,7 @@
 #include <condition_variable>
 #include <mutex>
 #include <thread>
+#include <chrono>
 
 namespace unity
 {
@@ -152,6 +153,12 @@
     mutable std::mutex mutex_;
 
     MWPublisher::SPtr publisher_;
+    std::thread publisher_notify_thread_;
+    std::condition_variable publisher_notify_cond_;
+    std::chrono::system_clock::time_point publisher_notify_timepoint_;
+    bool publisher_notify_reset_timer_;
+    bool publisher_notify_exit_;
+
     MWSubscriber::SPtr ss_list_update_subscriber_;
     std::shared_ptr<core::ScopedConnection> ss_list_update_connection_;
     bool generate_desktop_files_;

=== modified file 'include/unity/scopes/internal/Utils.h'
--- include/unity/scopes/internal/Utils.h	2014-11-17 01:29:26 +0000
+++ include/unity/scopes/internal/Utils.h	2015-04-23 15:43:14 +0000
@@ -55,6 +55,8 @@
 
 int safe_system_call(std::string const& command);
 
+void make_directories(std::string const& path_name, mode_t mode);
+
 } // namespace internal
 
 } // namespace scopes

=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2015-02-17 00:27:08 +0000
+++ scoperegistry/scoperegistry.cpp	2015-04-23 15:43:14 +0000
@@ -26,13 +26,13 @@
 #include <unity/scopes/internal/ScopeConfig.h>
 #include <unity/scopes/internal/ScopeImpl.h>
 #include <unity/scopes/internal/ScopeMetadataImpl.h>
+#include <unity/scopes/internal/Utils.h>
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
 
+#include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/filesystem/operations.hpp>
 
-#include <sys/stat.h>  // TODO: remove this once hack for creating data root dir is removed
 #include <wordexp.h>
 
 using namespace scoperegistry;
@@ -535,28 +535,17 @@
             identity = runtime->registry_identity();
             ss_reg_id = runtime->ss_registry_identity();
 
-            // TODO: HACK: We create the root of the cache and app directories for
-            //       confined scopes, in case the scope is confined and the dir doesn't
-            //       exist yet. This really should be done by the click-installation but,
-            //       prior to RTM, we don't rely on that.
-            boost::system::error_code ec;
-
+            // Make sure that the cache and app directories exist.
             string cache_root = rt_config.cache_directory() + "/leaf-net";
-            !boost::filesystem::exists(cache_root, ec) && ::mkdir(cache_root.c_str(), 0700);
+            make_directories(cache_root, 0700);
 
             string app_root = rt_config.app_directory();
-            !boost::filesystem::exists(app_root, ec) && ::mkdir(app_root.c_str(), 0700);
+            make_directories(app_root, 0700);
         } // Release memory for config parser
 
-        // Make sure that the parent directories for confined scope tmp directory exist.
-        {
-            string dir = string("/run/user/") + std::to_string(geteuid());
-            dir += "/scopes";
-            boost::system::error_code ec;
-            !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700 | S_ISVTX);
-            dir += "/leaf-net";
-            !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700 | S_ISVTX);
-        }
+        // Make sure that the confined scope tmp directory exists.
+        string tmp_dir = string("/run/user/") + std::to_string(geteuid()) + "/scopes/leaf-net";
+        make_directories(tmp_dir, 0700);
 
         // Collect the registry config data.
 

=== modified file 'src/scopes/Result.cpp'
--- src/scopes/Result.cpp	2014-02-14 17:00:04 +0000
+++ src/scopes/Result.cpp	2015-04-23 15:43:14 +0000
@@ -154,6 +154,11 @@
     return p->serialize();
 }
 
+bool Result::is_account_login_result() const
+{
+    return p->contains("online_account_details");
+}
+
 //! @endcond
 
 } // namespace scopes

=== modified file 'src/scopes/internal/RegistryObject.cpp'
--- src/scopes/internal/RegistryObject.cpp	2015-01-20 08:25:39 +0000
+++ src/scopes/internal/RegistryObject.cpp	2015-04-23 15:43:14 +0000
@@ -37,6 +37,7 @@
 
 static const char* c_debug_dbus_started_cmd = "dbus-send --type=method_call --dest=com.ubuntu.SDKAppLaunch /ScopeRegistryCallback com.ubuntu.SDKAppLaunch.ScopeLoaded";
 static const char* c_debug_dbus_stopped_cmd = "dbus-send --type=method_call --dest=com.ubuntu.SDKAppLaunch /ScopeRegistryCallback com.ubuntu.SDKAppLaunch.ScopeStopped";
+static const std::chrono::seconds removal_notification_delay(5);
 
 namespace unity
 {
@@ -73,6 +74,8 @@
           })
       },
       executor_(executor),
+      publisher_notify_reset_timer_(false),
+      publisher_notify_exit_(false),
       generate_desktop_files_(generate_desktop_files)
 {
     if (middleware)
@@ -99,10 +102,14 @@
 
 RegistryObject::~RegistryObject()
 {
+    if (publisher_notify_thread_.joinable())
     {
-        // The destructor may be called from an arbitrary
-        // thread, so we need a full fence here.
-        lock_guard<decltype(mutex_)> lock(mutex_);
+        {
+            lock_guard<decltype(mutex_)> lock(mutex_);
+            publisher_notify_exit_ = true;
+            publisher_notify_cond_.notify_one();
+        }
+        publisher_notify_thread_.join();
     }
 
     // kill all scope processes
@@ -322,8 +329,34 @@
 
     if (publisher_ && erased)
     {
-        // Send a blank message to subscribers to inform them that the registry has been updated
-        publisher_->send_message("");
+        // Send a blank message to subscribers to inform them that the registry has been updated.
+        // Delay notification so that scope is not seen as removed and then added when updated.
+        lock_guard<decltype(mutex_)> lock(mutex_);
+
+        if (!publisher_notify_thread_.joinable())
+        {
+            publisher_notify_timepoint_ = chrono::system_clock::now() + removal_notification_delay;
+            publisher_notify_thread_ = thread([this]
+            {
+                unique_lock<decltype(mutex_)> lock(mutex_);
+                while (!publisher_notify_exit_)
+                {
+                    auto pred = [this]
+                    {
+                        return publisher_notify_exit_ || publisher_notify_reset_timer_;
+                    };
+                    if (!publisher_notify_cond_.wait_until(lock, publisher_notify_timepoint_, pred)) // pred is false, but timeout reached
+                    {
+                        publisher_->send_message("");
+                        publisher_notify_timepoint_ = chrono::system_clock::time_point::max();
+                    }
+                    publisher_notify_reset_timer_ = false;
+                }
+            });
+        }
+        publisher_notify_reset_timer_ = true;
+        publisher_notify_timepoint_ = chrono::system_clock::now() + removal_notification_delay;
+        publisher_notify_cond_.notify_one();
     }
 
     if (ex)

=== modified file 'src/scopes/internal/RuntimeConfig.cpp'
--- src/scopes/internal/RuntimeConfig.cpp	2015-01-06 02:38:27 +0000
+++ src/scopes/internal/RuntimeConfig.cpp	2015-04-23 15:43:14 +0000
@@ -19,18 +19,14 @@
 #include <unity/scopes/internal/RuntimeConfig.h>
 
 #include <unity/scopes/internal/DfltConfig.h>
+#include <unity/scopes/internal/Utils.h>
 #include <unity/scopes/ScopeExceptions.h>
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/constants.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <boost/filesystem.hpp>
 #include <unity/UnityExceptions.h>
 
-#include <sys/stat.h>
-
-#include <stdlib.h>
-
 using namespace std;
 
 namespace unity
@@ -343,9 +339,7 @@
         throw ResourceException("RuntimeConfig::default_log_directory(): $HOME not set");
     }
     string dir = string(home) + "/" + DFLT_HOME_LOG_SUBDIR;
-
-    boost::system::error_code ec;
-    !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700);
+    make_directories(dir, 0700);
 
     return dir;
 }

=== modified file 'src/scopes/internal/RuntimeImpl.cpp'
--- src/scopes/internal/RuntimeImpl.cpp	2015-03-02 03:59:01 +0000
+++ src/scopes/internal/RuntimeImpl.cpp	2015-04-23 15:43:14 +0000
@@ -30,6 +30,7 @@
 #include <unity/scopes/internal/ScopeObject.h>
 #include <unity/scopes/internal/SettingsDB.h>
 #include <unity/scopes/internal/UniqueID.h>
+#include <unity/scopes/internal/Utils.h>
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/ScopeExceptions.h>
 
@@ -42,7 +43,6 @@
 #include <future>
 
 #include <sys/apparmor.h>
-#include <sys/stat.h>
 
 using namespace std;
 using namespace unity::scopes;
@@ -592,43 +592,39 @@
 string RuntimeImpl::find_cache_dir() const
 {
     // Create the cache_dir_/<confinement-type>/<id> directories if they don't exist.
-    boost::system::error_code ec;
-    !confined() && !boost::filesystem::exists(cache_dir_, ec) && ::mkdir(cache_dir_.c_str(), 0700);
     string dir = cache_dir_ + "/" + confinement_type();
-    !confined() && !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700);
-
+    if (!confined())  // Avoid apparmor noise
+    {
+        string dir = cache_dir_ + "/" + confinement_type();
+        make_directories(cache_dir_, 0700);
+    }
     // A confined scope is allowed to create this dir.
     dir += "/" + demangled_id(scope_id_);
-    !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700);
-
+    make_directories(dir, 0700);
     return dir;
 }
 
 string RuntimeImpl::find_app_dir() const
 {
     // Create the app_dir_/<id> directories if they don't exist.
-    boost::system::error_code ec;
-    !confined() && !boost::filesystem::exists(app_dir_, ec) && ::mkdir(app_dir_.c_str(), 0700);
     string dir = app_dir_ + "/" + demangled_id(scope_id_);
-    !confined() && !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700);
-
+    if (!confined())  // Avoid apparmor noise
+    {
+        make_directories(dir, 0700);
+    }
     return dir;
 }
 
 string RuntimeImpl::find_log_dir(string const& id) const
 {
-    // Create the log_dir_/<confinement-type>/<id>/logs directories if they don't exist.
-    boost::system::error_code ec;
-    !confined() && !boost::filesystem::exists(log_dir_, ec) && ::mkdir(log_dir_.c_str(), 0700);
     string dir = log_dir_ + "/" + confinement_type();
-    !confined() && !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700);
-
+    if (!confined())  // Avoid apparmore noise
+    {
+        make_directories(dir, 0700);
+    }
     // A confined scope is allowed to create this dir.
-    dir += "/" + demangled_id(id);
-    !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700);
-    dir += "/logs";
-    !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700);
-
+    dir += "/" + demangled_id(id) + "/logs";
+    make_directories(dir, 0700);
     return dir;
 }
 
@@ -638,17 +634,14 @@
     // We need to create any directories under /run/user/<uid> because they might not
     // exist. We set the sticky bit because, without this, things in
     // /run/user may be deleted if not accessed for more than six hours.
-    string dir = string("/run/user/") + std::to_string(geteuid());
-    dir += "/scopes";
-    boost::system::error_code ec;
-    !confined() && !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700 | S_ISVTX);
-    dir += "/" + confinement_type();
-    !confined() && !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700 | S_ISVTX);
-
+    string dir = string("/run/user/") + std::to_string(geteuid()) + "/scopes/" + confinement_type();
+    if (!confined())  // Avoid apparmor noise
+    {
+        make_directories(dir, 0700);
+    }
     // A confined scope is allowed to create this dir.
     dir += "/" + scope_id_;  // Not demangled, use the real scope ID.
-    !boost::filesystem::exists(dir, ec) && ::mkdir(dir.c_str(), 0700 | S_ISVTX);
-
+    make_directories(dir, 0700);
     return dir;
 }
 

=== modified file 'src/scopes/internal/SearchQueryBaseImpl.cpp'
--- src/scopes/internal/SearchQueryBaseImpl.cpp	2015-04-09 15:59:17 +0000
+++ src/scopes/internal/SearchQueryBaseImpl.cpp	2015-04-23 15:43:14 +0000
@@ -193,14 +193,19 @@
         reply->finished(CompletionDetails(CompletionDetails::OK,
                                           "empty result set due to aggregator loop or repeated query on aggregating scope "
                                           + get<1>(tuple)));
+        ctrl_proxy = make_shared<QueryCtrlImpl>(nullptr, nullptr);  // Dummy proxy in already-cancelled state
+
         auto scope_impl = dynamic_pointer_cast<ScopeImpl>(scope);
-        auto logger = scope_impl->runtime()->logger();
-        ctrl_proxy = make_shared<QueryCtrlImpl>(nullptr, nullptr);  // Dummy proxy in already-cancelled state
-        BOOST_LOG_SEV(logger, Logger::Warning)
-            << "query loop for query \"" << canned_query_.query_string()
-            << "\", client: " << get<0>(tuple)
-            << ", aggregator: " << get<1>(tuple)
-            << ", receiver: " << get<2>(tuple) << endl;
+        // scope_impl can be nullptr if we use a mock scope: TypedScopeFixture<testing::Scope>
+        if (scope_impl)
+        {
+            auto logger = scope_impl->runtime()->logger();
+            BOOST_LOG_SEV(logger, Logger::Warning)
+                << "query loop for query \"" << canned_query_.query_string()
+                << "\", client: " << get<0>(tuple)
+                << ", aggregator: " << get<1>(tuple)
+                << ", receiver: " << get<2>(tuple) << endl;
+        }
     }
     else
     {

=== modified file 'src/scopes/internal/Utils.cpp'
--- src/scopes/internal/Utils.cpp	2014-11-17 01:29:26 +0000
+++ src/scopes/internal/Utils.cpp	2015-04-23 15:43:14 +0000
@@ -20,10 +20,16 @@
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
 
+#include <boost/filesystem.hpp>
+
 #include <iomanip>
 #include <locale>
 #include <mutex>
 
+#include <sys/stat.h>
+
+using namespace std;
+
 namespace unity
 {
 
@@ -33,7 +39,7 @@
 namespace internal
 {
 
-VariantMap::const_iterator find_or_throw(std::string const& context, VariantMap const& var, std::string const& key)
+VariantMap::const_iterator find_or_throw(string const& context, VariantMap const& var, string const& key)
 {
     auto it = var.find(key);
     if (it == var.end())
@@ -43,14 +49,14 @@
     return it;
 }
 
-std::string to_percent_encoding(std::string const& str)
+string to_percent_encoding(string const& str)
 {
-    std::ostringstream result;
+    ostringstream result;
     for (auto const& c: str)
     {
         if ((!isalnum(c)))
         {
-            result << '%' << std::setw(2) << std::setfill('0') << std::hex << std::uppercase << static_cast<int>(static_cast<unsigned char>(c)) << std::nouppercase;
+            result << '%' << setw(2) << setfill('0') << hex << uppercase << static_cast<int>(static_cast<unsigned char>(c)) << nouppercase;
         }
         else
         {
@@ -60,9 +66,9 @@
     return result.str();
 }
 
-std::string from_percent_encoding(std::string const& str)
+string from_percent_encoding(string const& str)
 {
-    std::ostringstream result;
+    ostringstream result;
     for (auto it = str.begin(); it != str.end(); it++)
     {
         auto c = *it;
@@ -75,16 +81,16 @@
                 c = *it;
                 if (++it != str.end())
                 {
-                    std::string const hexnum { c, *it };
+                    string const hexnum { c, *it };
                     try
                     {
-                        auto k = std::stoi(hexnum, nullptr, 16);
+                        auto k = stoi(hexnum, nullptr, 16);
                         result << static_cast<char>(k);
                         valid = true;
                     }
-                    catch (std::logic_error const& e) // covers both std::invalid_argument and std::out_of_range
+                    catch (logic_error const& e) // covers both invalid_argument and out_of_range
                     {
-                        std::stringstream err;
+                        stringstream err;
                         err << "from_percent_encoding(): unsupported conversion of '" << hexnum << "'";
                         throw unity::InvalidArgumentException(err.str());
                     }
@@ -103,33 +109,33 @@
     return result.str();
 }
 
-std::string uncamelcase(std::string const& str)
+string uncamelcase(string const& str)
 {
-    const std::locale loc("");
+    const locale loc("");
     if (str.size() == 0)
     {
         return str;
     }
     auto it = str.begin();
-    int previous_is_lower = std::islower(*it);
-    std::stringstream res;
-    res << std::tolower(*it, loc);
+    int previous_is_lower = islower(*it);
+    stringstream res;
+    res << tolower(*it, loc);
     ++it;
     while (it != str.end())
     {
-        if (std::isupper(*it) && previous_is_lower)
+        if (isupper(*it) && previous_is_lower)
         {
             res << "-";
         }
-        previous_is_lower = std::islower(*it);
-        res << std::tolower(*it, loc);
+        previous_is_lower = islower(*it);
+        res << tolower(*it, loc);
         ++it;
     }
     return res.str();
 }
 
 template<>
-bool convert_to<bool>(std::string const& val, Variant& out)
+bool convert_to<bool>(string const& val, Variant& out)
 {
     if (val == "true")
     {
@@ -144,11 +150,44 @@
     return false;
 }
 
-int safe_system_call(std::string const& command)
-{
-    static std::mutex system_mutex;
-    std::lock_guard<std::mutex> lock(system_mutex);
-    return std::system(command.c_str());
+int safe_system_call(string const& command)
+{
+    static mutex system_mutex;
+    lock_guard<mutex> lock(system_mutex);
+    return system(command.c_str());
+}
+
+// Recursively create the directories in path, setting permissions to the specified mode
+// (regardless of the setting of umask). If one or more directories already exist, they
+// are left unchanged (including their permissions). If a directory cannot be created,
+// fail silently.
+
+void make_directories(string const& path_name, mode_t mode)
+{
+    using namespace boost::filesystem;
+
+    // We can't use boost::create_directories() here because that does not allow control over permissions.
+    auto abs = absolute(path_name);
+    path path_so_far = "";
+    path::iterator it = abs.begin();
+    ++it; // No point in trying to create /
+    while (it != abs.end())
+    {
+        path_so_far += "/";
+        path_so_far += *it++;
+        string p = path_so_far.native();
+        if (mkdir(p.c_str(), mode) != 0)
+        {
+            if (errno == EEXIST)
+            {
+                continue;
+            }
+            return;  // No point in continuing, we'd fail on all subsequent iterations.
+        }
+        // We just created the dir, make sure it has the requested permissions,
+        // not the permissions modified by umask.
+        chmod(p.c_str(), mode);
+    }
 }
 
 } // namespace internal

=== modified file 'src/scopes/internal/smartscopes/SmartScopesClient.cpp'
--- src/scopes/internal/smartscopes/SmartScopesClient.cpp	2015-01-28 09:03:59 +0000
+++ src/scopes/internal/smartscopes/SmartScopesClient.cpp	2015-04-23 15:43:14 +0000
@@ -21,6 +21,7 @@
 #include <unity/scopes/internal/FilterStateImpl.h>
 #include <unity/scopes/internal/RuntimeImpl.h>
 #include <unity/scopes/internal/smartscopes/SmartScopesClient.h>
+#include <unity/scopes/internal/Utils.h>
 
 #include <unity/scopes/ScopeExceptions.h>
 #include <unity/UnityExceptions.h>
@@ -34,7 +35,6 @@
 #include <utility>
 #include <map>
 #include <sstream>
-#include <sys/stat.h>
 
 static std::string homedir()
 {
@@ -860,7 +860,7 @@
 void SmartScopesClient::write_cache(std::string const& scopes_json)
 {
     // make cache directory (fails silently if already exists)
-    mkdir(c_scopes_cache_dir.c_str(), 0755);
+    make_directories(c_scopes_cache_dir, 0755);
 
     // open cache for output
     std::ofstream cache_file(c_scopes_cache_dir + c_scopes_cache_filename);

=== added file 'test/gtest/scopes/Aggregation/CMakeLists.txt'
--- test/gtest/scopes/Aggregation/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/Aggregation/CMakeLists.txt	2015-04-23 15:43:14 +0000
@@ -0,0 +1,39 @@
+configure_file(TestRegistry.ini.in ${CMAKE_CURRENT_BINARY_DIR}/TestRegistry.ini)
+configure_file(Runtime.ini.in ${CMAKE_CURRENT_BINARY_DIR}/Runtime.ini)
+configure_file(Zmq.ini.in ${CMAKE_CURRENT_BINARY_DIR}/Zmq.ini)
+
+add_definitions(-DTEST_RUNTIME_PATH="${CMAKE_CURRENT_BINARY_DIR}")
+add_definitions(-DTEST_RUNTIME_FILE="${CMAKE_CURRENT_BINARY_DIR}/Runtime.ini")
+add_definitions(-DTEST_REGISTRY_PATH="${PROJECT_BINARY_DIR}/scoperegistry")
+
+
+add_executable(ChildScopes_test ChildScopes_test.cpp)
+target_link_libraries(ChildScopes_test ${TESTLIBS})
+
+add_test(ChildScopes ChildScopes_test)
+
+
+add_executable(Keywords_test Keywords_test.cpp)
+target_link_libraries(Keywords_test ${TESTLIBS})
+
+add_test(Keywords Keywords_test)
+
+
+add_executable(LoopDetection_test LoopDetection_test.cpp AggTestScope.cpp)
+target_link_libraries(LoopDetection_test ${TESTLIBS})
+
+add_dependencies(LoopDetection_test scoperegistry scoperunner)
+
+add_test(LoopDetection LoopDetection_test)
+
+set(SCOPE_DIR "${CMAKE_CURRENT_BINARY_DIR}/scopes")
+
+foreach (scope A B C D)
+    file(MAKE_DIRECTORY "${SCOPE_DIR}/${scope}")
+    configure_file(AggTestScope.ini.in ${SCOPE_DIR}/${scope}/${scope}.ini)
+    add_library(${scope} MODULE AggTestScope.cpp)
+    set_target_properties(${scope}
+      PROPERTIES
+        LIBRARY_OUTPUT_DIRECTORY "${SCOPE_DIR}/${scope}/"
+    )
+endforeach()

=== removed file 'test/gtest/scopes/Aggregation/CMakeLists.txt'
--- test/gtest/scopes/Aggregation/CMakeLists.txt	2015-04-09 15:59:17 +0000
+++ test/gtest/scopes/Aggregation/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-configure_file(TestRegistry.ini.in ${CMAKE_CURRENT_BINARY_DIR}/TestRegistry.ini)
-configure_file(Runtime.ini.in ${CMAKE_CURRENT_BINARY_DIR}/Runtime.ini)
-configure_file(Zmq.ini.in ${CMAKE_CURRENT_BINARY_DIR}/Zmq.ini)
-
-add_definitions(-DTEST_RUNTIME_PATH="${CMAKE_CURRENT_BINARY_DIR}")
-add_definitions(-DTEST_RUNTIME_FILE="${CMAKE_CURRENT_BINARY_DIR}/Runtime.ini")
-add_definitions(-DTEST_REGISTRY_PATH="${PROJECT_BINARY_DIR}/scoperegistry")
-
-
-add_executable(ChildScopes_test ChildScopes_test.cpp)
-target_link_libraries(ChildScopes_test ${TESTLIBS})
-
-add_test(ChildScopes ChildScopes_test)
-
-
-add_executable(Keywords_test Keywords_test.cpp)
-target_link_libraries(Keywords_test ${TESTLIBS})
-
-add_test(Keywords Keywords_test)
-
-
-add_executable(LoopDetection_test LoopDetection_test.cpp AggTestScope.cpp)
-target_link_libraries(LoopDetection_test ${TESTLIBS})
-
-add_dependencies(LoopDetection_test scoperegistry scoperunner)
-
-add_test(LoopDetection LoopDetection_test)
-
-set(SCOPE_DIR "${CMAKE_CURRENT_BINARY_DIR}/scopes")
-
-foreach (scope A B C D)
-    file(MAKE_DIRECTORY "${SCOPE_DIR}/${scope}")
-    configure_file(AggTestScope.ini.in ${SCOPE_DIR}/${scope}/${scope}.ini)
-    add_library(${scope} MODULE AggTestScope.cpp)
-    set_target_properties(${scope}
-      PROPERTIES
-        LIBRARY_OUTPUT_DIRECTORY "${SCOPE_DIR}/${scope}/"
-    )
-endforeach()

=== modified file 'test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp'
--- test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp	2015-01-26 06:02:10 +0000
+++ test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp	2015-04-23 15:43:14 +0000
@@ -307,7 +307,9 @@
     auto cat = reg.register_category("1", "title", "icon", nullptr, CategoryRenderer());
     CategorisedResult result(cat);
 
+    EXPECT_FALSE(result.is_account_login_result());
     oa_client.register_account_login_item(result, CannedQuery("test"), OnlineAccountClient::InvalidateResults, OnlineAccountClient::DoNothing);
+    EXPECT_TRUE(result.is_account_login_result());
 
     EXPECT_TRUE(result.contains("online_account_details"));
 

=== modified file 'test/gtest/scopes/Registry/Registry_test.cpp'
--- test/gtest/scopes/Registry/Registry_test.cpp	2015-01-27 12:46:11 +0000
+++ test/gtest/scopes/Registry/Registry_test.cpp	2015-04-23 15:43:14 +0000
@@ -153,7 +153,7 @@
     EXPECT_FALSE(meta.is_aggregator());
 }
 
-auto const wait_for_update_time = std::chrono::milliseconds(5000);
+auto const wait_for_update_time = std::chrono::milliseconds(10000);
 
 TEST(Registry, scope_state_notify)
 {

=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/BadLogDirSize.ini' => 'test/gtest/scopes/internal/RuntimeConfig/BadLogDirSize.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/BadLogFileSize.ini' => 'test/gtest/scopes/internal/RuntimeConfig/BadLogFileSize.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/BadMW.ini' => 'test/gtest/scopes/internal/RuntimeConfig/BadMW.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/BadReapExpiry.ini' => 'test/gtest/scopes/internal/RuntimeConfig/BadReapExpiry.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/BadReapInterval.ini' => 'test/gtest/scopes/internal/RuntimeConfig/BadReapInterval.ini.in'
=== modified file 'test/gtest/scopes/internal/RuntimeConfig/CMakeLists.txt'
--- test/gtest/scopes/internal/RuntimeConfig/CMakeLists.txt	2014-06-23 06:53:45 +0000
+++ test/gtest/scopes/internal/RuntimeConfig/CMakeLists.txt	2015-04-23 15:43:14 +0000
@@ -1,5 +1,12 @@
-add_definitions(-DTEST_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
+add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 add_executable(RuntimeConfig_test RuntimeConfig_test.cpp)
 target_link_libraries(RuntimeConfig_test ${TESTLIBS})
 
+file(GLOB ini_files "*.ini.in")
+foreach(ini_in ${ini_files})
+    get_filename_component(file ${ini_in} NAME)
+    string(REGEX REPLACE "(.*)\\.in$" "\\1" ini ${file})
+    configure_file(${file} ${CMAKE_CURRENT_BINARY_DIR}/${ini})
+endforeach(ini_in)
+
 add_test(RuntimeConfig RuntimeConfig_test)

=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/CacheDir.ini' => 'test/gtest/scopes/internal/RuntimeConfig/CacheDir.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/Complete.ini' => 'test/gtest/scopes/internal/RuntimeConfig/Complete.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/ConfigDir.ini' => 'test/gtest/scopes/internal/RuntimeConfig/ConfigDir.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/LogDir.ini' => 'test/gtest/scopes/internal/RuntimeConfig/LogDir.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/NoAppDir.ini' => 'test/gtest/scopes/internal/RuntimeConfig/NoAppDir.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/NoCacheDir.ini' => 'test/gtest/scopes/internal/RuntimeConfig/NoCacheDir.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/NoConfigDir.ini' => 'test/gtest/scopes/internal/RuntimeConfig/NoConfigDir.ini.in'
=== renamed file 'test/gtest/scopes/internal/RuntimeConfig/NoLogDir.ini' => 'test/gtest/scopes/internal/RuntimeConfig/NoLogDir.ini.in'
=== modified file 'test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp'
--- test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2015-02-12 23:21:47 +0000
+++ test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2015-04-23 15:43:14 +0000
@@ -32,7 +32,7 @@
 
 TEST(RuntimeConfig, basic)
 {
-    setenv("HOME", TEST_SRC_DIR, 1);
+    setenv("HOME", TEST_DIR, 1);
 
     RuntimeConfig c("");
     EXPECT_EQ("Registry", c.registry_identity());
@@ -50,7 +50,7 @@
 
 TEST(RuntimeConfig, complete)
 {
-    RuntimeConfig c(TEST_SRC_DIR "/Complete.ini");
+    RuntimeConfig c(TEST_DIR "/Complete.ini");
     EXPECT_EQ("R.Id", c.registry_identity());
     EXPECT_EQ("R.Config", c.registry_configfile());
     EXPECT_EQ("SS.R.Id", c.ss_registry_identity());
@@ -70,25 +70,25 @@
 
 TEST(RuntimeConfig, _default_cache_dir)
 {
-    setenv("HOME", TEST_SRC_DIR, 1);
+    setenv("HOME", TEST_DIR, 1);
 
     RuntimeConfig c("");
-    EXPECT_EQ(TEST_SRC_DIR "/.local/share/unity-scopes", c.cache_directory());
+    EXPECT_EQ(TEST_DIR "/.local/share/unity-scopes", c.cache_directory());
 }
 
 TEST(RuntimeConfig, overridden_cache_dir)
 {
     unsetenv("HOME");
 
-    RuntimeConfig c(TEST_SRC_DIR "/CacheDir.ini");
+    RuntimeConfig c(TEST_DIR "/CacheDir.ini");
     EXPECT_EQ("cachedir", c.cache_directory());
 }
 
 TEST(RuntimeConfig, overridden_cache_dir_with_home_dir)
 {
-    setenv("HOME", TEST_SRC_DIR, 1);
+    setenv("HOME", TEST_DIR, 1);
 
-    RuntimeConfig c(TEST_SRC_DIR "/CacheDir.ini");
+    RuntimeConfig c(TEST_DIR "/CacheDir.ini");
     EXPECT_EQ("cachedir", c.cache_directory());
 }
 
@@ -96,15 +96,15 @@
 {
     unsetenv("HOME");
 
-    RuntimeConfig c(TEST_SRC_DIR "/CacheDir.ini");
+    RuntimeConfig c(TEST_DIR "/CacheDir.ini");
     EXPECT_EQ("appdir", c.app_directory());
 }
 
 TEST(RuntimeConfig, overridden_app_dir_with_home_dir)
 {
-    setenv("HOME", TEST_SRC_DIR, 1);
+    setenv("HOME", TEST_DIR, 1);
 
-    RuntimeConfig c(TEST_SRC_DIR "/ConfigDir.ini");
+    RuntimeConfig c(TEST_DIR "/ConfigDir.ini");
     EXPECT_EQ("appdir", c.app_directory());
 }
 
@@ -112,15 +112,15 @@
 {
     unsetenv("HOME");
 
-    RuntimeConfig c(TEST_SRC_DIR "/ConfigDir.ini");
+    RuntimeConfig c(TEST_DIR "/ConfigDir.ini");
     EXPECT_EQ("configdir", c.config_directory());
 }
 
 TEST(RuntimeConfig, overridden_config_dir_with_home_dir)
 {
-    setenv("HOME", TEST_SRC_DIR, 1);
+    setenv("HOME", TEST_DIR, 1);
 
-    RuntimeConfig c(TEST_SRC_DIR "/ConfigDir.ini");
+    RuntimeConfig c(TEST_DIR "/ConfigDir.ini");
     EXPECT_EQ("configdir", c.config_directory());
 }
 
@@ -128,13 +128,13 @@
 {
     unsetenv("HOME");
 
-    RuntimeConfig c(TEST_SRC_DIR "/LogDir.ini");
+    RuntimeConfig c(TEST_DIR "/LogDir.ini");
     EXPECT_EQ("logdir", c.log_directory());
 }
 
 TEST(RuntimeConfig, overridden_log_dir_with_home_dir)
 {
-    RuntimeConfig c(TEST_SRC_DIR "/LogDir.ini");
+    RuntimeConfig c(TEST_DIR "/LogDir.ini");
     EXPECT_EQ("logdir", c.log_directory());
 }
 
@@ -142,7 +142,7 @@
 {
     setenv("UNITY_SCOPES_LOGDIR", "otherdir", 1);
 
-    RuntimeConfig c(TEST_SRC_DIR "/LogDir.ini");
+    RuntimeConfig c(TEST_DIR "/LogDir.ini");
     EXPECT_EQ("otherdir", c.log_directory());
 }
 
@@ -150,7 +150,7 @@
 {
     setenv("UNITY_SCOPES_LOG_TRACECHANNELS", "ABC;XYZ;;DEF", 1);
 
-    RuntimeConfig c(TEST_SRC_DIR "/Complete.ini");
+    RuntimeConfig c(TEST_DIR "/Complete.ini");
     EXPECT_EQ((vector<string>{ "ABC", "XYZ", "DEF"}), c.trace_channels());
 }
 
@@ -158,36 +158,36 @@
 {
     try
     {
-        RuntimeConfig c(TEST_SRC_DIR "/BadMW.ini");
+        RuntimeConfig c(TEST_DIR "/BadMW.ini");
         FAIL();
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_SRC_DIR "/BadMW.ini\": Illegal value for Default.Middleware: "
+        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_DIR "/BadMW.ini\": Illegal value for Default.Middleware: "
                      "\"Foo\": legal values are \"Zmq\" and \"REST\"",
                      e.what());
     }
 
     try
     {
-        RuntimeConfig c(TEST_SRC_DIR "/BadReapExpiry.ini");
+        RuntimeConfig c(TEST_DIR "/BadReapExpiry.ini");
         FAIL();
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_SRC_DIR "/BadReapExpiry.ini\": Illegal value (0) for "
+        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_DIR "/BadReapExpiry.ini\": Illegal value (0) for "
                      "Reap.Expiry: value must be > 0",
                      e.what());
     }
 
     try
     {
-        RuntimeConfig c(TEST_SRC_DIR "/BadReapInterval.ini");
+        RuntimeConfig c(TEST_DIR "/BadReapInterval.ini");
         FAIL();
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_SRC_DIR "/BadReapInterval.ini\": Illegal value (0) for "
+        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_DIR "/BadReapInterval.ini\": Illegal value (0) for "
                      "Reap.Interval: value must be > 0",
                      e.what());
     }
@@ -196,12 +196,12 @@
     {
         unsetenv("HOME");
 
-        RuntimeConfig c(TEST_SRC_DIR "/NoCacheDir.ini");
+        RuntimeConfig c(TEST_DIR "/NoCacheDir.ini");
         FAIL();
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_SRC_DIR "/NoCacheDir.ini\": No CacheDir configured and "
+        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_DIR "/NoCacheDir.ini\": No CacheDir configured and "
                      "failed to get default:\n    unity::ResourceException: RuntimeConfig::default_cache_directory(): "
                      "$HOME not set",
                      e.what());
@@ -211,12 +211,12 @@
     {
         unsetenv("HOME");
 
-        RuntimeConfig c(TEST_SRC_DIR "/NoConfigDir.ini");
+        RuntimeConfig c(TEST_DIR "/NoConfigDir.ini");
         FAIL();
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_SRC_DIR "/NoConfigDir.ini\": No ConfigDir configured and "
+        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_DIR "/NoConfigDir.ini\": No ConfigDir configured and "
                      "failed to get default:\n    unity::ResourceException: RuntimeConfig::default_config_directory(): "
                      "$HOME not set",
                      e.what());
@@ -226,13 +226,13 @@
     {
         unsetenv("HOME");
 
-        RuntimeConfig c(TEST_SRC_DIR "/NoLogDir.ini");
+        RuntimeConfig c(TEST_DIR "/NoLogDir.ini");
         FAIL();
     }
     catch (ConfigException const& e)
     {
         // Using regex here because error message returned by glib changed from Utopic to Vivid.
-        // The final .* takes care of the difference. Note that, instead of using TEST_SRC_DIR, we
+        // The final .* takes care of the difference. Note that, instead of using TEST_DIR, we
         // use .+. That's because, when building with bzr bd, we end up with a '+' in the path,
         // and that is a regex metacharacter, causing the match to fail.
         boost::regex r("unity::scopes::ConfigException: \".+/NoLogDir.ini\": "
@@ -246,12 +246,12 @@
     {
         unsetenv("HOME");
 
-        RuntimeConfig c(TEST_SRC_DIR "/NoAppDir.ini");
+        RuntimeConfig c(TEST_DIR "/NoAppDir.ini");
         FAIL();
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_SRC_DIR "/NoAppDir.ini\": "
+        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_DIR "/NoAppDir.ini\": "
                      "No AppDir configured and failed to get default:\n"
                      "    unity::ResourceException: RuntimeConfig::default_app_directory(): $HOME not set",
                      e.what());
@@ -259,24 +259,24 @@
 
     try
     {
-        RuntimeConfig c(TEST_SRC_DIR "/BadLogFileSize.ini");
+        RuntimeConfig c(TEST_DIR "/BadLogFileSize.ini");
         FAIL();
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_SRC_DIR "/BadLogFileSize.ini\": "
+        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_DIR "/BadLogFileSize.ini\": "
                      "Illegal value (999) for Log.MaxFileSize: value must be > 1024",
                      e.what());
     }
 
     try
     {
-        RuntimeConfig c(TEST_SRC_DIR "/BadLogDirSize.ini");
+        RuntimeConfig c(TEST_DIR "/BadLogDirSize.ini");
         FAIL();
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_SRC_DIR "/BadLogDirSize.ini\": "
+        EXPECT_STREQ("unity::scopes::ConfigException: \"" TEST_DIR "/BadLogDirSize.ini\": "
                      "Illegal value (1024) for Log.MaxDirSize: value must be > Log.MaxFileSize (2048)",
                      e.what());
     }

=== modified file 'test/gtest/scopes/internal/Utils/CMakeLists.txt'
--- test/gtest/scopes/internal/Utils/CMakeLists.txt	2014-06-25 14:38:30 +0000
+++ test/gtest/scopes/internal/Utils/CMakeLists.txt	2015-04-23 15:43:14 +0000
@@ -1,4 +1,5 @@
 add_executable(Utils_test Utils_test.cpp)
+add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 target_link_libraries(Utils_test ${TESTLIBS})
 
 add_test(Utils Utils_test)

=== modified file 'test/gtest/scopes/internal/Utils/Utils_test.cpp'
--- test/gtest/scopes/internal/Utils/Utils_test.cpp	2014-11-17 01:29:26 +0000
+++ test/gtest/scopes/internal/Utils/Utils_test.cpp	2015-04-23 15:43:14 +0000
@@ -17,11 +17,14 @@
  */
 
 #include <unity/scopes/internal/Utils.h>
+
+#include <boost/filesystem.hpp>
+#include <gtest/gtest.h>
 #include <unity/UnityExceptions.h>
-#include <gtest/gtest.h>
 
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
+using namespace std;
 
 TEST(Utils, uncamelcase)
 {
@@ -47,7 +50,7 @@
     }
     {
         Variant out;
-        EXPECT_TRUE(convert_to<std::string>("foo", out));
+        EXPECT_TRUE(convert_to<string>("foo", out));
         EXPECT_EQ("foo", out.get_string());
     }
     {
@@ -66,3 +69,66 @@
         EXPECT_FALSE(out.get_bool());
     }
 }
+
+void empty_dir(string const& dir)
+{
+    namespace fs = boost::filesystem;
+    try
+    {
+        for (fs::directory_iterator end, it(dir); it != end; ++it)
+        {
+            remove_all(it->path());
+        }
+    }
+    catch (...)
+    {
+    }
+}
+
+int get_perms(string const& path)
+{
+    struct stat st;
+    if (stat(path.c_str(), &st) != 0)
+    {
+        string msg = "get_perms(): cannot stat " + path + ": errno = " + to_string(errno);
+        throw runtime_error(msg);
+    }
+    return st.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+}
+
+TEST(Utils, make_directories)
+{
+    using namespace std;
+
+    string test_root = TEST_DIR "/dir";
+
+    empty_dir(test_root);
+    rmdir(test_root.c_str());  // First time around, make sure that test_root doesn't exist.
+
+    make_directories(test_root, 0700);
+    EXPECT_EQ(0700, get_perms(test_root));
+
+    // Do it a second time, to test that it works whether test_root exists or not.
+    make_directories(test_root, 0700);
+    EXPECT_EQ(0700, get_perms(test_root));
+
+    // Change permissions on test_root and make a dir underneath it.
+    chmod(test_root.c_str(), 0777);
+    string child = test_root + "/child";
+    int old_umask = umask(0000);
+    make_directories(child, 0555);
+    umask(old_umask);
+
+    // test_root permissions must still be the same, child must have perm 0555.
+    EXPECT_EQ(0777, get_perms(test_root));
+    EXPECT_EQ(0555, get_perms(child));
+
+    // Remove permission from child dir.
+    chmod(child.c_str(), 0000);
+
+    // Check that we fail silently trying to create the grandchild.
+    string grandchild = child + "/grandchild";
+    make_directories(grandchild, 0555);
+
+    chmod(child.c_str(), 0777);  // Don't leave the dir behind without permissions.
+}

=== modified file 'unity-scopes.map'
--- unity-scopes.map	2014-12-01 14:12:24 +0000
+++ unity-scopes.map	2015-04-23 15:43:14 +0000
@@ -16,6 +16,7 @@
         unity::scopes::internal::Executor::*;
         unity::scopes::internal::IniSettingsSchema::*;
         unity::scopes::internal::JsonSettingsSchema::*;
+        unity::scopes::internal::make_directories*;
         unity::scopes::internal::MiddlewareBase::*;
         unity::scopes::internal::MiddlewareFactory::*;
         unity::scopes::internal::RegistryConfig::*;