Merge lp:~sergiusens/snapcraft/0.2-framework-policies into lp:snapcraft/0.2

[Sergio Schvezov]

Backport rev 221 from trunk: Support framework policies

[Michael Vogt (mvo)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~sergiusens/snapcraft/0.2-framework-policies into lp:snapcraft/0.2 failed. Below is the output from the failed tests.

The project has gotten complex.
Here's the list of units exceeding 10:
- snapcraft/cmds.py:
  286:1: 'cmd' 13

name: # the name of the snap
version: # the version of the snap
# The vendor for the snap (replace 'Vendor <email address hidden>')
vendor: Vendor <email address hidden>
summary: # 79 char long summary
description: # A longer description for the snap
icon: # A path to an icon for the package
cp --preserve=all -R zzz /tmp/tmpc86fvwnt/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmp0zjfo1_2/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmpcvovtmmt/parts/copy/install/dir/dst
===============================[ Analyzing Jobs ]===============================
=============================[ Session Statistics ]=============================
This session is about 0.00% complete
Estimated duration cannot be determined for automated jobs.
Estimated duration cannot be determined for manual jobs.
Size of the desired job list: 28
Size of the effective execution plan: 28
===========================[ Running Selected Jobs ]============================
--------------[ Running job 1 / 28. Estimated time left: unknown ]--------------
--------------------------[ snapcraft/normal/no-yaml ]--------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/no-yaml
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
Could not find snapcraft.yaml. Are you sure you are in the right directory? To start a new project, use 'snapcraft init'
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 2 / 28. Estimated time left: unknown ]--------------
------------------------[ snapcraft/normal/no-yaml-run ]------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/no-yaml-run
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
Could not find snapcraft.yaml. Are you sure you are in the right directory? To start a new project, use 'snapcraft init'
------------------------------------------------------------------------- >8 ---
Outcome: job passed
--------------[ Running job 3 / 28. Estimated time left: unknown ]--------------
-----------------[ snapcraft/normal/assemble-meta-externally ]------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/assemble-meta-externally
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
Pulling make-project
Building make-project
make: Nothing to be done for `all'.
cp -a bin /tmp/cwd-j8vc368w.bf60688d24faeff46950dce53ef4aa49a856a3f4dc977454770bce18a2473736/parts/make-project/install/bin
cp -a subdir /tmp/cwd-j8vc368w.bf60688d24faeff46950dce53ef4aa49a856a3f4dc977454770bce18a2473736/parts/make-project/install/subdir
if [ -e copy-meta ]; then \
  cp -arT snappy /tmp/cwd-j8vc368w.bf60688d24faeff4695...

[lp:~sergiusens/snapcraft/0.2-framework-policies]

210. By Sergio Schvezov on 2015-09-30

Backport rev 221 from trunk: Support framework policies

[Sergio Schvezov (sergiusens)]

review: Approve

=== added directory 'integration-tests/data/framework-policy'
=== added directory 'integration-tests/data/framework-policy/dir'
=== added file 'integration-tests/data/framework-policy/dir/a'
=== added file 'integration-tests/data/framework-policy/dir/b'
=== added file 'integration-tests/data/framework-policy/icon.png'
Binary files integration-tests/data/framework-policy/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/framework-policy/icon.png	2015-09-30 10:21:51 +0000 differ
=== added file 'integration-tests/data/framework-policy/one'
=== added file 'integration-tests/data/framework-policy/snapcraft.yaml'
--- integration-tests/data/framework-policy/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ integration-tests/data/framework-policy/snapcraft.yaml	2015-09-30 10:21:51 +0000
@@ -0,0 +1,14 @@
+name: assemble
+version: 1.0
+vendor: Sergio Schvezov <[e-mail]>
+summary: one line summary
+description: a longer description
+icon: icon.png
+framework-policy: dir
+
+parts:
+    framework-project:
+      type: copy
+      files:
+        one: one
+

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-23 13:42:57 +0000
+++ integration-tests/units/jobs.pxu	2015-09-30 10:21:51 +0000
@@ -52,6 +52,17 @@
     fi
 flags: simple has-leftovers
 
+id: snapcraft/normal/assemble-meta-with-policy
+command:
+    set -ex
+    cp -rT $PLAINBOX_PROVIDER_DATA/framework-policy .
+    ${SNAPCRAFT} assemble
+    test -e ./snap/meta/framework-policy/a
+    test -e ./snap/meta/framework-policy/b
+    test -e ./snap/one
+    test ! -e ./snap/dir
+flags: simple has-leftovers
+
 id: snapcraft/normal/local-source
 plugin: shell
 estimated_duration: 0.3

=== modified file 'schema/snapcraft.yaml'
--- schema/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ schema/snapcraft.yaml	2015-09-30 10:21:51 +0000
@@ -55,6 +55,10 @@
   config:
     type: string
     description: path to a configure hook to expose configuration for the package
+  framework-policy:
+    type: string
+    description: framework policies to add to the package
+    format: file-path
   services:
     type: object
     additionalProperties: false

=== modified file 'snapcraft/meta.py'
--- snapcraft/meta.py	2015-09-21 05:04:31 +0000
+++ snapcraft/meta.py	2015-09-30 10:21:51 +0000
@@ -54,6 +54,9 @@
 
     config_data['icon'] = _copy(meta_dir, config_data['icon'])
 
+    if 'framework-policy' in config_data:
+        _copy(meta_dir, config_data['framework-policy'], 'framework-policy')
+
     _write_package_yaml(meta_dir, config_data, arches)
     _write_readme_md(meta_dir, config_data)
 
@@ -91,9 +94,14 @@
     _write_wrap_exe(execparts[0], config_hook_path, args=args, cwd='$SNAP_APP_PATH')
 
 
-def _copy(meta_dir, relpath):
-    new_relpath = os.path.join(meta_dir, os.path.basename(relpath))
-    shutil.copyfile(relpath, new_relpath)
+def _copy(meta_dir, relpath, new_relpath=None):
+    new_base = new_relpath or os.path.basename(relpath)
+    new_relpath = os.path.join(meta_dir, new_base)
+
+    if os.path.isdir(relpath):
+        shutil.copytree(relpath, new_relpath)
+    else:
+        shutil.copyfile(relpath, new_relpath)
 
     return os.path.join('meta', os.path.basename(relpath))