Merge lp:~chipaca/snapweb/vendor-and-description into lp:~snappy-dev/snapweb/trunk

[John Lenton]

Exposed vendor and description.

(requires lp:~chipaca/snappy/description)

[Sergio Schvezov (sergiusens)]

can you merge trunk please?

[lp:~chipaca/snapweb/vendor-and-description]

112. By John Lenton on 2015-05-05

merged trunk

[Sergio Schvezov (sergiusens)]

Once the deps are merged, can you update dependencies.tsv please?

[lp:~chipaca/snapweb/vendor-and-description]

113. By John Lenton on 2015-05-05

updated dependencies

[Sergio Schvezov (sergiusens)]

\o/

review: Approve

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2015-05-03 17:57:48 +0000
+++ dependencies.tsv	2015-05-05 23:56:23 +0000
@@ -6,4 +6,4 @@
 github.com/mvo5/goconfigparser	git	26426272dda20cc76aa1fa44286dc743d2972fe8	2015-02-12T09:37:50Z
 gopkg.in/check.v1	git	64131543e7896d5bcc6bd5a76287eb75ea96c673	2014-10-24T13:38:53Z
 gopkg.in/yaml.v2	git	49c95bdc21843256fb6c4e0d370a05f24a0bf213	2015-02-24T22:57:58Z
-launchpad.net/snappy	bzr	snappy_tarmac-20150501152152-2ssql7e3a98ee9np	436
+launchpad.net/snappy	bzr	snappy_tarmac-20150505234155-4engr9ywa3p9badb	441

=== modified file 'snappy/common_test.go'
--- snappy/common_test.go	2015-05-03 22:05:24 +0000
+++ snappy/common_test.go	2015-05-05 23:56:23 +0000
@@ -29,11 +29,13 @@
 
 type fakeSnappyPart struct {
 	snappy.Part
-	name      string
-	version   string
-	installed bool
-	icon      string
-	snapType  snappy.SnapType
+	name        string
+	version     string
+	vendor      string
+	description string
+	installed   bool
+	icon        string
+	snapType    snappy.SnapType
 }
 
 type fakeSnappyPartServices struct {
@@ -43,10 +45,12 @@
 
 func newDefaultFakePart() *fakeSnappyPart {
 	return &fakeSnappyPart{
-		name:      "camlistore.sergiusens",
-		version:   "2.0",
-		installed: true,
-		snapType:  snappy.SnapTypeApp,
+		name:        "camlistore.sergiusens",
+		version:     "2.0",
+		installed:   true,
+		snapType:    snappy.SnapTypeApp,
+		vendor:      "Sergiusens Incorporated",
+		description: "Camlistore",
 	}
 }
 
@@ -123,6 +127,14 @@
 	return p.icon
 }
 
+func (p fakeSnappyPart) Vendor() string {
+	return p.vendor
+}
+
+func (p fakeSnappyPart) Description() string {
+	return p.description
+}
+
 func newFakeServicesNoExternalUI() []snappy.Service {
 	services := make([]snappy.Service, 0, 2)
 

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-03 21:54:17 +0000
+++ snappy/converge.go	2015-05-05 23:56:23 +0000
@@ -31,6 +31,8 @@
 	Name          string          `json:"name"`
 	Origin        string          `json:"origin"`
 	Version       string          `json:"version"`
+	Vendor        string          `json:"vendor"`
+	Description   string          `json:"description"`
 	Icon          string          `json:"icon"`
 	Status        string          `json:"status"`
 	Message       string          `json:"message,omitempty"`
@@ -160,10 +162,12 @@
 
 func (h *Handler) snapQueryToPayload(snapQ snappy.Part) snapPkg {
 	snap := snapPkg{
-		Name:    snapQ.Name(),
-		Origin:  snapQ.Namespace(),
-		Version: snapQ.Version(),
-		Type:    snapQ.Type(),
+		Name:        snapQ.Name(),
+		Origin:      snapQ.Namespace(),
+		Version:     snapQ.Version(),
+		Vendor:      snapQ.Vendor(),
+		Description: snapQ.Description(),
+		Type:        snapQ.Type(),
 	}
 
 	if hasPortInformation(snapQ) {

=== modified file 'snappy/converge_test.go'
--- snappy/converge_test.go	2015-05-03 21:54:17 +0000
+++ snappy/converge_test.go	2015-05-05 23:56:23 +0000
@@ -47,13 +47,15 @@
 
 	q := s.h.snapQueryToPayload(fakeSnap)
 
-	c.Assert(q.Name, Equals, fakeSnap.name)
-	c.Assert(q.Version, Equals, fakeSnap.version)
-	c.Assert(q.Status, Equals, webprogress.StatusInstalled)
-	c.Assert(q.Type, Equals, fakeSnap.snapType)
-	c.Assert(q.UIPort, Equals, uint64(0))
-	c.Assert(q.UIUri, Equals, "")
-	c.Assert(q.Icon, Equals, "/icons/camlistore.sergiusens_icon.png")
+	c.Check(q.Name, Equals, fakeSnap.name)
+	c.Check(q.Version, Equals, fakeSnap.version)
+	c.Check(q.Status, Equals, webprogress.StatusInstalled)
+	c.Check(q.Type, Equals, fakeSnap.snapType)
+	c.Check(q.UIPort, Equals, uint64(0))
+	c.Check(q.UIUri, Equals, "")
+	c.Check(q.Icon, Equals, "/icons/camlistore.sergiusens_icon.png")
+	c.Check(q.Description, Equals, fakeSnap.description)
+	c.Check(q.Vendor, Equals, fakeSnap.vendor)
 }
 
 func (s *PayloadSuite) TestPayloadWithServicesButNoUI(c *C) {