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

[John Lenton]

Move SnapType -> pkg.Type

[Sergio Schvezov (sergiusens)]

This looks good, but I want to know what the next MP will look like.

Will the layout look a bit like:

pkg/oem
pkg/app
pkg/kernel
pkg/os
pkg/framework
?

An interface in pkg (superseeded from Part)?

Maybe a generic implementation of the interface in pkg and every component composing/embedding that?

review: Needs Information

[John Lenton (chipaca)]

I think saying that that will be in the _next_ MP would be ambitious. But soon.

Whether it's pkg/oem or pkg/snap/oem (with common snap-level things in snap) is unclear to me at this point, I'm keeping an open mind until I've finished worrying the code some more.

Interfaces would be in pkg, unless it got too hairy in which case I wouldn't mind pkg/interface or some such.

The fractal nature of the dependencies right now makes it hard for me to give concrete answers. You probably have more of all of this in your head, so we should discuss.

[Sergio Schvezov (sergiusens)]

The road map feels excellent so this gets to land!

review: Approve

=== modified file 'cmd/snappy/cmd_booted.go'
--- cmd/snappy/cmd_booted.go	2015-05-18 19:05:50 +0000
+++ cmd/snappy/cmd_booted.go	2015-05-19 11:17:28 +0000
@@ -19,6 +19,7 @@
 
 import (
 	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/priv"
 	"launchpad.net/snappy/snappy"
 )
@@ -43,7 +44,7 @@
 	}
 	defer privMutex.Unlock()
 
-	parts, err := snappy.ActiveSnapsByType(snappy.SnapTypeCore)
+	parts, err := snappy.ActiveSnapsByType(pkg.TypeCore)
 	if err != nil {
 		return err
 	}

=== modified file 'cmd/snappy/cmd_info.go'
--- cmd/snappy/cmd_info.go	2015-05-18 19:05:50 +0000
+++ cmd/snappy/cmd_info.go	2015-05-19 11:17:28 +0000
@@ -22,6 +22,7 @@
 	"strings"
 
 	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/snappy"
 )
 
@@ -80,7 +81,7 @@
 }
 
 func ubuntuCoreChannel() string {
-	parts, err := snappy.ActiveSnapsByType(snappy.SnapTypeCore)
+	parts, err := snappy.ActiveSnapsByType(pkg.TypeCore)
 	if len(parts) == 1 && err == nil {
 		return parts[0].Channel()
 	}
@@ -90,8 +91,8 @@
 
 func info() error {
 	release := ubuntuCoreChannel()
-	frameworks, _ := snappy.ActiveSnapNamesByType(snappy.SnapTypeFramework)
-	apps, _ := snappy.ActiveSnapNamesByType(snappy.SnapTypeApp)
+	frameworks, _ := snappy.ActiveSnapNamesByType(pkg.TypeFramework)
+	apps, _ := snappy.ActiveSnapNamesByType(pkg.TypeApp)
 
 	fmt.Printf("release: %s\n", release)
 	fmt.Printf("architecture: %s\n", snappy.Architecture())

=== modified file 'cmd/snappy/cmd_list.go'
--- cmd/snappy/cmd_list.go	2015-05-18 19:05:50 +0000
+++ cmd/snappy/cmd_list.go	2015-05-19 11:17:28 +0000
@@ -25,6 +25,7 @@
 	"time"
 
 	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/snappy"
 )
 
@@ -134,7 +135,7 @@
 		//        there are only two version instaleld and
 		//        there is only a single part that may requires
 		//        a reboot
-		if part.Type() != snappy.SnapTypeCore {
+		if part.Type() != pkg.TypeCore {
 			continue
 		}
 

=== modified file 'cmd/snappy/cmd_search.go'
--- cmd/snappy/cmd_search.go	2015-05-18 19:05:50 +0000
+++ cmd/snappy/cmd_search.go	2015-05-19 11:17:28 +0000
@@ -23,6 +23,7 @@
 	"text/tabwriter"
 
 	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/snappy"
 )
 
@@ -68,7 +69,7 @@
 			}
 		} else {
 			for _, part := range sharedName.Parts {
-				if sharedName.IsAlias(part.Namespace()) || part.Type() == snappy.SnapTypeFramework {
+				if sharedName.IsAlias(part.Namespace()) || part.Type() == pkg.TypeFramework {
 					fmt.Fprintln(w, fmt.Sprintf("%s\t%s\t%s\t", part.Name(), part.Version(), part.Description()))
 				} else {
 					fmt.Fprintln(w, fmt.Sprintf("%s.%s\t%s\t%s\t", part.Name(), part.Namespace(), part.Version(), part.Description()))

=== added directory 'pkg'
=== added file 'pkg/types.go'
--- pkg/types.go	1970-01-01 00:00:00 +0000
+++ pkg/types.go	2015-05-19 11:17:28 +0000
@@ -0,0 +1,58 @@
+/*
+ * 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 pkg packages odds and ends that apply to packages in more than one
+// layer (to more than one of deb, click, snap, and part).
+package pkg
+
+import (
+	"encoding/json"
+)
+
+// Type represents the kind of snap (app, core, frameworks, oem)
+type Type string
+
+// The various types of snap parts we support
+const (
+	TypeApp       Type = "app"
+	TypeCore      Type = "core"
+	TypeFramework Type = "framework"
+	TypeOem       Type = "oem"
+)
+
+// MarshalJSON returns *m as the JSON encoding of m.
+func (m Type) MarshalJSON() ([]byte, error) {
+	return json.Marshal(string(m))
+}
+
+// UnmarshalJSON sets *m to a copy of data.
+func (m *Type) UnmarshalJSON(data []byte) error {
+	var str string
+	if err := json.Unmarshal(data, &str); err != nil {
+		return err
+	}
+
+	// this is a workaround as the store sends "application" but snappy uses
+	// "app" for TypeApp
+	if str == "application" {
+		*m = TypeApp
+	} else {
+		*m = Type(str)
+	}
+
+	return nil
+}

=== added file 'pkg/types_test.go'
--- pkg/types_test.go	1970-01-01 00:00:00 +0000
+++ pkg/types_test.go	2015-05-19 11:17:28 +0000
@@ -0,0 +1,64 @@
+/*
+ * 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 pkg
+
+import (
+	"encoding/json"
+	"testing"
+
+	. "launchpad.net/gocheck"
+)
+
+type typeSuite struct{}
+
+// Hook up gocheck into the "go test" runner
+func Test(t *testing.T) { TestingT(t) }
+
+var _ = Suite(&typeSuite{})
+
+func (s *typeSuite) TestJSONerr(c *C) {
+	var t Type
+	err := json.Unmarshal([]byte("false"), &t)
+	c.Assert(err, NotNil)
+}
+
+func (s *typeSuite) TestMarshalTypes(c *C) {
+	out, err := json.Marshal(TypeApp)
+	c.Assert(err, IsNil)
+	c.Check(string(out), Equals, "\"app\"")
+
+	out, err = json.Marshal(TypeOem)
+	c.Assert(err, IsNil)
+	c.Check(string(out), Equals, "\"oem\"")
+}
+
+func (s *typeSuite) TestUnmarshalTypes(c *C) {
+	var st Type
+
+	err := json.Unmarshal([]byte("\"application\""), &st)
+	c.Assert(err, IsNil)
+	c.Check(st, Equals, TypeApp)
+
+	err = json.Unmarshal([]byte("\"app\""), &st)
+	c.Assert(err, IsNil)
+	c.Check(st, Equals, TypeApp)
+
+	err = json.Unmarshal([]byte("\"oem\""), &st)
+	c.Assert(err, IsNil)
+	c.Check(st, Equals, TypeOem)
+}

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-05-18 19:15:37 +0000
+++ snappy/click.go	2015-05-19 11:17:28 +0000
@@ -43,6 +43,7 @@
 	"launchpad.net/snappy/clickdeb"
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/policy"
 	"launchpad.net/snappy/systemd"
 
@@ -55,7 +56,7 @@
 	Name          string                  `json:"name"`
 	Version       string                  `json:"version"`
 	Architecture  []string                `json:"architecture,omitempty"`
-	Type          SnapType                `json:"type,omitempty"`
+	Type          pkg.Type                `json:"type,omitempty"`
 	Framework     string                  `json:"framework,omitempty"`
 	Description   string                  `json:"description,omitempty"`
 	Icon          string                  `json:"icon,omitempty"`
@@ -300,7 +301,7 @@
 // generate the name
 func generateBinaryName(m *packageYaml, binary Binary) string {
 	var binName string
-	if m.Type == SnapTypeFramework {
+	if m.Type == pkg.TypeFramework {
 		binName = filepath.Base(binary.Name)
 	} else {
 		binName = fmt.Sprintf("%s.%s", m.Name, filepath.Base(binary.Name))
@@ -469,7 +470,7 @@
 			PostStop:    service.PostStop,
 			StopTimeout: time.Duration(service.StopTimeout),
 			AaProfile:   aaProfile,
-			IsFramework: m.Type == SnapTypeFramework,
+			IsFramework: m.Type == pkg.TypeFramework,
 			BusName:     service.BusName,
 			UdevAppName: udevPartName,
 		}), nil
@@ -533,7 +534,7 @@
 
 		// If necessary, generate the DBus policy file so the framework
 		// service is allowed to start
-		if m.Type == SnapTypeFramework && service.BusName != "" {
+		if m.Type == pkg.TypeFramework && service.BusName != "" {
 			content, err := genBusPolicyFile(service.BusName)
 			if err != nil {
 				return err
@@ -796,7 +797,7 @@
 		return err
 	}
 
-	if cm.Type != SnapTypeFramework && cm.Type != SnapTypeOem {
+	if cm.Type != pkg.TypeFramework && cm.Type != pkg.TypeOem {
 		// add the namespace to the name
 		cm.Name = fmt.Sprintf("%s.%s", cm.Name, namespace)
 	}
@@ -861,7 +862,7 @@
 
 	targetDir := snapAppsDir
 	// the "oem" parts are special
-	if manifest.Type == SnapTypeOem {
+	if manifest.Type == pkg.TypeOem {
 		targetDir = snapOemDir
 
 		// TODO do the following at a higher level once the store publishes snap types
@@ -885,7 +886,7 @@
 
 	fullName := manifest.Name
 	// namespacing only applies to apps.
-	if manifest.Type != SnapTypeFramework && manifest.Type != SnapTypeOem {
+	if manifest.Type != pkg.TypeFramework && manifest.Type != pkg.TypeOem {
 		fullName += "." + namespace
 	}
 	instDir := filepath.Join(targetDir, fullName, manifest.Version)
@@ -1158,7 +1159,7 @@
 		return err
 	}
 
-	if manifest.Type == SnapTypeFramework {
+	if manifest.Type == pkg.TypeFramework {
 
 		if err := policy.Remove(m.Name, clickDir); err != nil {
 			return err
@@ -1204,7 +1205,7 @@
 		return err
 	}
 
-	if newActiveManifest.Type == SnapTypeFramework {
+	if newActiveManifest.Type == pkg.TypeFramework {
 		if err := policy.Install(m.Name, baseDir); err != nil {
 			return err
 		}

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-05-16 15:29:55 +0000
+++ snappy/click_test.go	2015-05-19 11:17:28 +0000
@@ -32,6 +32,7 @@
 
 	"launchpad.net/snappy/clickdeb"
 	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/policy"
 	"launchpad.net/snappy/progress"
 	"launchpad.net/snappy/systemd"
@@ -1237,7 +1238,7 @@
 	m := packageYaml{
 		Name:    "xkcd-webserver",
 		Version: "0.3.4",
-		Type:    SnapTypeFramework,
+		Type:    pkg.TypeFramework,
 	}
 
 	generatedWrapper, err := generateSnapServicesFile(service, pkgPath, aaProfile, &m)

=== modified file 'snappy/common_test.go'
--- snappy/common_test.go	2015-05-06 12:26:38 +0000
+++ snappy/common_test.go	2015-05-19 11:17:28 +0000
@@ -23,12 +23,13 @@
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 
 	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/pkg"
 
 	"gopkg.in/yaml.v2"
 	. "launchpad.net/gocheck"
-	"strings"
 )
 
 const (
@@ -147,10 +148,10 @@
 	return path.Join(tmpdir, snapFile)
 }
 
-// makeTwoTestSnaps creates two real snaps of SnapType of name
+// makeTwoTestSnaps creates two real snaps of pkg.Type of name
 // "foo", with version "1.0" and "2.0", "2.0" being marked as the
 // active snap.
-func makeTwoTestSnaps(c *C, snapType SnapType, extra ...string) {
+func makeTwoTestSnaps(c *C, snapType pkg.Type, extra ...string) {
 	inter := &MockProgressMeter{}
 
 	packageYaml := `name: foo
@@ -161,7 +162,7 @@
 		packageYaml += strings.Join(extra, "\n") + "\n"
 	}
 
-	if snapType != SnapTypeApp {
+	if snapType != pkg.TypeApp {
 		packageYaml += fmt.Sprintf("type: %s\n", snapType)
 	}
 

=== modified file 'snappy/errors.go'
--- snappy/errors.go	2015-05-18 19:15:37 +0000
+++ snappy/errors.go	2015-05-19 11:17:28 +0000
@@ -119,7 +119,7 @@
 	// an interface is partial.
 	ErrNotImplemented = errors.New("not implemented")
 
-	// ErrNoOemConfiguration may be returned when there is a SnapTypeOem installed
+	// ErrNoOemConfiguration may be returned when there is a pkg.TypeOem installed
 	// but does not provide a configuration.
 	ErrNoOemConfiguration = errors.New("no configuration entry found in the oem snap")
 

=== modified file 'snappy/firstboot.go'
--- snappy/firstboot.go	2015-05-08 16:07:35 +0000
+++ snappy/firstboot.go	2015-05-19 11:17:28 +0000
@@ -24,6 +24,7 @@
 	"path/filepath"
 
 	"launchpad.net/snappy/helpers"
+	"launchpad.net/snappy/pkg"
 
 	"gopkg.in/yaml.v2"
 )
@@ -54,7 +55,7 @@
 	}
 	defer stampFirstBoot()
 
-	oemSnap, err := activeSnapsByType(SnapTypeOem)
+	oemSnap, err := activeSnapsByType(pkg.TypeOem)
 	if err != nil {
 		return err
 	}

=== modified file 'snappy/firstboot_test.go'
--- snappy/firstboot_test.go	2015-04-14 16:46:57 +0000
+++ snappy/firstboot_test.go	2015-05-19 11:17:28 +0000
@@ -23,13 +23,15 @@
 	"path/filepath"
 
 	. "launchpad.net/gocheck"
+
+	"launchpad.net/snappy/pkg"
 )
 
 type fakePart struct {
 	SnapPart
 	config    []byte
 	oemConfig SystemConfig
-	snapType  SnapType
+	snapType  pkg.Type
 }
 
 func (p *fakePart) Config(b []byte) (string, error) {
@@ -41,7 +43,7 @@
 	return p.oemConfig
 }
 
-func (p *fakePart) Type() SnapType {
+func (p *fakePart) Type() pkg.Type {
 	return p.snapType
 }
 
@@ -69,8 +71,8 @@
 }
 
 func (s *FirstBootTestSuite) mockActiveSnapNamesByType() *fakePart {
-	fakeOem := fakePart{oemConfig: s.oemConfig, snapType: SnapTypeOem}
-	activeSnapsByType = func(snapsTs ...SnapType) ([]Part, error) {
+	fakeOem := fakePart{oemConfig: s.oemConfig, snapType: pkg.TypeOem}
+	activeSnapsByType = func(snapsTs ...pkg.Type) ([]Part, error) {
 		return []Part{&fakeOem}, nil
 	}
 
@@ -78,7 +80,7 @@
 }
 
 func (s *FirstBootTestSuite) mockActiveSnapByName() *fakePart {
-	fakeMyApp := fakePart{snapType: SnapTypeApp}
+	fakeMyApp := fakePart{snapType: pkg.TypeApp}
 	activeSnapByName = func(needle string) Part {
 		return &fakeMyApp
 	}
@@ -108,7 +110,7 @@
 }
 
 func (s *FirstBootTestSuite) TestNoErrorWhenNoOEM(c *C) {
-	activeSnapsByType = func(snapsTs ...SnapType) ([]Part, error) {
+	activeSnapsByType = func(snapsTs ...pkg.Type) ([]Part, error) {
 		return nil, nil
 	}
 

=== modified file 'snappy/oem.go'
--- snappy/oem.go	2015-05-11 16:06:50 +0000
+++ snappy/oem.go	2015-05-19 11:17:28 +0000
@@ -31,6 +31,7 @@
 
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/pkg"
 )
 
 // OEM represents the structure inside the package.yaml for the oem component
@@ -101,7 +102,7 @@
 var getOem = getOemImpl
 
 var getOemImpl = func() (*packageYaml, error) {
-	oems, _ := ActiveSnapsByType(SnapTypeOem)
+	oems, _ := ActiveSnapsByType(pkg.TypeOem)
 	if len(oems) == 1 {
 		return oems[0].(*SnapPart).m, nil
 	}

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-05-07 15:19:05 +0000
+++ snappy/parts.go	2015-05-19 11:17:28 +0000
@@ -18,53 +18,19 @@
 package snappy
 
 import (
-	"encoding/json"
 	"fmt"
 	"net"
 	"net/url"
 	"strings"
 	"time"
 
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/progress"
 )
 
-// SnapType represents the kind of snap (app, core, frameworks, oem)
-type SnapType string
-
-// MarshalJSON returns *m as the JSON encoding of m.
-func (m SnapType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(string(m))
-}
-
-// UnmarshalJSON sets *m to a copy of data.
-func (m *SnapType) UnmarshalJSON(data []byte) error {
-	var str string
-	if err := json.Unmarshal(data, &str); err != nil {
-		return err
-	}
-
-	// this is a workaround as the store sends "application" but snappy uses
-	// "app" for SnapTypeApp
-	if str == "application" {
-		*m = SnapTypeApp
-	} else {
-		*m = SnapType(str)
-	}
-
-	return nil
-}
-
 // SystemConfig is a config map holding configs for multiple packages
 type SystemConfig map[string]interface{}
 
-// The various types of snap parts we support
-const (
-	SnapTypeApp       SnapType = "app"
-	SnapTypeCore      SnapType = "core"
-	SnapTypeFramework SnapType = "framework"
-	SnapTypeOem       SnapType = "oem"
-)
-
 // Services implements snappy packages that offer services
 type Services interface {
 	Services() []Service
@@ -78,7 +44,7 @@
 // Dirname of a Part is the Name, in most cases qualified with the
 // Namespace
 func Dirname(p Part) string {
-	if t := p.Type(); t == SnapTypeFramework || t == SnapTypeOem {
+	if t := p.Type(); t == pkg.TypeFramework || t == pkg.TypeOem {
 		return p.Name()
 	}
 	return p.Name() + "." + p.Namespace()
@@ -110,7 +76,7 @@
 	Icon() string
 
 	// Returns app, framework, core
-	Type() SnapType
+	Type() pkg.Type
 
 	InstalledSize() int64
 	DownloadSize() int64
@@ -237,7 +203,7 @@
 }
 
 // ActiveSnapsByType returns all installed snaps with the given type
-func ActiveSnapsByType(snapTs ...SnapType) (res []Part, err error) {
+func ActiveSnapsByType(snapTs ...pkg.Type) (res []Part, err error) {
 	m := NewMetaRepository()
 	installed, err := m.Installed()
 	if err != nil {
@@ -261,7 +227,7 @@
 // ActiveSnapNamesByType returns all installed snap names with the given type
 var ActiveSnapNamesByType = activeSnapNamesByTypeImpl
 
-func activeSnapNamesByTypeImpl(snapTs ...SnapType) (res []string, err error) {
+func activeSnapNamesByTypeImpl(snapTs ...pkg.Type) (res []string, err error) {
 	installed, err := ActiveSnapsByType(snapTs...)
 	for _, part := range installed {
 		res = append(res, part.Name())

=== modified file 'snappy/parts_test.go'
--- snappy/parts_test.go	2015-04-21 12:05:22 +0000
+++ snappy/parts_test.go	2015-05-19 11:17:28 +0000
@@ -24,6 +24,7 @@
 
 	. "launchpad.net/gocheck"
 
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/progress"
 )
 
@@ -43,12 +44,12 @@
 	c.Assert(err, IsNil)
 	makeSnapActive(yamlPath)
 
-	parts, err := ActiveSnapsByType(SnapTypeApp)
+	parts, err := ActiveSnapsByType(pkg.TypeApp)
 	c.Assert(err, IsNil)
 	c.Assert(parts, HasLen, 1)
 	c.Assert(parts[0].Name(), Equals, "app1")
 
-	parts, err = ActiveSnapsByType(SnapTypeFramework)
+	parts, err = ActiveSnapsByType(pkg.TypeFramework)
 	c.Assert(err, IsNil)
 	c.Assert(parts, HasLen, 1)
 	c.Assert(parts[0].Name(), Equals, "framework1")

=== modified file 'snappy/remove_test.go'
--- snappy/remove_test.go	2015-04-15 13:17:22 +0000
+++ snappy/remove_test.go	2015-05-19 11:17:28 +0000
@@ -19,6 +19,8 @@
 
 import (
 	. "launchpad.net/gocheck"
+
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/progress"
 )
 
@@ -30,7 +32,7 @@
 }
 
 func (s *SnapTestSuite) TestSnapRemoveByVersion(c *C) {
-	makeTwoTestSnaps(c, SnapTypeApp)
+	makeTwoTestSnaps(c, pkg.TypeApp)
 
 	err := Remove("foo=1.0", 0, &progress.NullProgress{})
 
@@ -41,7 +43,7 @@
 }
 
 func (s *SnapTestSuite) TestSnapRemoveActive(c *C) {
-	makeTwoTestSnaps(c, SnapTypeApp)
+	makeTwoTestSnaps(c, pkg.TypeApp)
 
 	err := Remove("foo", 0, &progress.NullProgress{})
 
@@ -52,7 +54,7 @@
 }
 
 func (s *SnapTestSuite) TestSnapRemoveActiveOemFails(c *C) {
-	makeTwoTestSnaps(c, SnapTypeOem)
+	makeTwoTestSnaps(c, pkg.TypeOem)
 
 	err := Remove("foo", 0, &progress.NullProgress{})
 	c.Assert(err, DeepEquals, ErrPackageNotRemovable)
@@ -67,13 +69,13 @@
 	installed, err := m.Installed()
 	c.Assert(err, IsNil)
 	c.Assert(installed[0].Name(), Equals, "foo")
-	c.Assert(installed[0].Type(), Equals, SnapTypeOem)
+	c.Assert(installed[0].Type(), Equals, pkg.TypeOem)
 	c.Assert(installed[0].Version(), Equals, "2.0")
 	c.Assert(installed, HasLen, 1)
 }
 
 func (s *SnapTestSuite) TestSnapRemoveGC(c *C) {
-	makeTwoTestSnaps(c, SnapTypeApp)
+	makeTwoTestSnaps(c, pkg.TypeApp)
 	err := Remove("foo", DoRemoveGC, &progress.NullProgress{})
 	c.Assert(err, IsNil)
 	m := NewMetaRepository()

=== modified file 'snappy/rollback_test.go'
--- snappy/rollback_test.go	2015-04-30 16:56:15 +0000
+++ snappy/rollback_test.go	2015-05-19 11:17:28 +0000
@@ -19,10 +19,12 @@
 
 import (
 	. "launchpad.net/gocheck"
+
+	"launchpad.net/snappy/pkg"
 )
 
 func (s *SnapTestSuite) TestRollbackWithVersion(c *C) {
-	makeTwoTestSnaps(c, SnapTypeApp)
+	makeTwoTestSnaps(c, pkg.TypeApp)
 	c.Assert(ActiveSnapByName("foo").Version(), Equals, "2.0")
 
 	// rollback with version
@@ -34,7 +36,7 @@
 }
 
 func (s *SnapTestSuite) TestRollbackFindVersion(c *C) {
-	makeTwoTestSnaps(c, SnapTypeApp)
+	makeTwoTestSnaps(c, pkg.TypeApp)
 	c.Assert(ActiveSnapByName("foo").Version(), Equals, "2.0")
 
 	// rollback without version
@@ -46,7 +48,7 @@
 }
 
 func (s *SnapTestSuite) TestRollbackService(c *C) {
-	makeTwoTestSnaps(c, SnapTypeApp, `services:
+	makeTwoTestSnaps(c, pkg.TypeApp, `services:
  - name: svc1
 `)
 	pkg := ActiveSnapByName("foo")

=== modified file 'snappy/security.go'
--- snappy/security.go	2015-05-18 19:05:50 +0000
+++ snappy/security.go	2015-05-19 11:17:28 +0000
@@ -12,6 +12,7 @@
 
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/pkg"
 )
 
 type apparmorJSONTemplate struct {
@@ -112,7 +113,7 @@
 
 func getSecurityProfile(m *packageYaml, appName, baseDir string) (string, error) {
 	cleanedName := strings.Replace(appName, "/", "-", -1)
-	if m.Type == SnapTypeFramework || m.Type == SnapTypeOem {
+	if m.Type == pkg.TypeFramework || m.Type == pkg.TypeOem {
 		return fmt.Sprintf("%s_%s_%s", m.Name, cleanedName, m.Version), nil
 	}
 

=== modified file 'snappy/security_test.go'
--- snappy/security_test.go	2015-04-19 14:02:33 +0000
+++ snappy/security_test.go	2015-05-19 11:17:28 +0000
@@ -6,6 +6,8 @@
 	"path/filepath"
 
 	. "launchpad.net/gocheck"
+
+	"launchpad.net/snappy/pkg"
 )
 
 type SecurityTestSuite struct {
@@ -143,7 +145,7 @@
 	m := packageYaml{
 		Name:    "foo",
 		Version: "1.0",
-		Type:    SnapTypeFramework,
+		Type:    pkg.TypeFramework,
 	}
 	b := Binary{Name: "bin/app"}
 	ap, err := getSecurityProfile(&m, b.Name, "/apps/foo.mvo/1.0/")

=== modified file 'snappy/set_test.go'
--- snappy/set_test.go	2015-04-30 16:56:15 +0000
+++ snappy/set_test.go	2015-05-19 11:17:28 +0000
@@ -24,6 +24,7 @@
 
 	. "launchpad.net/gocheck"
 
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/progress"
 )
 
@@ -73,7 +74,7 @@
 }
 
 func (s *SnapTestSuite) TestSetActive(c *C) {
-	makeTwoTestSnaps(c, SnapTypeApp)
+	makeTwoTestSnaps(c, pkg.TypeApp)
 
 	path, err := filepath.EvalSymlinks(filepath.Join(snapAppsDir, fooComposedName, "current"))
 	c.Assert(err, IsNil)

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-05-18 16:05:45 +0000
+++ snappy/snapp.go	2015-05-19 11:17:28 +0000
@@ -40,6 +40,7 @@
 	"launchpad.net/snappy/clickdeb"
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/logger"
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/policy"
 	"launchpad.net/snappy/progress"
 	"launchpad.net/snappy/release"
@@ -200,7 +201,7 @@
 	Version string
 	Vendor  string
 	Icon    string
-	Type    SnapType
+	Type    pkg.Type
 
 	// the spec allows a string or a list here *ick* so we need
 	// to convert that into something sensible via reflect
@@ -240,7 +241,7 @@
 	RatingsAverage  float64            `json:"ratings_average,omitempty"`
 	SupportURL      string             `json:"support_url"`
 	Title           string             `json:"title"`
-	Type            SnapType           `json:"content,omitempty"`
+	Type            pkg.Type           `json:"content,omitempty"`
 	Version         string             `json:"version"`
 }
 
@@ -343,7 +344,7 @@
 		return nil
 	}
 
-	if m.Type != SnapTypeFramework && m.Type != SnapTypeOem {
+	if m.Type != pkg.TypeFramework && m.Type != pkg.TypeOem {
 		if part.Namespace() != namespace {
 			return ErrPackageNameAlreadyInstalled
 		}
@@ -375,7 +376,7 @@
 }
 
 func (m *packageYaml) checkForFrameworks() error {
-	installed, err := ActiveSnapNamesByType(SnapTypeFramework)
+	installed, err := ActiveSnapNamesByType(pkg.TypeFramework)
 	if err != nil {
 		return err
 	}
@@ -497,7 +498,7 @@
 }
 
 // Type returns the type of the SnapPart (app, oem, ...)
-func (s *SnapPart) Type() SnapType {
+func (s *SnapPart) Type() pkg.Type {
 	if s.m.Type != "" {
 		return s.m.Type
 	}
@@ -614,7 +615,7 @@
 	// OEM snaps should not be removed as they are a key
 	// building block for OEMs. Prunning non active ones
 	// is acceptible.
-	if s.m.Type == SnapTypeOem && s.IsActive() {
+	if s.m.Type == pkg.TypeOem && s.IsActive() {
 		return ErrPackageNotRemovable
 	}
 
@@ -674,7 +675,7 @@
 //
 // /!\ not part of the Part interface.
 func (s *SnapPart) Dependents() ([]*SnapPart, error) {
-	if s.Type() != SnapTypeFramework {
+	if s.Type() != pkg.TypeFramework {
 		// only frameworks are depended on
 		return nil, nil
 	}
@@ -836,7 +837,7 @@
 		}
 
 		namespace := ""
-		if m.Type != SnapTypeFramework && m.Type != SnapTypeOem {
+		if m.Type != pkg.TypeFramework && m.Type != pkg.TypeOem {
 			namespace, err = namespaceFromYamlPath(realpath)
 			if err != nil {
 				return nil, err
@@ -870,7 +871,7 @@
 }
 
 // Type returns the type of the SnapPart (app, oem, ...)
-func (s *RemoteSnapPart) Type() SnapType {
+func (s *RemoteSnapPart) Type() pkg.Type {
 	return s.pkg.Type
 }
 
@@ -1123,7 +1124,7 @@
 	req.Header.Set("Accept", "application/hal+json")
 
 	// frameworks
-	frameworks, _ := ActiveSnapNamesByType(SnapTypeFramework)
+	frameworks, _ := ActiveSnapNamesByType(pkg.TypeFramework)
 	req.Header.Set("X-Ubuntu-Frameworks", strings.Join(addCoreFmk(frameworks), ","))
 	req.Header.Set("X-Ubuntu-Architecture", string(Architecture()))
 	req.Header.Set("X-Ubuntu-Release", release.String())
@@ -1236,7 +1237,7 @@
 func (s *SnapUbuntuStoreRepository) Updates() (parts []Part, err error) {
 	// the store only supports apps, oem and frameworks currently, so no
 	// sense in sending it our ubuntu-core snap
-	installed, err := ActiveSnapNamesByType(SnapTypeApp, SnapTypeFramework, SnapTypeOem)
+	installed, err := ActiveSnapNamesByType(pkg.TypeApp, pkg.TypeFramework, pkg.TypeOem)
 	if err != nil || len(installed) == 0 {
 		return nil, err
 	}

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-05-16 15:29:55 +0000
+++ snappy/snapp_test.go	2015-05-19 11:17:28 +0000
@@ -18,7 +18,6 @@
 package snappy
 
 import (
-	"encoding/json"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -31,6 +30,7 @@
 	"launchpad.net/snappy/clickdeb"
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/partition"
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/policy"
 	"launchpad.net/snappy/release"
 	"launchpad.net/snappy/systemd"
@@ -510,7 +510,7 @@
 	c.Check(parts[0].Channel(), Equals, "edge")
 }
 func mockActiveSnapNamesByType(mockSnaps []string) {
-	ActiveSnapNamesByType = func(snapTs ...SnapType) (res []string, err error) {
+	ActiveSnapNamesByType = func(snapTs ...pkg.Type) (res []string, err error) {
 		return mockSnaps, nil
 	}
 }
@@ -1384,33 +1384,3 @@
 	c.Assert(cmds[1], DeepEquals, aCmd{"udevadm", "trigger"})
 	c.Assert(cmds, HasLen, 2)
 }
-
-type SnapTypeSuite struct{}
-
-var _ = Suite(&SnapTypeSuite{})
-
-func (s *SnapTypeSuite) TestMarshalTypes(c *C) {
-	out, err := json.Marshal(SnapTypeApp)
-	c.Assert(err, IsNil)
-	c.Check(string(out), Equals, "\"app\"")
-
-	out, err = json.Marshal(SnapTypeOem)
-	c.Assert(err, IsNil)
-	c.Check(string(out), Equals, "\"oem\"")
-}
-
-func (s *SnapTypeSuite) TestUnmarshalTypes(c *C) {
-	var st SnapType
-
-	err := json.Unmarshal([]byte("\"application\""), &st)
-	c.Assert(err, IsNil)
-	c.Check(st, Equals, SnapTypeApp)
-
-	err = json.Unmarshal([]byte("\"app\""), &st)
-	c.Assert(err, IsNil)
-	c.Check(st, Equals, SnapTypeApp)
-
-	err = json.Unmarshal([]byte("\"oem\""), &st)
-	c.Assert(err, IsNil)
-	c.Check(st, Equals, SnapTypeOem)
-}

=== modified file 'snappy/systemimage.go'
--- snappy/systemimage.go	2015-05-11 16:06:50 +0000
+++ snappy/systemimage.go	2015-05-19 11:17:28 +0000
@@ -32,6 +32,7 @@
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/logger"
 	"launchpad.net/snappy/partition"
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/progress"
 )
 
@@ -94,9 +95,9 @@
 	partition partition.Interface
 }
 
-// Type returns SnapTypeCore for this snap
-func (s *SystemImagePart) Type() SnapType {
-	return SnapTypeCore
+// Type returns pkg.TypeCore for this snap
+func (s *SystemImagePart) Type() pkg.Type {
+	return pkg.TypeCore
 }
 
 // Name returns the name

=== modified file 'snappy/udev.go'
--- snappy/udev.go	2015-04-22 07:11:43 +0000
+++ snappy/udev.go	2015-05-19 11:17:28 +0000
@@ -20,10 +20,12 @@
 import (
 	"fmt"
 	"path/filepath"
+
+	"launchpad.net/snappy/pkg"
 )
 
 func getUdevPartName(m *packageYaml, baseDir string) (string, error) {
-	if m.Type == SnapTypeFramework || m.Type == SnapTypeOem {
+	if m.Type == pkg.TypeFramework || m.Type == pkg.TypeOem {
 		return m.Name, nil
 	}