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

[John Lenton]

Add Vendor() string to the Parts interface

Vendor, author, publisher, 'tis all the same, right?

[Sergio Schvezov (sergiusens)]

Nice

review: Approve

=== modified file 'snappy/parts.go'
--- snappy/parts.go	2015-04-30 16:56:15 +0000
+++ snappy/parts.go	2015-05-05 15:44:10 +0000
@@ -68,6 +68,7 @@
 	Version() string
 	Description() string
 	Namespace() string
+	Vendor() string
 
 	Hash() string
 	IsActive() bool

=== modified file 'snappy/snapp.go'
--- snappy/snapp.go	2015-05-05 15:44:10 +0000
+++ snappy/snapp.go	2015-05-05 15:44:10 +0000
@@ -522,6 +522,11 @@
 	return s.namespace
 }
 
+// Vendor returns the author. Or viceversa.
+func (s *SnapPart) Vendor() string {
+	return s.m.Vendor
+}
+
 // Hash returns the hash
 func (s *SnapPart) Hash() string {
 	return s.hash
@@ -886,6 +891,11 @@
 	return s.pkg.Namespace
 }
 
+// Vendor is the publisher. Author. Whatever.
+func (s *RemoteSnapPart) Vendor() string {
+	return s.pkg.Publisher
+}
+
 // Hash returns the hash
 func (s *RemoteSnapPart) Hash() string {
 	return s.pkg.DownloadSha512

=== modified file 'snappy/snapp_test.go'
--- snappy/snapp_test.go	2015-05-05 15:44:10 +0000
+++ snappy/snapp_test.go	2015-05-05 15:44:10 +0000
@@ -219,6 +219,7 @@
 const (
 	funkyAppName   = "8nzc1x4iim2xj1g2ul64"
 	funkyAppOrigin = "chipaca"
+	funkyAppVendor = "John Lenton"
 )
 
 /* acquired via:
@@ -464,6 +465,7 @@
 	c.Assert(parts, HasLen, 1)
 	c.Check(parts[0].Name(), Equals, funkyAppName)
 	c.Check(parts[0].Namespace(), Equals, funkyAppOrigin)
+	c.Check(parts[0].Vendor(), Equals, funkyAppVendor)
 	c.Check(parts[0].Version(), Equals, "42")
 	c.Check(parts[0].Description(), Equals, "Returns for store credit only.")
 
@@ -494,6 +496,8 @@
 	c.Check(parts[1].Name(), Equals, "hello-world")
 	c.Check(parts[0].Namespace(), Equals, "canonical")
 	c.Check(parts[1].Namespace(), Equals, "jdstrand")
+	c.Check(parts[0].Vendor(), Equals, "Canonical")
+	c.Check(parts[1].Vendor(), Equals, "Jamie Strandboge")
 	c.Check(parts[0].Version(), Equals, "1.0.8")
 	c.Check(parts[1].Version(), Equals, "1.4")
 	c.Check(parts[0].Description(), Equals, "hello-world")
@@ -592,6 +596,7 @@
 	c.Assert(results, HasLen, 1)
 	c.Check(results[0].Name(), Equals, funkyAppName)
 	c.Check(results[0].Namespace(), Equals, funkyAppOrigin)
+	c.Check(results[0].Vendor(), Equals, funkyAppVendor)
 	c.Check(results[0].Version(), Equals, "42")
 	c.Check(results[0].Hash(), Equals, "5364253e4a988f4f5c04380086d542f410455b97d48cc6c69ca2a5877d8aef2a6b2b2f83ec4f688cae61ebc8a6bf2cdbd4dbd8f743f0522fc76540429b79df42")
 	c.Check(results[0].Date().String(), Equals, "2015-04-15 18:30:16 +0000 UTC")
@@ -708,7 +713,7 @@
 func (s *SnapTestSuite) TestServicesWithPorts(c *C) {
 	const packageHello = `name: hello-app
 version: 1.10
-vendor: Michael Vogt <[e-mail]>
+vendor: Michael Vogt
 icon: meta/hello.svg
 binaries:
  - name: bin/hello
@@ -735,6 +740,7 @@
 
 	c.Assert(snap.Name(), Equals, "hello-app")
 	c.Assert(snap.Namespace(), Equals, testNamespace)
+	c.Assert(snap.Vendor(), Equals, "Michael Vogt")
 	c.Assert(snap.Version(), Equals, "1.10")
 	c.Assert(snap.IsActive(), Equals, false)
 

=== modified file 'snappy/systemimage.go'
--- snappy/systemimage.go	2015-04-15 20:39:24 +0000
+++ snappy/systemimage.go	2015-05-05 15:44:10 +0000
@@ -38,6 +38,7 @@
 const (
 	systemImagePartName      = "ubuntu-core"
 	systemImagePartNamespace = "ubuntu"
+	systemImagePartVendor    = "Canonical Ltd."
 
 	// location of the channel config on the filesystem.
 	//
@@ -103,11 +104,16 @@
 	return systemImagePartName
 }
 
-// Namespace returns the name
+// Namespace returns the namespace ("ubuntu")
 func (s *SystemImagePart) Namespace() string {
 	return systemImagePartNamespace
 }
 
+// Vendor returns the vendor ("Canonical Ltd.")
+func (s *SystemImagePart) Vendor() string {
+	return systemImagePartVendor
+}
+
 // Version returns the version
 func (s *SystemImagePart) Version() string {
 	return s.version

=== modified file 'snappy/systemimage_test.go'
--- snappy/systemimage_test.go	2015-04-22 10:35:09 +0000
+++ snappy/systemimage_test.go	2015-05-05 15:44:10 +0000
@@ -113,6 +113,7 @@
 	c.Assert(parts, HasLen, 2)
 	c.Assert(parts[0].Name(), Equals, systemImagePartName)
 	c.Assert(parts[0].Namespace(), Equals, systemImagePartNamespace)
+	c.Assert(parts[0].Vendor(), Equals, systemImagePartVendor)
 	c.Assert(parts[0].Version(), Equals, "1")
 	c.Assert(parts[0].Hash(), Equals, "e09c13f68fccef3b2fe0f5c8ff5c61acf2173b170b1f2a3646487147690b0970ef6f2c555d7bcb072035f29ee4ea66a6df7f6bb320d358d3a7d78a0c37a8a549")
 	c.Assert(parts[0].IsActive(), Equals, true)