Merge lp:~michihenning/unity-scopes-api/scope-cache-dir into lp:unity-scopes-api/devel

[Michi Henning]

  - Added cache_directory() method to ScopeBase, so a scope can find out where it can write its files.

  - Refactored scoperunner and ScopeLoader. ScopeLoader no longer knows about the registry and
    scoperunner now calls RuntimeImpl::run_scope() to set the scope running, instead of duplicating
    lots of functionality.

  - Removed registry parameter from ScopeBase::start(). The registry is now available via a registry()
    accessor on ScopeBase. The original start() method is still present, but deprecated. The default
    implementation of the new start() method forwards to the old one so, if a scope implements only the
    old one but not the new one, things still work.

  - Made methods on ScopeBase virtual, so the testing framework can override them in a test scope.

  - Added cache_directory() method to ScopeBase, so a scope can find out where it can write its files.

  - Refactored scoperunner and ScopeLoader. ScopeLoader no longer knows about the registry and
    scoperunner now calls RuntimeImpl::run_scope() to set the scope running, instead of duplicating
    lots of functionality.

  - Removed registry parameter from ScopeBase::start(). The registry is now available via a registry()
    accessor on ScopeBase. The original start() method is still present, but deprecated. The default
    implementation of the new start() method forwards to the old one so, if a scope implements only the
    old one but not the new one, things still work.

  - Made methods on ScopeBase virtual, so the testing framework can override them in a test scope.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:402
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/725/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/279/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/277/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/277/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

403. By Michi Henning on 2014-07-07

Added encoding = utf-8 to file open(), so the 'ß' in Thomas's headers won't break
the tests :-)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/726/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/278
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/278/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/278/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/727/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/279
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/279/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/279

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

43 + $HOME/.local/share/unity-scopes/leaf-fs/<scope_id>
851 + data_dir_ + "/leaf-fs/" + scope_id_

The local content template doesn't exist, so there's no need to try to support it.

42 + $HOME/.local/share/unity-scopes/leaf-net/<scope_id>

Who's responsible for creating this directory? I suppose the leaf could be created by the scope itself (does it have permissions to do that?), but the parents have to be created by something unconfined, so who's doing it? The click hook?

review: Needs Information

[Michal Hruby (mhr3)]

41 + $HOME/.local/share/unity-scopes/aggregator/<scope_id>

Same as for leaf-fs, there's no apparmor template for aggregator scopes, so this should really be $HOME/.local/share/unity-scopes/unconfined/<scope_id>

[Michi Henning (michihenning)]

> 43 + $HOME/.local/share/unity-scopes/leaf-fs/<scope_id>
> 851 + data_dir_ +
> "/leaf-fs/" + scope_id_
>
> The local content template doesn't exist, so there's no need to try to support
> it.

Not sure what you mean here. We have net, fs, and unconfined scopes. All of these can have a scratch area. I'm going by Jamie's comments here: https://bugs.launchpad.net/unity-scopes-api/+bug/1327426

> 42 + $HOME/.local/share/unity-scopes/leaf-net/<scope_id>
>
> Who's responsible for creating this directory? I suppose the leaf could be
> created by the scope itself (does it have permissions to do that?), but the
> parents have to be created by something unconfined, so who's doing it? The
> click hook?

Yes, the directory needs to be created as part of the installation.

[Michi Henning (michihenning)]

> 41 + $HOME/.local/share/unity-scopes/aggregator/<scope_id>
>
> Same as for leaf-fs, there's no apparmor template for aggregator scopes, so
> this should really be $HOME/.local/share/unity-scopes/unconfined/<scope_id>

Referring to: https://bugs.launchpad.net/unity-scopes-api/+bug/1327426

I don't mind whether we call it "aggregator" or "unconfined". Jamie?

Personally, I think "unconfined" is a slightly better name though. I think it better expresses the semantics, and we may want to have unconfined scopes at some point in the future that are not aggregators.

[Jamie Strandboge (jdstrand)]

There are plans to support the local content scope at some point and so I don't see any harm in using 'leaf-fs' for it. There is no reason why we couldn't also provide an aggregator template for us and trusted 3rd parties to use to help confine the scope somewhat (we just wouldn't make it available to unknown 3rd party developers). As for 'aggregator' vs 'unconfined', I personally like the idea of expressing the functionality there. While 'leaf-net', 'leaf-fs', 'aggregator' or anything else does have to do with what is expressed in the apparmor policy for the specified template, I'm not sure you want to have to worry about what templates are defined and what aren't in your code. Wouldn't it be best to just use these 3 different types so that if we ever supply the templates at a future date nothing in your code has to change?

[Michi Henning (michihenning)]

Hi Jamie, not totally sure whether your response is in favour of "aggregator" or "unconfined' here :-) Can you clarify?

As far as the scopes run time is concerned, all we care about is that there are three different kinds of scope who use different locations in the filesystem. So, I wouldn't really care if those locations were called "a", "b", and "c", and whether the directory names are the same as the apparmor policy or not.

Basically, all we need to do is agree on the three names :-)

[Michal Hruby (mhr3)]

> > 43 + $HOME/.local/share/unity-scopes/leaf-fs/<scope_id>
> > 851 + data_dir_
> +
> > "/leaf-fs/" + scope_id_
> >
> > The local content template doesn't exist, so there's no need to try to
> support
> > it.
>
> Not sure what you mean here. We have net, fs, and unconfined scopes. All of
> these can have a scratch area. I'm going by Jamie's comments here:
> https://bugs.launchpad.net/unity-scopes-api/+bug/1327426

No, we don't support fs scopes, cause there are unresolved security issues with them.

[Michal Hruby (mhr3)]

374 - std::string scope_directory() const;
377 + virtual std::string scope_directory() const;
412 - VariantMap settings() const;
413 + virtual VariantMap settings() const;

I really don't like these changes, other than tests there's absolutely no reason for these to be virtual and therefore to allow the scope to override them. Can't we do something different, like setting a special envvar for the tests and have the impl look at that first? Yes, making it virtual does make it easily unit-testable, but imo such a test is really just testing itself.

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

404. By Michi Henning on 2014-07-10

Fixed broken autopkg test by changing code to match the new API.
Added build and run of the autopkg test to the test target. That
way, we'll at least notice if the code for the autopkg test
no longer compiles/runs.
Update HACKING for autopkg tests with instructions for how
to run the tests in a VM (thanks Saviq!) and a pointer to
the corresponding subdir in the test subtree, so we don't
forget to add new autopkg tests to the local test suite.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/740/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/292/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/292/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

405. By Michi Henning on 2014-07-10

Merged devel and resolved conflict.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/741/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/295
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/293
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/293/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/293

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

review: Approve (continuous-integration)

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

406. By Michi Henning on 2014-07-10

Added AbstractScopeBase and made the following
methods final in ScopeBase:

- scope_directory()
- cache_directory()
- registry()
- settings()

This allows the tests to mock a scope implementation
while preventing real scope implementations from overriding
methods they shouldn't override.

[Michi Henning (michihenning)]

> I really don't like these changes, other than tests there's absolutely no
> reason for these to be virtual and therefore to allow the scope to override
> them.

The testing frameworks needs to allow a scope to be mocked, so it's not just
our tests. But I agree, the scope author should not be able to override these.

> Can't we do something different, like setting a special envvar for the
> tests and have the impl look at that first? Yes, making it virtual does make
> it easily unit-testable, but imo such a test is really just testing itself.

No more env vars! I'm going to institute a blanket ban on them. The are worse
than global variables: not declared anywhere totally invisible.

I've made the relevant methods final in ScopeBase, so it's no longer possible
to override them.

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

407. By Michi Henning on 2014-07-10

Changed "aggregator" to "unconfined" when looking for cache directories.

[Michi Henning (michihenning)]

> 41 + $HOME/.local/share/unity-scopes/aggregator/<scope_id>
>
> Same as for leaf-fs, there's no apparmor template for aggregator scopes, so
> this should really be $HOME/.local/share/unity-scopes/unconfined/<scope_id>

OK, it's "unconfined" now. I've left leaf-fs there because Jamie mentioned that confined local content scopes might come back.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:406
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/742/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/296/console
    None: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/294/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

408. By Michi Henning on 2014-07-10

Fixed symbols file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:407
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/743/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/295/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:408
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/744/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/296
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/296/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/296

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

602 virtual void start(std::string const& scope_id, RegistryProxy const& registry);

The point of keeping this was to preserve ABI compatibility, but with the introduction of AbstractScopeBase that is moot, so feel free to get rid of it.

Also, since it is breaking the ABI, we probably want to merge the 4.9 branch as well before the next "release" to distro?

[Jamie Strandboge (jdstrand)]

"Hi Jamie, not totally sure whether your response is in favour of "aggregator" or "unconfined' here :-) Can you clarify?"

I preferred leaf-net, leaf-fs and aggregator so that you don't have to change your code if we ever do implement leaf-fs or aggregator policy in the future (note, just because we may never make these available to third party developers, it doesn't mean we won't want apparmor policy for our own stuff).

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

409. By Michi Henning on 2014-07-10

Removed deprecated start() method.

[Michi Henning (michihenning)]

> 602 virtual void start(std::string const& scope_id, RegistryProxy
> const& registry);
>
> The point of keeping this was to preserve ABI compatibility, but with the
> introduction of AbstractScopeBase that is moot, so feel free to get rid of it.

OK, done.

> Also, since it is breaking the ABI, we probably want to merge the 4.9 branch
> as well before the next "release" to distro?

Is the default gcc in distro 4.9 now? It would be good to merge, yes, but we also need to merge the 4.9 unity-api. And, once we've done that, there will essentially be no going back :-)

The (now inappropriately named) set-env-vars should also be merged in the same batch, because it adds another virtual to AbstractScopeBase.

[Michi Henning (michihenning)]

> I preferred leaf-net, leaf-fs and aggregator so that you don't have to change
> your code if we ever do implement leaf-fs or aggregator policy in the future
> (note, just because we may never make these available to third party
> developers, it doesn't mean we won't want apparmor policy for our own stuff).

Would the policy for an aggregator every be different from an unconfined scope?
I guess the question is whether I should use "leaf-fs", "leaf-net", "aggregator", and "unconfined"?

It's really neither here nor there to me--the list can be as long as we like and, if some of the directories in there don't exist, the right things still happen.

For the time being, I'll just check for both "aggregator" and "unconfined". That way, we have our bases covered. Michal, Jamie, please speak up if you think this is wrong or if I'm missing something!

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

410. By Michi Henning on 2014-07-10

Added "aggregator" to list of directories looked at for cache_directory().

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:409
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/745/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/299/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/297/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

411. By Michi Henning on 2014-07-10

Fixed symbols file by hand without gcc 4.8 installed. Fingers crossed...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:411
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/746/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/300/console
    None: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/298/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/298/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

412. By Michi Henning on 2014-07-11

Fixed symbols file using gcc 4.8.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/750/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/302
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/302/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/302

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

> Who's responsible for creating this directory? I suppose the leaf could be
> created by the scope itself (does it have permissions to do that?), but the
> parents have to be created by something unconfined, so who's doing it? The
> click hook?

Yes, the directory needs to be created as part of the installation.

Still not solved afaict, without it, this branch is useless.

review: Needs Fixing

[Michi Henning (michihenning)]

> Yes, the directory needs to be created as part of the installation.
>
> Still not solved afaict, without it, this branch is useless.

Well, I wouldn't quite say "useless" because the branch will do the right thing once the directory is there :-)

I'll open a separate bug for this because that's really a separate issue.

[Michi Henning (michihenning)]

Bug is here:

https://bugs.launchpad.net/unity-scopes-api/+bug/1341896

[Michal Hruby (mhr3)]

Sorry, didn't mean to sound harsh, but we need the dirs for scopes to be able to use this.

[Michi Henning (michihenning)]

> Sorry, didn't mean to sound harsh, but we need the dirs for scopes to be able
> to use this.

Not a problem, relax! :-)

[Michi Henning (michihenning)]

OK, so the approach of looking for the scope's data dir and setting cache_directory() to the right value isn't going to work because the click install can't create the directory.

So, next best idea:

The registry can look for each scope in the manifests and parse the JSON to figure out what kind of scope it is looking at. Then it can go to $HOME/.local/unity-scopes and create the scope cache directory if it doesn't exist, with permission 0700. The registry adds the scope cache directory to the scope's metadata, which is available remotely.

On the scope side, during initialization of the run time, we go to the registry and grab the metadata, so cache_directory() can return the correct location.

Down-sides and questions:

- If no registry is running, we have to wait for the metadata() call to time out. Currently, the default timeout is 5 seconds, due to the slow emulator problem. This will probably break some tests, and will be inconvenient during development. The work-around would be to change the default registry timeout to something short, so things don't hang around all the time waiting to time out.

- I can look through /var/lib/apparmor/clicks for JSON files. In there, I find things such as

com.ubuntu.clock_clock_1.0.430.json
com.ubuntu.music_music_1.3.511.json

When I look at the clock one, I see:

{
    "policy_groups": [
        "calendar",
        "networking"
        ],
    "policy_version": 1.1
}

When I look at the music one, I see:

{
    "policy_version": 1.2,
    "template": "unconfined",
    "policy_groups": []
}

So, it's not clear to me what exactly I should be parsing ("template" or "policy_groups") to figure out whether a scope is leaf-net or aggregator/unconfined.

- We have scopes that come pre-installed, scopes installed by the OEM, plus scopes installed by the user(s). Is it sufficient to look through /var/lib/apparmor/clicks to guarantee that I won't be missing any scopes? For the approach I outlined above, I need to be sure that I find something for every local scope.

- I'm questioning the wisdom of what I suggested above. It seems that the registry is forced to do a lot more than it should have to just so it can let a scope know what its writable tmp dir is. Isn't this something that should somehow be available via an apparmor call? Or should there be a way for click to be able to create the directory in the right place?

- There are potentially many cache and settings directories for a single scope (one for each user). When a new user is added to the device, who should create the cache dir and settings dir?

My apologies for all the questions, but it seems that I don't have all the pieces of the puzzle yet, so I don't want to rush and implement something only to have it fall over for some reason I don't know about. I'd appreciate any and all feedback!

[Michi Henning (michihenning)]

Following up on this:

> - I'm questioning the wisdom of what I suggested above. It seems that the
> registry is forced to do a lot more than it should have to

How is this going to work for apps? I expect that applications also will need a writable area in the file system somewhere. How do apps find out where they can write their files?

[Michal Hruby (mhr3)]

> On the scope side, during initialization of the run time, we go to the
> registry and grab the metadata, so cache_directory() can return the correct
> location.

Eh, remote call during startup? /me frowns.

>
> Down-sides and questions:
>
> - If no registry is running, we have to wait for the metadata() call to time
> out. Currently, the default timeout is 5 seconds, due to the slow emulator
> problem. This will probably break some tests, and will be inconvenient during
> development. The work-around would be to change the default registry timeout
> to something short, so things don't hang around all the time waiting to time
> out.
>
> - I can look through /var/lib/apparmor/clicks for JSON files. In there, I find
> things such as
>
> com.ubuntu.clock_clock_1.0.430.json
> com.ubuntu.music_music_1.3.511.json
>
> When I look at the clock one, I see:
>
> {
> "policy_groups": [
> "calendar",
> "networking"
> ],
> "policy_version": 1.1
> }
>
> When I look at the music one, I see:
>
> {
> "policy_version": 1.2,
> "template": "unconfined",
> "policy_groups": []
> }
>
> So, it's not clear to me what exactly I should be parsing ("template" or
> "policy_groups") to figure out whether a scope is leaf-net or
> aggregator/unconfined.

According to our tutorial:

> "template": "ubuntu-scope-network"

Is what you should find in the manifest.

> - We have scopes that come pre-installed, scopes installed by the OEM, plus
> scopes installed by the user(s). Is it sufficient to look through
> /var/lib/apparmor/clicks to guarantee that I won't be missing any scopes? For
> the approach I outlined above, I need to be sure that I find something for
> every local scope.

You won't, obviously only click-packaged scopes will have there something.

> - I'm questioning the wisdom of what I suggested above. It seems that the
> registry is forced to do a lot more than it should have to just so it can let
> a scope know what its writable tmp dir is. Isn't this something that should
> somehow be available via an apparmor call? Or should there be a way for click
> to be able to create the directory in the right place?

Sounds reasonable to me, but can't answer that.

>
> - There are potentially many cache and settings directories for a single scope
> (one for each user). When a new user is added to the device, who should create
> the cache dir and settings dir?

The registry again. Afterall it's run per-user.

[Michal Hruby (mhr3)]

> Following up on this:
>
> > - I'm questioning the wisdom of what I suggested above. It seems that the
> > registry is forced to do a lot more than it should have to
>
> How is this going to work for apps? I expect that applications also will need
> a writable area in the file system somewhere. How do apps find out where they
> can write their files?

https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement but iiuic Qt itself was patched to build the directory based on a few envvars. Imo we should just do the same, afterall the path has to be "prefix + scope_id", and the prefix can be passed as an envvar - it's not like a single process can be both unconfined and leaf-net at the same time.

[Michi Henning (michihenning)]

> https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement but
> iiuic Qt itself was patched to build the directory based on a few envvars. Imo
> we should just do the same, afterall the path has to be "prefix + scope_id",
> and the prefix can be passed as an envvar - it's not like a single process can
> be both unconfined and leaf-net at the same time.

I'm still not happy about this, as I mentioned earlier: if we have multiple instances of the run time in a single address space, the setting will be wrong for all but one of them.

But getting the value into the scope is just a side-issue. The real problem is that I don't know how to figure out what to set "prefix" to. It seems I can't even reliably get at all the manifests for pre-installed, OEM, and click scopes.

Jamie, instead of having something like $HOME/.local/share/unity-scopes/leaf-net/<scope_id>, could we get rid of the "leaf-fs"/"leaf-net"/"aggregator"/"confined" sub-directory?

If so, we could just make it $HOME/.local/share/unity-scopes/data_home/<scope_id>.

The core problem here is that I don't know which confinement profile belongs to what scope ID, so I don't know how to set the path correctly. If we have a path that doesn't change depending on the confinement profile, the problem would go away because the prefix would be independent of the confinement type.

[Michal Hruby (mhr3)]

> > https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement
> but
> > iiuic Qt itself was patched to build the directory based on a few envvars.
> Imo
> > we should just do the same, afterall the path has to be "prefix + scope_id",
> > and the prefix can be passed as an envvar - it's not like a single process
> can
> > be both unconfined and leaf-net at the same time.
>
> I'm still not happy about this, as I mentioned earlier: if we have multiple
> instances of the run time in a single address space, the setting will be wrong
> for all but one of them.

My point was that you can apply only one apparmor profile, so if there are multiple runtimes and scopes in a single process, they either have to share the apparmor template or need to be unconfined, otherwise things won't work anyway. So the prefix is indeed per process, not per runtime.

[Jamie Strandboge (jdstrand)]

> > https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement
> but
> > iiuic Qt itself was patched to build the directory based on a few envvars.
> Imo
> > we should just do the same, afterall the path has to be "prefix + scope_id",
> > and the prefix can be passed as an envvar - it's not like a single process
> can
> > be both unconfined and leaf-net at the same time.
>
> I'm still not happy about this, as I mentioned earlier: if we have multiple
> instances of the run time in a single address space, the setting will be wrong
> for all but one of them.
>
> But getting the value into the scope is just a side-issue. The real problem is
> that I don't know how to figure out what to set "prefix" to. It seems I can't
> even reliably get at all the manifests for pre-installed, OEM, and click
> scopes.
>
> Jamie, instead of having something like $HOME/.local/share/unity-scopes/leaf-
> net/<scope_id>, could we get rid of the "leaf-fs"/"leaf-
> net"/"aggregator"/"confined" sub-directory?
>
> If so, we could just make it $HOME/.local/share/unity-
> scopes/data_home/<scope_id>.
>
> The core problem here is that I don't know which confinement profile belongs
> to what scope ID, so I don't know how to set the path correctly. If we have a
> path that doesn't change depending on the confinement profile, the problem
> would go away because the prefix would be independent of the confinement type.

As mentioned, that breaks the confinement separation for the case when a scope changes from leaf-fs to leaf-net. We need to have these scope type (eg, leaf-net, leaf-fs) for whenever we confine both types. Putting it in $HOME/.local/share/unity-scopes/<scope_id> or $HOME/.local/share/unity-copes/data_home/<scope_id> breaks that. People have asked what apps do: apps are different because there is no concept of 'local-fs'. All apps are expected to be able to have network access to all the app templates are very tightly confined. leaf-fs and aggregator scopes are very different from apps in that by design they need wide access to the user's data.

Why not just add this to the scope runner .ini file:
[ScopeConfig]
Type=Network # or LocalContent or Aggregator

The downside is the scope author has to keep this in sync with the declared template in the security manifest, but that is something the SDK can help with (not to mention, people shouldn't be changing from one scope type to another except in the most unusual circumstances).

[Jamie Strandboge (jdstrand)]

> > Who's responsible for creating this directory? I suppose the leaf could be
> > created by the scope itself (does it have permissions to do that?), but the
> > parents have to be created by something unconfined, so who's doing it? The
> > click hook?
>
> Yes, the directory needs to be created as part of the installation.
>
> Still not solved afaict, without it, this branch is useless.

The leaf-net, leaf-fs, or aggregator directories can all be unconditionally created by the scope click hook if they don't already exist. The scope click hook could also consider a new 'Type' field added to ScopeConfig (see below for discussion), but I don't think it needs to (just create all 3 and be done with it).

[Jamie Strandboge (jdstrand)]

> > I preferred leaf-net, leaf-fs and aggregator so that you don't have to
> change
> > your code if we ever do implement leaf-fs or aggregator policy in the future
> > (note, just because we may never make these available to third party
> > developers, it doesn't mean we won't want apparmor policy for our own
> stuff).
>
> Would the policy for an aggregator every be different from an unconfined
> scope?
> I guess the question is whether I should use "leaf-fs", "leaf-net",
> "aggregator", and "unconfined"?
>
> It's really neither here nor there to me--the list can be as long as we like
> and, if some of the directories in there don't exist, the right things still
> happen.
>
> For the time being, I'll just check for both "aggregator" and "unconfined".
> That way, we have our bases covered. Michal, Jamie, please speak up if you
> think this is wrong or if I'm missing something!

I think it is conceivable that an aggregator can be confined, especially when considering that we might want to confine it for code execution, etc even if the aggregator is still only for trusted 3rd parties. I don't think the scopes team should worry about what confinement goes with what-- just worry about keeping the types (leaf-net, leaf-fs, aggregator, whatever) separate and don't let them share writable when changing between them with the understanding that confinement will enforce this separation.

[Jamie Strandboge (jdstrand)]

> > Following up on this:
> >
> > > - I'm questioning the wisdom of what I suggested above. It seems that the
> > > registry is forced to do a lot more than it should have to
> >
> > How is this going to work for apps? I expect that applications also will
> need
> > a writable area in the file system somewhere. How do apps find out where
> they
> > can write their files?
>
> https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement but
> iiuic Qt itself was patched to build the directory based on a few envvars. Imo
> we should just do the same, afterall the path has to be "prefix + scope_id",
> and the prefix can be passed as an envvar - it's not like a single process can
> be both unconfined and leaf-net at the same time.

The app toolkits all understand XDG We make sure all the XDG directories are set correctly to *system* values, not app-specific values. Then have the app declare its applicationName. The toolkits all known how to known to append applicationName to the XDG directories (this is standard practice going back years and years). Applications can then use QStandardPath to query for these values.

As mentioned, apps are quite different than scopes and there is no concept of 'an app has wide filesystem/data access but no network access). All apps are assumed that they may have networking and therefore all apps are very tightly confined wrt filesystem/data access, so there is no need draw a distinction between app templates like we are for scope templates.

We can use the same idea for scopes though-- just like applications declare their applicationName in their QML and that adjusts their application directories, scopes can declare in their .ini file what scope type they are which will adjust their writable scope directory.

[Michi Henning (michihenning)]

> My point was that you can apply only one apparmor profile, so if there are
> multiple runtimes and scopes in a single process, they either have to share
> the apparmor template or need to be unconfined, otherwise things won't work
> anyway. So the prefix is indeed per process, not per runtime.

Ah, yes, that's true. I'm still trying to avoid environment variables though,
for the simple reason that they are global hidden state. The less we use
env vars, the better, IMO.

[Michi Henning (michihenning)]

> > Yes, the directory needs to be created as part of the installation.
> >
> > Still not solved afaict, without it, this branch is useless.
>
> The leaf-net, leaf-fs, or aggregator directories can all be unconditionally
> created by the scope click hook if they don't already exist. The scope click
> hook could also consider a new 'Type' field added to ScopeConfig (see below
> for discussion), but I don't think it needs to (just create all 3 and be done
> with it).

One thing I don't understand here: because the dir is underneath $HOME, that means the click hook would have to create the dir for *all* users of the device? What if a user is added later, after a scope was installed? In that case, whatever script runs to add a user would have to make sure that this directory is create along with everything else.

Unless I'm missing something, this seems brittle to me.

[Michi Henning (michihenning)]

> I think it is conceivable that an aggregator can be confined, especially when
> considering that we might want to confine it for code execution, etc even if
> the aggregator is still only for trusted 3rd parties. I don't think the scopes
> team should worry about what confinement goes with what-- just worry about
> keeping the types (leaf-net, leaf-fs, aggregator, whatever) separate and don't
> let them share writable when changing between them with the understanding that
> confinement will enforce this separation.

Yes, I like this. The less we tie the semantics together, the better.

[Michi Henning (michihenning)]

> > The core problem here is that I don't know which confinement profile belongs
> > to what scope ID, so I don't know how to set the path correctly. If we have
> a
> > path that doesn't change depending on the confinement profile, the problem
> > would go away because the prefix would be independent of the confinement
> type.
>
> As mentioned, that breaks the confinement separation for the case when a scope
> changes from leaf-fs to leaf-net. We need to have these scope type (eg, leaf-
> net, leaf-fs) for whenever we confine both types. Putting it in
> $HOME/.local/share/unity-scopes/<scope_id> or $HOME/.local/share/unity-
> copes/data_home/<scope_id> breaks that.

Right, yes, this makes sense, thanks!

> Why not just add this to the scope runner .ini file:
> [ScopeConfig]
> Type=Network # or LocalContent or Aggregator

I think this approach has merit, at least to tidy us over until after RTM. I could make the setting optional, with the default being Type=Network. That means the setting would effectively be invisible to scope authors (though still documented), and only aggregators (us, mostly) would need to set it.

The path would be set accordingly, as "leaf-net" or "unconfined".

Directory creation can be done by the scoperunner, I think: if the directory doesn't exist, it'll be created on the fly.

> The downside is the scope author has to keep this in sync with the declared
> template in the security manifest, but that is something the SDK can help with
> (not to mention, people shouldn't be changing from one scope type to another
> except in the most unusual circumstances).

Seeing that, at the moment, we have only two policies for scopes, I don't think that's a big deal. Longer term, once we have a fancier Apparmor query API, we should be able to ditch the config item again and just rely on what we learn from the query API. What I would like to have from the API is functionality that allows me to ask the question "what is the root of my writable data area?"

Ideally, I should get an answer even if that directory doesn't exist yet. And, if it doesn't exist, I should still be able to create that (and only that) directory. That way, the scoperunner wouldn't have to do anything on behalf of the scope before exec'ing it. Instead, the scope, after it was exec'd (and is confined already), could still create its own data directory if it doesn't exist.

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

413. By Michi Henning on 2014-07-18

Changed the way cache_directory() is set. New config setting
in <scope_id>.ini, ConfinementType, now determines the
confinement type, which is part of the path for the cache
directory. scoperegistry creates the cache directory if
it doesn't exist.

414. By Michi Henning on 2014-07-18

Merged devel.

415. By Michi Henning on 2014-07-18

Updated symbols file.

[Michi Henning (michihenning)]

OK, latest version now uses a ConfinementType setting in <scope_id>.ini.

The setting can be either "leaf-net" or "unconfined".

The default is "leaf-net", so scope authors are unaffected. If an unconfined scope wants to use the cache dir, it needs to set this to "unconfined".

cache_directory() returns the appropriate path, with the type substituted:

$HOME/.local/share/unity-scopes/<type>/<scope_id>

The registry creates the directory if it doesn't exist, with permissions 0700.

For now, I think this is good enough. It gets us off the hook until Apparmor can provide a fancier query API.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:415
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/821/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/373
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/373/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/373

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

review: Approve (continuous-integration)

[Jamie Strandboge (jdstrand)]

> > > Yes, the directory needs to be created as part of the installation.
> > >
> > > Still not solved afaict, without it, this branch is useless.
> >
> > The leaf-net, leaf-fs, or aggregator directories can all be unconditionally
> > created by the scope click hook if they don't already exist. The scope click
> > hook could also consider a new 'Type' field added to ScopeConfig (see below
> > for discussion), but I don't think it needs to (just create all 3 and be
> done
> > with it).
>
> One thing I don't understand here: because the dir is underneath $HOME, that
> means the click hook would have to create the dir for *all* users of the
> device? What if a user is added later, after a scope was installed? In that
> case, whatever script runs to add a user would have to make sure that this
> directory is create along with everything else.
>
> Unless I'm missing something, this seems brittle to me.

That is the job of the click hook system. We don't support multi-user yet, but when we do, click user hooks will have to be run anyway. When the click user hooks are run on adding a new user, you get this for free.

In other words-- running click user hooks (of which the scope is but one) have to be solved for the case you mentioned anyway. Nothing special has to be done for scopes when it is.

[Jamie Strandboge (jdstrand)]

> > > The core problem here is that I don't know which confinement profile
> belongs
> > > to what scope ID, so I don't know how to set the path correctly. If we
> have
> > a
> > > path that doesn't change depending on the confinement profile, the problem
> > > would go away because the prefix would be independent of the confinement
> > type.
> >
> > As mentioned, that breaks the confinement separation for the case when a
> scope
> > changes from leaf-fs to leaf-net. We need to have these scope type (eg,
> leaf-
> > net, leaf-fs) for whenever we confine both types. Putting it in
> > $HOME/.local/share/unity-scopes/<scope_id> or $HOME/.local/share/unity-
> > copes/data_home/<scope_id> breaks that.
>
> Right, yes, this makes sense, thanks!
>
> > Why not just add this to the scope runner .ini file:
> > [ScopeConfig]
> > Type=Network # or LocalContent or Aggregator
>
> I think this approach has merit, at least to tidy us over until after RTM. I
> could make the setting optional, with the default being Type=Network. That
> means the setting would effectively be invisible to scope authors (though
> still documented), and only aggregators (us, mostly) would need to set it.
>
> The path would be set accordingly, as "leaf-net" or "unconfined".
>
> Directory creation can be done by the scoperunner, I think: if the directory
> doesn't exist, it'll be created on the fly.
>
> > The downside is the scope author has to keep this in sync with the declared
> > template in the security manifest, but that is something the SDK can help
> with
> > (not to mention, people shouldn't be changing from one scope type to another
> > except in the most unusual circumstances).
>
> Seeing that, at the moment, we have only two policies for scopes, I don't
> think that's a big deal. Longer term, once we have a fancier Apparmor query
> API, we should be able to ditch the config item again and just rely on what we
> learn from the query API. What I would like to have from the API is
> functionality that allows me to ask the question "what is the root of my
> writable data area?"
>
> Ideally, I should get an answer even if that directory doesn't exist yet. And,
> if it doesn't exist, I should still be able to create that (and only that)
> directory. That way, the scoperunner wouldn't have to do anything on behalf of
> the scope before exec'ing it. Instead, the scope, after it was exec'd (and is
> confined already), could still create its own data directory if it doesn't
> exist.

The libapparmor query API won't be able to answer 'what is the base of my writable area'. It will be able to say 'can I write to $HOME/.local/share/unity-scopes/leaf-net/<scope_id>' or 'can I write to $HOME/.local/share/unity-scopes/leaf-fs/<scope_id>' so you can determine which is your writable area.

IMPORTANT: I think this is understood, the confined process will be able to create the '<scope id>' subdirectory (eg, $HOME/.local/share/unity-scopes/leaf-net/<scope_id>), so the scoperunner/API can do that. The confined process will *not* be able to create the 'scope type' directory (eg, $HOME/.local/share/unity-scopes/leaf-net), which is why I said the scope click user hook could just make su...

[Jamie Strandboge (jdstrand)]

I am going to approve this, for my part. I did glance through the code and made a couple of inline comments. While I do think the approach here couples the scope type with security policy more than is required, I understand that this is temporary until we have the libapparmor query interface up and running for files. For now, we only have leaf-net and unconfined and this MR handles that. By the looks of it, it shouldn't be difficult to transition away from ConfinementType when you move to the apparmor query API, and after you do, maintenance of that bit of code shouldn't be much more than managing an 'if/else if/else' statement.

review: Approve

[Michal Hruby (mhr3)]

> IMPORTANT: I think this is understood, the confined process will be able to
> create the '<scope id>' subdirectory (eg, $HOME/.local/share/unity-scopes
> /leaf-net/<scope_id>), so the scoperunner/API can do that.

This actually wasn't clear, if that's the case, I think the scope itself should just try to create / open the dir and use that, then we don't need a new config item that would just be deprecated as soon as possible. (and scoperegistry can just create the parent dirs unconditionally)

[Jamie Strandboge (jdstrand)]

> > IMPORTANT: I think this is understood, the confined process will be able to
> > create the '<scope id>' subdirectory (eg, $HOME/.local/share/unity-scopes
> > /leaf-net/<scope_id>), so the scoperunner/API can do that.
>
> This actually wasn't clear, if that's the case, I think the scope itself
> should just try to create / open the dir and use that, then we don't need a
> new config item that would just be deprecated as soon as possible. (and
> scoperegistry can just create the parent dirs unconditionally)

As long as the process creating the $HOME/.local/share/unity-scopes/leaf-net/ is unconfined, it doesn't matter who creates it. However, don't you still need the config item for the API to know what to return to the confined process so it can create $HOME/.local/share/unity-scopes/leaf-net/<scope_id>?

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

416. By Michi Henning on 2014-07-22

Backed out changes for config file setting. Using the
try-and-make-conclusions-if-it-doesn't-work approach now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:416
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/859/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/411
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/411/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/411

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

review: Approve (continuous-integration)

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

417. By Michi Henning on 2014-07-25

Merged devel and resolved conflicts.

418. By Michi Henning on 2014-07-25

scoperegistry now creates the root of the data directory for confined
scopes, e.g. $HOME/.local/share/unity-scopes/leaf-net.

The directory <scope_id> within that directory is created by
each confined scope itself when the scope is run.
(The scope's Apparmor profile allows this.)

[Michi Henning (michihenning)]

The registry now creates the leaf-net directory in case it isn't there already, e.g

$HOME/.local/share/unity-scopes/leaf-net

The <scope_id> subdir under that is created by each confined scope itself when it
is run.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:417
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/903/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/455
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/455/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/455

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:418
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/905/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/459
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/457
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/457/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/457

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:418
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/935/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/489/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/489/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/487/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/scope-cache-dir]

419. By Michi Henning on 2014-07-28

Merged devel and resolved conflicts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:419
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/936/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/490
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/490/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/488

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Let's merge this and fix any remaining issues afterwards, it's been sitting here for far too long.

review: Approve

=== modified file 'CONFIGFILES'
--- CONFIGFILES	2014-07-21 06:34:24 +0000
+++ CONFIGFILES	2014-07-28 11:21:43 +0000
@@ -92,7 +92,7 @@
 
 - DataDir
 
-  The parent directory under the run time writes scope-specific data files
+  The parent directory under which the run time writes scope-specific data files
   (such as settings).
 
   The default value is $HOME/.local/share/unity-scopes.

=== modified file 'HACKING'
--- HACKING	2014-06-26 15:53:22 +0000
+++ HACKING	2014-07-28 11:21:43 +0000
@@ -193,12 +193,17 @@
 Running the test manually is simple. After building and installing the
 new packages, just run 'sh debian/tests/scopebuild'.
 
-When making API breaks, make sure to check if autopkg test scripts
-need changing. The point of autopkg is not to exercise the API
-thoroughly, so it should not need changing all that often.
-
-At the moment it is unclear if these tests are executed during Jenkins
-builds.  This will lead to autopkgtest failing later if scopes' API is
-changed in a backwards incompatible way. If this happens the test
-needs to be fixed either by updating the test or backing out the API
-breaking change.
+To run the autopkg tests the same way Jenkins does, without installing
+the packages, follow the instructions here:
+
+http://packaging.ubuntu.com/html/auto-pkg-test.html
+
+When adding new tests to debian/tests, be sure that the new tests
+are built and run by adding them to tests/autopkg. Doing this doesn't
+run the tests exactly the same way as on Jenkins because they will
+be built and run against the headers and library in the build area,
+rather than against the installed packages. But it provides a basic
+sanity check for them. Without this, it's very easy to make a breaking
+change to the API and forgetting to update the autopkg tests too,
+meaning that the failure will show up only in Jenkins, but not
+when running the tests locally.

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2014-07-24 12:12:13 +0000
+++ RELEASE_NOTES.md	2014-07-28 11:21:43 +0000
@@ -3,8 +3,23 @@
 
 Changes in version 0.6.0
 ========================
+  - Added cache_directory() method to ScopeBase, so a scope can find out where it can write its files.
+
+  - Refactored scoperunner and ScopeLoader. ScopeLoader no longer knows about the registry and
+    scoperunner now calls RuntimeImpl::run_scope() to set the scope running, instead of duplicating
+    lots of functionality.
+
+  - Removed registry parameter from ScopeBase::start(). The registry is now available via a registry()
+    accessor on ScopeBase. The original start() method is still present, but deprecated. The default
+    implementation of the new start() method forwards to the old one so, if a scope implements only the
+    old one but not the new one, things still work.
+
+  - Made methods on ScopeBase virtual, so the testing framework can override them in a test scope.
+
   - Added support for additional query reply info.
+
   - Introduced QueryMetadata base for shared functionality of *Metadata classes.
+
   - Added set_internet_connectivity() and internet_connectivity() to QueryMetadata.
 
 Changes in version 0.5.2

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-28 10:02:00 +0000
+++ debian/changelog	2014-07-28 11:21:43 +0000
@@ -1,10 +1,13 @@
 unity-scopes-api (0.6.0-0ubuntu1) UNRELEASED; urgency=medium
 
-  * Added support for additional query reply info.
+  * Added cache_directory() method and refactored scoperunner and RuntimeImpl.
+
+  [ Marcus Tomlinson ]
   * Introduced QueryMetadata base for shared functionality of *Metadata classes.
   * Added set_internet_connectivity() and internet_connectivity() to QueryMetadata.
+  * Added support for additional query reply info.
 
- -- Marcus Tomlinson <[e-mail]>  Mon, 21 Jul 2014 09:14:39 +0200
+ -- Michi Henning <[e-mail]>  Mon, 07 Jul 2014 14:34:04 +1000
 
 unity-scopes-api (0.5.2+14.10.20140723-0ubuntu1) utopic; urgency=low
 

=== modified file 'debian/libunity-scopes2.symbols'
--- debian/libunity-scopes2.symbols	2014-07-28 10:02:00 +0000
+++ debian/libunity-scopes2.symbols	2014-07-28 11:21:43 +0000
@@ -408,8 +408,10 @@
  (c++)"unity::scopes::testing::Benchmark::Result::load_from(std::basic_istream<char, std::char_traits<char> >&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::operator==(unity::scopes::testing::Benchmark::Result const&, unity::scopes::testing::Benchmark::Result const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::operator<<(std::basic_ostream<char, std::char_traits<char> >&, unity::scopes::testing::Benchmark::Result const&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::CategoryRenderer const&)@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::CategoryRenderer const&)@Base" 0replaceme
+ (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::CannedQuery const> const&, unity::scopes::CategoryRenderer const&)@Base" 0replaceme
  (c++)"unity::scopes::Category::Category(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::CategoryRenderer const&)@Base" 0replaceme
  (c++)"unity::scopes::Category::Category(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::CannedQuery const> const&, unity::scopes::CategoryRenderer const&)@Base" 0.5.2+14.10.20140709.2
  (c++)"unity::scopes::Category::Category(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Category::~Category()@Base" 0.4.0+14.04.20140312.1
@@ -424,11 +426,11 @@
  (c++)"unity::scopes::internal::ScopeConfig::parse_appearance_attribute(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.2+14.10.20140709.2
  (c++)"unity::scopes::internal::ScopeConfig::ScopeConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::~ScopeConfig()@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::ScopeLoader::load(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::Registry> const&)@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::internal::ScopeLoader::load(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeLoader::stop()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeLoader::start()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeLoader::unload()@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::ScopeLoader::ScopeLoader(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::Registry> const&)@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::internal::ScopeLoader::ScopeLoader(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeLoader::~ScopeLoader()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeObject::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeObject::query(std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::MiddlewareBase*, std::function<std::shared_ptr<unity::scopes::QueryBase> ()> const&, std::function<std::shared_ptr<unity::scopes::internal::QueryObjectBase> (std::shared_ptr<unity::scopes::QueryBase>, std::shared_ptr<unity::scopes::internal::MWQueryCtrl>)> const&)@Base" 0.4.0+14.04.20140312.1
@@ -545,7 +547,7 @@
  (c++)"unity::scopes::ScopeBase::runtime_version(int&, int&, int&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeBase::run()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeBase::stop()@Base" 0.5.0+14.10.20140619
- (c++)"unity::scopes::ScopeBase::start(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::Registry> const&)@Base" 0.5.0+14.10.20140619
+ (c++)"unity::scopes::ScopeBase::start(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::ScopeBase::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeBase::ScopeBase()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeBase::~ScopeBase()@Base" 0.4.0+14.04.20140312.1
@@ -733,6 +735,7 @@
  (c++)"unity::scopes::internal::RuntimeImpl::reply_reaper() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::ss_configfile() const@Base" 0.4.4+14.10.20140508
  (c++)"unity::scopes::internal::RuntimeImpl::waiter_thread(std::shared_ptr<unity::scopes::internal::ThreadSafeQueue<std::future<void> > > const&) const@Base" 0.4.3+14.10.20140428
+ (c++)"unity::scopes::internal::RuntimeImpl::find_cache_dir() const@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeImpl::proxy_to_string(std::shared_ptr<unity::scopes::Object> const&) const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::string_to_proxy(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::registry_identity() const@Base" 0.4.0+14.04.20140312.1
@@ -815,9 +818,11 @@
  (c++)"unity::scopes::internal::JsonSettingsSchema::definitions() const@Base" 0.5.2+14.10.20140709.2
  (c++)"unity::scopes::internal::StateReceiverObject::state_received() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::QueryBase::valid() const@Base" 0.4.3+14.10.20140428
- (c++)"unity::scopes::QueryBase::settings() const@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::QueryBase::settings() const@Base" 0replaceme
+ (c++)"unity::scopes::ScopeBase::cache_directory() const@Base" 0replaceme
  (c++)"unity::scopes::ScopeBase::scope_directory() const@Base" 0.4.2+14.04.20140404.2
- (c++)"unity::scopes::ScopeBase::settings() const@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::ScopeBase::registry() const@Base" 0replaceme
+ (c++)"unity::scopes::ScopeBase::settings() const@Base" 0replaceme
  (c++)"typeinfo for unity::scopes::FilterBase@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::SearchReply@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::ListenerBase@Base" 0.4.0+14.04.20140312.1
@@ -838,6 +843,7 @@
  (c++)"typeinfo for unity::scopes::CategoryRenderer@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::PreviewQueryBase@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
+ (c++)"typeinfo for unity::scopes::AbstractScopeBase@Base" 0replaceme
  (c++)"typeinfo for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
@@ -883,6 +889,7 @@
  (c++)"typeinfo name for unity::scopes::CategoryRenderer@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::PreviewQueryBase@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
+ (c++)"typeinfo name for unity::scopes::AbstractScopeBase@Base" 0replaceme
  (c++)"typeinfo name for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo name for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1
@@ -939,6 +946,7 @@
  (c++)"vtable for unity::scopes::CategoryRenderer@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::PreviewQueryBase@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::TimeoutException@Base" 0.4.0+14.04.20140312.1
+ (c++)"vtable for unity::scopes::AbstractScopeBase@Base" 0replaceme
  (c++)"vtable for unity::scopes::CategorisedResult@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::NotFoundException@Base" 0.4.0+14.04.20140312.1
  (c++)"vtable for unity::scopes::SearchListenerBase@Base" 0.4.0+14.04.20140312.1

=== modified file 'debian/tests/scopebuild'
--- debian/tests/scopebuild	2014-06-03 12:49:04 +0000
+++ debian/tests/scopebuild	2014-07-28 11:21:43 +0000
@@ -9,60 +9,11 @@
 
 WORKDIR=$(mktemp -d)
 trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cp scopetest.cpp $WORKDIR
 cd $WORKDIR
-cat <<EOF > scopetest.cpp
-#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 DemoScope : public unity::scopes::ScopeBase
-{
-public:
-    virtual int start(std::string const&, unity::scopes::RegistryProxy const&) override;
-
-    virtual void stop() override;
-
-    unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&,
-            const unity::scopes::ActionMetadata&) override;
-
-    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& q,
-            unity::scopes::SearchMetadata const&) override;
-};
-
-using namespace unity::scopes;
-
-int DemoScope::start(std::string const&, unity::scopes::RegistryProxy const&)
-{
-    return 0;
-}
-
-void DemoScope::stop()
-{
-}
-
-SearchQueryBase::UPtr DemoScope::search(unity::scopes::CannedQuery const &q,
-        unity::scopes::SearchMetadata const&)
-{
-    unity::scopes::SearchQueryBase::UPtr query(nullptr);
-    return query;
-}
-
-PreviewQueryBase::UPtr DemoScope::preview(Result const& result, ActionMetadata const& /*metadata*/) {
-    unity::scopes::PreviewQueryBase::UPtr preview(nullptr);
-    return preview;
-}
-
-int main(int, char**)
-{
-    DemoScope d;
-    return 0;
-}
-EOF
-
-g++ -std=c++11 -o scopebin scopetest.cpp `pkg-config --cflags --libs libunity-scopes`
+
+g++ -std=c++11 -o scopetest scopetest.cpp `pkg-config --cflags --libs libunity-scopes`
 echo "Scope build: OK"
-[ -x scopebin ]
-./scopebin
+[ -x scopetest ]
+./scopetest
 echo "Scope run: OK"

=== added file 'debian/tests/scopetest.cpp'
--- debian/tests/scopetest.cpp	1970-01-01 00:00:00 +0000
+++ debian/tests/scopetest.cpp	2014-07-28 11:21:43 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <unity/scopes/PreviewQueryBase.h>
+#include <unity/scopes/QueryBase.h>
+#include <unity/scopes/ReplyProxyFwd.h>
+#include <unity/scopes/ScopeBase.h>
+
+class DemoScope : public unity::scopes::ScopeBase
+{
+public:
+    virtual void start(std::string const&) override;
+
+    virtual void stop() override;
+
+    virtual unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&,
+                                                          const unity::scopes::ActionMetadata&) override;
+
+    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& q,
+                                                        unity::scopes::SearchMetadata const&) override;
+};
+
+using namespace unity::scopes;
+
+void DemoScope::start(std::string const&)
+{
+}
+
+void DemoScope::stop()
+{
+}
+
+SearchQueryBase::UPtr DemoScope::search(unity::scopes::CannedQuery const& /*q*/,
+        unity::scopes::SearchMetadata const&)
+{
+    unity::scopes::SearchQueryBase::UPtr query(nullptr);
+    return query;
+}
+
+PreviewQueryBase::UPtr DemoScope::preview(Result const& /*result*/, ActionMetadata const& /*metadata*/) {
+    unity::scopes::PreviewQueryBase::UPtr preview(nullptr);
+    return preview;
+}
+
+int main(int, char**)
+{
+    DemoScope d;
+    return 0;
+}

=== modified file 'demo/click/scope-click/scope-click.cpp'
--- demo/click/scope-click/scope-click.cpp	2014-06-17 11:20:48 +0000
+++ demo/click/scope-click/scope-click.cpp	2014-07-28 11:21:43 +0000
@@ -56,7 +56,7 @@
 class MyScope : public ScopeBase
 {
 public:
-    virtual void start(string const&, RegistryProxy const&) override {}
+    virtual void start(string const&) override {}
 
     virtual void stop() override {}
 

=== modified file 'demo/scopes/scope-A/scope-A.cpp'
--- demo/scopes/scope-A/scope-A.cpp	2014-06-25 16:41:51 +0000
+++ demo/scopes/scope-A/scope-A.cpp	2014-07-28 11:21:43 +0000
@@ -160,7 +160,7 @@
 class MyScope : public ScopeBase
 {
 public:
-    virtual void start(string const& scope_id, RegistryProxy const&) override
+    virtual void start(string const& scope_id) override
     {
         scope_id_ = scope_id;
     }

=== modified file 'demo/scopes/scope-B/scope-B.cpp'
--- demo/scopes/scope-B/scope-B.cpp	2014-06-17 11:20:48 +0000
+++ demo/scopes/scope-B/scope-B.cpp	2014-07-28 11:21:43 +0000
@@ -140,18 +140,18 @@
 class MyScope : public ScopeBase
 {
 public:
-    virtual void start(string const& scope_id, RegistryProxy const& registry) override
+    virtual void start(string const& scope_id) override
     {
         scope_id_ = scope_id;
 
-        if (!registry)
+        if (!registry())
         {
             throw ConfigException(scope_id + ": No registry available, cannot locate child scopes");
         }
         // Lock up scopes C and D in the registry and remember their proxies.
-        auto meta_c = registry->get_metadata("scope-C");
+        auto meta_c = registry()->get_metadata("scope-C");
         scope_c_ = meta_c.proxy();
-        auto meta_d = registry->get_metadata("scope-D");
+        auto meta_d = registry()->get_metadata("scope-D");
         scope_d_ = meta_d.proxy();
     }
 

=== modified file 'demo/scopes/scope-C/scope-C.cpp'
--- demo/scopes/scope-C/scope-C.cpp	2014-06-17 11:20:48 +0000
+++ demo/scopes/scope-C/scope-C.cpp	2014-07-28 11:21:43 +0000
@@ -184,7 +184,7 @@
 class MyScope : public ScopeBase
 {
 public:
-    virtual void start(string const& scope_id, RegistryProxy const&) override
+    virtual void start(string const& scope_id) override
     {
         scope_id_ = scope_id;
     }

=== modified file 'demo/scopes/scope-D/scope-D.cpp'
--- demo/scopes/scope-D/scope-D.cpp	2014-06-17 11:20:48 +0000
+++ demo/scopes/scope-D/scope-D.cpp	2014-07-28 11:21:43 +0000
@@ -183,7 +183,7 @@
 class MyScope : public ScopeBase
 {
 public:
-    virtual void start(string const& scope_id, RegistryProxy const&) override
+    virtual void start(string const& scope_id) override
     {
         scope_id_ = scope_id;
     }

=== modified file 'demo/scopes/scope-N/scope-N.cpp'
--- demo/scopes/scope-N/scope-N.cpp	2014-06-17 11:20:48 +0000
+++ demo/scopes/scope-N/scope-N.cpp	2014-07-28 11:21:43 +0000
@@ -68,7 +68,7 @@
 class MyScope : public ScopeBase
 {
 public:
-    virtual void start(string const& scope_id, RegistryProxy const&) override
+    virtual void start(string const& scope_id) override
     {
         scope_id_ = scope_id;
     }

=== modified file 'demo/scopes/scope-S/scope-S.cpp'
--- demo/scopes/scope-S/scope-S.cpp	2014-06-17 11:20:48 +0000
+++ demo/scopes/scope-S/scope-S.cpp	2014-07-28 11:21:43 +0000
@@ -85,7 +85,7 @@
 class MyScope : public ScopeBase
 {
 public:
-    virtual void start(string const& scope_id, RegistryProxy const&) override
+    virtual void start(string const& scope_id) override
     {
         scope_id_ = scope_id;
     }

=== modified file 'doc/tutorial.dox'
--- doc/tutorial.dox	2014-07-22 10:38:18 +0000
+++ doc/tutorial.dox	2014-07-28 11:21:43 +0000
@@ -615,10 +615,10 @@
 With the above classes a test case that checks if MyScope calls appropriate methods of unity::scopes::SearchReply may look like this (note that it just checks
 if proper methods get called and uses _ matchers that match any values; put actual values in there for stricts checks):
 \code{.cpp}
-typedef unity::scopes::testing::TypedScopeFixture<MyScope> TestScopeFixutre;
+typedef unity::scopes::testing::TypedScopeFixture<MyScope> TestScopeFixture;
 using namespace ::testing;
 
-TEST_F(TestScopeFixutre, search_results)
+TEST_F(TestScopeFixture, search_results)
 {
     const unity::scopes::CategoryRenderer renderer;
 
@@ -724,7 +724,7 @@
 The `ScopeConfig` group is mandatory and must contain settings for at least `DisplayName`, `Description`, and `Author`.
 `DisplayName` and `Description` can (and should) be localized. For example:
 
-`Description[de] = Fu&szlig;ballergebnisse`
+`Description[de_DE] = Fu&szlig;ballergebnisse`
 
 In addition to allowing the registry to make the scope available, this information controls how the scope appears
 in the "Scopes" scope.

=== added file 'include/unity/scopes/AbstractScopeBase.h'
--- include/unity/scopes/AbstractScopeBase.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/AbstractScopeBase.h	2014-07-28 11:21:43 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michi Henning <[e-mail]>
+ */
+
+#ifndef UNITY_SCOPES_ABSTRACTSCOPEBASE_H
+#define UNITY_SCOPES_ABSTRACTSCOPEBASE_H
+
+#include <unity/scopes/ActivationQueryBase.h>
+#include <unity/scopes/PreviewQueryBase.h>
+#include <unity/scopes/Registry.h>
+#include <unity/scopes/SearchQueryBase.h>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+/**
+\brief Abstract base class for a scope implementation.
+
+This class allows a scope to be replaced by a mock implementation.
+See unity::scopes::ScopeBase for documentation of the member functions.
+*/
+
+class AbstractScopeBase
+{
+public:
+/// @cond
+    virtual void start(std::string const& scope_id) = 0;
+    virtual void stop() = 0;
+    virtual void run() = 0;
+    virtual SearchQueryBase::UPtr search(CannedQuery const& query, SearchMetadata const& metadata) = 0;
+    virtual ActivationQueryBase::UPtr activate(Result const& result, ActionMetadata const& metadata) = 0;
+    virtual ActivationQueryBase::UPtr perform_action(Result const& result,
+                                                     ActionMetadata const& metadata,
+                                                     std::string const& widget_id,
+                                                     std::string const& action_id) = 0;
+    virtual PreviewQueryBase::UPtr preview(Result const& result, ActionMetadata const& metadata) = 0;
+    virtual std::string scope_directory() const = 0;
+    virtual std::string cache_directory() const = 0;
+    virtual unity::scopes::RegistryProxy registry() const = 0;
+    virtual VariantMap settings() const = 0;
+/// @endcond
+};
+
+} // namespace scopes
+
+} // namespace unity
+
+#endif

=== modified file 'include/unity/scopes/ScopeBase.h'
--- include/unity/scopes/ScopeBase.h	2014-06-24 11:11:11 +0000
+++ include/unity/scopes/ScopeBase.h	2014-07-28 11:21:43 +0000
@@ -19,14 +19,10 @@
 #ifndef UNITY_SCOPES_SCOPEBASE_H
 #define UNITY_SCOPES_SCOPEBASE_H
 
-#include <unity/scopes/SearchQueryBase.h>
-#include <unity/scopes/PreviewQueryBase.h>
-#include <unity/scopes/RegistryProxyFwd.h>
-#include <unity/scopes/ActivationQueryBase.h>
-#include <unity/scopes/Version.h>
-#include <unity/scopes/Result.h>
+#include <unity/scopes/AbstractScopeBase.h>
 #include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/SearchMetadata.h>
+#include <unity/scopes/Version.h>
 
 /**
 \brief Expands to the identifier of the scope create function. @hideinitializer
@@ -68,9 +64,10 @@
 
 namespace internal
 {
+
 class ScopeBaseImpl;
-class ScopeLoader;
 class RuntimeImpl;
+
 }
 
 /**
@@ -90,9 +87,9 @@
     MyScope();
     virtual ~MyScope();
 
-    virtual void start();   // Optional
-    virtual void stop();    // Optional
-    virtual void run();     // Optional
+    virtual void start(std::string const& scope_id);   // Optional
+    virtual void stop();                               // Optional
+    virtual void run();                                // Optional
 };
 ~~~
 
@@ -134,7 +131,7 @@
 call to stop() in a timely manner.
 */
 
-class ScopeBase
+class ScopeBase : public AbstractScopeBase
 {
 public:
     /// @cond
@@ -150,11 +147,8 @@
     The call to start() is made by the same thread that calls the create function.
 
     \param scope_id The name of the scope as defined by the scope's configuration file.
-
-    \param registry A proxy to the scope registry. This parameter is provided for aggregating
-    scopes that need to retrieve proxies to their child scopes.
     */
-    virtual void start(std::string const& scope_id, RegistryProxy const& registry);
+    virtual void start(std::string const& scope_id);
 
     /**
     \brief Called by the scopes run time when the scope should shut down.
@@ -184,7 +178,7 @@
     /**
     \brief Called by the scopes run time when a scope needs to instantiate a query.
 
-    This method must return an instance that is derived from QueryBase. The implementation
+    This method must return an instance that is derived from `QueryBase`. The implementation
     of this method must return in a timely manner, that is, it should perform only minimal
     initialization that is guaranteed to complete quickly. The call to search() is made
     by an arbitrary thread.
@@ -197,7 +191,7 @@
     /**
     \brief Called by the scopes run time when a scope needs to respond to a result activation request.
 
-    This method must return an instance that is derived from ActivationQueryBase. The implementation
+    This method must return an instance that is derived from `ActivationQueryBase`. The implementation
     of this method must return in a timely manner, that is, it should perform only minimal
     initialization that is guaranteed to complete quickly. The call to activate() is made
     by an arbitrary thread.
@@ -206,13 +200,13 @@
     \param result The result that should be activated.
     \param metadata additional data sent by the client.
     \return The activation instance.
-     */
+    */
     virtual ActivationQueryBase::UPtr activate(Result const& result, ActionMetadata const& metadata);
 
     /**
     \brief Invoked when a scope is requested to handle a preview action.
 
-    This method must return an instance that is derived from ActivationQueryBase. The implementation
+    This method must return an instance that is derived from `ActivationQueryBase`. The implementation
     of this method must return in a timely manner, that is, it should perform only minimal
     initialization that is guaranteed to complete quickly. The call to activate() is made
     by an arbitrary thread.
@@ -223,20 +217,23 @@
     \param widget_id The identifier of the 'actions' widget of the activated action.
     \param action_id The identifier of the action that was activated.
     \return The activation instance.
-     */
-    virtual ActivationQueryBase::UPtr perform_action(Result const& result, ActionMetadata const& metadata, std::string const& widget_id, std::string const& action_id);
+    */
+    virtual ActivationQueryBase::UPtr perform_action(Result const& result,
+                                                     ActionMetadata const& metadata,
+                                                     std::string const& widget_id,
+                                                     std::string const& action_id);
 
     /**
     \brief Invoked when a scope is requested to create a preview for a particular result.
 
-    This method must return an instance that is derived from PreviewQueryBase. The implementation
+    This method must return an instance that is derived from `PreviewQueryBase`. The implementation
     of this method must return in a timely manner, that is, it should perform only minimal
     initialization that is guaranteed to complete quickly. The call to activate() is made
     by an arbitrary thread.
     \param result The result that should be previewed.
     \param metadata Additional data sent by the client.
     \return The preview instance.
-     */
+    */
     virtual PreviewQueryBase::UPtr preview(Result const& result, ActionMetadata const& metadata) = 0;
 
     /**
@@ -251,8 +248,34 @@
     call this method from the constructor!
 
     \return The scope's configuration directory.
-    */
-    std::string scope_directory() const;
+    \throws LogicException if called from the constructor of this instance.
+    */
+    virtual std::string scope_directory() const final;
+
+    /**
+    \brief Returns a directory that is (exclusively) writable for the scope.
+
+    This directory allows scopes to store persistent information, such
+    as cached content or similar.
+
+    \note The cache directory is available only after this ScopeBase is instantiated; do not
+    call this method from the constructor!
+
+    \return The root directory of the filesystem sub-tree that is writable for the scope.
+    \throws LogicException if called from the constructor of this instance.
+    */
+    virtual std::string cache_directory() const final;
+
+    /**
+    \brief Returns the proxy to the registry.
+
+    \note The registr proxy is available only after this ScopeBase is instantiated; do not
+    call this method from the constructor!
+
+    \return The proxy to the registry.
+    \throws LogicException if called from the constructor of this instance.
+    */
+    virtual unity::scopes::RegistryProxy registry() const final;
 
     /**
     \brief Returns a dictionary with the scope's current settings.
@@ -266,8 +289,9 @@
     call this method from the constructor!
 
     \return The scope's current settings.
+    \throws LogicException if called from the constructor of this instance.
     */
-    VariantMap settings() const;
+    virtual VariantMap settings() const final;
 
 protected:
     /// @cond
@@ -275,9 +299,8 @@
 private:
     std::unique_ptr<internal::ScopeBaseImpl> p;
 
-    friend class internal::ScopeLoader;
+    friend class internal::RuntimeImpl;
     friend class internal::ScopeObject;
-    friend class internal::RuntimeImpl;
     /// @endcond
 };
 
@@ -287,13 +310,17 @@
 
 /**
 \brief The function called by the scopes run time to initialize the scope.
-It must return a pointer to an instance derived from ScopeBase. The returned
+It must return a pointer to an instance derived from `ScopeBase`. The returned
 instance need not be heap-allocated, but must remain in scope until the
 destroy function is called by the scopes run time.
 
 If this function throws an exception, the destroy function will _not_ be called. If this function returns NULL,
 the destroy function _will_ be called with NULL as its argument.
 
+\note The only purpose of the create function is to return the an instance.
+Do not do anything in the implementation that might block, and do
+not attempt to call any methods on `ScopeBase` from the constructor.
+
 \return The pointer to the ScopeBase instance.
 */
 extern "C" unity::scopes::ScopeBase* UNITY_SCOPE_CREATE_FUNCTION();

=== modified file 'include/unity/scopes/internal/DfltConfig.h.in'
--- include/unity/scopes/internal/DfltConfig.h.in	2014-07-21 06:34:24 +0000
+++ include/unity/scopes/internal/DfltConfig.h.in	2014-07-28 11:21:43 +0000
@@ -39,6 +39,7 @@
 static constexpr char const* DFLT_MIDDLEWARE_INI = DFLT_ZMQ_MIDDLEWARE_INI;
 static constexpr char const* DFLT_SCOPE_INSTALL_DIR = "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@";
 static constexpr char const* DFLT_OEM_INSTALL_DIR = "/custom/@LIB_INSTALL_PREFIX@/@UNITY_SCOPES_LIB@";
+static constexpr char const* DFLT_CONFINEMENT_TYPE = "leaf-net";
 
 static constexpr int DFLT_SS_HTTP_TIMEOUT = 20;              // seconds
 static constexpr int DFLT_SS_REG_REFRESH_RATE = 86400;       // 24 hours as seconds

=== modified file 'include/unity/scopes/internal/RuntimeImpl.h'
--- include/unity/scopes/internal/RuntimeImpl.h	2014-06-24 03:05:19 +0000
+++ include/unity/scopes/internal/RuntimeImpl.h	2014-07-28 11:21:43 +0000
@@ -64,6 +64,7 @@
 private:
     RuntimeImpl(std::string const& scope_id, std::string const& configfile);
     void waiter_thread(ThreadSafeQueue<std::future<void>>::SPtr const& queue) const noexcept;
+    std::string find_cache_dir() const;
 
     bool destroyed_;
     std::string scope_id_;

=== modified file 'include/unity/scopes/internal/ScopeBaseImpl.h'
--- include/unity/scopes/internal/ScopeBaseImpl.h	2014-06-24 03:05:19 +0000
+++ include/unity/scopes/internal/ScopeBaseImpl.h	2014-07-28 11:21:43 +0000
@@ -19,9 +19,9 @@
 #ifndef UNITY_SCOPES_INTERNAL_SCOPEBASEIMPL_H
 #define UNITY_SCOPES_INTERNAL_SCOPEBASEIMPL_H
 
+#include <unity/scopes/RegistryProxyFwd.h>
 #include <unity/scopes/Variant.h>
 
-#include <memory>
 #include <mutex>
 #include <string>
 
@@ -39,17 +39,35 @@
 class ScopeBaseImpl final
 {
 public:
-    ScopeBaseImpl() = default;
+    ScopeBaseImpl();
     ~ScopeBaseImpl() = default;
-    void set_scope_directory(std::string const &path);
+
+    void set_scope_directory(std::string const& path);
     std::string scope_directory() const;
+
+    void set_cache_directory(std::string const& path);
+    std::string cache_directory() const;
+
+    void set_registry(RegistryProxy const& registry);
+    RegistryProxy registry() const;
+
     std::shared_ptr<unity::scopes::internal::SettingsDB> settings_db() const;
     void set_settings_db(std::shared_ptr<unity::scopes::internal::SettingsDB> const& db);
     unity::scopes::VariantMap settings() const;
 
 private:
     std::string scope_directory_;
+    bool scope_dir_initialized_;
+
+    std::string cache_directory_;
+    bool cache_dir_initialized_;
+
+    unity::scopes::RegistryProxy registry_;
+    bool registry_initialized_;
+
     std::shared_ptr<unity::scopes::internal::SettingsDB> db_;
+    bool settings_db_initialized_;
+
     mutable std::mutex mutex_;
 };
 

=== modified file 'include/unity/scopes/internal/ScopeConfig.h'
--- include/unity/scopes/internal/ScopeConfig.h	2014-06-26 12:49:46 +0000
+++ include/unity/scopes/internal/ScopeConfig.h	2014-07-28 11:21:43 +0000
@@ -39,18 +39,18 @@
     ScopeConfig(std::string const& configfile);
     ~ScopeConfig();
 
-    bool overrideable() const;           // Optional, returns false if not present
-    std::string display_name() const;    // Mandatory, localizable
-    std::string description() const;     // Mandatory, localizable
-    std::string author() const;          // Mandatory
-    std::string art() const;             // Optional, throws NotFoundException if not present
-    std::string icon() const;            // Optional, throws NotFoundException if not present
-    std::string search_hint() const;     // Optional, localizable, throws NotFoundException if not present
-    std::string hot_key() const;         // Optional, throws NotFoundException if not present
-    bool invisible() const;              // Optional, returns false if not present
-    bool location_data_needed() const;   // Optional, returns false if not present
-    std::string scope_runner() const;    // Optional, throws NotFoundException if not present
-    int idle_timeout() const;            // Optional, returns default value if not present
+    bool overrideable() const;             // Optional, returns false if not present
+    std::string display_name() const;      // Mandatory, localizable
+    std::string description() const;       // Mandatory, localizable
+    std::string author() const;            // Mandatory
+    std::string art() const;               // Optional, throws NotFoundException if not present
+    std::string icon() const;              // Optional, throws NotFoundException if not present
+    std::string search_hint() const;       // Optional, localizable, throws NotFoundException if not present
+    std::string hot_key() const;           // Optional, throws NotFoundException if not present
+    bool invisible() const;                // Optional, returns false if not present
+    bool location_data_needed() const;     // Optional, returns false if not present
+    std::string scope_runner() const;      // Optional, throws NotFoundException if not present
+    int idle_timeout() const;              // Optional, returns default value if not present
     ScopeMetadata::ResultsTtlType results_ttl_type() const;  // Optional, returns none if not present
 
     VariantMap appearance_attributes() const; // Optional, returns empty map if no attributes are present

=== modified file 'include/unity/scopes/internal/ScopeLoader.h'
--- include/unity/scopes/internal/ScopeLoader.h	2014-07-02 05:17:19 +0000
+++ include/unity/scopes/internal/ScopeLoader.h	2014-07-28 11:21:43 +0000
@@ -40,12 +40,8 @@
     NONCOPYABLE(ScopeLoader);
     UNITY_DEFINES_PTRS(ScopeLoader);
 
-    // Creates a ScopeLoader for a scope with the given ID, library, and settings dir. We pass in the registry proxy
-    // so we can pass it to the scope's start method.
-    static UPtr load(std::string const& scope_id,
-                     std::string const& libpath,
-                     std::string const& data_dir,
-                     RegistryProxy const& registry);
+    // Creates a ScopeLoader for a scope with the given ID and library.
+    static UPtr load(std::string const& scope_id, std::string const& libpath);
 
     // unload() explicitly finalizes the scope. This is called by the destructor too, but calling it explicity
     // allows the caller to receive any exceptions that may have been produced by the scope thread.
@@ -67,14 +63,10 @@
     ~ScopeLoader();
 
 private:
-    ScopeLoader(std::string const& scope_id,
-                std::string const& libpath,
-                std::string const& data_dir,
-                RegistryProxy const& registry);
+    ScopeLoader(std::string const& scope_id, std::string const& path);
 
     std::string scope_id_;
     unity::scopes::internal::DynamicLoader::UPtr dyn_loader_;
-    unity::scopes::RegistryProxy registry_;
     std::exception_ptr exception_;
 
     std::thread scope_thread_;

=== modified file 'include/unity/scopes/testing/TypedScopeFixture.h'
--- include/unity/scopes/testing/TypedScopeFixture.h	2014-06-17 09:27:49 +0000
+++ include/unity/scopes/testing/TypedScopeFixture.h	2014-07-28 11:21:43 +0000
@@ -46,9 +46,9 @@
         return "unknown";
     }
 
-    inline static std::shared_ptr<Scope> construct()
+    inline static std::shared_ptr<Scope> construct(RegistryProxy const& r)
     {
-        return std::make_shared<Scope>();
+        return std::make_shared<Scope>(r);
     }
 };
 
@@ -57,14 +57,14 @@
 {
 public:
     TypedScopeFixture()
-        : scope(ScopeTraits<Scope>::construct()),
-          registry_proxy(&registry, [](unity::scopes::Registry*) {})
+        : registry_proxy(&registry, [](unity::scopes::Registry*) {})
+        , scope(ScopeTraits<Scope>::construct(registry_proxy))
     {
     }
 
     void SetUp()
     {
-        EXPECT_NO_THROW(scope->start(ScopeTraits<Scope>::name(), registry_proxy));
+        EXPECT_NO_THROW(scope->start(ScopeTraits<Scope>::name()));
         EXPECT_NO_THROW(scope->run());
     }
 
@@ -74,9 +74,9 @@
     }
 
 protected:
-    std::shared_ptr<Scope> scope;
     unity::scopes::testing::MockRegistry registry;
     unity::scopes::RegistryProxy registry_proxy;
+    std::shared_ptr<Scope> scope;
 };
 
 /// @endcond

=== modified file 'scoperegistry/scoperegistry.cpp'
--- scoperegistry/scoperegistry.cpp	2014-07-22 10:48:57 +0000
+++ scoperegistry/scoperegistry.cpp	2014-07-28 11:21:43 +0000
@@ -35,7 +35,6 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
 
 #include <algorithm>
 #include <cassert>
@@ -43,11 +42,8 @@
 #include <iostream>
 #include <map>
 #include <set>
-#include <sstream>
-
-#include <libgen.h>
-#include <unistd.h>
-
+
+#include <sys/stat.h>  // TODO: remove this once hack for creating data root dir is removed
 
 using namespace scoperegistry;
 using namespace std;
@@ -464,11 +460,23 @@
         SignalThreadWrapper signal_handler_wrapper;
 
         // And finally creating our runtime.
-        RuntimeConfig rt_config(config_file);
-        RuntimeImpl::UPtr runtime = RuntimeImpl::create(rt_config.registry_identity(), config_file);
-
-        string identity = runtime->registry_identity();
-        string ss_reg_id = runtime->ss_registry_identity();
+        string identity;
+        string ss_reg_id;
+        RuntimeImpl::UPtr runtime;
+        {
+            RuntimeConfig rt_config(config_file);
+            runtime = RuntimeImpl::create(rt_config.registry_identity(), config_file);
+
+            identity = runtime->registry_identity();
+            ss_reg_id = runtime->ss_registry_identity();
+
+            // TODO: HACK: We create the root of the data directory 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.
+            string data_root = rt_config.data_directory() + "/leaf-net";
+            ::mkdir(data_root.c_str(), 0700);
+        } // Release memory for config parser
 
         // Collect the registry config data.
 
@@ -539,9 +547,8 @@
         }
 
         // Configure watches for scope install directories
-        ScopesWatcher local_scopes_watcher(registry,
-                                           [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
-                                           (pair<string, string> const& scope)
+        auto local_watch_lambda = [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
+                                  (pair<string, string> const& scope)
         {
             try
             {
@@ -551,13 +558,13 @@
             {
                 error("ignoring installed scope \"" + scope.first + "\": cannot create metadata: " + e.what());
             }
-        });
+        };
+        ScopesWatcher local_scopes_watcher(registry, local_watch_lambda);
         local_scopes_watcher.add_install_dir(scope_installdir);
         local_scopes_watcher.add_install_dir(oem_installdir);
 
-        ScopesWatcher click_scopes_watcher(registry,
-                                           [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
-                                           (pair<string, string> const& scope)
+        auto click_watch_lambda = [registry, &middleware, &scoperunner_path, &config_file, process_timeout]
+                                  (pair<string, string> const& scope)
         {
             try
             {
@@ -567,7 +574,8 @@
             {
                 error("ignoring installed scope \"" + scope.first + "\": cannot create metadata: " + e.what());
             }
-        });
+        };
+        ScopesWatcher click_scopes_watcher(registry, click_watch_lambda);
         click_scopes_watcher.add_install_dir(click_installdir);
 
         // Let's add the registry's state receiver to the middleware so that scopes can inform

=== modified file 'scoperunner/scoperunner.cpp'
--- scoperunner/scoperunner.cpp	2014-07-21 15:37:57 +0000
+++ scoperunner/scoperunner.cpp	2014-07-28 11:21:43 +0000
@@ -38,8 +38,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include <libgen.h>
-
 using namespace std;
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
@@ -59,7 +57,7 @@
 // Run the scope specified by the config_file in a separate thread and wait for the thread to finish.
 // Return exit status for main to use.
 
-int run_scope(std::string const& runtime_config, std::string const& scope_configfile)
+int run_scope(std::string const& runtime_config, std::string const& scope_config)
 {
     auto trap = core::posix::trap_signals_for_all_subsequent_threads(
     {
@@ -69,16 +67,11 @@
 
     std::thread trap_worker([trap]() { trap->run(); });
 
-    // Retrieve the registry middleware and create a proxy to its state receiver
-    RuntimeConfig rt_config(runtime_config);
-    RegistryConfig reg_conf(rt_config.registry_identity(), rt_config.registry_configfile());
-    auto reg_runtime = RuntimeImpl::create(rt_config.registry_identity(), runtime_config);
-    auto reg_mw = reg_runtime->factory()->find(reg_runtime->registry_identity(), reg_conf.mw_kind());
-    auto reg_state_receiver = reg_mw->create_state_receiver_proxy("StateReceiver");
-
-    filesystem::path scope_config_path(scope_configfile);
+    // Figure out what the scope ID is from the name of the scope config file.
+    filesystem::path scope_config_path(scope_config);
     string lib_dir = scope_config_path.parent_path().native();
     string scope_id = scope_config_path.stem().native();
+
     if (!lib_dir.empty())
     {
       lib_dir += '/';
@@ -87,11 +80,6 @@
     int exit_status = 1;
     try
     {
-        // Instantiate the run time, create the middleware, load the scope from its
-        // shared library, and call the scope's start() method.
-        auto rt = RuntimeImpl::create(scope_id, runtime_config);
-        auto mw = rt->factory()->create(scope_id, reg_conf.mw_kind(), reg_conf.mw_configfile());
-
         // For a scope_id "Fred", we look for the library as "libFred.so", "Fred.so", and "scope.so".
         vector<string> libs;
         libs.push_back(lib_dir + "lib" + scope_id + ".so");
@@ -104,7 +92,7 @@
         {
             try
             {
-                loader = ScopeLoader::load(scope_id, lib, rt_config.data_directory(), rt->registry());
+                loader = ScopeLoader::load(scope_id, lib);
             }
             catch (unity::ResourceException& e)
             {
@@ -123,35 +111,24 @@
             e.remember(ep);
             throw e;
         }
-        loader->start();
-
-        // Give a thread to the scope to do with as it likes. If the scope doesn't want to use it and
-        // immediately returns from run(), that's fine.
-        auto run_future = std::async(launch::async, [loader] { loader->scope_base()->run(); });
-
-        // Create a servant for the scope and register the servant.
-        ScopeConfig scope_config(scope_configfile);
-        auto scope = unique_ptr<ScopeObject>(new ScopeObject(rt.get(), loader->scope_base()));
-        auto proxy = mw->add_scope_object(scope_id, move(scope), scope_config.idle_timeout() * 1000);
-
-        trap->signal_raised().connect([mw](core::posix::Signal)
+
+        static mutex rt_mutex;
+        RuntimeImpl::SPtr rt;
+
+        // Signal handler to shut down the run time on receipt of a signal.
+        trap->signal_raised().connect([rt](core::posix::Signal)
         {
-            mw->stop();
+            lock_guard<mutex> lock(rt_mutex);
+            rt->destroy();
         });
 
-        // Inform the registry that this scope is now ready to process requests
-        reg_state_receiver->push_state(scope_id, StateReceiverObject::State::ScopeReady);
-
-        mw->wait_for_shutdown();
-
-        // Inform the registry that this scope is shutting down
-        reg_state_receiver->push_state(scope_id, StateReceiverObject::State::ScopeStopping);
-
-        loader->stop();
-
-        // Collect exit status from the run thread. If this throws, the ScopeLoader
-        // destructor will still call stop() on the scope.
-        run_future.get();
+        // Instantiate the run time and run the scope.
+        {
+            lock_guard<mutex> lock(rt_mutex);
+            rt = RuntimeImpl::create(scope_id, runtime_config);
+        }
+
+        rt->run_scope(loader->scope_base(), runtime_config, scope_config);
 
         exit_status = 0;
     }

=== modified file 'smartscopesproxy/smartscopesproxy.cpp'
--- smartscopesproxy/smartscopesproxy.cpp	2014-06-30 07:20:30 +0000
+++ smartscopesproxy/smartscopesproxy.cpp	2014-07-28 11:21:43 +0000
@@ -27,9 +27,10 @@
 #include <core/posix/signal.h>
 
 #include <cassert>
+#include <iostream>
+
+#include <libgen.h>
 #include <signal.h>
-#include <libgen.h>
-#include <iostream>
 #include <unistd.h>
 
 using namespace unity::scopes;

=== modified file 'src/scopes/ScopeBase.cpp'
--- src/scopes/ScopeBase.cpp	2014-06-24 11:11:11 +0000
+++ src/scopes/ScopeBase.cpp	2014-07-28 11:21:43 +0000
@@ -18,6 +18,7 @@
 
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/ActivationQueryBase.h>
+#include <unity/scopes/Registry.h>
 #include <unity/scopes/internal/ScopeBaseImpl.h>
 
 namespace unity
@@ -39,7 +40,7 @@
 
 //! @endcond
 
-void ScopeBase::start(std::string const&, RegistryProxy const&)
+void ScopeBase::start(std::string const&)
 {
     // Intentionally empty: default "do nothing" implementation.
 }
@@ -76,6 +77,16 @@
     return p->scope_directory();
 }
 
+std::string ScopeBase::cache_directory() const
+{
+    return p->cache_directory();
+}
+
+RegistryProxy ScopeBase::registry() const
+{
+    return p->registry();
+}
+
 unity::scopes::VariantMap ScopeBase::settings() const
 {
     return p->settings();

=== modified file 'src/scopes/internal/RegistryConfig.cpp'
--- src/scopes/internal/RegistryConfig.cpp	2014-05-09 06:36:46 +0000
+++ src/scopes/internal/RegistryConfig.cpp	2014-07-28 11:21:43 +0000
@@ -78,7 +78,7 @@
         throw_ex("Illegal value (" + to_string(process_timeout_) + ") for " + process_timeout_key + ": value must be 10-5000 ms");
     }
 
-    const KnownEntries known_entries = {
+    KnownEntries const known_entries = {
                                           {  registry_config_group,
                                              {
                                                 mw_kind_key,

=== modified file 'src/scopes/internal/RuntimeConfig.cpp'
--- src/scopes/internal/RuntimeConfig.cpp	2014-07-07 05:22:26 +0000
+++ src/scopes/internal/RuntimeConfig.cpp	2014-07-28 11:21:43 +0000
@@ -104,7 +104,7 @@
         }
     }
 
-    const KnownEntries known_entries = {
+    KnownEntries const known_entries = {
                                           {  runtime_config_group,
                                              {
                                                 registry_identity_key,

=== modified file 'src/scopes/internal/RuntimeImpl.cpp'
--- src/scopes/internal/RuntimeImpl.cpp	2014-07-21 15:37:57 +0000
+++ src/scopes/internal/RuntimeImpl.cpp	2014-07-28 11:21:43 +0000
@@ -35,8 +35,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include <signal.h>
-#include <libgen.h>
+#include <boost/filesystem.hpp>
 
 #include <cassert>
 #include <cstring>
@@ -301,27 +300,37 @@
     auto mw = factory()->create(scope_id_, reg_conf.mw_kind(), reg_conf.mw_configfile());
 
     {
-        boost::filesystem::path inip(scope_ini_file);
-        boost::filesystem::path scope_dir(inip.parent_path());
-        scope_base->p->set_scope_directory(inip.native());
+        boost::filesystem::path dir = boost::filesystem::path(scope_ini_file).parent_path();
+        scope_base->p->set_scope_directory(dir.native());
     }
 
-    // Try to open the scope settings database, if any.
-    string settings_dir = data_dir_ + "/" + scope_id_;
-    string scope_dir = scope_base->scope_directory();
-    string settings_db = settings_dir + "/settings.db";
-    string settings_schema = scope_dir + "/" + scope_id_ + "-settings.ini";
-    if (boost::filesystem::exists(settings_schema))
     {
-        // Make sure the settings directories exist. (No permission for group and others; data might be sensitive.)
-        ::mkdir(data_dir_.c_str(), 0700);
-        ::mkdir(settings_dir.c_str(), 0700);
+        // Try to open the scope settings database, if any.
+        string settings_dir = data_dir_ + "/" + scope_id_;
+        string scope_dir = scope_base->scope_directory();
+        string settings_db = settings_dir + "/settings.db";
+        string settings_schema = scope_dir + "/" + scope_id_ + "-settings.ini";
+        if (boost::filesystem::exists(settings_schema))
+        {
+            // Make sure the settings directories exist. (No permission for group and others; data might be sensitive.)
+            ::mkdir(data_dir_.c_str(), 0700);
+            ::mkdir(settings_dir.c_str(), 0700);
 
-        shared_ptr<SettingsDB> db(SettingsDB::create_from_ini_file(settings_db, settings_schema));
-        scope_base->p->set_settings_db(db);
+            shared_ptr<SettingsDB> db(SettingsDB::create_from_ini_file(settings_db, settings_schema));
+            scope_base->p->set_settings_db(db);
+        }
+        else
+        {
+            scope_base->p->set_settings_db(nullptr);
+        }
     }
 
-    scope_base->start(scope_id_, registry());
+    scope_base->p->set_registry(registry_);
+
+    scope_base->p->set_cache_directory(find_cache_dir());
+
+    scope_base->start(scope_id_);
+
     // Ensure the scope gets stopped.
     unique_ptr<ScopeBase, void(*)(ScopeBase*)> cleanup_scope(scope_base, [](ScopeBase *scope_base) { scope_base->stop(); });
 
@@ -332,15 +341,13 @@
 
     // Create a servant for the scope and register the servant.
     auto scope = unique_ptr<internal::ScopeObject>(new internal::ScopeObject(this, scope_base));
+    int idle_timeout_ms = 0;
     if (!scope_ini_file.empty())
     {
         ScopeConfig scope_config(scope_ini_file);
-        mw->add_scope_object(scope_id_, move(scope), scope_config.idle_timeout() * 1000);
-    }
-    else
-    {
-        mw->add_scope_object(scope_id_, move(scope));
-    }
+        idle_timeout_ms = scope_config.idle_timeout() * 1000;
+    }
+    mw->add_scope_object(scope_id_, move(scope), idle_timeout_ms);
 
     // Inform the registry that this scope is now ready to process requests
     reg_state_receiver->push_state(scope_id_, StateReceiverObject::State::ScopeReady);
@@ -383,6 +390,42 @@
     }
 }
 
+string RuntimeImpl::find_cache_dir() const
+{
+    // TODO: HACK: Until we get a fancier Apparmor query API, we try
+    //             to create the scope cache dir and figure out whether
+    //             whether we are confined or unconfined. We first try to
+    //             create <data_dir>/unconfined and <data_dir>/unconfined/<scope_id_>,
+    //             in case they don't exist. Then we try to create a file in
+    //             <data_dir>unconfined/<scope_id_>. If that works, we unlink
+    //             the file again and can conclude that the scope is unconfined.
+    //             Otherwise, the scope must be confined, in which case
+    //             we create <data_dir>/leaf-net and <data_dir>/leaf-net/<scope_id_>.
+
+    string cache_dir = data_dir_ + "/unconfined/" + scope_id_;
+
+    // The following two mkdir() calls will fail if the scope is confined or
+    // the directories exist already.
+    ::mkdir((data_dir_ + "/unconfined").c_str(), 0700);
+    ::mkdir(cache_dir.c_str(), 0700);
+    string tmp = cache_dir + "/.unconfined_scope_XXXXXX";
+    int fd = mkstemp(const_cast<char*>(tmp.c_str()));  // mkstemp() modifies its argument
+    if (fd != -1)
+    {
+        // If mkstemp succeeded, the scope is unconfined.
+        assert(::unlink(tmp.c_str()) == 0);
+        ::close(fd);
+    }
+    else
+    {
+        // mkstemp() failed, the scope must be confined.
+        ::mkdir((data_dir_ + "/leaf-net").c_str(), 0700);
+        ::mkdir(cache_dir.c_str(), 0700);
+        cache_dir = data_dir_ + "/leaf-net/" + scope_id_;
+    }
+    return cache_dir;
+}
+
 } // namespace internal
 
 } // namespace scopes

=== modified file 'src/scopes/internal/ScopeBaseImpl.cpp'
--- src/scopes/internal/ScopeBaseImpl.cpp	2014-06-24 03:05:19 +0000
+++ src/scopes/internal/ScopeBaseImpl.cpp	2014-07-28 11:21:43 +0000
@@ -17,8 +17,12 @@
  */
 
 #include <unity/scopes/internal/ScopeBaseImpl.h>
+
+#include <unity/UnityExceptions.h>
 #include <unity/scopes/internal/SettingsDB.h>
+#include <unity/scopes/ScopeExceptions.h>
 
+using namespace unity;
 using namespace unity::scopes;
 using namespace std;
 
@@ -31,21 +35,78 @@
 namespace internal
 {
 
-void ScopeBaseImpl::set_scope_directory(std::string const &path)
+ScopeBaseImpl::ScopeBaseImpl()
+    : scope_dir_initialized_(false)
+    , cache_dir_initialized_(false)
+    , registry_initialized_(false)
+    , settings_db_initialized_(false)
+{
+}
+
+void ScopeBaseImpl::set_scope_directory(std::string const& path)
 {
     lock_guard<mutex> lock(mutex_);
     scope_directory_ = path;
+    scope_dir_initialized_ = true;
 }
 
 std::string ScopeBaseImpl::scope_directory() const
 {
     lock_guard<mutex> lock(mutex_);
+    if (!scope_dir_initialized_)
+    {
+        throw LogicException("ScopeBase::scope_directory() cannot be called from constructor");
+    }
+    // scope_dir_ is never empty, except for tests, so we don't throw if it is empty here.
     return scope_directory_;
 }
 
+void ScopeBaseImpl::set_cache_directory(std::string const& path)
+{
+    lock_guard<mutex> lock(mutex_);
+    cache_directory_ = path;
+    cache_dir_initialized_ = true;
+}
+
+std::string ScopeBaseImpl::cache_directory() const
+{
+    lock_guard<mutex> lock(mutex_);
+    if (!cache_dir_initialized_)
+    {
+        throw LogicException("ScopeBase::cache_directory() cannot be called from constructor");
+    }
+    if (cache_directory_.empty())
+    {
+        throw ConfigException("ScopeBase::cache_directory(): no cache directory available");
+    }
+    return cache_directory_;
+}
+
+void ScopeBaseImpl::set_registry(RegistryProxy const& registry)
+{
+    lock_guard<mutex> lock(mutex_);
+    registry_ = registry;
+    registry_initialized_ = true;
+}
+
+RegistryProxy ScopeBaseImpl::registry() const
+{
+    lock_guard<mutex> lock(mutex_);
+    if (!registry_initialized_)
+    {
+        throw LogicException("ScopeBase::registry() cannot be called from constructor");
+    }
+    // registry_ can be a null proxy.
+    return registry_;
+}
+
 SettingsDB::SPtr ScopeBaseImpl::settings_db() const
 {
     lock_guard<mutex> lock(mutex_);
+    if (!settings_db_initialized_)
+    {
+        throw LogicException("ScopeBase::settings_db() cannot be called from constructor");
+    }
     return db_;
 }
 
@@ -53,11 +114,16 @@
 {
     lock_guard<mutex> lock(mutex_);
     db_ = db;
+    settings_db_initialized_ = true;
 }
 
 VariantMap ScopeBaseImpl::settings() const
 {
     lock_guard<mutex> lock(mutex_);
+    if (!settings_db_initialized_)
+    {
+        throw LogicException("ScopeBase::settings_db() cannot be called from constructor");
+    }
     return db_ ? db_->settings() : VariantMap();
 }
 

=== modified file 'src/scopes/internal/ScopeConfig.cpp'
--- src/scopes/internal/ScopeConfig.cpp	2014-07-24 13:08:48 +0000
+++ src/scopes/internal/ScopeConfig.cpp	2014-07-28 11:21:43 +0000
@@ -54,7 +54,7 @@
     const string location_data_needed_key = "LocationDataNeeded";
     const string scoperunner_key = "ScopeRunner";
     const string idle_timeout_key = "IdleTimeout";
-    const string results_ttl_str = "ResultsTtlType";
+    const string results_ttl_key = "ResultsTtlType";
 
     const string scope_appearance_group = "Appearance";
     const string fg_color_key = "ForegroundColor";
@@ -141,8 +141,8 @@
     // custom scope runner executable is optional
     try
     {
-        string key = parser()->get_string(scope_config_group, scoperunner_key);
-        scope_runner_.reset(new string(key));
+        string scope_runner = parser()->get_string(scope_config_group, scoperunner_key);
+        scope_runner_.reset(new string(scope_runner));
     }
     catch (LogicException const&)
     {
@@ -162,7 +162,7 @@
     results_ttl_type_ = ScopeMetadata::ResultsTtlType::None;
     try
     {
-        string orig = parser()->get_string(scope_config_group, results_ttl_str);
+        string orig = parser()->get_string(scope_config_group, results_ttl_key);
         string ttl = orig;
         to_lower(ttl);
         if (ttl.empty() || ttl == "none")
@@ -182,7 +182,7 @@
         }
         else
         {
-            throw_ex("Illegal value (" + orig + ") for " + results_ttl_str);
+            throw_ex("Illegal value (\"" + orig + "\") for " + results_ttl_key);
         }
     }
     catch (LogicException const&)
@@ -201,7 +201,7 @@
     {
     }
 
-    const KnownEntries known_entries = {
+    KnownEntries const known_entries = {
                                           {  scope_config_group,
                                              {
                                                 overrideable_key,
@@ -216,7 +216,7 @@
                                                 location_data_needed_key,
                                                 scoperunner_key,
                                                 idle_timeout_key,
-                                                results_ttl_str
+                                                results_ttl_key
                                              }
                                           },
                                           {  scope_appearance_group,

=== modified file 'src/scopes/internal/ScopeLoader.cpp'
--- src/scopes/internal/ScopeLoader.cpp	2014-07-02 05:17:19 +0000
+++ src/scopes/internal/ScopeLoader.cpp	2014-07-28 11:21:43 +0000
@@ -23,11 +23,7 @@
 #include <unity/scopes/Version.h>
 #include <unity/UnityExceptions.h>
 
-#include <boost/filesystem.hpp>
-
 #include <cassert>
-#include <libgen.h>
-#include <sys/stat.h>
 
 using namespace std;
 using namespace unity::scopes;
@@ -42,13 +38,9 @@
 namespace internal
 {
 
-ScopeLoader::ScopeLoader(string const& scope_id,
-                         string const& libpath,
-                         string const& data_dir,
-                         RegistryProxy const& registry) :
+ScopeLoader::ScopeLoader(string const& scope_id, string const& libpath) :
     scope_id_(scope_id),
     dyn_loader_(DynamicLoader::create(libpath, DynamicLoader::Binding::now, DynamicLoader::Unload::noclose)),
-    registry_(registry),
     scope_base_(nullptr, reinterpret_cast<DestroyFunction>(dyn_loader_->find_function(UNITY_SCOPE_DESTROY_SYMSTR))),
     scope_state_(ScopeState::Stopped)
 {
@@ -62,26 +54,6 @@
     {
         throw unity::ResourceException("Scope " + scope_id_ + " returned nullptr from " + UNITY_SCOPE_CREATE_SYMSTR);
     }
-
-    {
-        boost::filesystem::path libp(libpath);
-        boost::filesystem::path scope_dir(libp.parent_path());
-        scope_base_->p->set_scope_directory(scope_dir.native());
-    }
-
-    string settings_dir = data_dir + "/" + scope_id;
-    string scope_dir = scope_base_->scope_directory();
-    string settings_db = settings_dir + "/settings.db";
-    string settings_schema = scope_dir + "/" + scope_id + "-settings.ini";
-    if (boost::filesystem::exists(settings_schema))
-    {
-        // Make sure the settings directories exist. (No permission for group and others; data might be sensitive.)
-        ::mkdir(data_dir.c_str(), 0700);
-        ::mkdir(settings_dir.c_str(), 0700);
-
-        shared_ptr<SettingsDB> db(SettingsDB::create_from_ini_file(settings_db, settings_schema));
-        scope_base_->p->set_settings_db(db);
-    }
 }
 
 ScopeLoader::~ScopeLoader()
@@ -95,12 +67,9 @@
     }
 }
 
-ScopeLoader::UPtr ScopeLoader::load(string const& scope_id,
-                                    string const& libpath,
-                                    string const& data_dir,
-                                    RegistryProxy const& registry)
+ScopeLoader::UPtr ScopeLoader::load(string const& scope_id, string const& libpath)
 {
-    return UPtr(new ScopeLoader(scope_id, libpath, data_dir, registry));
+    return UPtr(new ScopeLoader(scope_id, libpath));
 }
 
 void ScopeLoader::unload()
@@ -142,7 +111,7 @@
 
     try
     {
-        scope_base_->start(scope_id_, registry_);
+        scope_base_->start(scope_id_);
     }
     catch (...)
     {

=== modified file 'src/scopes/internal/zmq_middleware/ZmqConfig.cpp'
--- src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2014-07-22 04:01:45 +0000
+++ src/scopes/internal/zmq_middleware/ZmqConfig.cpp	2014-07-28 11:21:43 +0000
@@ -88,7 +88,7 @@
     registry_endpoint_dir_ = get_optional_string(zmq_config_group, registry_endpoint_dir_key);
     ss_registry_endpoint_dir_ = get_optional_string(zmq_config_group, ss_registry_endpoint_dir_key);
 
-    const KnownEntries known_entries = {
+    KnownEntries const known_entries = {
                                           {  zmq_config_group,
                                              {
                                                 endpoint_dir_key,

=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt	2014-07-07 23:53:36 +0000
+++ test/CMakeLists.txt	2014-07-28 11:21:43 +0000
@@ -4,3 +4,4 @@
 endif()
 add_subdirectory(copyright)
 add_subdirectory(whitespace)
+add_subdirectory(autopkg)

=== added directory 'test/autopkg'
=== added file 'test/autopkg/CMakeLists.txt'
--- test/autopkg/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ test/autopkg/CMakeLists.txt	2014-07-28 11:21:43 +0000
@@ -0,0 +1,4 @@
+add_executable(scopetest ${CMAKE_SOURCE_DIR}/debian/tests/scopetest.cpp)
+target_link_libraries(scopetest ${UNITY_SCOPES_LIB} ${OTHER_LIBS})
+
+add_test(autopkg-scopetest scopetest)

=== modified file 'test/gtest/scopes/Activation/TestScope.h'
--- test/gtest/scopes/Activation/TestScope.h	2014-06-17 11:20:48 +0000
+++ test/gtest/scopes/Activation/TestScope.h	2014-07-28 11:21:43 +0000
@@ -98,7 +98,7 @@
 class TestScope : public ScopeBase
 {
 public:
-    virtual void start(std::string const&, RegistryProxy const &) override {}
+    virtual void start(std::string const&) override {}
 
     virtual void stop() override {}
 

=== modified file 'test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp'
--- test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp	2014-06-17 11:20:48 +0000
+++ test/gtest/scopes/IdleShutdown/SlowSearchScope.cpp	2014-07-28 11:21:43 +0000
@@ -50,7 +50,7 @@
 
 }  // namespace
 
-void SlowSearchScope::start(string const&, RegistryProxy const &)
+void SlowSearchScope::start(string const&)
 {
 }
 

=== modified file 'test/gtest/scopes/IdleShutdown/SlowSearchScope.h'
--- test/gtest/scopes/IdleShutdown/SlowSearchScope.h	2014-06-17 09:27:49 +0000
+++ test/gtest/scopes/IdleShutdown/SlowSearchScope.h	2014-07-28 11:21:43 +0000
@@ -27,7 +27,7 @@
 class SlowSearchScope : public ScopeBase
 {
 public:
-    virtual void start(string const&, RegistryProxy const &) override;
+    virtual void start(string const&) override;
 
     virtual void stop() override;
 

=== modified file 'test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.cpp'
--- test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.cpp	2014-06-17 11:20:48 +0000
+++ test/gtest/scopes/Registry/scopes/testscopeA/testscopeA.cpp	2014-07-28 11:21:43 +0000
@@ -64,7 +64,7 @@
 class MyScope : public ScopeBase
 {
 public:
-    virtual void start(string const&, RegistryProxy const&) override {}
+    virtual void start(string const&) override {}
 
     virtual void stop() override {}
 

=== modified file 'test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp'
--- test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp	2014-06-17 11:20:48 +0000
+++ test/gtest/scopes/Registry/scopes/testscopeB/testscopeB.cpp	2014-07-28 11:21:43 +0000
@@ -77,7 +77,7 @@
 class MyScope : public ScopeBase
 {
 public:
-    virtual void start(string const&, RegistryProxy const&) override {}
+    virtual void start(string const&) override {}
 
     virtual void stop() override {}
 

=== modified file 'test/gtest/scopes/Runtime/PusherScope.h'
--- test/gtest/scopes/Runtime/PusherScope.h	2014-07-24 13:51:38 +0000
+++ test/gtest/scopes/Runtime/PusherScope.h	2014-07-28 11:21:43 +0000
@@ -21,14 +21,13 @@
 
 #include <unity/scopes/ScopeBase.h>
 
-using namespace std;
-using namespace unity::scopes;
-
-class PusherScope : public ScopeBase
+class PusherScope : public unity::scopes::ScopeBase
 {
 public:
-    virtual SearchQueryBase::UPtr search(CannedQuery const&, SearchMetadata const&) override;
-    virtual PreviewQueryBase::UPtr preview(Result const& result, ActionMetadata const& metadata) override;
+    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const&,
+                                                        unity::scopes::SearchMetadata const&) override;
+    virtual unity::scopes::PreviewQueryBase::UPtr preview(unity::scopes::Result const&,
+                                                          unity::scopes::ActionMetadata const&) override;
 };
 
 #endif

=== modified file 'test/gtest/scopes/Runtime/SlowCreateScope.h'
--- test/gtest/scopes/Runtime/SlowCreateScope.h	2014-07-24 13:51:38 +0000
+++ test/gtest/scopes/Runtime/SlowCreateScope.h	2014-07-28 11:21:43 +0000
@@ -21,14 +21,13 @@
 
 #include <unity/scopes/ScopeBase.h>
 
-using namespace std;
-using namespace unity::scopes;
-
-class SlowCreateScope : public ScopeBase
+class SlowCreateScope : public unity::scopes::ScopeBase
 {
 public:
-    virtual SearchQueryBase::UPtr search(CannedQuery const&, SearchMetadata const&) override;
-    virtual PreviewQueryBase::UPtr preview(Result const&, ActionMetadata const&) override;
+    virtual unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const&,
+                                                        unity::scopes::SearchMetadata const&) override;
+    virtual unity::scopes::PreviewQueryBase::UPtr preview(unity::scopes::Result const&,
+                                                          unity::scopes::ActionMetadata const&) override;
 };
 
 #endif

=== modified file 'test/gtest/scopes/ScopeBase/ScopeBase_test.cpp'
--- test/gtest/scopes/ScopeBase/ScopeBase_test.cpp	2014-07-07 23:53:36 +0000
+++ test/gtest/scopes/ScopeBase/ScopeBase_test.cpp	2014-07-28 11:21:43 +0000
@@ -65,7 +65,7 @@
     EXPECT_EQ(UNITY_SCOPES_VERSION_MINOR, vminor);
     EXPECT_EQ(UNITY_SCOPES_VERSION_MICRO, vmicro);
 
-    b->start("some_scope", nullptr);
+    b->start("some_scope");
     b->stop();
     destroy(b);
 }

=== modified file 'test/gtest/scopes/ScopeBase/scopelib.cpp'
--- test/gtest/scopes/ScopeBase/scopelib.cpp	2014-06-17 09:27:49 +0000
+++ test/gtest/scopes/ScopeBase/scopelib.cpp	2014-07-28 11:21:43 +0000
@@ -25,7 +25,7 @@
 public:
     MyScope() {}
 
-    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override {}
+    virtual void start(std::string const&) override {}
     virtual void stop() override {}
     virtual void run() override {}
 

=== modified file 'test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp'
--- test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-06-27 02:19:43 +0000
+++ test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-07-28 11:21:43 +0000
@@ -125,7 +125,7 @@
     }
     catch(ConfigException const& e)
     {
-        boost::regex r("unity::scopes::ConfigException: \".*\": Illegal value \\(blah\\) for ResultsTtlType");
+        boost::regex r("unity::scopes::ConfigException: \".*\": Illegal value \\(\"blah\"\\) for ResultsTtlType");
         EXPECT_TRUE(boost::regex_match(e.what(), r));
     }
 }

=== modified file 'test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in	2014-06-26 12:49:46 +0000
+++ test/gtest/scopes/internal/ScopeConfig/complete_config.ini.in	2014-07-28 11:21:43 +0000
@@ -15,6 +15,7 @@
 IdleTimeout = 300
 ResultsTtlType = large
 LocationDataNeeded = true
+ConfinementType = unconfined
 
 [Appearance]
 arbitrary_key = true

=== modified file 'test/gtest/scopes/internal/ScopeLoader/MyScope.h'
--- test/gtest/scopes/internal/ScopeLoader/MyScope.h	2014-06-17 09:27:49 +0000
+++ test/gtest/scopes/internal/ScopeLoader/MyScope.h	2014-07-28 11:21:43 +0000
@@ -31,7 +31,7 @@
     MyScope() {}
     virtual ~MyScope() {}
 
-    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
+    virtual void start(std::string const&) override
     {
         inc_start();
     }

=== modified file 'test/gtest/scopes/internal/ScopeLoader/ScopeA.cpp'
--- test/gtest/scopes/internal/ScopeLoader/ScopeA.cpp	2014-06-17 09:27:49 +0000
+++ test/gtest/scopes/internal/ScopeLoader/ScopeA.cpp	2014-07-28 11:21:43 +0000
@@ -30,7 +30,7 @@
 class ScopeA : public MyScope
 {
 public:
-    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
+    virtual void start(std::string const&) override
     {
         inc_start();
     }

=== modified file 'test/gtest/scopes/internal/ScopeLoader/ScopeB.cpp'
--- test/gtest/scopes/internal/ScopeLoader/ScopeB.cpp	2014-06-17 09:27:49 +0000
+++ test/gtest/scopes/internal/ScopeLoader/ScopeB.cpp	2014-07-28 11:21:43 +0000
@@ -30,7 +30,7 @@
 class ScopeA : public MyScope
 {
 public:
-    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
+    virtual void start(std::string const&) override
     {
         inc_start();
     }

=== modified file 'test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp'
--- test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp	2014-07-01 08:39:17 +0000
+++ test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp	2014-07-28 11:21:43 +0000
@@ -47,11 +47,6 @@
 char const* scopeB = TEST_DIR "/libScopeB.so";
 }
 
-// Need to make a dummy registry proxy because, if we pass a null shared_ptr to load(),
-// load() throws an exception.
-
-RegistryProxy registry(make_shared<RegistryImpl>(nullptr, (RuntimeImpl*)0x1));
-
 // Basic test.
 
 TEST(ScopeLoader, basic)
@@ -59,13 +54,12 @@
     reset_counters();
 
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
         EXPECT_EQ(1, num_create());
         EXPECT_EQ(0, num_destroy());
 
         EXPECT_EQ("testScope", sl->scope_id());
         EXPECT_EQ(scope_lib, sl->libpath());
-        EXPECT_EQ(TEST_DIR, sl->scope_base()->scope_directory());
     }
     EXPECT_EQ(1, num_create());
     EXPECT_EQ(1, num_destroy());
@@ -78,7 +72,7 @@
     reset_counters();
 
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
 
         // Check that calling stop on a stopped thread does nothing.
         sl->stop();
@@ -116,7 +110,7 @@
     reset_counters();
 
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
 
         sl->start();
         EXPECT_EQ(1, num_start());
@@ -136,7 +130,7 @@
 
     try
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", "no_such_lib", TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", "no_such_lib");
         FAIL();
     }
     catch (unity::Exception const& e)
@@ -156,7 +150,7 @@
 
     try
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", no_destroy_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", no_destroy_lib);
         FAIL();
     }
     catch (unity::Exception const& e)
@@ -176,7 +170,7 @@
 
     try
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", null_return_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", null_return_lib);
         FAIL();
     }
     catch (unity::Exception const& e)
@@ -197,7 +191,7 @@
 
     try
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", null_return_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", null_return_lib);
         sl->unload();
         FAIL();
     }
@@ -217,7 +211,7 @@
 {
     reset_counters();
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib);
         try
         {
             sl->start();
@@ -242,7 +236,7 @@
 {
     reset_counters();
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib);
         try
         {
             sl->start();
@@ -266,7 +260,7 @@
 {
     reset_counters();
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unknown_ex_from_start_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unknown_ex_from_start_lib);
         try
         {
             sl->start();
@@ -293,7 +287,7 @@
     reset_counters();
     try
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_stop_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_stop_lib);
         sl->start();
         sl->stop();
         EXPECT_EQ(1, num_start());
@@ -319,7 +313,7 @@
     reset_counters();
     try
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_std_ex_from_stop_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_std_ex_from_stop_lib);
         sl->start();
         sl->stop();
         EXPECT_EQ(1, num_start());
@@ -345,7 +339,7 @@
     reset_counters();
     try
     {
-        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unknown_ex_from_stop_lib, TEST_DIR, registry);
+        ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unknown_ex_from_stop_lib);
         sl->start();
         sl->stop();
         EXPECT_EQ(1, num_start());
@@ -369,7 +363,7 @@
 {
     reset_counters();
 
-    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
+    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
     sl->start();
     sl->stop();
     sl->unload();
@@ -387,7 +381,7 @@
 {
     reset_counters();
 
-    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_stop_lib, TEST_DIR, registry);
+    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_stop_lib);
     sl->start();
     try
     {
@@ -418,7 +412,7 @@
 {
     reset_counters();
 
-    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
+    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
     sl->start();
     sl->unload();
     try
@@ -438,7 +432,7 @@
 {
     reset_counters();
 
-    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib, TEST_DIR, registry);
+    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", scope_lib);
     sl->start();
     sl->unload();
     try
@@ -458,7 +452,7 @@
 {
     reset_counters();
 
-    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib, TEST_DIR, registry);
+    ScopeLoader::UPtr sl = ScopeLoader::load("testScope", throw_unity_ex_from_start_lib);
     try
     {
         sl->start();
@@ -495,12 +489,12 @@
     reset_counters();
     clear_vars();
 
-    ScopeLoader::UPtr slA = ScopeLoader::load("scopeA", scopeA, TEST_DIR, registry);
+    ScopeLoader::UPtr slA = ScopeLoader::load("scopeA", scopeA);
     slA->start();
     EXPECT_EQ(1, num_create());
     EXPECT_EQ(1, num_start());
 
-    ScopeLoader::UPtr slB = ScopeLoader::load("scopeB", scopeB, TEST_DIR, registry);
+    ScopeLoader::UPtr slB = ScopeLoader::load("scopeB", scopeB);
     slB->start();
     EXPECT_EQ(2, num_create());
     EXPECT_EQ(2, num_start());

=== modified file 'test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromStart.cpp'
--- test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromStart.cpp	2014-06-17 09:27:49 +0000
+++ test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromStart.cpp	2014-07-28 11:21:43 +0000
@@ -29,7 +29,7 @@
 class EXPORT MyThrowingScope : public MyScope
 {
 public:
-    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
+    virtual void start(std::string const&) override
     {
         inc_start();
         throw unity::LogicException("start failure");

=== modified file 'test/gtest/scopes/internal/ScopeLoader/ThrowUnknownExFromStart.cpp'
--- test/gtest/scopes/internal/ScopeLoader/ThrowUnknownExFromStart.cpp	2014-06-17 09:27:49 +0000
+++ test/gtest/scopes/internal/ScopeLoader/ThrowUnknownExFromStart.cpp	2014-07-28 11:21:43 +0000
@@ -28,7 +28,7 @@
 class EXPORT MyThrowingScope : public MyScope
 {
 public:
-    virtual void start(std::string const&, unity::scopes::RegistryProxy const&) override
+    virtual void start(std::string const&) override
     {
         inc_start();
         throw 42;

=== modified file 'test/gtest/scopes/testing/IsolatedScope/scope.cpp'
--- test/gtest/scopes/testing/IsolatedScope/scope.cpp	2014-06-18 09:50:21 +0000
+++ test/gtest/scopes/testing/IsolatedScope/scope.cpp	2014-07-28 11:21:43 +0000
@@ -91,7 +91,8 @@
 {
 public:
     Query(unity::scopes::CannedQuery const& query, unity::scopes::SearchMetadata const& metadata, unity::scopes::RegistryProxy const& registry)
-        : unity::scopes::SearchQueryBase(query, metadata), registry_(registry)
+        : unity::scopes::SearchQueryBase(query, metadata)
+        , registry_(registry)
     {
     }
 
@@ -167,9 +168,15 @@
 
 } // namespace testing
 
-void testing::Scope::start(std::string const&, unity::scopes::RegistryProxy const &registry)
-{
-    registry_ = registry;
+testing::Scope::Scope(unity::scopes::RegistryProxy const& r)
+    : registry_(r)
+{
+}
+
+testing::Scope::~Scope() = default;
+
+void testing::Scope::start(std::string const&)
+{
 }
 
 void testing::Scope::stop()
@@ -184,7 +191,7 @@
         unity::scopes::CannedQuery const& query,
         unity::scopes::SearchMetadata const &metadata)
 {
-    return unity::scopes::SearchQueryBase::UPtr(new testing::Query(query, metadata, registry_));
+    return unity::scopes::SearchQueryBase::UPtr(new testing::Query(query, metadata, registry()));
 }
 
 unity::scopes::ActivationQueryBase::UPtr testing::Scope::activate(
@@ -209,3 +216,23 @@
 {
     return unity::scopes::PreviewQueryBase::UPtr(new testing::Preview(result, metadata));
 }
+
+std::string testing::Scope::scope_directory() const
+{
+    return "";
+}
+
+std::string testing::Scope::cache_directory() const
+{
+    return "";
+}
+
+unity::scopes::RegistryProxy testing::Scope::registry() const
+{
+    return registry_;
+}
+
+unity::scopes::VariantMap testing::Scope::settings() const
+{
+    return unity::scopes::VariantMap();
+}

=== modified file 'test/gtest/scopes/testing/IsolatedScope/scope.h'
--- test/gtest/scopes/testing/IsolatedScope/scope.h	2014-06-18 09:50:21 +0000
+++ test/gtest/scopes/testing/IsolatedScope/scope.h	2014-07-28 11:21:43 +0000
@@ -17,15 +17,19 @@
  *              Thomas Voß <[e-mail]>
  */
 
-#include <unity/scopes/ScopeBase.h>
+#include <unity/scopes/AbstractScopeBase.h>
+#include <unity/scopes/testing/MockRegistry.h>
 
 namespace testing
 {
 
-class Scope : public unity::scopes::ScopeBase
+class Scope : public unity::scopes::AbstractScopeBase
 {
 public:
-    void start(std::string const&, unity::scopes::RegistryProxy const &) override;
+    Scope(unity::scopes::RegistryProxy const&);
+    virtual ~Scope();
+
+    void start(std::string const&) override;
 
     void stop() override;
 
@@ -49,6 +53,14 @@
             unity::scopes::Result const&,
             unity::scopes::ActionMetadata const &) override;
 
+    std::string scope_directory() const override;
+
+    std::string cache_directory() const override;
+
+    unity::scopes::RegistryProxy registry() const override;
+
+    unity::scopes::VariantMap settings() const override;
+
     unity::scopes::RegistryProxy registry_;
 };
 

=== modified file 'test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp'
--- test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp	2014-04-03 12:57:25 +0000
+++ test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp	2014-07-28 11:21:43 +0000
@@ -55,7 +55,7 @@
         return "BenchmarkingScope";
     }
 
-    inline static std::shared_ptr<::testing::Scope> construct()
+    inline static std::shared_ptr<::testing::Scope> construct(unity::scopes::RegistryProxy const&)
     {
         return std::make_shared<::testing::Scope>(mean, variance);
     }

=== modified file 'test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.cpp'
--- test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.cpp	2014-06-17 11:20:48 +0000
+++ test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.cpp	2014-07-28 11:21:43 +0000
@@ -155,7 +155,7 @@
 {
 }
 
-void testing::Scope::start(std::string const&, unity::scopes::RegistryProxy const &)
+void testing::Scope::start(std::string const&)
 {
 }
 

=== modified file 'test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h'
--- test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h	2014-06-17 09:27:49 +0000
+++ test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h	2014-07-28 11:21:43 +0000
@@ -30,7 +30,7 @@
 public:
     Scope(const std::chrono::milliseconds& mean, const std::chrono::milliseconds& variance);
 
-    void start(std::string const&, unity::scopes::RegistryProxy const &) override;
+    void start(std::string const&) override;
 
     void stop() override;
 

=== modified file 'test/headers/CMakeLists.txt'
--- test/headers/CMakeLists.txt	2014-01-24 09:55:09 +0000
+++ test/headers/CMakeLists.txt	2014-07-28 11:21:43 +0000
@@ -6,6 +6,7 @@
 
 set(subdirs
     unity/scopes
+    unity/scopes/testing
 )
 foreach(dir ${OTHER_INCLUDE_DIRS})
     set(other_inc_dirs "${other_inc_dirs} -I${dir}")
@@ -26,9 +27,11 @@
             ${public_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fsyntax-only -I${root_inc_dir} -I${public_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS}")
 
     # Test that each internal header compiles stand-alone.
-    add_test(stand-alone-${location}-internal-headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py
-            ${internal_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fsyntax-only -I${root_inc_dir} -I${internal_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS}")
+    if (IS_DIRECTORY ${internal_inc_dir})
+        add_test(stand-alone-${location}-internal-headers
+            ${CMAKE_CURRENT_SOURCE_DIR}/compile_headers.py
+                ${internal_inc_dir} ${CMAKE_CXX_COMPILER} "${CMAKE_CXX_COMPILER_ARG1} -fsyntax-only -I${root_inc_dir} -I${internal_inc_dir} ${other_inc_dirs} ${CMAKE_CXX_FLAGS}")
+    endif()
 
     # Test that no public header includes an internal header
     add_test(clean-public-${location}-headers ${CMAKE_CURRENT_SOURCE_DIR}/check_public_headers.py ${public_inc_dir})

=== modified file 'test/headers/check_public_headers.py'
--- test/headers/check_public_headers.py	2013-06-27 08:38:02 +0000
+++ test/headers/check_public_headers.py	2014-07-28 11:21:43 +0000
@@ -53,7 +53,7 @@
     for hdr in hdrs:
         try:
             hdr_name = os.path.join(hdr_dir, hdr)
-            file = open(hdr_name, "r")
+            file = open(hdr_name, 'r', encoding = 'utf=8')
         except OSError as e:
             error("cannot open \"" + hdr_name + "\": " + e.strerror)
             sys.exit(1)