Merge lp:~dpm/reminders-app/account-click into lp:reminders-app

[David Planella]

Move the account plugin to the click package

Now that there is support for account plugins as click packages, I'd like to move away from the .deb package the app requires on the phone to have a self-contained click package that contains the app and the account plugin.

This will allow us as well to replace the Evernote API key behind Jenkins, while we can leave the current one in the code.

# Notes

- The click reviewers tools show validation errors: bug 1357211
- Click package available for testing at: http://people.canonical.com/~dpm/click/com.ubuntu.reminders_0.5.230_armhf.click
- The layout of the click package is as follows: http://pastebin.ubuntu.com/8044356/ - I'm not too sure about where the authentication plugin expects the account icon to be
- The layout of the installed click package: http://pastebin.ubuntu.com/8044350/
- The upload to the store should be coordinated with the removal of the Evernote account plugin from the seeds

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:220
http://91.189.93.70:8080/job/reminders-app-ci/500/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1941
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1941/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/196

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/500/rebuild

review: Approve (continuous-integration)

[Chris Wayne (cwayne)]

IIRC the .service file should actually technically be included in the app itself, rather than the account-plugin click. I'm not sure how much it matters since it's all 1 click package, but it may still be a good thing to change

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I tested this out on device and had an error. Talking to Mardy, he suggested:-

14:53 <mardy> ah, right the manifest.json is wrong
14:53 <mardy> it says "account-qml-plugin": "@ACCOUNT_SERVICE_DIR@/evernote",
14:54 <popey> what should it be?
14:54 <mardy> s/ACCOUNT_SERVICE_DIR/ACCOUNT_QML_PLUGIN_DIR/
14:55 <mardy> if I can read the CMakeLists.txt correctly

[lp:~dpm/reminders-app/account-click]

221. By David Planella on 2014-09-09

Fixed manifest path for account qml plugin

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:221
http://91.189.93.70:8080/job/reminders-app-ci/505/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1959
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1959/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/201

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/505/rebuild

review: Approve (continuous-integration)

[lp:~dpm/reminders-app/account-click]

222. By David Planella on 2014-09-09

Changed the manifest hooks according to jdstrand's feedback

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:222
http://91.189.93.70:8080/job/reminders-app-ci/506/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1963
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1963/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/202

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/506/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Chris, I've changed the hooks in the manifest as per jdstrand's feedback. Does that address your comment? Or were you suggesting any other changes?

[Alberto Mardegan (mardy)]

Hi! I finally spotted what is the issue (sorry, I should have thought of it earlier, as it's quite obvious!): now that the .provider and qml files are shipped via a click package, their name is not just "evernote". The hooks we run will rename them to <click-package_application-name>.

So, in your case you should update the evernote code (the parts where you use the AccountServiceModel and the Setup elements) to use this as provider: "com.ubuntu.reminders_evernote-account-plugin".

[lp:~dpm/reminders-app/account-click]

223. By David Planella on 2014-09-12

Added changes recommended by mardy

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:223
http://91.189.93.70:8080/job/reminders-app-ci/511/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1980/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/207/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/511/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dpm/reminders-app/account-click]

224. By David Planella on 2014-09-12

Added ability to switch between account providers

[David Planella (dpm)]

Ok, I've added all the changes recommended by mardy:

http://bazaar.launchpad.net/~dpm/reminders-app/account-click/revision/223

Except for one, which is not essential and I will address separately to keep the changes to a minimum:

- Rename the provider file to com.ubuntu.reminders_evernote-account-plugin in the deb as well, to simplify the building

There is now a new .click package available for testing at: http://people.canonical.com/~dpm/click/com.ubuntu.reminders_0.5.224_armhf.click

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:224
http://91.189.93.70:8080/job/reminders-app-ci/512/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1981/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/208/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/512/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dpm/reminders-app/account-click]

225. By David Planella on 2014-09-12

Merged from trunk, fixed manifest file conflict

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:225
http://91.189.93.70:8080/job/reminders-app-ci/513/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1982
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1982/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/209

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/513/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

This looks correct :-)

review: Approve

[Chris Wayne (cwayne)]

LGTM

review: Approve

[David Planella (dpm)]

#blocked by bug 1368763

[David Planella (dpm)]

#blocked by bug 1369941

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:225
http://91.189.93.70:8080/job/reminders-app-ci/514/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2025
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2025/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/210

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/514/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dpm/reminders-app/account-click]

226. By David Planella on 2014-09-23

Merged from trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:226
http://91.189.93.70:8080/job/reminders-app-ci/521/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/502
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/502/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/217

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/521/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

So the app now works, but its .deb packaged version used by Jenkins fails the tests.

I can't figure out what's different and could be causing the .deb packages to fail. Unlike the click counterpart, the .deb packaging has remained the same, and only some ids have been redefined.

Here's a diff of the changes in the .deb packages:

http://pastebin.ubuntu.com/8417102/

[lp:~dpm/reminders-app/account-click]

227. By David Planella on 2014-09-24

Renamed .service and .provider files to make the desktop version work

228. By David Planella on 2014-09-24

Fixed installation names in the debian packaging

229. By David Planella on 2014-09-24

Updated service and provider names in the manifest file

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:228
http://91.189.93.70:8080/job/reminders-app-ci/522/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/515
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/515/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/218

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/522/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:229
http://91.189.93.70:8080/job/reminders-app-ci/523/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/517
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/517/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/219

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/523/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dpm/reminders-app/account-click]

230. By David Planella on 2014-09-24

Fixed names of services

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:230
http://91.189.93.70:8080/job/reminders-app-ci/524/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/521
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/521/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/220

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/524/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:230
http://91.189.93.70:8080/job/reminders-app-ci/525/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/523
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/523/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/221

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/525/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dpm/reminders-app/account-click]

231. By David Planella on 2014-09-25

Fixed the service file path in the manifest

232. By David Planella on 2014-09-25

Really really really fix the manifest now

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:231
http://91.189.93.70:8080/job/reminders-app-ci/526/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/533
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/533/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/222

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/526/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:232
http://91.189.93.70:8080/job/reminders-app-ci/527/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/535
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/535/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/223

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/527/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:232
http://91.189.93.70:8080/job/reminders-app-ci/528/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/573/console
    None: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/224/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/528/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Played a little debugging here:

https://code.launchpad.net/~nskaggs/reminders-app/debug-test/+merge/236204

[Nicholas Skaggs (nskaggs)]

I'll note this works fine locally after dpm's latest tweaks, but fails at this step in jenkins:

        session = Signon.AuthSession.new(identity, method)
        session.process(
            session_data, mechanism, self._on_login_processed, None)

[Nicholas Skaggs (nskaggs)]

We can see a bit more detail here about what's happening locally (which works) and what is happening in jenkins:

http://paste.ubuntu.com/8467742/

In short, the authentication data is blank because it appears the initial account creation

        account = self._manager.create_account('evernote-sandbox')

is blank, instead of having the oauth details and keys.

[Nicholas Skaggs (nskaggs)]

I can confirm I can recreate what is occurring in jenkins locally but using the installed binaries instead of the local build. This rules out something specific to jenkins.

This points to something in the cmake or debian build as the potential issue.

[David Planella (dpm)]

Thanks a lot Nick. Do you think you could create a small python file to
reproduce the failure?

I'd then test the file with locally installed packages: first the ones from
trunk, and then the ones from this branch. I'd use this to point mardy to
the failure (rather than having to start the test suite to reproduce).

On Tue, Sep 30, 2014 at 9:51 PM, Nicholas Skaggs <
<email address hidden>> wrote:

> I can confirm I can recreate what is occurring in jenkins locally but
> using the installed binaries instead of the local build. This rules out
> something specific to jenkins.
>
> This points to something in the cmake or debian build as the potential
> issue.
> --
> https://code.launchpad.net/~dpm/reminders-app/account-click/+merge/230768
> You are the owner of lp:~dpm/reminders-app/account-click.
>

[Alberto Mardegan (mardy)]

At least one reason for the failure is quite obvious: the provider was renamed from "evernote-sandbox" to "com.ubuntu.reminders_evernote-account-plugin-sandbox".

[lp:~dpm/reminders-app/account-click]

233. By David Planella on 2014-10-01

Updated provider and service IDs in the tests too

[David Planella (dpm)]

Ok, updated the tests to use the right service and provider IDs now. Fingers crossed!

[lp:~dpm/reminders-app/account-click]

234. By David Planella on 2014-10-01

Added -sandbox suffix to service ID in the tests

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:234
http://91.189.93.70:8080/job/reminders-app-ci/536/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/635/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/232/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/536/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dpm/reminders-app/account-click]

235. By David Planella on 2014-10-01

Make flake8 happy

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:235
http://91.189.93.70:8080/job/reminders-app-ci/537/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/636/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/233/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/537/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dpm/reminders-app/account-click]

236. By David Planella on 2014-10-01

Fixed typo in variable name

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:236
http://91.189.93.70:8080/job/reminders-app-ci/538/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/638
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/638/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/234

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/538/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

code changes look ok to me, didn't test it though

review: Approve (code review)

[Nicholas Skaggs (nskaggs)]

Can you wrap-and-sort the debian/control file David? I notice there is some duplicated depends in the list. account-plugin-evernote-sandbox is listed twice for instance under reminders-app-autopilot

review: Needs Fixing

[David Planella (dpm)]

It now works for me on the RTM images too. As per mardy's instructions, I needed to uninstall and reinstall the app after the u-s-s-o-a package got updated in my system. So I think that's finally good to go.

[lp:~dpm/reminders-app/account-click]

237. By David Planella on 2014-10-01

Added CMake command to determine the bzr revno upon build

238. By David Planella on 2014-10-01

Ran wrap-and-sort on debian files

[David Planella (dpm)]

On Wed, Oct 1, 2014 at 5:18 PM, Nicholas Skaggs <
<email address hidden>> wrote:

> Review: Needs Fixing
>
> Can you wrap-and-sort the debian/control file David? I notice there is
> some duplicated depends in the list. account-plugin-evernote-sandbox is
> listed twice for instance under reminders-app-autopilot
>

Done, thanks for the review and the hint at wrap-and-sort!

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:238
http://91.189.93.70:8080/job/reminders-app-ci/539/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/644
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/644/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/235

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/539/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-28 09:10:46 +0000
+++ CMakeLists.txt	2014-10-01 20:48:08 +0000
@@ -22,6 +22,11 @@
 set(EXEC "reminders")
 set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
 
+set(ACCOUNT_ICON_DIR ${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps)
+set(ACCOUNT_PROVIDER_DIR ${CMAKE_INSTALL_DATADIR}/accounts/providers)
+set(ACCOUNT_SERVICE_DIR ${CMAKE_INSTALL_DATADIR}/accounts/services)
+set(ACCOUNT_QML_PLUGIN_DIR ${CMAKE_INSTALL_DATADIR}/accounts/qml-plugins)
+
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
         set(BZR_SOURCE "lp:${APP_HARDCODE}")
@@ -38,6 +43,13 @@
     set(DATA_DIR /)
     set(DESKTOP_DIR ${DATA_DIR})
     set(APPLICATION_DIR ${DATA_DIR})
+
+    # Sets BZR_REVNO
+    execute_process(
+        COMMAND bzr revno ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE BZR_REVNO
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
     if(NOT BZR_REVNO)
         set(BZR_REVNO "latest")
     endif(NOT BZR_REVNO)
 
=== modified file 'com.ubuntu.reminders_reminders.application.in'
--- com.ubuntu.reminders_reminders.application.in	2014-06-27 14:32:32 +0000
+++ com.ubuntu.reminders_reminders.application.in	2014-10-01 20:48:08 +0000
@@ -4,10 +4,10 @@
   <description>Reminders</description>
 
   <services>
-    <service id="evernote">
+    <service id="com.ubuntu.reminders_reminders">
       <description>Synchronize your notes with Evernote</description>
     </service>
-    <service id="evernote-sandbox">
+    <service id="com.ubuntu.reminders_reminders-sandbox">
       <description>Synchronize your notes with the Evernote Sandbox</description>
     </service>
   </services>
 
=== modified file 'debian/account-plugin-evernote-sandbox.install'
--- debian/account-plugin-evernote-sandbox.install	2014-06-27 17:26:38 +0000
+++ debian/account-plugin-evernote-sandbox.install	2014-10-01 20:48:08 +0000
@@ -1,4 +1,4 @@
-usr/share/accounts/providers/evernote-sandbox.provider
+usr/share/accounts/providers/com.ubuntu.reminders_evernote-account-plugin-sandbox.provider
 usr/share/accounts/qml-plugins/evernote-sandbox/Main.qml
-usr/share/accounts/services/evernote-sandbox.service
+usr/share/accounts/services/com.ubuntu.reminders_reminders-sandbox.service
 usr/share/icons/hicolor/32x32/apps/evernote-sandbox.png
 
=== modified file 'debian/account-plugin-evernote.install'
--- debian/account-plugin-evernote.install	2014-06-27 15:57:59 +0000
+++ debian/account-plugin-evernote.install	2014-10-01 20:48:08 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/dh-exec
 
-usr/share/accounts/providers/evernote.provider
+usr/share/accounts/providers/com.ubuntu.reminders_evernote-account-plugin.provider
 usr/share/accounts/qml-plugins/evernote/Main.qml
-usr/share/accounts/services/evernote.service
+usr/share/accounts/services/com.ubuntu.reminders_reminders.service
 usr/share/icons/hicolor/32x32/apps/evernote.png
 usr/lib/*/qt5/qml/Evernote usr/lib/${DEB_HOST_MULTIARCH}/ubuntu-system-settings/private
 
=== modified file 'debian/control'
--- debian/control	2014-09-28 08:31:38 +0000
+++ debian/control	2014-10-01 20:48:08 +0000
@@ -10,7 +10,7 @@
                libssl-dev,
                python3-all,
                qt5-default,
-               qtdeclarative5-dev,
+               qtdeclarative5-dev
 Standards-Version: 3.9.5
 Section: misc
 Homepage: https://launchpad.net/reminders-app
@@ -18,24 +18,24 @@
 
 Package: reminders-app
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-         account-plugin-evernote,
+Depends: account-plugin-evernote,
          qtdeclarative5-accounts-plugin,
          qtdeclarative5-evernote0.1,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-localstorage-plugin,
          qtdeclarative5-online-accounts-client0.1 (>= 0.3+14.10.20140506),
+         qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-quicklayouts-plugin,
-         qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          signon-plugin-oauth2 (>= 0.19-0~57~),
          suru-icon-theme | ubuntu-mobile-icons,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Reminders application
  Note taking application powered by Evernote
 
 Package: qtdeclarative5-evernote0.1
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Expose the Evernote API to QML applications
  This module provides access to the Evernote API from QML applications.
 
@@ -44,7 +44,7 @@
 Depends: libaccount-plugin-generic-oauth,
          qtdeclarative5-online-accounts-client0.1,
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: Allow Ubuntu applications to access Evernote accounts
  This plugin enables users to authenticate to their Evernote accounts,
  providing syncing of Evernote notes across Ubuntu devices.
@@ -55,16 +55,14 @@
          libaccount-plugin-generic-oauth,
          qtdeclarative5-online-accounts-client0.1,
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: Allow Ubuntu applications to access Evernote sandbox accounts
  This plugin enables developers to authenticate to their Evernote developer
  sandbox account, which allows syncing of Evernote notes across Ubuntu devices.
 
 Package: reminders-app-autopilot
 Architecture: all
-Depends: ${misc:Depends},
-         reminders-app (>= ${source:Version}), reminders-app (<< ${source:Version}.1~),
-         account-plugin-evernote-sandbox,
+Depends: account-plugin-evernote-sandbox,
          libautopilot-qt,
          libclick-0.4-0,
          libqt5test5,
@@ -73,7 +71,9 @@
          python3-fixtures,
          python3-oauthlib,
          python3-requests-oauthlib,
+         reminders-app (<< ${source:Version}.1~),
+         reminders-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
-         account-plugin-evernote-sandbox
+         ${misc:Depends}
 Description: Test package for the Reminders app
  Autopilot tests for the Reminders app package
 
=== modified file 'debian/reminders-app-autopilot.install'
--- debian/reminders-app-autopilot.install	2014-06-26 15:43:02 +0000
+++ debian/reminders-app-autopilot.install	2014-10-01 20:48:08 +0000
@@ -1,3 +1,3 @@
+usr/lib/*/dist-packages/evernote/
 usr/lib/*/dist-packages/reminders/
 usr/lib/*/dist-packages/thrift/
-usr/lib/*/dist-packages/evernote/
 
=== modified file 'debian/rules'
--- debian/rules	2014-09-08 15:39:00 +0000
+++ debian/rules	2014-10-01 20:48:08 +0000
@@ -9,10 +9,6 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DEVERNOTE_SANDBOX_CONSUMER_KEY="ubuntu" \
-		-DEVERNOTE_SANDBOX_CONSUMER_SECRET="44f8ee81a8359500" \
-		-DEVERNOTE_CONSUMER_KEY="canonicalis" \
-		-DEVERNOTE_CONSUMER_SECRET="174a72ce5bffbcad" \
 		-DCLICK_MODE=OFF
 
 override_dh_install:
 
=== modified file 'manifest.json.in'
--- manifest.json.in	2014-09-23 07:35:24 +0000
+++ manifest.json.in	2014-10-01 20:48:08 +0000
@@ -5,8 +5,13 @@
     "hooks": {
         "reminders": {
             "account-application": "com.ubuntu.reminders_reminders.application",
+            "account-service": "@ACCOUNT_SERVICE_DIR@/com.ubuntu.reminders_reminders.service",
             "apparmor": "reminders.apparmor",
             "desktop": "com.ubuntu.reminders.desktop"
+        },
+        "evernote-account-plugin": {
+            "account-qml-plugin": "@ACCOUNT_QML_PLUGIN_DIR@/evernote",
+            "account-provider": "@ACCOUNT_PROVIDER_DIR@/com.ubuntu.reminders_evernote-account-plugin.provider"
         }
     },
     "maintainer": "Ubuntu App Cats <[e-mail]>",
@@ -17,10 +22,18 @@
         "vcs-bzr": "lp:reminders-app",
         "vcs-bzr-revno": "@BZR_REVNO@"
     },
-   "x-test": {
-           "autopilot": {
-                "autopilot_module": "@AUTOPILOT_DIR@",
-                "depends": ["account-plugin-evernote-sandbox", "libclick-0.4-0", "python3-dbus", "python3-dbusmock", "python3-fixtures", "python3-oauthlib", "python3-requests-oauthlib"]
-            }
-   }
+    "x-test": {
+        "autopilot": {
+            "autopilot_module": "@AUTOPILOT_DIR@",
+            "depends": [
+                "account-plugin-evernote-sandbox",
+                "libclick-0.4-0",
+                "python3-dbus",
+                "python3-dbusmock",
+                "python3-fixtures",
+                "python3-oauthlib",
+                "python3-requests-oauthlib"
+            ]
+        }
+    }
 }
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-01-30 13:53:15 +0000
+++ src/CMakeLists.txt	2014-10-01 20:48:08 +0000
@@ -1,5 +1,3 @@
-if(NOT CLICK_MODE)
 add_subdirectory(account-plugin)
-endif(NOT CLICK_MODE)
 add_subdirectory(plugin)
 add_subdirectory(app)
 
=== modified file 'src/account-plugin/CMakeLists.txt'
--- src/account-plugin/CMakeLists.txt	2014-07-01 13:27:32 +0000
+++ src/account-plugin/CMakeLists.txt	2014-10-01 20:48:08 +0000
@@ -1,70 +1,54 @@
+set(EVERNOTE_SANDBOX_CONSUMER_KEY "ubuntu")
+set(EVERNOTE_SANDBOX_CONSUMER_SECRET "44f8ee81a8359500")
+set(EVERNOTE_CONSUMER_KEY "canonicalis")
+set(EVERNOTE_CONSUMER_SECRET "174a72ce5bffbcad")
+
+function(EvernoteOnlineAccountSetup account_display_name account_name provider_id service_id hostname consumer_key consumer_secret)
+
+    set(EVERNOTE_DATA_FILENAME evernote)
+    set(EVERNOTE_CONSUMER_KEY ${consumer_key})
+    set(EVERNOTE_CONSUMER_SECRET ${consumer_secret})
+
+    set(EVERNOTE_ACCOUNT_DISPLAY_NAME ${account_display_name})
+    set(EVERNOTE_ACCOUNT_NAME ${account_name})
+    set(EVERNOTE_HOSTNAME ${hostname})
+
+    set(EVERNOTE_PROVIDER_ID ${provider_id})
+    set(EVERNOTE_SERVICE_ID ${service_id})
+    set(EVERNOTE_ICON_NAME ${account_name})
+
+    set(ICON_FILE data/icons/${EVERNOTE_ICON_NAME}.png)
+    set(PROVIDER_FILE_IN data/providers/${EVERNOTE_DATA_FILENAME}.provider.in)
+    set(SERVICE_FILE_IN data/services/${EVERNOTE_DATA_FILENAME}.service.in)
+    set(QML_PLUGIN_FILE_IN qml/${EVERNOTE_DATA_FILENAME}/Main.qml.in)
+
+    set(PROVIDER_FILE data/providers/${EVERNOTE_PROVIDER_ID}.provider)
+    set(SERVICE_FILE data/services/${EVERNOTE_SERVICE_ID}.service)
+    set(QML_PLUGIN_FILE qml/${account_name}/Main.qml)
+
+    install(FILES ${ICON_FILE} DESTINATION ${ACCOUNT_ICON_DIR})
+
+    configure_file(${PROVIDER_FILE_IN} ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE}
+            DESTINATION ${ACCOUNT_PROVIDER_DIR})
+
+    configure_file(${SERVICE_FILE_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE}
+            DESTINATION ${ACCOUNT_SERVICE_DIR})
+
+    configure_file(${QML_PLUGIN_FILE_IN} ${CMAKE_CURRENT_BINARY_DIR}/${QML_PLUGIN_FILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${QML_PLUGIN_FILE}
+            DESTINATION ${ACCOUNT_QML_PLUGIN_DIR}/${EVERNOTE_ACCOUNT_NAME})
+
+endfunction()
+
 # Build and install the files for the production plugin
-
-set(EVERNOTE_ACCOUNT_DISPLAY_NAME Evernote)
-set(EVERNOTE_ACCOUNT_NAME evernote)
-set(EVERNOTE_HOSTNAME www.evernote.com)
-
-set(EVERNOTE_PROVIDER_ID ${EVERNOTE_ACCOUNT_NAME})
-set(EVERNOTE_SERVICE_ID ${EVERNOTE_ACCOUNT_NAME})
-set(EVERNOTE_ICON_NAME ${EVERNOTE_ACCOUNT_NAME})
-
-set(ICON data/icons/${EVERNOTE_ICON_NAME}.png)
-set(PROVIDER_FILE data/providers/${EVERNOTE_ACCOUNT_NAME}.provider)
-set(SERVICE_FILE data/services/${EVERNOTE_ACCOUNT_NAME}.service)
-set(QML_PLUGIN_FILE qml/${EVERNOTE_ACCOUNT_NAME}/Main.qml)
-set(QML_PLUGIN_DIR ${CMAKE_INSTALL_DATADIR}/accounts/qml-plugins)
-
-set(ICON_DIR ${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps)
-set(PROVIDER_DIR ${CMAKE_INSTALL_DATADIR}/accounts/providers)
-set(SERVICE_DIR ${CMAKE_INSTALL_DATADIR}/accounts/services)
-
-install(FILES ${ICON} DESTINATION ${ICON_DIR})
-
-configure_file(${PROVIDER_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE}
-        DESTINATION ${PROVIDER_DIR})
-
-configure_file(${SERVICE_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE}
-        DESTINATION ${SERVICE_DIR})
-
-configure_file(${QML_PLUGIN_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${QML_PLUGIN_FILE})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${QML_PLUGIN_FILE}
-        DESTINATION ${QML_PLUGIN_DIR}/${EVERNOTE_ACCOUNT_NAME})
-
-# Build and install the files for the sandbox plugin
-
-set(EVERNOTE_ACCOUNT_DISPLAY_NAME "Evernote Developer Sandbox")
-set(EVERNOTE_ACCOUNT_NAME evernote-sandbox)
-set(EVERNOTE_HOSTNAME sandbox.evernote.com)
-set(EVERNOTE_CONSUMER_KEY ${EVERNOTE_SANDBOX_CONSUMER_KEY})
-set(EVERNOTE_CONSUMER_SECRET ${EVERNOTE_SANDBOX_CONSUMER_SECRET})
-
-set(EVERNOTE_PROVIDER_ID ${EVERNOTE_ACCOUNT_NAME})
-set(EVERNOTE_SERVICE_ID ${EVERNOTE_ACCOUNT_NAME})
-set(EVERNOTE_ICON_NAME ${EVERNOTE_ACCOUNT_NAME})
-
-set(PROVIDER_FILE_SANDBOX data/providers/${EVERNOTE_ACCOUNT_NAME}.provider)
-set(SERVICE_FILE_SANDBOX data/services/${EVERNOTE_ACCOUNT_NAME}.service)
-set(QML_PLUGIN_FILE_SANDBOX qml/${EVERNOTE_ACCOUNT_NAME}/Main.qml)
-set(QML_PLUGIN_DIR ${CMAKE_INSTALL_DATADIR}/accounts/qml-plugins)
-
-install(FILES ${ICON}
-        DESTINATION ${ICON_DIR}
-        RENAME ${EVERNOTE_ACCOUNT_NAME}.png)
-
-configure_file(${PROVIDER_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE_SANDBOX})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE_SANDBOX}
-        DESTINATION ${PROVIDER_DIR})
-
-configure_file(${PROVIDER_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE_SANDBOX})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE_SANDBOX}
-        DESTINATION ${PROVIDER_DIR})
-
-configure_file(${SERVICE_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE_SANDBOX})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE_SANDBOX}
-        DESTINATION ${SERVICE_DIR})
-
-configure_file(${QML_PLUGIN_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${QML_PLUGIN_FILE_SANDBOX})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${QML_PLUGIN_FILE_SANDBOX}
-        DESTINATION ${QML_PLUGIN_DIR}/${EVERNOTE_ACCOUNT_NAME})
+EvernoteOnlineAccountSetup(Evernote evernote com.ubuntu.reminders_evernote-account-plugin com.ubuntu.reminders_reminders www.evernote.com
+                           ${EVERNOTE_CONSUMER_KEY} ${EVERNOTE_CONSUMER_SECRET})
+
+if(NOT CLICK_MODE)
+    # Build and install the files for the sandbox plugin
+    # We're only building it as a .deb package for Jenkins, we don't need it in the click package
+    EvernoteOnlineAccountSetup("Evernote Developer Sandbox" evernote-sandbox com.ubuntu.reminders_evernote-account-plugin-sandbox com.ubuntu.reminders_reminders-sandbox sandbox.evernote.com
+                               ${EVERNOTE_SANDBOX_CONSUMER_KEY} ${EVERNOTE_SANDBOX_CONSUMER_SECRET})
+endif(NOT CLICK_MODE)
 
=== added file 'src/account-plugin/data/icons/evernote-sandbox.png'
 Binary files src/account-plugin/data/icons/evernote-sandbox.png	1970-01-01 00:00:00 +0000 and src/account-plugin/data/icons/evernote-sandbox.png	2014-10-01 20:48:08 +0000 differ
=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-09-23 12:39:27 +0000
+++ src/app/qml/reminders.qml	2014-10-01 20:48:08 +0000
@@ -130,7 +130,7 @@
 
     AccountServiceModel {
         id: accounts
-        service: useSandbox ? "evernote-sandbox" : "evernote"
+        applicationId: "com.ubuntu.reminders_reminders"
     }
 
     AccountService {
@@ -336,7 +336,7 @@
             Setup {
                 id: setup
                 applicationId: "com.ubuntu.reminders_reminders"
-                providerId: "evernote"
+                providerId: useSandbox ? "com.ubuntu.reminders_evernote-account-plugin-sandbox" : "com.ubuntu.reminders_evernote-account-plugin"
             }
 
             Button {
 
=== modified file 'tests/autopilot/reminders/credentials.py'
--- tests/autopilot/reminders/credentials.py	2014-09-01 23:10:54 +0000
+++ tests/autopilot/reminders/credentials.py	2014-10-01 20:48:08 +0000
@@ -81,7 +81,8 @@
 
     def _create_account(self):
         logger.debug('Creating the Evernote account.')
-        account = self._manager.create_account('evernote-sandbox')
+        provider_id = 'com.ubuntu.reminders_evernote-account-plugin-sandbox'
+        account = self._manager.create_account(provider_id)
         account.set_enabled(True)
         account.store(self._on_account_created, None)
         return account
@@ -143,7 +144,8 @@
 
     def _enable_evernote_service(self, account):
         logger.debug('Enabling evernote service.')
-        service = self._manager.get_service('evernote-sandbox')
+        service_id = 'com.ubuntu.reminders_reminders-sandbox'
+        service = self._manager.get_service(service_id)
         account.select_service(service)
         account.set_enabled(True)
         account.store(self._on_service_enabled, None)
 
=== modified file 'tests/autopilot/reminders/tests/test_credentials.py'
--- tests/autopilot/reminders/tests/test_credentials.py	2014-07-30 17:23:26 +0000
+++ tests/autopilot/reminders/tests/test_credentials.py	2014-10-01 20:48:08 +0000
@@ -51,14 +51,16 @@
     def test_add_evernote_account_must_set_provider(self):
         account = self.add_evernote_account()
 
-        self.assertEqual(account.get_provider_name(), 'evernote-sandbox')
+        provider_id = 'com.ubuntu.reminders_evernote-account-plugin-sandbox'
+        self.assertEqual(account.get_provider_name(), provider_id)
 
     def test_add_evernote_account_must_enable_evernote_service(self):
         account = self.add_evernote_account()
         services = account.list_services()
 
         self.assertThat(services, HasLength(1))
-        self.assertEqual(services[0].get_name(), 'evernote-sandbox')
+        service_id = 'com.ubuntu.reminders_reminders-sandbox'
+        self.assertEqual(services[0].get_name(), service_id)
         service = Accounts.AccountService.new(account, services[0])
         self.assertTrue(service.get_enabled())