Merge lp:~mvo/snapcraft/demo-pep8-pyflakes into lp:~snappy-dev/snapcraft/abandoned-go-trunk

[Michael Vogt]

pep8/pyflakes and reindent.

Sorry for the churn in this branch.

It fixes pep8/pyflakes issues and adds a "run-checks.py" script that enforces pep8/pyflakes. It also uses spaces instead of tabs as this is what pep8 recommends. I hope that is ok with you (ironically the reverse recommendation that go makes).

Its mostly mechanical so no human needs to go over the diff, I just didn't want to commit it directly in case there is concern about the changes :)

Unmerged revisions

48. By Michael Vogt on 2015-06-30

pep8/pyflakes

47. By Michael Vogt on 2015-06-30

run reindent.py

46. By Michael Terry on 2015-06-26

add missing Makefile

45. By Michael Terry on 2015-06-26

Fix deb packages

44. By Michael Terry on 2015-06-26

Fix some output

43. By Michael Terry on 2015-06-26

Some renames

42. By Michael Terry on 2015-06-25

Add more examples

41. By Michael Terry on 2015-06-24

Fix deb inclusion; add example for it

40. By Michael Terry on 2015-06-24

Wrap scripts when assembling

39. By Michael Terry on 2015-06-24

initial mostly-working pass at includedPackages support

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-06-30 14:21:21 +0000
@@ -0,0 +1,3 @@
+**/parts/
+**/snap/
+**/stage/

=== renamed file '.bzrignore' => '.bzrignore.moved'
=== added directory 'bin'
=== added file 'bin/snapcraft'
--- bin/snapcraft	1970-01-01 00:00:00 +0000
+++ bin/snapcraft	2015-06-30 14:21:21 +0000
@@ -0,0 +1,260 @@
+#!/usr/bin/python3
+# -*- Mode:Python; -*-
+
+import glob
+import os
+import subprocess
+import sys
+import tempfile
+import time
+import yaml
+
+sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
+import snapcraft
+import snapcraft.common
+import snapcraft.plugin
+
+systemPackages = []
+includedPackages = []
+allParts = []
+afterRequests = {}
+
+pluginDir = os.path.abspath(os.path.join(__file__, "..", "..", "plugins"))
+
+
+def loadPlugin(partName, pluginName, properties, loadCode=True):
+    global allParts, systemPackages, includedPackages
+
+    part = snapcraft.plugin.Plugin(
+        pluginDir, pluginName, partName, properties, loadCode=loadCode)
+    if not part.isValid():
+        snapcraft.common.log(
+            "Could not load part %s" % pluginName, file=sys.stderr)
+        sys.exit(1)
+
+    systemPackages += part.config.get('systemPackages', [])
+    includedPackages += part.config.get('includedPackages', [])
+    allParts.append(part)
+    return part
+
+cmds = sys.argv[1:]
+if not cmds:
+    snapcraft.common.log("Need an argument", file=sys.stderr)
+    sys.exit(1)
+
+forceAll = False
+forceCommand = None
+if "--force" in cmds:
+    cmds.remove("--force")
+    forceAll = True
+
+if cmds[0] == "all":
+    cmds = snapcraft.common.commandOrder
+else:
+    if cmds[0] in snapcraft.common.commandOrder:
+        forceCommand = cmds[0]
+        cmds = snapcraft.common.commandOrder[
+            0:snapcraft.common.commandOrder.index(cmds[0])+1]
+
+if cmds[0] == "init":
+    if os.path.exists("snapcraft.yaml"):
+        snapcraft.common.log("snapcraft.yaml already exists!", file=sys.stderr)
+        sys.exit(1)
+    yamlstr = 'parts:\n'
+    for partName in cmds[1:]:
+        loadPlugin(partName, partName, {}, loadCode=False)
+    for part in allParts:
+        yamlstr += '    ' + part.names()[0] + ':\n'
+        for opt in part.config.get('options', []):
+            if part.config['options'][opt].get('required', False):
+                yamlstr += '        ' + opt + ':\n'
+    yamlstr = yamlstr.strip()
+    with open('snapcraft.yaml', mode='w+') as f:
+        f.write(yaml)
+    snapcraft.common.log("Wrote the following as snapcraft.yaml.")
+    print()
+    print(yamlstr)
+    sys.exit(0)
+
+data = yaml.load(open("snapcraft.yaml", 'r'))
+systemPackages = data.get('systemPackages', [])
+includedPackages = data.get('includedPackages', [])
+
+for partName in data.get("parts", []):
+    properties = data["parts"][partName]
+
+    pluginName = properties.get("plugin", partName)
+    if "plugin" in properties:
+        del properties["plugin"]
+
+    if "after" in properties:
+        afterRequests[partName] = properties["after"]
+        del properties["after"]
+
+    loadPlugin(partName, pluginName, properties)
+
+# Grab all required dependencies, if not already specified
+newParts = allParts.copy()
+while newParts:
+    part = newParts.pop(0)
+    requires = part.config.get('requires', [])
+    for requiredPart in requires:
+        alreadyPresent = False
+        for p in allParts:
+            if requiredPart in p.names():
+                alreadyPresent = True
+                break
+        if not alreadyPresent:
+            newParts.append(loadPlugin(requiredPart, requiredPart, {}))
+
+# Now sort them
+partsToSort = allParts.copy()
+while partsToSort:
+    part = partsToSort.pop(0)
+    requires = part.config.get('requires', [])
+    for requiredPart in requires:
+        for i in range(len(allParts)):
+            if requiredPart in allParts[i].names():
+                allParts.insert(0, allParts.pop(i))
+                break
+    afterNames = afterRequests.get(part.names()[0], [])
+    for afterName in afterNames:
+        for i in range(len(allParts)):
+            if afterName in allParts[i].names():
+                allParts.insert(0, allParts.pop(i))
+                break
+
+# Install local packages that we need
+if systemPackages:
+    newPackages = []
+    for checkpkg in systemPackages:
+        if subprocess.call(
+                ['dpkg-query', '-s', checkpkg],
+                stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0:
+            newPackages.append(checkpkg)
+    if newPackages:
+        print("Installing required packages on the host system: %s" %
+              ", ".join(newPackages))
+        subprocess.call(
+            ['sudo', 'apt-get', 'install'] + newPackages,
+            stdout=subprocess.DEVNULL)
+
+if includedPackages:
+    class Options:
+        pass
+    options = Options()
+    setattr(options, 'includedPackages', includedPackages)
+    part = snapcraft.plugin.Plugin(
+        pluginDir, 'snapcraft', 'includedPackages', {},
+        optionsOverride=options, loadConfig=False)
+    part.includedPackages = includedPackages
+    allParts = [part] + allParts
+
+env = []
+env.append("PATH=\"%s/bin:%s/usr/bin:$PATH\"" % (
+    snapcraft.common.stagedir, snapcraft.common.stagedir))
+env.append("LD_LIBRARY_PATH=\"%s/lib:%s/usr/lib:$LD_LIBRARY_PATH\"" % (
+    snapcraft.common.stagedir, snapcraft.common.stagedir))
+env.append("CFLAGS=\"-I%s/include $CFLAGS\"" % snapcraft.common.stagedir)
+env.append("LDFLAGS=\"-L%s/lib $LDFLAGS\"" % snapcraft.common.stagedir)
+
+if cmds[0] == "shell":
+    for part in allParts:
+        env += part.env()
+    snapcraft.common.env = env
+    userCommand = ' '.join(cmds[1:])
+    if not userCommand:
+        userCommand = ("/usr/bin/env " +
+                       "PS1='\[\e[1;32m\]snapcraft:\w\$\[\e[0m\] ' " +
+                       "/bin/bash --norc")
+    snapcraft.common.run(userCommand)
+
+elif cmds[0] == "assemble":
+    snapcraft.common.run(
+        "cp -arv %s %s" % (data["snap"]["meta"], snapcraft.common.snapdir))
+
+    # wrap all included commands
+    for part in allParts:
+        env += part.env()
+    snapcraft.common.env = env
+    script = "#!/bin/sh\n%s\nexec %%s $*" % \
+             snapcraft.common.assembleEnv().replace(
+                 snapcraft.common.stagedir, "$SNAP_APP_PATH")
+
+    def wrapBins(bindir):
+        absbindir = os.path.join(snapcraft.common.snapdir, bindir)
+        if not os.path.exists(absbindir):
+            return
+        for exe in os.listdir(absbindir):
+            if exe.endswith('.real'):
+                continue
+            exePath = os.path.join(absbindir, exe)
+            try:
+                os.remove(exePath + '.real')
+            except:
+                pass
+            os.rename(exePath, exePath + '.real')
+            with open(exePath, 'w+') as f:
+                f.write(script % (
+                    '"$SNAP_APP_PATH/' + bindir + '/' + exe + '.real"'))
+            os.chmod(exePath, 0o755)
+    wrapBins('bin')
+    wrapBins('usr/bin')
+
+    snapcraft.common.run("snappy build " + snapcraft.common.snapdir)
+
+
+elif cmds[0] == "run":
+    qemudir = os.path.join(os.getcwd(), "image")
+    qemu_img = os.path.join(qemudir, "15.04.img")
+    if not os.path.exists(qemu_img):
+        try:
+            os.makedirs(qemudir)
+        except FileExistsError:
+            pass
+        snapcraft.common.run(
+            "sudo ubuntu-device-flash core --developer-mode"
+            "--enable-ssh 15.04 -o %s" % qemu_img,
+            cwd=qemudir)
+    qemu = subprocess.Popen(
+        ["kvm", "-m", "768", "-nographic",
+         "-snapshot", "-redir", "tcp:8022::22", qemu_img],
+        stdin=subprocess.PIPE)
+    n = tempfile.NamedTemporaryFile()
+    ssh_opts = [
+        "-oStrictHostKeyChecking=no",
+        "-oUserKnownHostsFile=%s" % n.name
+    ]
+    while True:
+        ret_code = subprocess.call(
+            ["ssh"] + ssh_opts +
+            ["ubuntu@localhost", "-p", "8022", "true"])
+        if ret_code == 0:
+            break
+        print("Waiting for device")
+        time.sleep(1)
+    snap_dir = os.path.join(os.getcwd(), "snap")
+    # copy the snap
+    snaps = glob.glob(snap_dir+"/*.snap")
+    subprocess.call(
+        ["scp"]+ssh_opts+[
+            "-P", "8022", "-r"]+snaps+["ubuntu@localhost:~/"])
+    # install the snap
+    ret_code = subprocess.call(
+        ["ssh"] + ssh_opts +
+        ["ubuntu@localhost", "-p", "8022", "sudo snappy install  *.snap"])
+    # "login"
+    subprocess.call(
+        ["ssh"]+ssh_opts+["-p", "8022", "ubuntu@localhost"],
+        preexec_fn=os.setsid)
+    qemu.kill()
+else:
+    for part in allParts:
+        env += part.env()
+        snapcraft.common.env = env
+        for cmd in cmds:
+            force = forceAll or cmd == forceCommand
+            if not getattr(part, cmd)(force=force):
+                snapcraft.common.log(
+                    "Failed doing %s for %s!" % (cmd, part.names()[0]))
+                sys.exit(1)

=== added directory 'examples'
=== added directory 'examples/godd'
=== added directory 'examples/godd/meta'
=== added file 'examples/godd/meta/package.yaml'
--- examples/godd/meta/package.yaml	1970-01-01 00:00:00 +0000
+++ examples/godd/meta/package.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,5 @@
+name: godd
+version: 1.0
+vendor: Michael Vogt <[e-mail]>
+binaries:
+  - name: ./bin/godd

=== added file 'examples/godd/meta/readme.md'
--- examples/godd/meta/readme.md	1970-01-01 00:00:00 +0000
+++ examples/godd/meta/readme.md	2015-06-30 14:21:21 +0000
@@ -0,0 +1,1 @@
+Simple dd like tool

=== added file 'examples/godd/snapcraft.yaml'
--- examples/godd/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ examples/godd/snapcraft.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,4 @@
+parts:
+  godd:
+    plugin: go1.4-project
+    source: git://github.com/mvo5/godd

=== added directory 'examples/gopaste'
=== added file 'examples/gopaste/Makefile'
--- examples/gopaste/Makefile	1970-01-01 00:00:00 +0000
+++ examples/gopaste/Makefile	2015-06-30 14:21:21 +0000
@@ -0,0 +1,8 @@
+# -*- Mode: Makefile; indent-tabs-mode:t; tab-width: 4 -*-
+
+all:
+	cp parts/gopaste/src/github.com/wisnij/gopaste/web.template snap/
+	cp -r parts/gopaste/src/github.com/wisnij/gopaste/static snap/
+	cp -r meta snap/
+	cp gopaste snap/bin/
+

=== added file 'examples/gopaste/gopaste'
--- examples/gopaste/gopaste	1970-01-01 00:00:00 +0000
+++ examples/gopaste/gopaste	2015-06-30 14:21:21 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -x
+
+cd $SNAP_APP_DATA_PATH
+cp $SNAP_APP_PATH/web.template .
+cp -r $SNAP_APP_PATH/static .
+export HOME=$SNAP_APP_DATA_PATH
+
+exec $SNAP_APP_PATH/bin/gopasted

=== added directory 'examples/gopaste/meta'
=== added file 'examples/gopaste/meta/package.yaml'
--- examples/gopaste/meta/package.yaml	1970-01-01 00:00:00 +0000
+++ examples/gopaste/meta/package.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,7 @@
+name: gopaste
+version: 1.0
+vendor: [e-mail]
+services:
+  - name: gopaste
+    description: "gopaste"
+    start: bin/gopaste

=== added file 'examples/gopaste/meta/readme.md'
--- examples/gopaste/meta/readme.md	1970-01-01 00:00:00 +0000
+++ examples/gopaste/meta/readme.md	2015-06-30 14:21:21 +0000
@@ -0,0 +1,1 @@
+Simple dd like tool

=== added file 'examples/gopaste/snapcraft.yaml'
--- examples/gopaste/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ examples/gopaste/snapcraft.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,4 @@
+parts:
+  gopaste:
+    plugin: go1.4-project
+    source: git://github.com/wisnij/gopaste/gopasted

=== added directory 'examples/libpipeline'
=== added file 'examples/libpipeline/Makefile'
--- examples/libpipeline/Makefile	1970-01-01 00:00:00 +0000
+++ examples/libpipeline/Makefile	2015-06-30 14:21:21 +0000
@@ -0,0 +1,11 @@
+# -*- Mode:Makefile; indent-tabs-mode:t; tab-width:4 -*-
+
+all:
+	gcc -o test ./test.c $(CFLAGS) $(LDFLAGS) -lpipeline
+
+install:
+	install -d -m755  $(DESTDIR)/bin/
+	install -m755 ./test $(DESTDIR)/bin/test
+
+clean:
+	rm -f test

=== added directory 'examples/libpipeline/meta'
=== added file 'examples/libpipeline/meta/package.yaml'
--- examples/libpipeline/meta/package.yaml	1970-01-01 00:00:00 +0000
+++ examples/libpipeline/meta/package.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,5 @@
+name: pipelinetest
+version: 1.0
+vendor: Mike Terry
+binaries:
+  - name: ./bin/pipelinetest

=== added file 'examples/libpipeline/meta/readme.md'
--- examples/libpipeline/meta/readme.md	1970-01-01 00:00:00 +0000
+++ examples/libpipeline/meta/readme.md	2015-06-30 14:21:21 +0000
@@ -0,0 +1,1 @@
+Libpipeline example

=== added file 'examples/libpipeline/snapcraft.yaml'
--- examples/libpipeline/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ examples/libpipeline/snapcraft.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,9 @@
+parts:
+    pipelinetest:
+        plugin: make-project
+        source: lp:~mterry/+junk/pipelinetest
+        after:
+            - libpipeline
+    libpipeline:
+        plugin: autotools-project
+        source: lp:~mterry/libpipeline/printf

=== added file 'examples/libpipeline/test.c'
--- examples/libpipeline/test.c	1970-01-01 00:00:00 +0000
+++ examples/libpipeline/test.c	2015-06-30 14:21:21 +0000
@@ -0,0 +1,18 @@
+#include <pipeline.h>
+#include <stdio.h>
+
+int main()
+{
+    pipeline *p;
+    int status;
+
+    printf("running ls | grep s | grep t\n");
+
+    p = pipeline_new ();
+    pipeline_command_args (p, "ls", NULL);
+    pipeline_command_args (p, "grep", "s", NULL);
+    pipeline_command_args (p, "grep", "t", NULL);
+    status = pipeline_run (p);
+
+    return status;
+}

=== added directory 'examples/webcam-webui-snap'
=== added directory 'examples/webcam-webui-snap/meta'
=== added file 'examples/webcam-webui-snap/meta/package.yaml'
--- examples/webcam-webui-snap/meta/package.yaml	1970-01-01 00:00:00 +0000
+++ examples/webcam-webui-snap/meta/package.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,7 @@
+name: webcam-webui
+version: 1.0.0
+vendor: Loïc Minier <[e-mail]>
+services:
+ - name: webcam-webui
+   start: bin/webcam-webui
+   security-template: unconfined

=== added file 'examples/webcam-webui-snap/meta/readme.md'
--- examples/webcam-webui-snap/meta/readme.md	1970-01-01 00:00:00 +0000
+++ examples/webcam-webui-snap/meta/readme.md	2015-06-30 14:21:21 +0000
@@ -0,0 +1,3 @@
+Webcam web UI
+
+Exposes your webcam over a web UI

=== added file 'examples/webcam-webui-snap/snapcraft.yaml'
--- examples/webcam-webui-snap/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ examples/webcam-webui-snap/snapcraft.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,6 @@
+parts:
+    golang-static-http:
+        plugin: go1.4-project
+        source: git://github.com/mikix/golang-static-http
+includedPackages:
+    - fswebcam

=== added file 'examples/webcam-webui-snap/webcam-webui'
--- examples/webcam-webui-snap/webcam-webui	1970-01-01 00:00:00 +0000
+++ examples/webcam-webui-snap/webcam-webui	2015-06-30 14:21:21 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+export PATH="${SNAPP_APP_PATH}/bin:${SNAPP_APP_PATH}/usr/bin${PATH:+:$PATH}"
+export LD_LIBRARY_PATH="${SNAPP_APP_PATH}/lib/x86_64-linux-gnu:${SNAPP_APP_PATH}/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH}"
+
+cd "$SNAPP_APP_DATA_PATH"
+
+golang-static-http &
+
+while :; do
+    fswebcam shot.jpeg
+    sleep 10
+done
+

=== added directory 'examples/wget-deb'
=== added directory 'examples/wget-deb/meta'
=== added file 'examples/wget-deb/meta/package.yaml'
--- examples/wget-deb/meta/package.yaml	1970-01-01 00:00:00 +0000
+++ examples/wget-deb/meta/package.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,5 @@
+name: wget
+version: 0
+vendor: [e-mail]
+binaries:
+    - name: usr/bin/wget

=== added file 'examples/wget-deb/meta/readme.md'
--- examples/wget-deb/meta/readme.md	1970-01-01 00:00:00 +0000
+++ examples/wget-deb/meta/readme.md	2015-06-30 14:21:21 +0000
@@ -0,0 +1,1 @@
+wget

=== added file 'examples/wget-deb/snapcraft.yaml'
--- examples/wget-deb/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ examples/wget-deb/snapcraft.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,4 @@
+includedPackages:
+    - wget
+snap:
+  meta: meta

=== added directory 'plugins'
=== added file 'plugins/autotools-project.py'
--- plugins/autotools-project.py	1970-01-01 00:00:00 +0000
+++ plugins/autotools-project.py	2015-06-30 14:21:21 +0000
@@ -0,0 +1,32 @@
+# -*- Mode:Python; -*-
+
+import os
+import snapcraft
+
+
+class AutotoolsHandler(snapcraft.BaseHandler):
+
+    def __init__(self, name, options):
+        super().__init__(name, options)
+        if self.options.configflags is None:
+            self.options.configflags = ''
+
+    def pull(self):
+        return self.pullBranch(self.options.source)
+
+    def build(self):
+        if not os.path.exists(os.path.join(self.builddir, "configure")):
+            if not self.run("env NOCONFIGURE=1 ./autogen.sh"):
+                return False
+        if not self.run("./configure --prefix= " + self.options.configflags):
+            return False
+        return self.run("make all")
+
+    def stage(self):
+        return self.run("make install DESTDIR=" + self.stagedir)
+
+    def snap(self):
+        return self.doDeploy(["bin", "share", "lib"])  # not "include"
+
+    def test(self):
+        return self.run("make check")

=== added file 'plugins/autotools-project.yaml'
--- plugins/autotools-project.yaml	1970-01-01 00:00:00 +0000
+++ plugins/autotools-project.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,6 @@
+systemPackages: [autoconf, automake, autopoint]
+options:
+    source:
+        required: true
+    configflags:
+        required: false

=== added file 'plugins/go1.4-project.py'
--- plugins/go1.4-project.py	1970-01-01 00:00:00 +0000
+++ plugins/go1.4-project.py	2015-06-30 14:21:21 +0000
@@ -0,0 +1,42 @@
+# -*- Mode:Python; -*-
+
+import os
+import snapcraft
+
+
+class Go14ProjectHandler(snapcraft.BaseHandler):
+    def __init__(self, name, options):
+        super().__init__(name, options)
+        if self.options.source.startswith("lp:"):
+            self.fullname = self.options.source.split(":~")[1]
+        else:
+            self.fullname = self.options.source.split("://")[1]
+        self.godir = os.path.join(
+            os.path.join(os.getcwd(), "parts", self.name))
+        try:
+            os.makedirs(self.godir)
+        except FileExistsError:
+            pass
+
+    def env(self):
+        return [
+            "GOPATH=%s" % self.godir,
+        ]
+
+    def pull(self):
+        return self.run("go get -t %s" % (self.fullname), self.godir)
+
+    def build(self):
+        return self.run("go build %s" % (self.fullname), self.godir)
+
+    def stage(self):
+        if not self.run("go install %s" % (self.fullname), self.godir):
+            return False
+        return self.run("cp -rf %s %s" % (
+            os.path.join(self.godir, "bin"), self.stagedir))
+
+    def snap(self):
+        return self.doDeploy(["bin"])
+
+    def test(self):
+        return self.run("go test %s" % (self.fullname), self.godir)

=== added file 'plugins/go1.4-project.yaml'
--- plugins/go1.4-project.yaml	1970-01-01 00:00:00 +0000
+++ plugins/go1.4-project.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,7 @@
+requires:
+  - go1.4
+options:
+  source:
+    required: true
+  configflags:
+    required: false

=== added file 'plugins/go1.4.py'
--- plugins/go1.4.py	1970-01-01 00:00:00 +0000
+++ plugins/go1.4.py	2015-06-30 14:21:21 +0000
@@ -0,0 +1,44 @@
+# -*- Mode:Python; -*-
+
+import os
+import snapcraft
+
+
+# FIXME: add support for i386
+URLS = {
+    'amd64':
+        "https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz",
+}
+
+
+class Go14Handler(snapcraft.BaseHandler):
+
+    def __init__(self, name, options):
+        super().__init__(name, options)
+        # FIXME: horrible
+        self.arch = "amd64"
+        self.godir = os.path.join(
+            os.path.join(os.getcwd(), "parts", self.name))
+        self.goroot = os.path.join(os.path.join(
+            os.getcwd(), "parts", "go1.4", "go"))
+        self.gorootbin = os.path.join(self.goroot, "bin")
+        self.tar_file = os.path.join(
+            self.godir, os.path.basename(URLS[self.arch]))
+        try:
+            os.makedirs(self.godir)
+        except FileExistsError:
+            pass
+
+    def env(self):
+        return [
+            "PATH=%s:$PATH" % self.gorootbin,
+            "GOROOT=%s" % self.goroot,
+        ]
+
+    def pull(self):
+        # FIXME: use the internal downloader (once its there) to get stuff
+        if not self.run("wget -c %s " % URLS[self.arch], cwd=self.godir):
+            return False
+        if not os.path.exists(os.path.join(self.godir, "go/bin/go")):
+            return self.run("tar xf %s" % self.tar_file, cwd=self.godir)
+        return True

=== added file 'plugins/go1.4.yaml'
=== added file 'plugins/make-project.py'
--- plugins/make-project.py	1970-01-01 00:00:00 +0000
+++ plugins/make-project.py	2015-06-30 14:21:21 +0000
@@ -0,0 +1,21 @@
+# -*- Mode:Python; -*-
+
+import snapcraft
+
+
+class MakeHandler(snapcraft.BaseHandler):
+
+    def pull(self):
+        return self.pullBranch(self.options.source)
+
+    def build(self):
+        return self.run("make all")
+
+    def stage(self):
+        return self.run("make install DESTDIR=" + self.stagedir)
+
+    def snap(self):
+        return self.doDeploy(["bin", "share", "lib"])  # not "include"
+
+    def test(self):
+        return self.run("make check")

=== added file 'plugins/make-project.yaml'
--- plugins/make-project.yaml	1970-01-01 00:00:00 +0000
+++ plugins/make-project.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,4 @@
+systemPackages: [make]
+options:
+    source:
+        required: true

=== added file 'plugins/manifest.txt'
--- plugins/manifest.txt	1970-01-01 00:00:00 +0000
+++ plugins/manifest.txt	2015-06-30 14:21:21 +0000
@@ -0,0 +1,97 @@
+adduser
+apt
+base-files
+base-passwd
+bash
+bsdutils
+coreutils
+dash
+debconf
+debianutils
+diffutils
+dmsetup
+dpkg
+e2fslibs
+e2fsprogs
+findutils
+gcc-4.9-base
+gcc-5-base
+gnupg
+gpgv
+grep
+gzip
+hostname
+init
+initscripts
+insserv
+libacl1
+libapparmor1
+libapt-pkg4.12
+libattr1
+libaudit-common
+libaudit1
+libblkid1
+libbz2-1.0
+libc-bin
+libc6
+libcap2
+libcap2-bin
+libcomerr2
+libcryptsetup4
+libdb5.3
+libdebconfclient0
+libdevmapper1.02.1
+libgcc1
+libgcrypt20
+libgpg-error0
+libkmod2
+liblzma5
+libmount1
+libncurses5
+libncursesw5
+libpam-modules
+libpam-modules-bin
+libpam-runtime
+libpam0g
+libpcre3
+libprocps3
+libreadline6
+libselinux1
+libsemanage-common
+libsemanage1
+libsepol1
+libslang2
+libsmartcols1
+libss2
+libstdc++6
+libsystemd0
+libtinfo5
+libudev1
+libusb-0.1-4
+libustr-1.0-1
+libuuid1
+locales
+login
+lsb-base
+makedev
+mawk
+mount
+multiarch-support
+ncurses-base
+ncurses-bin
+passwd
+perl-base
+procps
+readline-common
+sed
+sensible-utils
+systemd
+systemd-sysv
+sysv-rc
+sysvinit-utils
+tar
+tzdata
+ubuntu-keyring
+udev
+util-linux
+zlib1g

=== added file 'plugins/readline.yaml'
--- plugins/readline.yaml	1970-01-01 00:00:00 +0000
+++ plugins/readline.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,3 @@
+source: git://git.sv.gnu.org/readline.git
+requires:
+  - autotools-project

=== added file 'plugins/snapcraft.py'
--- plugins/snapcraft.py	1970-01-01 00:00:00 +0000
+++ plugins/snapcraft.py	2015-06-30 14:21:21 +0000
@@ -0,0 +1,93 @@
+# -*- Mode:Python; -*-
+
+import apt
+import os
+import snapcraft.common
+import subprocess
+import sys
+
+
+class SnapcraftHandler(snapcraft.BaseHandler):
+
+    def __init__(self, name, options):
+        super().__init__(name, options)
+        self.debdir = os.path.join(os.getcwd(), "parts", self.name, "debs")
+        self.downloadablePackages = []
+        self.includedPackages = options.includedPackages
+
+    def pull(self):
+        self.downloadablePackages = self.getAllDepPackages(
+            self.includedPackages)
+        return self.downloadDebs(self.downloadablePackages)
+
+    def stage(self):
+        if not self.downloadablePackages:
+            self.downloadablePackages = self.getAllDepPackages(
+                self.includedPackages)
+        return self.unpackDebs(self.downloadablePackages, self.stagedir)
+
+    def snap(self):
+        if not self.downloadablePackages:
+            self.downloadablePackages = self.getAllDepPackages(
+                self.includedPackages)
+        return self.unpackDebs(self.downloadablePackages, self.snapdir)
+
+    def getAllDepPackages(self, packages):
+        cache = apt.Cache()
+        alldeps = set()
+        manifestdeps = set()
+        skipped = set()
+
+        manif = os.path.abspath(os.path.join(__file__, '..', 'manifest.txt'))
+        with open(manif) as f:
+            for line in f:
+                pkg = line.strip()
+                if pkg in cache:
+                    manifestdeps.add(pkg)
+
+        def addDeps(pkgs):
+            for p in pkgs:
+                if p in alldeps:
+                    continue
+                if p in manifestdeps and p not in packages:
+                    skipped.add(p)
+                    continue
+                try:
+                    deps = set()
+                    candidatePkg = cache[p].candidate
+                    deps = candidatePkg.dependencies + candidatePkg.recommends
+                    alldeps.add(p)
+                    addDeps([x[0].name for x in deps])
+                except:
+                    pass
+
+        addDeps(packages)
+
+        exit = False
+        for p in packages:
+            if p not in alldeps:
+                exit = True
+                snapcraft.common.log(
+                    "Package %s not recognized" % p, file=sys.stderr)
+        if exit:
+            sys.exit(1)
+
+        return sorted(alldeps)
+
+    def downloadDebs(self, pkgs):
+        try:
+            os.makedirs(self.debdir)
+        except:
+            pass
+        if pkgs:
+            return self.run(
+                ['dget'] + pkgs, cwd=self.debdir, stdout=subprocess.DEVNULL)
+        else:
+            return True
+
+    def unpackDebs(self, pkgs, targetDir):
+        for p in pkgs:
+            cmd = ['dpkg-deb', '--extract', p + '_*.deb', targetDir]
+            if not self.run(cmd, cwd=self.debdir):
+                return False
+        return True

=== added file 'plugins/tgz-content.py'
--- plugins/tgz-content.py	1970-01-01 00:00:00 +0000
+++ plugins/tgz-content.py	2015-06-30 14:21:21 +0000
@@ -0,0 +1,16 @@
+# -*- Mode:Python; -*-
+
+import os
+import snapcraft
+
+
+class TgzContentHandler(snapcraft.BaseHandler):
+
+    def __init__(self, name, options):
+        super().__init__(name, options)
+        self.partdir = os.path.join(os.getcwd(), "parts", self.name)
+
+    def pull(self):
+        self.run("wget -c %s " % self.options.source, cwd=self.partdir)
+        tar_file = os.path.basename(self.partdir)
+        return self.run("tar xf %s" % tar_file, cwd=self.partdir)

=== added file 'plugins/tgz-content.yaml'
--- plugins/tgz-content.yaml	1970-01-01 00:00:00 +0000
+++ plugins/tgz-content.yaml	2015-06-30 14:21:21 +0000
@@ -0,0 +1,5 @@
+# FIXME: this will become part of the language
+name: tgz-content
+options:
+  source:
+    required: true

=== added file 'run-checks.sh'
--- run-checks.sh	1970-01-01 00:00:00 +0000
+++ run-checks.sh	2015-06-30 14:21:21 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+# no "py fmt" so we need to make do with reident
+PYVER="$(python3 -c 'import sys;print(sys.version[0:3])')"
+PYFMT=/usr/share/doc/python${PYVER}/examples/scripts/reindent.py
+
+
+PY=$(find . -name "*.py" -or -name "snapcraft" -type f)
+if echo $PY |xargs $PYFMT --verbose | grep "... changed"; then
+    echo "Warning: please commit indent changes"
+    exit 1
+fi
+
+pyflakes3 $PY
+pep8 $PY

=== added directory 'snapcraft'
=== added file 'snapcraft/__init__.py'
--- snapcraft/__init__.py	1970-01-01 00:00:00 +0000
+++ snapcraft/__init__.py	2015-06-30 14:21:21 +0000
@@ -0,0 +1,75 @@
+# -*- Mode:Python; -*-
+
+import os
+import snapcraft.common
+
+
+class BaseHandler:
+
+    def __init__(self, name, options):
+        self.name = name
+        self.options = options
+        self.sourcedir = os.path.join(os.getcwd(), "parts", self.name, "src")
+        self.builddir = os.path.join(os.getcwd(), "parts", self.name, "build")
+        self.stagedir = os.path.join(os.getcwd(), "stage")
+        self.snapdir = os.path.join(os.getcwd(), "snap")
+
+    # The API
+    def pull(self):
+        return True
+
+    def build(self):
+        return True
+
+    def stage(self):
+        return True
+
+    def snap(self):
+        return True
+
+    def test(self):
+        return True
+
+    def env(self):
+        return []
+
+    # Helpers
+    def run(self, cmd, cwd=None, **kwargs):
+        if cwd is None:
+            cwd = self.builddir
+        if True:
+            print(cmd)
+        return snapcraft.common.run(cmd, cwd=cwd, **kwargs)
+
+    def pullBranch(self, url):
+        if url.startswith("bzr:") or url.startswith("lp:"):
+            if os.path.exists(os.path.join(self.sourcedir, ".bzr")):
+                return self.run("bzr pull " + url, self.sourcedir)
+            else:
+                os.rmdir(self.sourcedir)
+                return self.run("bzr branch " + url + " " + self.sourcedir)
+        elif url.startswith("git:"):
+            if os.path.exists(os.path.join(self.sourcedir, ".git")):
+                return self.run("git pull", self.sourcedir)
+            else:
+                return self.run("git clone " + url + " .", self.sourcedir)
+        else:
+            raise Exception("Did not recognize branch url: " + url)
+
+    def doDeploy(self, dirs):
+        try:
+            os.makedirs(self.snapdir)
+        except:
+            pass
+
+        for d in dirs:
+            if os.path.exists(os.path.join(self.stagedir, d)):
+                try:
+                    os.makedirs(os.path.join(self.snapdir, d))
+                except:
+                    pass
+                if not self.run(
+                        "cp -rf " + d + " " + self.snapdir + "/",
+                        cwd=self.stagedir):
+                    return False
+        return True

=== added file 'snapcraft/common.py'
--- snapcraft/common.py	1970-01-01 00:00:00 +0000
+++ snapcraft/common.py	2015-06-30 14:21:21 +0000
@@ -0,0 +1,34 @@
+# -*- Mode:Python; -*-
+
+# Data/methods shared between plugins and snapcraft
+
+import os
+import subprocess
+import tempfile
+
+env = []
+
+
+def assembleEnv():
+    return '\n'.join(['export ' + e for e in env])
+
+
+def run(cmd, **kwargs):
+    # FIXME: This is gross to keep writing this, even when env is the same
+    if isinstance(cmd, list):
+        cmd = ' '.join(cmd)
+    with tempfile.NamedTemporaryFile(mode='w+') as f:
+        f.write(assembleEnv())
+        f.write('\n')
+        f.write('exec ' + cmd)
+        f.flush()
+        return subprocess.call(['/bin/sh', f.name], **kwargs) == 0
+
+
+def log(msg, file=None):
+    print('\033[01m' + msg + '\033[0m', file=None)
+
+
+commandOrder = ["pull", "build", "test", "stage", "snap"]
+stagedir = os.path.join(os.getcwd(), "stage")
+snapdir = os.path.join(os.getcwd(), "snap")

=== added file 'snapcraft/plugin.py'
--- snapcraft/plugin.py	1970-01-01 00:00:00 +0000
+++ snapcraft/plugin.py	2015-06-30 14:21:21 +0000
@@ -0,0 +1,172 @@
+# -*- Mode:Python; -*-
+
+import importlib.machinery
+import os
+import snapcraft
+import subprocess
+import sys
+import yaml
+
+
+class Plugin:
+
+    def __init__(self, pluginDir, name, partName, properties,
+                 optionsOverride=None, loadCode=True, loadConfig=True):
+        self.valid = False
+        self.code = None
+        self.config = None
+        self.partNames = []
+
+        self.sourcedir = os.path.join(os.getcwd(), "parts", partName, "src")
+        self.builddir = os.path.join(os.getcwd(), "parts", partName, "build")
+        self.stagedir = os.path.join(os.getcwd(), "stage")
+        self.snapdir = os.path.join(os.getcwd(), "snap")
+        self.statefile = os.path.join(os.getcwd(), "parts", partName, "state")
+
+        if loadConfig:
+            configPath = os.path.join(pluginDir, name + ".yaml")
+            if not os.path.exists(configPath):
+                snapcraft.common.log(
+                    "Missing config for part %s" % (name), file=sys.stderr)
+                return
+            self.config = yaml.load(open(configPath, 'r')) or {}
+
+        codePath = os.path.join(pluginDir, name + ".py")
+        if loadCode and os.path.exists(codePath):
+            class Options():
+                pass
+            options = Options()
+
+            if self.config:
+                for opt in self.config.get('options', []):
+                    if opt in properties:
+                        setattr(options, opt, properties[opt])
+                    else:
+                        if self.config['options'][opt].get('required', False):
+                            snapcraft.common.log(
+                                "Required field %s missing on part %s" % (
+                                    opt, name), file=sys.stderr)
+                            return
+                        setattr(options, opt, None)
+            if optionsOverride:
+                options = optionsOverride
+
+            loader = importlib.machinery.SourceFileLoader(
+                "snapcraft.plugins." + name, codePath)
+            module = loader.load_module()
+            for propName in dir(module):
+                prop = getattr(module, propName)
+                if issubclass(prop, snapcraft.BaseHandler):
+                    self.code = prop(partName, options)
+                    break
+
+        self.partNames.append(partName)
+        self.valid = True
+
+    def makedirs(self):
+        try:
+            os.makedirs(self.sourcedir)
+        except:
+            pass
+        try:
+            os.makedirs(self.builddir)
+        except:
+            pass
+        try:
+            os.makedirs(self.stagedir)
+        except:
+            pass
+        try:
+            os.makedirs(self.snapdir)
+        except:
+            pass
+
+    def isValid(self):
+        return self.valid
+
+    def names(self):
+        return self.partNames
+
+    def notifyStage(self, stage, hint=''):
+        snapcraft.common.log(stage + " " + self.partNames[0] + hint)
+
+    def isDirty(self, stage):
+        try:
+            with open(self.statefile, 'r') as f:
+                lastStep = f.read()
+                return (
+                    snapcraft.common.commandOrder.index(stage) >
+                    snapcraft.common.commandOrder.index(lastStep))
+        except Exception:
+            return True
+
+    def shouldStageRun(self, stage, force):
+        if not force and not self.isDirty(stage):
+            self.notifyStage('Skipping ' + stage, ' (already ran)')
+            return False
+        return True
+
+    def markDone(self, stage):
+        with open(self.statefile, 'w+') as f:
+            f.write(stage)
+
+    def pull(self, force=False):
+        if not self.shouldStageRun('pull', force):
+            return True
+        self.makedirs()
+        if self.code and hasattr(self.code, 'pull'):
+            self.notifyStage("Pulling")
+            if not getattr(self.code, 'pull')():
+                return False
+            self.markDone('pull')
+        return True
+
+    def build(self, force=False):
+        if not self.shouldStageRun('build', force):
+            return True
+        self.makedirs()
+        subprocess.call(['cp', '-Trf', self.sourcedir, self.builddir])
+        if self.code and hasattr(self.code, 'build'):
+            self.notifyStage("Building")
+            if not getattr(self.code, 'build')():
+                return False
+            self.markDone('build')
+        return True
+
+    def test(self, force=False):
+        if not self.shouldStageRun('test', force):
+            return True
+        self.makedirs()
+        if self.code and hasattr(self.code, 'test'):
+            self.notifyStage("Testing")
+            if not getattr(self.code, 'test')():
+                return False
+            self.markDone('test')
+        return True
+
+    def stage(self, force=False):
+        if not self.shouldStageRun('stage', force):
+            return True
+        self.makedirs()
+        if self.code and hasattr(self.code, 'stage'):
+            self.notifyStage("Staging")
+            if not getattr(self.code, 'stage')():
+                return False
+            self.markDone('stage')
+        return True
+
+    def snap(self, force=False):
+        if not self.shouldStageRun('snap', force):
+            return True
+        self.makedirs()
+        if self.code and hasattr(self.code, 'snap'):
+            self.notifyStage("Snapping")
+            if not getattr(self.code, 'snap')():
+                return False
+            self.markDone('snap')
+        return True
+
+    def env(self):
+        if self.code and hasattr(self.code, 'env'):
+            return getattr(self.code, 'env')()
+        return []