Merge lp:~chipaca/ubuntu-push/client-v0-p2 into lp:ubuntu-push

[John Lenton]

second step of the v0 of the client: getting the device id

Second step of the v0 of the client: getting the device id. Includes a
small fix to whoopsie/identifier where identifier.New wasn't returning
an identifier.Id.

[Samuele Pedroni (pedronis)]

it's intentional that getDeviceId is private?

review: Approve

[John Lenton (chipaca)]

At least for now yes, the idea being that these will all be orchestrated from within client itself. If that turns out to be unwieldy and the orchestration needs to be done from outside, that (and a number of ones to come) would be public instead.

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite https://code.launchpad.net/~chipaca/ubuntu-push/client-v0-p1 has not yet been merged into https://code.launchpad.net/~ubuntu-push-hackers/ubuntu-push/trunk.

=== modified file 'client/client.go'
--- client/client.go	2014-02-03 14:20:12 +0000
+++ client/client.go	2014-02-03 14:20:12 +0000
@@ -25,6 +25,7 @@
 	"launchpad.net/ubuntu-push/bus/connectivity"
 	"launchpad.net/ubuntu-push/config"
 	"launchpad.net/ubuntu-push/logger"
+	"launchpad.net/ubuntu-push/whoopsie/identifier"
 	"os"
 )
 
@@ -38,9 +39,11 @@
 }
 
 type Client struct {
-	config ClientConfig
-	log    logger.Logger
-	pem    []byte
+	config   ClientConfig
+	log      logger.Logger
+	pem      []byte
+	idder    identifier.Id
+	deviceId string
 }
 
 // Configure loads the configuration specified in configPath, and sets it up.
@@ -56,6 +59,9 @@
 	// later, we'll be specifying logging options in the config file
 	client.log = logger.NewSimpleLogger(os.Stderr, "error")
 
+	// overridden for testing
+	client.idder = identifier.New()
+
 	if client.config.CertPEMFile != "" {
 		client.pem, err = ioutil.ReadFile(client.config.CertPEMFile)
 		if err != nil {
@@ -70,3 +76,13 @@
 
 	return nil
 }
+
+// getDeviceId gets the whoopsie identifier for the device
+func (client *Client) getDeviceId() error {
+	err := client.idder.Generate()
+	if err != nil {
+		return err
+	}
+	client.deviceId = client.idder.String()
+	return nil
+}
 
=== modified file 'client/client_test.go'
--- client/client_test.go	2014-02-03 14:20:12 +0000
+++ client/client_test.go	2014-02-03 14:20:12 +0000
@@ -22,6 +22,8 @@
 	. "launchpad.net/gocheck"
 	"launchpad.net/ubuntu-push/logger"
 	helpers "launchpad.net/ubuntu-push/testing"
+	"launchpad.net/ubuntu-push/whoopsie/identifier"
+	idtesting "launchpad.net/ubuntu-push/whoopsie/identifier/testing"
 	"os"
 	"path/filepath"
 	"testing"
@@ -83,6 +85,14 @@
 	c.Assert(cli.pem, NotNil)
 }
 
+func (cs *clientSuite) TestConfigureSetsUpIdder(c *C) {
+	cli := new(Client)
+	c.Check(cli.idder, IsNil)
+	err := cli.Configure(cs.configPath)
+	c.Assert(err, IsNil)
+	c.Assert(cli.idder, DeepEquals, identifier.New())
+}
+
 func (cs *clientSuite) TestConfigureBailsOnBadFilename(c *C) {
 	cli := new(Client)
 	err := cli.Configure("/does/not/exist")
@@ -128,3 +138,22 @@
 	err := cli.Configure(cs.configPath)
 	c.Assert(err, NotNil)
 }
+
+/*****************************************************************
+    getDeviceId tests
+******************************************************************/
+
+func (cs *clientSuite) TestGetDeviceIdWorks(c *C) {
+	cli := new(Client)
+	cli.idder = identifier.New()
+	c.Check(cli.deviceId, Equals, "")
+	c.Check(cli.getDeviceId(), IsNil)
+	c.Check(cli.deviceId, HasLen, 128)
+}
+
+func (cs *clientSuite) TestGetDeviceIdCanFail(c *C) {
+	cli := new(Client)
+	cli.idder = idtesting.Failing()
+	c.Check(cli.deviceId, Equals, "")
+	c.Check(cli.getDeviceId(), NotNil)
+}
 
=== modified file 'whoopsie/identifier/identifier.go'
--- whoopsie/identifier/identifier.go	2014-01-15 15:51:50 +0000
+++ whoopsie/identifier/identifier.go	2014-02-03 14:20:12 +0000
@@ -40,7 +40,7 @@
 }
 
 // New creates an Identifier, but does not call Generate() on it.
-func New() *Identifier {
+func New() Id {
 	return &Identifier{}
 }