Merge lp:~chipaca/snappy/serve into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Introducing snapd.

Initial daemon branch.

[Leo Arias (elopio)]

I think you need to update the dependencies.tsv.

Some tiny comments in the diff...

[John Lenton (chipaca)]

Fixed, thank you!

To test you can use systemd-activate(8) on a snappy system.

[Michael Vogt (mvo)]

Hey, thanks a bunch! This looks very good, I have lots of silly questions in the comments but given our tight deadline feel free to ignore, nothing that needs fixing.

review: Approve

[Michael Vogt (mvo)]

Looks like we will have to backport "golang-gopkg-tomb.v2-dev" to vivid (only available in vivid right now). No problem though.

With the following diff I can build the package:
"""
=== modified file 'daemon/daemon.go'
--- daemon/daemon.go 2015-09-09 09:22:36 +0000
+++ daemon/daemon.go 2015-09-09 12:07:32 +0000
@@ -25,7 +25,7 @@
  "net/http"

  "github.com/gorilla/mux"
- "github.com/stgraber/lxd-go-systemd/activation"
+ "github.com/coreos/go-systemd/activation"
  "gopkg.in/tomb.v2"

  "launchpad.net/snappy/logger"

=== modified file 'debian/control'
--- debian/control 2015-07-21 19:07:56 +0000
+++ debian/control 2015-09-09 12:05:57 +0000
@@ -18,6 +18,9 @@
                golang-pb-dev,
                golang-uboot-go-dev,
                golang-yaml.v2-dev,
+ golang-mux-dev,
+ golang-gopkg-tomb.v2-dev,
+ golang-go-systemd-dev,
                python3,
                python3-markdown
 Standards-Version: 3.9.6

=== modified file 'debian/ubuntu-snappy-cli.install'
--- debian/ubuntu-snappy-cli.install 2015-07-29 18:50:28 +0000
+++ debian/ubuntu-snappy-cli.install 2015-09-09 12:14:34 +0000
@@ -1,4 +1,5 @@
 /usr/bin/snappy
+/usr/bin/snapd
 data/completion/snappy /usr/share/bash-completion/completions/
 # i18n stuff
 ../../share /usr

"""

Note that I switched from lxd-go-sytemd/activation to the upstream one. this should be ok because we have golang-go-systemd-dev v2 in the archive which should work with go1.3 (unless I miss something).

[Michael Vogt (mvo)]

Feel free to top-approve once the above diff (or something similar) lands and its bzr-buildpackage able.

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~chipaca/snappy/serve into lp:snappy failed. Below is the output from the failed tests.

Checking docs
Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/gorilla/mux failed; trying to fetch newer version
update github.com/gosexy/gettext failed; trying to fetch newer version
github.com/gorilla/mux now at ee1815431e497d3850809578c93ab6705f1a19f7
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update gopkg.in/tomb.v2 failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update github.com/blakesmith/ar failed; trying to fetch newer version
gopkg.in/tomb.v2 now at 14b3d72120e8d10ea6e6b7f87f7175734b1faab8
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/gorilla/context now at 1c83b3eabd45b6d76072b66b746c20815fb2872d
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 1acbbaff2f347c412a0c7884873bd72cc9c1f5b4
update github.com/stgraber/lxd-go-systemd failed; trying to fetch newer version
github.com/mvo5/uboot-go now at 361f6ebcbb54f389d15dc9faefa000e996ba3e37
update golang.org/x/crypto failed; trying to fetch newer version
github.com/stgraber/lxd-go-systemd now at a3dcd1d0480ee0ae9ec354f1632202bfba715e03
update gopkg.in/check.v1 failed; trying to fetch newer version
golang.org/x/crypto now at 60052bd85f2d91293457e8811b0cf26b773de469
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
Building

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/snappy
cp -a . $GOPATH/src/launchpad.net/snappy/
cd $GOPATH/src/launchpad.net/snappy

./run-checks

if which goctest >/dev/null; then
    goctest="goctest"
else
    goctest="go test"
fi

echo Checking docs
./mdlint.py docs/*.md

echo Checking formatting
fmt=$(gofmt -l .)

if [ -n "$fmt" ]; then
    echo "Formatting wrong in following files"
    echo "$fmt"
    exit 1
fi

echo Installing godeps
go get launchpad.net/godeps
export PATH=$PATH:$GOPATH/bin

echo Install golint
go get github.com/golang/lint/golint
export PATH=$PATH:$GOPATH/bin

echo Obtaining dependencies
godeps -u dependencies.tsv

echo Building
go build -v launchpad.net/snappy/...
daemon/daemon.go:27:2: cannot find package "github.com/coreos/go-systemd/activation" in any of:
 /usr/lib/go/src/pkg/github.com/coreos/go-systemd/activation (from $GOROOT)
 /tmp/tmp.DqGQs5Bgjf/src/github.com/coreos/go-systemd/activation (from $GOPATH)

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~chipaca/snappy/serve into lp:snappy failed. Below is the output from the failed tests.

Checking docs
Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/coreos/go-systemd failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/gorilla/context failed; trying to fetch newer version
github.com/coreos/go-systemd now at 392c689e425689acb51976419a8d62878966511f
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/gorilla/context now at 1c83b3eabd45b6d76072b66b746c20815fb2872d
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 1acbbaff2f347c412a0c7884873bd72cc9c1f5b4
update golang.org/x/crypto failed; trying to fetch newer version
github.com/mvo5/uboot-go now at 361f6ebcbb54f389d15dc9faefa000e996ba3e37
update gopkg.in/check.v1 failed; trying to fetch newer version
golang.org/x/crypto now at 60052bd85f2d91293457e8811b0cf26b773de469
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update github.com/gorilla/mux failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/gosexy/gettext failed; trying to fetch newer version
github.com/gorilla/mux now at ee1815431e497d3850809578c93ab6705f1a19f7
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update gopkg.in/tomb.v2 failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
gopkg.in/tomb.v2 now at 14b3d72120e8d10ea6e6b7f87f7175734b1faab8
Building

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/snappy
cp -a . $GOPATH/src/launchpad.net/snappy/
cd $GOPATH/src/launchpad.net/snappy

./run-checks

if which goctest >/dev/null; then
    goctest="goctest"
else
    goctest="go test"
fi

echo Checking docs
./mdlint.py docs/*.md

echo Checking formatting
fmt=$(gofmt -l .)

if [ -n "$fmt" ]; then
    echo "Formatting wrong in following files"
    echo "$fmt"
    exit 1
fi

echo Installing godeps
go get launchpad.net/godeps
export PATH=$PATH:$GOPATH/bin

echo Install golint
go get github.com/golang/lint/golint
export PATH=$PATH:$GOPATH/bin

echo Obtaining dependencies
godeps -u dependencies.tsv

echo Building
go build -v launchpad.net/snappy/...
github.com/blakesmith/ar
launchpad.net/snappy/logger
launchpad.net/snappy/helpers
github.com/coreos/go-systemd/activation
# github.com/coreos/go-systemd/activation
../../github.com/coreos/go-systemd/activation/files.go:31: undefined: os.Unsetenv
../../github.com/coreos/go-systemd/activation/files.go:32: undefined...

[Leo Arias (elopio)]

Any idea what's this about?
../../github.com/coreos/go-systemd/activation/files.go:31: undefined: os.Unsetenv
../../github.com/coreos/go-systemd/activation/files.go:32: undefined...

I get it in vivid, not in wily.

[John Lenton (chipaca)]

yes, os.Unsetenv is not in go 1.3.

On 13 September 2015 at 01:39, Leo Arias <email address hidden> wrote:
> Any idea what's this about?
> ../../github.com/coreos/go-systemd/activation/files.go:31: undefined: os.Unsetenv
> ../../github.com/coreos/go-systemd/activation/files.go:32: undefined...
>
> I get it in vivid, not in wily.
> --
> https://code.launchpad.net/~chipaca/snappy/serve/+merge/270372
> You are the owner of lp:~chipaca/snappy/serve.

[Leo Arias (elopio)]

> yes, os.Unsetenv is not in go 1.3.

Should I upgrade tarmac to wily?

[John Lenton (chipaca)]

no, because 15.04 is what we target stable at. The fix here is to
either package stgraber's version (which i was using originally), or
patch the coreos one with stgraber's patch.

On 13 September 2015 at 02:14, Leo Arias <email address hidden> wrote:
>> yes, os.Unsetenv is not in go 1.3.
>
> Should I upgrade tarmac to wily?
> --
> https://code.launchpad.net/~chipaca/snappy/serve/+merge/270372
> You are the owner of lp:~chipaca/snappy/serve.

[Michael Vogt (mvo)]

We have golang-go-systemd-dev v2 in the archive which will work fine with go1.3. So its only a problem in CI AFAICT. It seems like the easiest way to unblock this would be to update dependencies.tsv to point to the v2 commit ? Unfortuantely it seems like godeps files can not have comments so I can add a comment why this commit was chosen in the file itself.

Would this help?
"""
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2015-09-09 13:46:17 +0000
+++ dependencies.tsv 2015-09-14 09:04:21 +0000
@@ -1,6 +1,6 @@
 github.com/blakesmith/ar git c9a977dd0cc1392b023382c7bfa5a22af8d3b7302013-02-19T04:59:55Z
 github.com/cheggaaa/pb git e8c7cc515bfde3e267957a3b110080ceed51354e 2014-12-02T07:01:21Z
-github.com/coreos/go-systemd git 392c689e425689acb51976419a8d62878966511f2015-09-08T19:15:25Z
+github.com/coreos/go-systemd git f743bc15d6bddd23662280b4ad20f7c874cdd5ad2015-09-08T19:15:25Z
 github.com/gorilla/context git 1c83b3eabd45b6d76072b66b746c20815fb2872d2015-08-20T05:12:45Z
 github.com/gorilla/mux git ee1815431e497d3850809578c93ab6705f1a19f7 2015-08-20T05:15:06Z
 github.com/gosexy/gettext git 98b7b91596d20b96909e6b60d57411547dd9959c2013-02-21T11:21:43Z
"""

[Snappy Tarmac (snappydevtarmac)]

Attempt to merge into lp:snappy failed due to conflicts:

text conflict in po/snappy.pot

[Snappy Tarmac (snappydevtarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== added directory 'cmd/snapd'
=== added file 'cmd/snapd/main.go'
--- cmd/snapd/main.go	1970-01-01 00:00:00 +0000
+++ cmd/snapd/main.go	2015-09-14 09:25:29 +0000
@@ -0,0 +1,65 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"launchpad.net/snappy/daemon"
+	"launchpad.net/snappy/logger"
+)
+
+func init() {
+	err := logger.SimpleSetup()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "WARNING: failed to activate logging: %s\n", err)
+	}
+}
+
+func main() {
+	if err := run(); err != nil {
+		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		os.Exit(1)
+	}
+}
+
+func run() error {
+	d := daemon.New()
+
+	if err := d.Init(); err != nil {
+		return err
+	}
+
+	d.Start()
+
+	ch := make(chan os.Signal)
+	signal.Notify(ch, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM)
+	select {
+	case sig := <-ch:
+		logger.Noticef("Exiting on %s signal.\n", sig)
+	case <-d.Dying():
+		// something called Stop()
+	}
+
+	return d.Stop()
+}

=== added directory 'daemon'
=== added file 'daemon/api.go'
--- daemon/api.go	1970-01-01 00:00:00 +0000
+++ daemon/api.go	2015-09-14 09:25:29 +0000
@@ -0,0 +1,54 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package daemon
+
+import (
+	"net/http"
+
+	"launchpad.net/snappy/release"
+	_ "launchpad.net/snappy/snappy" // FIXME: remove this import when it's imported elsewhere (we need the setroot for release)
+)
+
+var api = []*Command{
+	rootCmd,
+	v1Cmd,
+}
+
+var (
+	rootCmd = &Command{
+		Path: "/",
+		GET:  SyncResponse([]string{"/1.0"}).Self,
+	}
+
+	v1Cmd = &Command{
+		Path: "/1.0",
+		GET:  v1Get,
+	}
+)
+
+func v1Get(c *Command, r *http.Request) Response {
+	rel := release.Get()
+	return SyncResponse(map[string]string{
+		"flavor":          rel.Flavor,
+		"release":         rel.Series,
+		"default_channel": rel.Channel,
+		"api_compat":      "0",
+	}).Self(c, r)
+}

=== added file 'daemon/api_test.go'
--- daemon/api_test.go	1970-01-01 00:00:00 +0000
+++ daemon/api_test.go	2015-09-14 09:25:29 +0000
@@ -0,0 +1,132 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2014-2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package daemon
+
+import (
+	"encoding/json"
+	"go/ast"
+	"go/parser"
+	"go/token"
+	"io/ioutil"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"gopkg.in/check.v1"
+
+	"launchpad.net/snappy/release"
+)
+
+// Hook up check.v1 into the "go test" runner
+func Test(t *testing.T) { check.TestingT(t) }
+
+type apiSuite struct{}
+
+var _ = check.Suite(&apiSuite{})
+
+func (s *apiSuite) TestListIncludesAll(c *check.C) {
+	// Very basic check to help stop us from not adding all the
+	// commands to the command list.
+	//
+	// It could get fancier, looking deeper into the AST to see
+	// exactly what's being defined, but it's probably not worth
+	// it; this gives us most of the benefits of that, with a
+	// fraction of the work.
+	//
+	// NOTE: there's probably a
+	// better/easier way of doing this (patches welcome)
+
+	fset := token.NewFileSet()
+	f, err := parser.ParseFile(fset, "api.go", nil, 0)
+	if err != nil {
+		panic(err)
+	}
+
+	found := 0
+
+	ast.Inspect(f, func(n ast.Node) bool {
+		switch v := n.(type) {
+		case *ast.ValueSpec:
+			found += len(v.Values)
+			return false
+		}
+		return true
+	})
+
+	exceptions := []string{"api"}
+	c.Check(found, check.Equals, len(api)+len(exceptions),
+		check.Commentf(`At a glance it looks like you've not added all the Commands defined in api to the api list. If that is not the case, please add the exception to the "exceptions" list in this test.`))
+}
+
+func (s *apiSuite) TestRootCmd(c *check.C) {
+	// check it only does GET
+	c.Check(rootCmd.PUT, check.IsNil)
+	c.Check(rootCmd.POST, check.IsNil)
+	c.Check(rootCmd.DELETE, check.IsNil)
+	c.Assert(rootCmd.GET, check.NotNil)
+
+	rec := httptest.NewRecorder()
+	c.Check(rootCmd.Path, check.Equals, "/")
+
+	rootCmd.GET(rootCmd, nil).Handler(rec, nil)
+	c.Check(rec.Code, check.Equals, 200)
+	c.Check(rec.HeaderMap.Get("Content-Type"), check.Equals, "application/json")
+
+	expected := []interface{}{"/1.0"}
+	var rsp resp
+	c.Assert(json.Unmarshal(rec.Body.Bytes(), &rsp), check.IsNil)
+	c.Check(rsp.Status, check.Equals, 200)
+	c.Check(rsp.Metadata, check.DeepEquals, expected)
+}
+
+func (s *apiSuite) TestV1(c *check.C) {
+	// check it only does GET
+	c.Check(v1Cmd.PUT, check.IsNil)
+	c.Check(v1Cmd.POST, check.IsNil)
+	c.Check(v1Cmd.DELETE, check.IsNil)
+	c.Assert(v1Cmd.GET, check.NotNil)
+
+	rec := httptest.NewRecorder()
+	c.Check(v1Cmd.Path, check.Equals, "/1.0")
+
+	// set up release
+	root := c.MkDir()
+	d := filepath.Join(root, "etc", "system-image")
+	c.Assert(os.MkdirAll(d, 0755), check.IsNil)
+	c.Assert(ioutil.WriteFile(filepath.Join(d, "channel.ini"), []byte("[service]\nchannel: ubuntu-flavor/release/channel"), 0644), check.IsNil)
+	c.Assert(release.Setup(root), check.IsNil)
+
+	v1Cmd.GET(v1Cmd, nil).Handler(rec, nil)
+	c.Check(rec.Code, check.Equals, 200)
+	c.Check(rec.HeaderMap.Get("Content-Type"), check.Equals, "application/json")
+
+	expected := map[string]interface{}{
+		"flavor":          "flavor",
+		"release":         "release",
+		"default_channel": "channel",
+		"api_compat":      "0",
+	}
+	var rsp resp
+	c.Assert(json.Unmarshal(rec.Body.Bytes(), &rsp), check.IsNil)
+	c.Check(rsp.Status, check.Equals, 200)
+	c.Check(rsp.Type, check.Equals, ResponseTypeSync)
+	c.Check(rsp.Metadata, check.DeepEquals, expected)
+}

=== added file 'daemon/daemon.go'
--- daemon/daemon.go	1970-01-01 00:00:00 +0000
+++ daemon/daemon.go	2015-09-14 09:25:29 +0000
@@ -0,0 +1,125 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package daemon
+
+import (
+	"fmt"
+	"net"
+	"net/http"
+
+	"github.com/coreos/go-systemd/activation"
+	"github.com/gorilla/mux"
+	"gopkg.in/tomb.v2"
+
+	"launchpad.net/snappy/logger"
+)
+
+// A Daemon listens for requests and routes them to the right command
+type Daemon struct {
+	listener net.Listener
+	tomb     tomb.Tomb
+	router   *mux.Router
+}
+
+// A ResponseFunc handles one of the individual verbs for a method
+type ResponseFunc func(*Command, *http.Request) Response
+
+// A Command routes a request to an individual per-verb ResponseFUnc
+type Command struct {
+	Path string
+	//
+	GET    ResponseFunc
+	PUT    ResponseFunc
+	POST   ResponseFunc
+	DELETE ResponseFunc
+	//
+	d *Daemon
+}
+
+func (c *Command) handler(w http.ResponseWriter, r *http.Request) {
+	var rspf ResponseFunc
+	rsp := BadMethod
+
+	switch r.Method {
+	case "GET":
+		rspf = c.GET
+	case "PUT":
+		rspf = c.PUT
+	case "POST":
+		rspf = c.POST
+	case "DELETE":
+		rspf = c.DELETE
+	}
+	if rspf != nil {
+		rsp = rspf(c, r)
+	}
+
+	rsp.Handler(w, r)
+}
+
+// Init sets up the Daemon's internal workings.
+// Don't call more than once.
+func (d *Daemon) Init() error {
+	listeners, err := activation.Listeners(false)
+	if err != nil {
+		return err
+	}
+
+	if len(listeners) != 1 {
+		return fmt.Errorf("daemon does not handle %d listeners right now, just one", len(listeners))
+	}
+
+	d.listener = listeners[0]
+
+	d.router = mux.NewRouter()
+
+	for _, c := range api {
+		c.d = d
+		logger.Debugf("adding %s", c.Path)
+		d.router.HandleFunc(c.Path, c.handler).Name(c.Path)
+	}
+
+	d.router.NotFoundHandler = http.HandlerFunc(NotFound.Handler)
+
+	return nil
+}
+
+// Start the Daemon
+func (d *Daemon) Start() {
+	d.tomb.Go(func() error {
+		return http.Serve(d.listener, d.router)
+	})
+}
+
+// Stop shuts down the Daemon
+func (d *Daemon) Stop() error {
+	d.tomb.Kill(nil)
+	return d.tomb.Wait()
+}
+
+// Dying is a tomb-ish thing
+func (d *Daemon) Dying() <-chan struct{} {
+	return d.tomb.Dying()
+}
+
+// New Daemon
+func New() *Daemon {
+	return &Daemon{}
+}

=== added file 'daemon/response.go'
--- daemon/response.go	1970-01-01 00:00:00 +0000
+++ daemon/response.go	2015-09-14 09:25:29 +0000
@@ -0,0 +1,107 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package daemon
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"launchpad.net/snappy/logger"
+)
+
+// ResponseType is the response type
+type ResponseType string
+
+// “there are three standard return types: Standard return value,
+// Background operation, Error”, each returning a JSON object with the
+// following “type” field:
+const (
+	ResponseTypeSync  ResponseType = "sync"
+	ResponseTypeAsync              = "async"
+	ResponseTypeError              = "error"
+)
+
+// Response knows how to render itself, how to handle itself, and how to find itself
+type Response interface {
+	Render(w http.ResponseWriter) ([]byte, int)
+	Handler(w http.ResponseWriter, r *http.Request)
+	Self(*Command, *http.Request) Response // has the same arity as ResponseFunc for convenience
+}
+
+type resp struct {
+	Type     ResponseType `json:"type"`
+	Status   int          `json:"status_code"`
+	Metadata interface{}  `json:"metadata"`
+}
+
+func (r *resp) MarshalJSON() ([]byte, error) {
+	return json.Marshal(map[string]interface{}{
+		"type":        r.Type,
+		"status":      http.StatusText(r.Status),
+		"status_code": r.Status,
+		"metadata":    &r.Metadata,
+	})
+}
+
+func (r *resp) Render(w http.ResponseWriter) (buf []byte, status int) {
+	bs, err := r.MarshalJSON()
+	if err != nil {
+		logger.Noticef("unable to marshal %#v to JSON: %v", *r, err)
+		return nil, http.StatusInternalServerError
+	}
+
+	return bs, r.Status
+}
+
+func (r *resp) Handler(w http.ResponseWriter, _ *http.Request) {
+	bs, status := r.Render(w)
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(status)
+	w.Write(bs)
+}
+
+func (r *resp) Self(*Command, *http.Request) Response {
+	return r
+}
+
+// SyncResponse builds a "sync" response from the given metadata.
+func SyncResponse(metadata interface{}) Response {
+	return &resp{
+		Type:     ResponseTypeSync,
+		Status:   http.StatusOK,
+		Metadata: metadata,
+	}
+}
+
+// ErrorResponse builds an "error" response from the given error status.
+func ErrorResponse(status int) Response {
+	return &resp{
+		Type:   ResponseTypeError,
+		Status: status,
+	}
+}
+
+// standard error responses
+var (
+	NotFound      = ErrorResponse(http.StatusNotFound)
+	BadMethod     = ErrorResponse(http.StatusMethodNotAllowed)
+	InternalError = ErrorResponse(http.StatusInternalServerError)
+)

=== modified file 'debian/control'
--- debian/control	2015-07-21 19:07:56 +0000
+++ debian/control	2015-09-14 09:25:29 +0000
@@ -18,6 +18,9 @@
                golang-pb-dev,
                golang-uboot-go-dev,
                golang-yaml.v2-dev,
+               golang-mux-dev,
+               golang-gopkg-tomb.v2-dev,
+               golang-go-systemd-dev,
                python3,
                python3-markdown
 Standards-Version: 3.9.6

=== modified file 'debian/ubuntu-snappy-cli.install'
--- debian/ubuntu-snappy-cli.install	2015-07-29 18:50:28 +0000
+++ debian/ubuntu-snappy-cli.install	2015-09-14 09:25:29 +0000
@@ -1,4 +1,5 @@
 /usr/bin/snappy
+/usr/bin/snapd
 data/completion/snappy /usr/share/bash-completion/completions/
 # i18n stuff
 ../../share /usr

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2015-08-18 13:34:46 +0000
+++ dependencies.tsv	2015-09-14 09:25:29 +0000
@@ -1,9 +1,13 @@
 github.com/blakesmith/ar	git	c9a977dd0cc1392b023382c7bfa5a22af8d3b730	2013-02-19T04:59:55Z
 github.com/cheggaaa/pb	git	e8c7cc515bfde3e267957a3b110080ceed51354e	2014-12-02T07:01:21Z
+github.com/coreos/go-systemd	git	f743bc15d6bddd23662280b4ad20f7c874cdd5ad	2015-09-08T19:15:25Z
+github.com/gorilla/context	git	1c83b3eabd45b6d76072b66b746c20815fb2872d	2015-08-20T05:12:45Z
+github.com/gorilla/mux	git	ee1815431e497d3850809578c93ab6705f1a19f7	2015-08-20T05:15:06Z
 github.com/gosexy/gettext	git	98b7b91596d20b96909e6b60d57411547dd9959c	2013-02-21T11:21:43Z
 github.com/jessevdk/go-flags	git	1acbbaff2f347c412a0c7884873bd72cc9c1f5b4	2015-08-16T10:05:21Z
 github.com/mvo5/goconfigparser	git	26426272dda20cc76aa1fa44286dc743d2972fe8	2015-02-12T09:37:50Z
 github.com/mvo5/uboot-go	git	361f6ebcbb54f389d15dc9faefa000e996ba3e37	2015-07-22T06:53:46Z
 golang.org/x/crypto	git	60052bd85f2d91293457e8811b0cf26b773de469	2015-06-22T23:34:07Z
 gopkg.in/check.v1	git	64131543e7896d5bcc6bd5a76287eb75ea96c673	2014-10-24T13:38:53Z
+gopkg.in/tomb.v2	git	14b3d72120e8d10ea6e6b7f87f7175734b1faab8	2014-06-26T14:46:23Z
 gopkg.in/yaml.v2	git	49c95bdc21843256fb6c4e0d370a05f24a0bf213	2015-02-24T22:57:58Z

=== modified file 'po/snappy.pot'
--- po/snappy.pot	2015-09-11 16:23:03 +0000
+++ po/snappy.pot	2015-09-14 09:25:29 +0000
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: snappy\n"
         "Report-Msgid-Bugs-To: [e-mail]\n"
-        "POT-Creation-Date: 2015-09-11 18:22+0200\n"
+        "POT-Creation-Date: 2015-09-14 10:22+0100\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'release/release.go'
--- release/release.go	2015-05-15 13:33:27 +0000
+++ release/release.go	2015-09-14 09:25:29 +0000
@@ -51,6 +51,11 @@
 	return rel.String()
 }
 
+// Get the release
+func Get() Release {
+	return rel
+}
+
 // Override sets up the release using a Release
 func Override(r Release) {
 	rel = r