Merge lp:~sergiusens/goget-ubuntu-touch/relative into lp:goget-ubuntu-touch

[Sergio Schvezov]

Adding relative image support

This allows flashing with --revision <= 0 for relative versions the the latest one.

I could filter by full when I order them and make the code look simpler; but I want to leave the possibility open for delta images.

[lp:~sergiusens/goget-ubuntu-touch/relative]

27. By Sergio Schvezov on 2014-03-18

Adding option to emulator

28. By Sergio Schvezov on 2014-03-18

Adding error test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/21/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:28
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/22/rebuild

review: Approve (continuous-integration)

[lp:~sergiusens/goget-ubuntu-touch/relative]

29. By Sergio Schvezov on 2014-03-18

Making "full" a constant

[Manuel de la Peña (mandel)]

Loosk good, thx for adding the constants.

review: Approve

=== modified file 'ubuntu-device-flash/main.go'
--- ubuntu-device-flash/main.go	2014-03-10 17:33:08 +0000
+++ ubuntu-device-flash/main.go	2014-03-18 14:56:18 +0000
@@ -91,8 +91,8 @@
 		log.Fatal(err)
 	}
 	var image ubuntuimage.Image
-	if args.Revision == 0 {
-		image, err = deviceChannel.GetLatestImage()
+	if args.Revision <= 0 {
+		image, err = deviceChannel.GetRelativeImage(args.Revision)
 	} else {
 		image, err = deviceChannel.GetImage(args.Revision)
 	}
 
=== modified file 'ubuntu-emulator/create.go'
--- ubuntu-emulator/create.go	2014-02-23 03:29:15 +0000
+++ ubuntu-emulator/create.go	2014-03-18 14:56:18 +0000
@@ -83,8 +83,8 @@
 		return err
 	}
 	var image ubuntuimage.Image
-	if createCmd.Revision == 0 {
-		image, err = deviceChannel.GetLatestImage()
+	if createCmd.Revision <= 0 {
+		image, err = deviceChannel.GetRelativeImage(createCmd.Revision)
 	} else {
 		image, err = deviceChannel.GetImage(createCmd.Revision)
 	}
 
=== modified file 'ubuntuimage/channels.go'
--- ubuntuimage/channels.go	2014-03-10 13:39:53 +0000
+++ ubuntuimage/channels.go	2014-03-18 14:56:18 +0000
@@ -26,7 +26,10 @@
 	"net/http"
 )
 
-const channelsPath = "/channels.json"
+const (
+	channelsPath = "/channels.json"
+	FULL_IMAGE   = "full"
+)
 
 func NewChannels(server string) (channels Channels, err error) {
 	resp, err := http.Get(server + channelsPath)
@@ -46,7 +49,7 @@
 		return deviceChannel, fmt.Errorf("Channel %s not found on server %s", channel, server)
 	} else if _, found := channels[channel].Devices[device]; !found {
 		return deviceChannel, fmt.Errorf("Device %s not found on server %s channel %s",
-				device, server, channel)
+			device, server, channel)
 	}
 	channelUri := server + channels[channel].Devices[device].Index
 	resp, err := http.Get(channelUri)
@@ -60,28 +63,42 @@
 		return deviceChannel, fmt.Errorf("Cannot parse channel information for device on %s", channelUri)
 	}
 	deviceChannel.Alias = channels[channel].Alias
+	order := func(i1, i2 *Image) bool {
+		return i1.Version > i2.Version
+	}
+	ImageBy(order).ImageSort(deviceChannel.Images)
 	return deviceChannel, err
 }
 
-func (deviceChannel *DeviceChannel) GetLatestImage() (image Image, err error) {
-	var latestImage Image
-	for _, image := range deviceChannel.Images {
-		if image.Type == "full" && image.Version > latestImage.Version {
-			latestImage = image
-		}
-	}
-	if latestImage.Version == 0 {
-		err = errors.New("Failed to locate latest image information")
-	}
-	return latestImage, err
-}
-
 func (deviceChannel *DeviceChannel) GetImage(revision int) (image Image, err error) {
 	for _, image := range deviceChannel.Images {
-		if image.Type == "full" && image.Version == revision {
+		if image.Type == FULL_IMAGE && image.Version == revision {
 			return image, nil
 		}
 	}
 	//If we reached this point, that means we haven't found the image we were looking for.
 	return image, fmt.Errorf("Failed to locate image %d", revision)
 }
+
+func (deviceChannel *DeviceChannel) GetRelativeImage(revision int) (image Image, err error) {
+	var steps int
+	if revision < 0 {
+		revision = -revision
+	}
+	for _, image := range deviceChannel.Images {
+		if image.Type != FULL_IMAGE {
+			continue
+		}
+		if steps == revision {
+			return image, nil
+		}
+		steps++
+	}
+	//If we reached this point, that means we haven't found the image we were looking for.
+	if revision == 0 {
+		err = errors.New("Failed to locate latest image information")
+	} else {
+		err = fmt.Errorf("Failed to locate relative image to latest - %d", revision)
+	}
+	return Image{}, err
+}
 
=== modified file 'ubuntuimage/channels_test.go'
--- ubuntuimage/channels_test.go	2014-03-10 13:42:49 +0000
+++ ubuntuimage/channels_test.go	2014-03-18 14:56:18 +0000
@@ -295,10 +295,10 @@
 	c.Assert(channelData, NotNil)
 	c.Assert(channelData.Alias, Equals, "touch/trusty")
 	c.Assert(channelData.Images, NotNil)
-	image, err := channelData.GetLatestImage()
+	image, err := channelData.GetRelativeImage(0)
 	c.Assert(err, IsNil)
 	c.Check(image.Version, Equals, 166)
-	c.Check(image.Type, Equals, "full")
+	c.Check(image.Type, Equals, FULL_IMAGE)
 	c.Check(len(image.Files), Equals, 3)
 }
 
@@ -314,7 +314,7 @@
 	c.Assert(channelData.Alias, Equals, "touch/trusty")
 	c.Assert(channelData.Images, NotNil)
 	expectedErr := errors.New("Failed to locate latest image information")
-	_, err = channelData.GetLatestImage()
+	_, err = channelData.GetRelativeImage(0)
 	c.Assert(err, DeepEquals, expectedErr)
 }
 
@@ -329,8 +329,38 @@
 	image, err := channelData.GetImage(166)
 	c.Assert(err, IsNil)
 	c.Check(image.Version, Equals, 166)
-	c.Check(image.Type, Equals, "full")
-	c.Check(len(image.Files), Equals, 3)
+	c.Check(image.Type, Equals, FULL_IMAGE)
+	c.Check(len(image.Files), Equals, 3)
+}
+
+func (s *DeviceChannelsSuite) TestGetSpecificRelativeImageForChannel(c *C) {
+	device := "mako"
+	channel := "touch/devel"
+	channelData, err := s.channels.GetDeviceChannel(s.ts.URL, channel, device)
+	c.Assert(err, IsNil)
+	c.Assert(channelData, NotNil)
+	c.Assert(channelData.Alias, Equals, "touch/trusty")
+	c.Assert(channelData.Images, NotNil)
+	image, err := channelData.GetRelativeImage(-1)
+	c.Assert(err, IsNil)
+	c.Check(image.Version, Equals, 150)
+	c.Check(image.Type, Equals, FULL_IMAGE)
+	c.Check(len(image.Files), Equals, 3)
+}
+
+func (s *DeviceChannelsSuite) TestFailGetRelativeImageForChannel(c *C) {
+	device := "mako"
+	channel := "touch/devel"
+	channelData, err := s.channels.GetDeviceChannel(s.ts.URL, channel, device)
+	c.Assert(err, IsNil)
+	c.Assert(channelData, NotNil)
+	c.Assert(channelData.Alias, Equals, "touch/trusty")
+	c.Assert(channelData.Images, NotNil)
+	rev := -5
+	_, err = channelData.GetRelativeImage(rev)
+	expectedErr := fmt.Errorf("Failed to locate relative image to latest - %d", -rev)
+	_, err = channelData.GetRelativeImage(rev)
+	c.Assert(err, DeepEquals, expectedErr)
 }
 
 func (s *DeviceChannelsSuite) TestFailGetSpecificImageForChannel(c *C) {
 
=== modified file 'ubuntuimage/sort.go'
--- ubuntuimage/sort.go	2014-01-07 15:19:28 +0000
+++ ubuntuimage/sort.go	2014-03-18 14:56:18 +0000
@@ -55,3 +55,36 @@
 func (s *fileSorter) Less(i, j int) bool {
 	return s.by(&s.files[i], &s.files[j])
 }
+
+// By is the type of a "less" function that defines the ordering of its File arguments.
+type ImageBy func(p1, p2 *Image) bool
+
+// Sort is a method on the function type, By, that sorts the argument slice according to the function.
+func (by ImageBy) ImageSort(images []Image) {
+	is := &imageSorter{
+		images: images,
+		by:     by,
+	}
+	sort.Sort(is)
+}
+
+// fileSorter joins a By function and a slice of File to be sorted.
+type imageSorter struct {
+	images []Image
+	by     func(p1, p2 *Image) bool // Closure used in the Less method.
+}
+
+// Len is part of sort.Interface.
+func (s *imageSorter) Len() int {
+	return len(s.images)
+}
+
+// Swap is part of sort.Interface.
+func (s *imageSorter) Swap(i, j int) {
+	s.images[i], s.images[j] = s.images[j], s.images[i]
+}
+
+// Less is part of sort.Interface. It is implemented by calling the "by" closure in the sorter.
+func (s *imageSorter) Less(i, j int) bool {
+	return s.by(&s.images[i], &s.images[j])
+}