Merge lp:~chipaca/ubuntu-push/beta-here-we-come into lp:ubuntu-push

[John Lenton]

Changes to get ready for beta.

Changes to get ready for beta.

[lp:~chipaca/ubuntu-push/beta-here-we-come]

95. By John Lenton on 2014-03-26

fixed changelog

[Lucio Torre (lucio.torre)]

message looks good

review: Approve

[lp:~chipaca/ubuntu-push/beta-here-we-come]

96. By John Lenton on 2014-03-27

make session tests pass again

=== modified file 'client/client.go'
--- client/client.go	2014-03-12 11:08:57 +0000
+++ client/client.go	2014-03-27 13:26:23 +0000
@@ -186,17 +186,21 @@
 }
 
 // handleNotification deals with receiving a notification
-func (client *PushClient) handleNotification() error {
+func (client *PushClient) handleNotification(msg *session.Notification) error {
 	action_id := "dummy_id"
 	a := []string{action_id, "Go get it!"} // action value not visible on the phone
 	h := map[string]*dbus.Variant{"x-canonical-switch-to-application": &dbus.Variant{true}}
 	nots := notifications.Raw(client.notificationsEndp, client.log)
+	body := "Tap to open the system updater."
+	if msg != nil {
+		body = fmt.Sprintf("[%d] %s", msg.TopLevel, body)
+	}
 	not_id, err := nots.Notify(
 		"ubuntu-push-client",               // app name
 		uint32(0),                          // id
 		"update_manager_icon",              // icon
-		"There's an updated system image!", // summary
-		"You've got to get it! Now! Run!",  // body
+		"There's an updated system image.", // summary
+		body,           // body
 		a,              // actions
 		h,              // hints
 		int32(10*1000), // timeout (ms)
@@ -217,15 +221,15 @@
 }
 
 // doLoop connects events with their handlers
-func (client *PushClient) doLoop(connhandler func(bool), clickhandler, notifhandler func() error, errhandler func(error)) {
+func (client *PushClient) doLoop(connhandler func(bool), clickhandler func() error, notifhandler func(*session.Notification) error, errhandler func(error)) {
 	for {
 		select {
 		case state := <-client.connCh:
 			connhandler(state)
 		case <-client.actionsCh:
 			clickhandler()
-		case <-client.session.MsgCh:
-			notifhandler()
+		case msg := <-client.session.MsgCh:
+			notifhandler(msg)
 		case err := <-client.session.ErrCh:
 			errhandler(err)
 		case count := <-client.sessionConnectedCh:
 
=== modified file 'client/client_test.go'
--- client/client_test.go	2014-02-08 18:31:01 +0000
+++ client/client_test.go	2014-03-27 13:26:23 +0000
@@ -392,7 +392,7 @@
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(true), uint32(1))
 	cli.notificationsEndp = endp
 	cli.log = cs.log
-	c.Check(cli.handleNotification(), IsNil)
+	c.Check(cli.handleNotification(nil), IsNil)
 	// check we sent the notification
 	args := testibus.GetCallArgs(endp)
 	c.Assert(args, HasLen, 1)
@@ -405,7 +405,7 @@
 	cli.log = cs.log
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
 	cli.notificationsEndp = endp
-	c.Check(cli.handleNotification(), NotNil)
+	c.Check(cli.handleNotification(nil), NotNil)
 }
 
 /*****************************************************************
@@ -437,7 +437,7 @@
 	c.Assert(cli.initSession(), IsNil)
 
 	ch := make(chan bool, 1)
-	go cli.doLoop(func(bool) { ch <- true }, func() error { return nil }, func() error { return nil }, func(error) {})
+	go cli.doLoop(func(bool) { ch <- true }, func() error { return nil }, func(_ *session.Notification) error { return nil }, func(error) {})
 	c.Check(takeNextBool(ch), Equals, true)
 }
 
@@ -450,7 +450,7 @@
 	cli.actionsCh = aCh
 
 	ch := make(chan bool, 1)
-	go cli.doLoop(func(bool) {}, func() error { ch <- true; return nil }, func() error { return nil }, func(error) {})
+	go cli.doLoop(func(bool) {}, func() error { ch <- true; return nil }, func(_ *session.Notification) error { return nil }, func(error) {})
 	c.Check(takeNextBool(ch), Equals, true)
 }
 
@@ -462,7 +462,7 @@
 	cli.session.MsgCh <- &session.Notification{}
 
 	ch := make(chan bool, 1)
-	go cli.doLoop(func(bool) {}, func() error { return nil }, func() error { ch <- true; return nil }, func(error) {})
+	go cli.doLoop(func(bool) {}, func() error { return nil }, func(_ *session.Notification) error { ch <- true; return nil }, func(error) {})
 	c.Check(takeNextBool(ch), Equals, true)
 }
 
@@ -474,7 +474,7 @@
 	cli.session.ErrCh <- nil
 
 	ch := make(chan bool, 1)
-	go cli.doLoop(func(bool) {}, func() error { return nil }, func() error { return nil }, func(error) { ch <- true })
+	go cli.doLoop(func(bool) {}, func() error { return nil }, func(_ *session.Notification) error { return nil }, func(error) { ch <- true })
 	c.Check(takeNextBool(ch), Equals, true)
 }
 
 
=== modified file 'client/session/session.go'
--- client/session/session.go	2014-03-19 22:31:20 +0000
+++ client/session/session.go	2014-03-27 13:26:23 +0000
@@ -36,7 +36,7 @@
 var wireVersionBytes = []byte{protocol.ProtocolWireVersion}
 
 type Notification struct {
-	// something something something
+	TopLevel int64
 }
 
 type serverMsg struct {
@@ -189,7 +189,7 @@
 	if bcast.ChanId == protocol.SystemChannelId {
 		// the system channel id, the only one we care about for now
 		sess.Log.Debugf("sending it over")
-		sess.MsgCh <- &Notification{}
+		sess.MsgCh <- &Notification{bcast.TopLevel}
 		sess.Log.Debugf("sent it over")
 	} else {
 		sess.Log.Debugf("what is this weird channel, %#v?", bcast.ChanId)
 
=== modified file 'client/session/session_test.go'
--- client/session/session_test.go	2014-03-19 23:46:18 +0000
+++ client/session/session_test.go	2014-03-27 13:26:23 +0000
@@ -390,7 +390,7 @@
 	s.upCh <- nil // ack ok
 	c.Check(<-s.errCh, Equals, nil)
 	c.Assert(len(s.sess.MsgCh), Equals, 1)
-	c.Check(<-s.sess.MsgCh, Equals, &Notification{})
+	c.Check(<-s.sess.MsgCh, DeepEquals, &Notification{TopLevel: 2})
 	// and finally, the session keeps track of the levels
 	levels, err := s.sess.Levels.GetAll()
 	c.Check(err, IsNil)
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-25 17:27:10 +0000
+++ debian/changelog	2014-03-27 13:26:23 +0000
@@ -1,3 +1,9 @@
+ubuntu-push (0.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * got rid of multiarch bug
+
+ -- John Lenton <[e-mail]>  Wed, 26 Mar 2014 16:27:06 +0000
+
 ubuntu-push (0.1+14.04.20140325.2-0ubuntu1) trusty; urgency=low
 
   [ Diogo Baeder de Paula Pinto ]
 
=== modified file 'debian/ubuntu-push-client.install'
--- debian/ubuntu-push-client.install	2014-02-07 19:36:38 +0000
+++ debian/ubuntu-push-client.install	2014-03-27 13:26:23 +0000
@@ -1,4 +1,4 @@
 #!/usr/bin/dh-exec
 debian/config.json /etc/xdg/ubuntu-push-client
 debian/ubuntu-push-client.conf /usr/share/upstart/sessions
-usr/bin/ubuntu-push => /usr/lib/${DEB_HOST_MULTIARCH}/ubuntu-push-client/ubuntu-push-client
+usr/bin/ubuntu-push => /usr/lib/ubuntu-push-client/ubuntu-push-client