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

[Sergio Schvezov]

icon support for snapcraft.yaml

[lp:~sergiusens/snapcraft/icon-meta]

154. By Sergio Schvezov on 2015-08-27

oops moment

[Leo Arias (elopio)]

You forgot to add the icon.png files for the integration-tests. They all fail with:

Issues while validating snapcraft.yaml: 'icon.png' is not a 'icon-path'

And you are missing the assertion on the copy call:

+ icon_path = os.path.join(meta_dir, 'my-icon.png')
+ self.mock_copyfile.assert_called_once_with('my-icon.png', icon_path)

review: Needs Fixing

[Sergio Schvezov (sergiusens)]

doh, thanks, done

On Thu, Aug 27, 2015 at 7:51 PM, Leo Arias <email address hidden> wrote:

> Review: Needs Fixing
>
> You forgot to add the icon.png files for the integration-tests. They all
> fail with:
>
> Issues while validating snapcraft.yaml: 'icon.png' is not a 'icon-path'
>
> And you are missing the assertion on the copy call:
>
> + icon_path = os.path.join(meta_dir, 'my-icon.png')
> + self.mock_copyfile.assert_called_once_with('my-icon.png',
> icon_path)
>
> --
> https://code.launchpad.net/~sergiusens/snapcraft/icon-meta/+merge/269446
> You are the owner of lp:~sergiusens/snapcraft/icon-meta.
>
> Launchpad-Message-Rationale: Owner
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~sergiusens/snapcraft/icon-meta
> Launchpad-Project: snapcraft
>

[lp:~sergiusens/snapcraft/icon-meta]

155. By Sergio Schvezov on 2015-08-28

da icons

[John Lenton (chipaca)]

Awesome

review: Approve

=== added file 'examples/godd/icon.png'
 Binary files examples/godd/icon.png	1970-01-01 00:00:00 +0000 and examples/godd/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/godd/snapcraft.yaml'
--- examples/godd/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/godd/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -5,6 +5,7 @@
   - name: ./bin/godd
 summary: Simple dd like tool
 description: written in go so it is self contained and really portable, you would need to use hw-assign to access devices.
+icon: icon.png
 
 parts:
   godd:
 
=== added file 'examples/gopaste/icon.png'
 Binary files examples/gopaste/icon.png	1970-01-01 00:00:00 +0000 and examples/gopaste/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/gopaste/snapcraft.yaml'
--- examples/gopaste/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/gopaste/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -7,6 +7,7 @@
     start: bin/gopaste
 summary: Simple pasting tool
 description: Runs a service that allows you to paste to and share.
+icon: icon.png
 
 parts:
   gopaste:
 
=== added file 'examples/java-hello-world/icon.png'
 Binary files examples/java-hello-world/icon.png	1970-01-01 00:00:00 +0000 and examples/java-hello-world/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/java-hello-world/snapcraft.yaml'
--- examples/java-hello-world/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/java-hello-world/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -6,6 +6,7 @@
    exec: bin/wrapper
 summary: A java exmaple
 description: this is not much more than an example
+icon: icon.png
 
 parts:
     local:
 
=== added file 'examples/libpipeline/icon.png'
 Binary files examples/libpipeline/icon.png	1970-01-01 00:00:00 +0000 and examples/libpipeline/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/libpipeline/snapcraft.yaml'
--- examples/libpipeline/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/libpipeline/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -5,6 +5,7 @@
   - name: ./bin/pipelinetest
 summary: Libpipeline example
 description: this is an example package of an autotools project built with snapcraft using
+icon: icon.png
 
 parts:
     pipelinetest:
 
=== added file 'examples/py2-project/icon.png'
 Binary files examples/py2-project/icon.png	1970-01-01 00:00:00 +0000 and examples/py2-project/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/py2-project/snapcraft.yaml'
--- examples/py2-project/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/py2-project/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -5,6 +5,7 @@
  - name: ./bin/sha3sum
 summary: A python sha3 implementation
 description: A python2 project using snapcraft
+icon: icon.png
 
 parts:
   spongeshaker:
 
=== added file 'examples/py3-project/icon.png'
 Binary files examples/py3-project/icon.png	1970-01-01 00:00:00 +0000 and examples/py3-project/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/py3-project/snapcraft.yaml'
--- examples/py3-project/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/py3-project/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -5,6 +5,7 @@
  - name: bin/sha3sum
 summary: A python sha3 implementation
 description: A python2 project using snapcraft
+icon: icon.png
 
 parts:
   spongeshaker:
 
=== added file 'examples/qmldemo/icon.png'
 Binary files examples/qmldemo/icon.png	1970-01-01 00:00:00 +0000 and examples/qmldemo/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/qmldemo/snapcraft.yaml'
--- examples/qmldemo/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/qmldemo/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -11,6 +11,7 @@
       - network-client
 summary: qml demo
 description: An example of shipping a usable QML file in a snap using the QML plugin.
+icon: icon.png
 
 parts:
   qml:
 
=== added file 'examples/tomcat-maven-webapp/icon.png'
 Binary files examples/tomcat-maven-webapp/icon.png	1970-01-01 00:00:00 +0000 and examples/tomcat-maven-webapp/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/tomcat-maven-webapp/snapcraft.yaml'
--- examples/tomcat-maven-webapp/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/tomcat-maven-webapp/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -11,6 +11,7 @@
    - network-service
 summary: Demo of Tomcat-hosted Webapp
 description: This is a demo snap of a Tomcat-hosted webapp produced by snapcraft with maven.
+icon: icon.png
 
 parts:
     webapp:
 
=== added file 'examples/webcam-webui-snap/icon.png'
 Binary files examples/webcam-webui-snap/icon.png	1970-01-01 00:00:00 +0000 and examples/webcam-webui-snap/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/webcam-webui-snap/snapcraft.yaml'
--- examples/webcam-webui-snap/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/webcam-webui-snap/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -7,6 +7,7 @@
    security-template: unconfined
 summary: Webcam web UI
 description: Exposes your webcam over a web UI
+icon: icon.png
 
 parts:
     golang-static-http:
 
=== added file 'examples/wget-deb/icon.png'
 Binary files examples/wget-deb/icon.png	1970-01-01 00:00:00 +0000 and examples/wget-deb/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'examples/wget-deb/snapcraft.yaml'
--- examples/wget-deb/snapcraft.yaml	2015-08-25 18:53:18 +0000
+++ examples/wget-deb/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -5,6 +5,7 @@
     - name: usr/bin/wget
 summary: wget for snappy
 description: a basic example from ubuntu packages
+icon: icon.png
 
 parts:
   wget:
 
=== added file 'integration-tests/data/assemble/icon.png'
 Binary files integration-tests/data/assemble/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/assemble/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/assemble/snapcraft.yaml'
--- integration-tests/data/assemble/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/assemble/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 binaries:
   - exec: binary1
     name: assemble-bin
 
=== added file 'integration-tests/data/bzr-head/icon.png'
 Binary files integration-tests/data/bzr-head/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/bzr-head/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/bzr-head/snapcraft.yaml'
--- integration-tests/data/bzr-head/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/bzr-head/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     bzr:
 
=== added file 'integration-tests/data/bzr-tag/icon.png'
 Binary files integration-tests/data/bzr-tag/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/bzr-tag/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/bzr-tag/snapcraft.yaml'
--- integration-tests/data/bzr-tag/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/bzr-tag/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     bzr:
 
=== added file 'integration-tests/data/conflicts/icon.png'
 Binary files integration-tests/data/conflicts/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/conflicts/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/conflicts/snapcraft.yaml'
--- integration-tests/data/conflicts/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/conflicts/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
   p1:
 
=== added file 'integration-tests/data/dependencies/icon.png'
 Binary files integration-tests/data/dependencies/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/dependencies/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/dependencies/snapcraft.yaml'
--- integration-tests/data/dependencies/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/dependencies/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
   p1:
 
=== added file 'integration-tests/data/git-branch/icon.png'
 Binary files integration-tests/data/git-branch/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/git-branch/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/git-branch/snapcraft.yaml'
--- integration-tests/data/git-branch/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/git-branch/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     git:
 
=== added file 'integration-tests/data/git-head/icon.png'
 Binary files integration-tests/data/git-head/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/git-head/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/git-head/snapcraft.yaml'
--- integration-tests/data/git-head/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/git-head/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     git:
 
=== added file 'integration-tests/data/git-tag/icon.png'
 Binary files integration-tests/data/git-tag/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/git-tag/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/git-tag/snapcraft.yaml'
--- integration-tests/data/git-tag/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/git-tag/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     git:
 
=== added file 'integration-tests/data/hg-branch/icon.png'
 Binary files integration-tests/data/hg-branch/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/hg-branch/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/hg-branch/snapcraft.yaml'
--- integration-tests/data/hg-branch/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/hg-branch/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     mercurial:
 
=== added file 'integration-tests/data/hg-head/icon.png'
 Binary files integration-tests/data/hg-head/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/hg-head/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/hg-head/snapcraft.yaml'
--- integration-tests/data/hg-head/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/hg-head/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     mercurial:
 
=== added file 'integration-tests/data/hg-tag/icon.png'
 Binary files integration-tests/data/hg-tag/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/hg-tag/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/hg-tag/snapcraft.yaml'
--- integration-tests/data/hg-tag/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/hg-tag/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     mercurial:
 
=== added file 'integration-tests/data/local-plugin/icon.png'
 Binary files integration-tests/data/local-plugin/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/local-plugin/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/local-plugin/snapcraft.yaml'
--- integration-tests/data/local-plugin/snapcraft.yaml	2015-08-25 20:40:26 +0000
+++ integration-tests/data/local-plugin/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     x-local-plugin:
 
=== added file 'integration-tests/data/local-source/icon.png'
 Binary files integration-tests/data/local-source/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/local-source/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/local-source/snapcraft.yaml'
--- integration-tests/data/local-source/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/local-source/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
     make-project:
 
=== added file 'integration-tests/data/simple-cmake/icon.png'
 Binary files integration-tests/data/simple-cmake/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/simple-cmake/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/simple-cmake/snapcraft.yaml'
--- integration-tests/data/simple-cmake/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/simple-cmake/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
   cmake-project:
 
=== added file 'integration-tests/data/simple-copy/icon.png'
 Binary files integration-tests/data/simple-copy/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/simple-copy/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/simple-copy/snapcraft.yaml'
--- integration-tests/data/simple-copy/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/simple-copy/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
   copy-example:
 
=== added file 'integration-tests/data/simple-make/icon.png'
 Binary files integration-tests/data/simple-make/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/simple-make/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/simple-make/snapcraft.yaml'
--- integration-tests/data/simple-make/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/simple-make/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
   make-project:
 
=== added file 'integration-tests/data/simple-tar/icon.png'
 Binary files integration-tests/data/simple-tar/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/simple-tar/icon.png	2015-08-28 00:36:51 +0000 differ
=== modified file 'integration-tests/data/simple-tar/snapcraft.yaml'
--- integration-tests/data/simple-tar/snapcraft.yaml	2015-08-24 18:27:50 +0000
+++ integration-tests/data/simple-tar/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -3,6 +3,7 @@
 vendor: Sergio Schvezov <[e-mail]>
 summary: one line summary
 description: a longer description
+icon: icon.png
 
 parts:
   oneflat:
 
=== modified file 'schema/snapcraft.yaml'
--- schema/snapcraft.yaml	2015-08-26 18:33:20 +0000
+++ schema/snapcraft.yaml	2015-08-28 00:36:51 +0000
@@ -15,6 +15,10 @@
   vendor:
     type: string
     format: email
+  icon:
+    type: string
+    description: path to a 512x512 icon representing the package.
+    format: icon-path
   summary:
     type: string
     description: one line summary for the package
@@ -86,4 +90,5 @@
   - vendor
   - summary
   - description
+  - icon
   - parts
 
=== modified file 'snapcraft/meta.py'
--- snapcraft/meta.py	2015-08-26 12:11:33 +0000
+++ snapcraft/meta.py	2015-08-28 00:36:51 +0000
@@ -17,6 +17,7 @@
 import os
 import logging
 import shlex
+import shutil
 import tempfile
 import yaml
 
@@ -29,6 +30,7 @@
     'name',
     'version',
     'vendor',
+    'icon',
 ]
 
 _OPTIONAL_PACKAGE_KEYS = [
@@ -50,6 +52,8 @@
     meta_dir = os.path.join(common.get_snapdir(), 'meta')
     os.makedirs(meta_dir, exist_ok=True)
 
+    config_data['icon'] = _copy_icon(meta_dir, config_data['icon'])
+
     _write_package_yaml(meta_dir, config_data, arches)
     _write_readme_md(meta_dir, config_data)
 
@@ -72,6 +76,13 @@
         f.write(readme_md)
 
 
+def _copy_icon(meta_dir, icon_path):
+    new_icon_path = os.path.join(meta_dir, os.path.basename(icon_path))
+    shutil.copyfile(icon_path, new_icon_path)
+
+    return os.path.join('meta', os.path.basename(icon_path))
+
+
 def _compose_package_yaml(config_data, arches):
     '''
     Creates a dictionary that can be used to yaml.dump a package.yaml using
 
=== modified file 'snapcraft/tests/test_meta.py'
--- snapcraft/tests/test_meta.py	2015-08-26 16:05:34 +0000
+++ snapcraft/tests/test_meta.py	2015-08-28 00:36:51 +0000
@@ -16,7 +16,6 @@
 
 import os
 from unittest.mock import (
-    Mock,
     call,
     mock_open,
     patch,
@@ -42,6 +41,7 @@
             'name': 'my-package',
             'version': '1.0',
             'vendor': 'Sergio Schvezov <[e-mail]>',
+            'icon': 'my-icon.png',
         }
 
     def test_plain_no_binaries_or_services(self):
@@ -52,6 +52,7 @@
             'name': 'my-package',
             'version': '1.0',
             'vendor': 'Sergio Schvezov <[e-mail]>',
+            'icon': 'my-icon.png',
             'architectures': ['armhf', 'amd64'],
         }
 
@@ -65,6 +66,7 @@
             'name': 'my-package',
             'version': '1.0',
             'vendor': 'Sergio Schvezov <[e-mail]>',
+            'icon': 'my-icon.png',
         }
 
         self.assertEqual(y, expected)
@@ -86,6 +88,7 @@
             'name': 'my-package',
             'version': '1.0',
             'vendor': 'Sergio Schvezov <[e-mail]>',
+            'icon': 'my-icon.png',
             'architectures': ['armhf', 'amd64'],
             'binaries': [
                 {
@@ -123,6 +126,7 @@
             'name': 'my-package',
             'version': '1.0',
             'vendor': 'Sergio Schvezov <[e-mail]>',
+            'icon': 'my-icon.png',
             'architectures': ['armhf', 'amd64'],
             'services': [
                 {
@@ -151,6 +155,7 @@
             'name': 'my-package',
             'version': '1.0',
             'vendor': 'Sergio Schvezov <[e-mail]>',
+            'icon': 'my-icon.png',
             'architectures': ['armhf', 'amd64'],
             'frameworks': ['mir', ],
         }
@@ -173,7 +178,13 @@
 
     def setUp(self):
         super().setUp()
-        self.orig_os_makedirs = os.makedirs
+        patcher_makedirs = patch('os.makedirs')
+        self.mock_makedirs = patcher_makedirs.start()
+        self.addCleanup(patcher_makedirs.stop)
+
+        patcher_copyfile = patch('shutil.copyfile')
+        self.mock_copyfile = patcher_copyfile.start()
+        self.addCleanup(patcher_copyfile.stop)
 
         self.config_data = {
             'name': 'my-package',
@@ -181,14 +192,10 @@
             'vendor': 'Sergio Schvezov <[e-mail]>',
             'description': 'my description',
             'summary': 'my summary',
+            'icon': 'my-icon.png',
         }
 
-    def tearDown(self):
-        super().tearDown()
-        os.makedirs = self.orig_os_makedirs
-
     def test_create_meta(self):
-        os.makedirs = Mock()
         mock_the_open = mock_open()
 
         with patch('snapcraft.meta.open', mock_the_open, create=True):
@@ -196,7 +203,7 @@
 
         meta_dir = os.path.join(os.path.abspath(os.curdir), 'snap', 'meta')
 
-        os.makedirs.assert_called_once_with(meta_dir, exist_ok=True)
+        self.mock_makedirs.assert_called_once_with(meta_dir, exist_ok=True)
 
         mock_the_open.assert_has_calls([
             call(os.path.join(meta_dir, 'package.yaml'), 'w'),
@@ -208,6 +215,11 @@
             call().write(' '),
             call().write('amd64'),
             call().write('\n'),
+            call().write('icon'),
+            call().write(':'),
+            call().write(' '),
+            call().write('meta/my-icon.png'),
+            call().write('\n'),
             call().write('name'),
             call().write(':'),
             call().write(' '),
 
=== modified file 'snapcraft/tests/test_yaml.py'
--- snapcraft/tests/test_yaml.py	2015-08-27 13:00:16 +0000
+++ snapcraft/tests/test_yaml.py	2015-08-28 00:36:51 +0000
@@ -31,6 +31,15 @@
 
 class TestYaml(TestCase):
 
+    def setUp(self):
+        super().setUp()
+        dirs.setup_dirs()
+
+        patcher = unittest.mock.patch('os.path.exists')
+        mock_wrap_exe = patcher.start()
+        mock_wrap_exe.return_value = True
+        self.addCleanup(patcher.stop)
+
     def make_snapcraft_yaml(self, content):
         tempdirObj = tempfile.TemporaryDirectory()
         self.addCleanup(tempdirObj.cleanup)
@@ -40,13 +49,12 @@
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
     def test_config_loads_plugins(self, mock_loadPlugin):
-        dirs.setup_dirs()
-
         self.make_snapcraft_yaml("""name: test
 version: "1"
 vendor: me <[e-mail]>
 summary: test
 description: test
+icon: my-icon.png
 
 parts:
   ubuntu:
@@ -72,8 +80,6 @@
             fake_logger.output)
 
     def test_config_loop(self):
-        dirs.setup_dirs()
-
         fake_logger = fixtures.FakeLogger(level=logging.ERROR)
         self.useFixture(fake_logger)
 
@@ -82,6 +88,7 @@
 vendor: me <[e-mail]>
 summary: test
 description: test
+icon: my-icon.png
 
 parts:
   p1:
@@ -99,8 +106,6 @@
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
     def test_invalid_yaml_missing_name(self, mock_loadPlugin):
-        dirs.setup_dirs()
-
         fake_logger = fixtures.FakeLogger(level=logging.ERROR)
         self.useFixture(fake_logger)
 
@@ -109,6 +114,7 @@
 vendor: me <[e-mail]>
 summary: test
 description: nothing
+icon: my-icon.png
 
 parts:
   ubuntu:
@@ -124,8 +130,6 @@
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
     def test_invalid_yaml_invalid_name_as_number(self, mock_loadPlugin):
-        dirs.setup_dirs()
-
         fake_logger = fixtures.FakeLogger(level=logging.ERROR)
         self.useFixture(fake_logger)
 
@@ -134,6 +138,7 @@
 vendor: me <[e-mail]>
 summary: test
 description: nothing
+icon: my-icon.png
 
 parts:
   ubuntu:
@@ -149,8 +154,6 @@
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
     def test_invalid_yaml_invalid_name_chars(self, mock_loadPlugin):
-        dirs.setup_dirs()
-
         fake_logger = fixtures.FakeLogger(level=logging.ERROR)
         self.useFixture(fake_logger)
 
@@ -159,6 +162,7 @@
 vendor: me <[e-mail]>
 summary: test
 description: nothing
+icon: my-icon.png
 
 parts:
   ubuntu:
@@ -174,8 +178,6 @@
 
     @unittest.mock.patch('snapcraft.yaml.Config.load_plugin')
     def test_invalid_yaml_missing_description(self, mock_loadPlugin):
-        dirs.setup_dirs()
-
         fake_logger = fixtures.FakeLogger(level=logging.ERROR)
         self.useFixture(fake_logger)
 
@@ -183,6 +185,7 @@
 version: "1"
 vendor: me <[e-mail]>
 summary: test
+icon: my-icon.png
 
 parts:
   ubuntu:
@@ -203,12 +206,18 @@
         super().setUp()
         dirs.setup_dirs()
 
+        patcher = unittest.mock.patch('os.path.exists')
+        self.mock_path_exists = patcher.start()
+        self.mock_path_exists.return_value = True
+        self.addCleanup(patcher.stop)
+
         self.data = {
             'name': 'my-package-1',
             'version': '1.0-snapcraft1~ppa1',
             'vendor': 'Me <[e-mail]>',
             'summary': 'my summary less that 79 chars',
             'description': 'description which can be pretty long',
+            'icon': 'my-icon.png',
             'parts': {
                 'part1': {
                     'type': 'project',
@@ -324,3 +333,12 @@
         mock_the_open.assert_called_once_with(expected_path)
         expected_message = 'Schema is missing, could not validate snapcraft.yaml, check installation'
         self.assertEqual(raised.exception.message, expected_message)
+
+    def test_icon_missing(self):
+        self.mock_path_exists.return_value = False
+
+        with self.assertRaises(jsonschema.ValidationError) as raised:
+            snapcraft.yaml._validate_snapcraft_yaml(self.data)
+
+        expected_message = '\'my-icon.png\' is not a \'icon-path\''
+        self.assertEqual(raised.exception.message, expected_message, msg=self.data)
 
=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-08-27 16:37:32 +0000
+++ snapcraft/yaml.py	2015-08-28 00:36:51 +0000
@@ -20,6 +20,7 @@
 import yaml
 import jsonschema
 import os
+import os.path
 
 import snapcraft.plugin
 from snapcraft import common
@@ -28,6 +29,11 @@
 logger = logging.getLogger(__name__)
 
 
[e-mail]_checks('icon-path')
+def _validate_file_exists(instance):
+    return os.path.exists(instance)
+
+
 class SchemaNotFoundError(Exception):
 
     def __init__(self, message):
@@ -43,7 +49,8 @@
     except FileNotFoundError:
         raise SchemaNotFoundError('Schema is missing, could not validate snapcraft.yaml, check installation')
 
-    jsonschema.validate(snapcraft_yaml, schema)
+    format_check = jsonschema.FormatChecker()
+    jsonschema.validate(snapcraft_yaml, schema, format_checker=format_check)
 
 
 class Config: