Merge lp:~sergiusens/snapcraft/1501037 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Support framework policies

[Michael Vogt (mvo)]

LGTM

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 09:21:17 +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 09:21:17 +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:
+      plugin: copy
+      files:
+        one: one
+

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-29 19:41:21 +0000
+++ integration-tests/units/jobs.pxu	2015-09-30 09:21:17 +0000
@@ -45,6 +45,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
 command:
     set -ex

=== modified file 'schema/snapcraft.yaml'
--- schema/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ schema/snapcraft.yaml	2015-09-30 09:21:17 +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 09:21:17 +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))