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

[Sergio Schvezov]

Getting onto the tarmac for a ride

[John Lenton (chipaca)]

review: Approve

[Sergio Schvezov (sergiusens)]

review: Approve

=== added file '.tarmac.sh'
--- .tarmac.sh	1970-01-01 00:00:00 +0000
+++ .tarmac.sh	2015-04-16 23:16:20 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -ev
+
+# we always run in a fresh dir in tarmac
+export GOPATH=$(mktemp -d)
+trap 'rm -rf "$GOPATH"' EXIT
+
+# this is a hack, but not sure tarmac is golang friendly
+mkdir -p $GOPATH/src/launchpad.net/goget-ubuntu-touch
+cp -a . $GOPATH/src/launchpad.net/goget-ubuntu-touch
+cd $GOPATH/src/launchpad.net/goget-ubuntu-touch
+
+./run-checks

=== modified file 'bootimg/bootimg.go'
--- bootimg/bootimg.go	2014-01-07 15:19:28 +0000
+++ bootimg/bootimg.go	2015-04-16 23:16:20 +0000
@@ -22,8 +22,8 @@
 import (
 	"bytes"
 	"encoding/binary"
+	"errors"
 	"io/ioutil"
-	"errors"
 )
 
 type bootHeader map[uint]uint32
@@ -40,13 +40,13 @@
 	pageSize
 )
 
-type AndroidBootImg struct{
+type AndroidBootImg struct {
 	kernelOffset, ramdiskOffset, secondOffset uint32
-	hdr bootHeader
-	img []byte
+	hdr                                       bootHeader
+	img                                       []byte
 }
 
-// readChunk reads a chunk o b []bytes returns it's Little Endian 
+// readChunk reads a chunk o b []bytes returns it's Little Endian
 // unsigned size(4) value
 func readChunk(b []byte) (value uint32, err error) {
 	if len(b) != 4 {
@@ -66,10 +66,10 @@
 	if BOOT_MAGIC != string(magic) {
 		return boot, errors.New("This is not on an android bootimg")
 	}
-	
+
 	boot.hdr = make(bootHeader)
 	for i, start := kernelSize, len(BOOT_MAGIC); i <= pageSize; i++ {
-		if boot.hdr[uint(i)], err = readChunk(img[start:start + 4]); err != nil {
+		if boot.hdr[uint(i)], err = readChunk(img[start : start+4]); err != nil {
 			return boot, err
 		}
 		// sizeof(unsigned)

=== modified file 'bootimg/example/abootimg-extract/main.go'
--- bootimg/example/abootimg-extract/main.go	2014-01-08 12:04:18 +0000
+++ bootimg/example/abootimg-extract/main.go	2015-04-16 23:16:20 +0000
@@ -20,9 +20,10 @@
 // with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import (
+	"io/ioutil"
 	"log"
-	"io/ioutil"
 	"os"
+
 	"launchpad.net/goget-ubuntu-touch/bootimg"
 )
 

=== added file 'dependencies.tsv'
--- dependencies.tsv	1970-01-01 00:00:00 +0000
+++ dependencies.tsv	2015-04-16 23:16:20 +0000
@@ -0,0 +1,8 @@
+github.com/blakesmith/ar	git	c9a977dd0cc1392b023382c7bfa5a22af8d3b730	2013-02-19T04:59:55Z
+github.com/cheggaaa/pb	git	e8c7cc515bfde3e267957a3b110080ceed51354e	2014-12-02T07:01:21Z
+github.com/jessevdk/go-flags	git	15347ef417a300349807983f15af9e65cd2e1b3a	2015-01-25T08:53:51Z
+github.com/juju/loggo	git	4c7cbce140ca070eeb59a28f4bf9507e511711f9	2015-02-26T05:51:10Z
+github.com/mvo5/goconfigparser	git	26426272dda20cc76aa1fa44286dc743d2972fe8	2015-02-12T09:37:50Z
+gopkg.in/yaml.v2	git	49c95bdc21843256fb6c4e0d370a05f24a0bf213	2015-02-24T22:57:58Z
+launchpad.net/gocheck	bzr	[e-mail]-20140225173054-xu9zlkf9kxhvow02	87
+launchpad.net/snappy	bzr	snappy_tarmac-20150416201159-kvpgniq8mp64bimf	382

=== modified file 'devices/fastboot.go'
--- devices/fastboot.go	2014-01-07 15:19:28 +0000
+++ devices/fastboot.go	2015-04-16 23:16:20 +0000
@@ -76,7 +76,7 @@
 	cmd := append(fastboot.params, []string{"getvar", "product"}...)
 	deviceOutput, err := exec.Command(fastbootCommand, cmd...).CombinedOutput()
 	lines := strings.Split(string(deviceOutput), "\n")
-	for _, line := range(lines) {
+	for _, line := range lines {
 		fields := strings.Split(line, ":")
 		if strings.Contains(fields[0], "product") {
 			device = strings.TrimSpace(fields[1])

=== modified file 'diskimage/bootloader_test.go'
--- diskimage/bootloader_test.go	2015-03-30 14:39:55 +0000
+++ diskimage/bootloader_test.go	2015-04-16 23:16:20 +0000
@@ -171,7 +171,7 @@
 }
 
 func (s *BootAssetRawFilesTestSuite) TestRawWriteNoValidOffset(c *C) {
-	f := fmt.Sprintf(fileName)
+	f := fileName
 	fAbsolutePath := filepath.Join(s.oemRootPathDir, f)
 	c.Assert(ioutil.WriteFile(fAbsolutePath, []byte(f), 0644), IsNil)
 	offset := "NaN"
@@ -181,7 +181,7 @@
 }
 
 func (s *BootAssetRawFilesTestSuite) TestRawWriteNoValidFile(c *C) {
-	f := fmt.Sprintf(fileName)
+	f := fileName
 	offset := "10"
 	s.files = []BootAssetRawFiles{BootAssetRawFiles{Path: f, Offset: offset}}
 

=== modified file 'diskimage/core_grub.go'
--- diskimage/core_grub.go	2015-03-31 12:46:01 +0000
+++ diskimage/core_grub.go	2015-04-16 23:16:20 +0000
@@ -331,7 +331,7 @@
 	}
 	grubFile, err := os.Create(filepath.Join(grubDir, "50-system-image.cfg"))
 	if err != nil {
-		return fmt.Errorf("unable to create %s file: %s", grubFile, err)
+		return fmt.Errorf("unable to create %s file: %s", grubFile.Name(), err)
 	}
 	defer grubFile.Close()
 	if _, err := io.WriteString(grubFile, grubCfgContent); err != nil {

=== modified file 'diskimage/image.go'
--- diskimage/image.go	2015-01-21 23:22:53 +0000
+++ diskimage/image.go	2015-04-16 23:16:20 +0000
@@ -221,7 +221,7 @@
 			return err
 		}
 	} else if !fi.IsDir() {
-		return fmt.Errorf("extract dir %s is not a directory")
+		return fmt.Errorf("extract dir %s is not a directory", fi.Name())
 	}
 	dstFile, err := os.Create(filepath.Join(dir, filePath))
 	if err != nil {

=== added file 'run-checks'
--- run-checks	1970-01-01 00:00:00 +0000
+++ run-checks	2015-04-16 23:16:20 +0000
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+set -e
+
+if which goctest >/dev/null; then
+    goctest="goctest"
+else
+    goctest="go test"
+fi
+
+echo Checking formatting
+fmt=$(gofmt -l .)
+
+if [ -n "$fmt" ]; then
+    echo "Formatting wrong in following files"
+    echo $fmt
+    exit 1
+fi
+
+echo Installing godeps
+go get launchpad.net/godeps
+export PATH=$PATH:$GOPATH/bin
+
+echo Install golint
+go get github.com/golang/lint/golint
+export PATH=$PATH:$GOPATH/bin
+
+echo Obtaining dependencies
+godeps -u dependencies.tsv
+
+
+
+echo Building
+go build -v launchpad.net/goget-ubuntu-touch/...
+
+
+# tests
+echo Running tests from $(pwd)
+$goctest -v -cover ./...
+
+
+# go vet
+echo Running vet
+go vet ./...
+
+# golint
+# TODO enable!
+#echo Running lint
+#lint=$(golint ./...)
+#if [ -n "$lint" ]; then
+#    echo "Lint complains:"
+#    echo $lint
+#    exit 1
+#fi
+
+echo "All good, what could possibly go wrong"

=== modified file 'ubuntu-emulator/common.go'
--- ubuntu-emulator/common.go	2014-06-06 15:15:03 +0000
+++ ubuntu-emulator/common.go	2015-04-16 23:16:20 +0000
@@ -23,10 +23,11 @@
 	"errors"
 	"fmt"
 	"io/ioutil"
-	"launchpad.net/goget-ubuntu-touch/bootimg"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"launchpad.net/goget-ubuntu-touch/bootimg"
 )
 
 func getDeviceTar(files []string) (string, error) {
@@ -52,7 +53,7 @@
 	if err := boot.WriteRamdisk(ramdiskPath); err != nil {
 		return err
 	}
-	if (ramdiskName == bootRamdisk) {
+	if ramdiskName == bootRamdisk {
 		kernelPath := filepath.Join(dataDir, kernelName)
 		if boot.WriteKernel(kernelPath); err != nil {
 			return err

=== modified file 'ubuntu-emulator/constants.go'
--- ubuntu-emulator/constants.go	2014-06-06 15:15:03 +0000
+++ ubuntu-emulator/constants.go	2015-04-16 23:16:20 +0000
@@ -21,14 +21,14 @@
 
 //Global constansts
 const (
-	kernelName  = "ubuntu-kernel"
-	dataImage   = "userdata.img"
-	sdcardImage = "sdcard.img"
-	systemImage = "system.img"
-	cacheImage  = "cache.img"
-	bootImage   = "boot.img"
-	bootRamdisk = "ramdisk.img"
-	recoveryImage = "recovery.img"
+	kernelName      = "ubuntu-kernel"
+	dataImage       = "userdata.img"
+	sdcardImage     = "sdcard.img"
+	systemImage     = "system.img"
+	cacheImage      = "cache.img"
+	bootImage       = "boot.img"
+	bootRamdisk     = "ramdisk.img"
+	recoveryImage   = "recovery.img"
 	recoveryRamdisk = "recovery-ramdisk.img"
 )
 

=== modified file 'ubuntu-emulator/run_test.go'
--- ubuntu-emulator/run_test.go	2014-07-08 19:24:20 +0000
+++ ubuntu-emulator/run_test.go	2015-04-16 23:16:20 +0000
@@ -25,6 +25,7 @@
 	"os"
 	"path/filepath"
 	"testing"
+
 	. "launchpad.net/gocheck"
 )
 

=== modified file 'ubuntuimage/channels.go'
--- ubuntuimage/channels.go	2014-10-02 08:48:42 +0000
+++ ubuntuimage/channels.go	2015-04-16 23:16:20 +0000
@@ -25,8 +25,8 @@
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"net/http"
-	"io/ioutil"
 )
 
 const (
@@ -106,7 +106,7 @@
 		return err
 	}
 
-	if (resp.StatusCode != 200) {
+	if resp.StatusCode != 200 {
 		statusErr := errors.New(fmt.Sprintf("Invalid HTTP response: %d", resp.StatusCode))
 		return statusErr
 	}