Merge lp:~chipaca/snapweb/old-branches into lp:~snappy-dev/snapweb/trunk

[John Lenton]

Misc fixes to get it working again, most of it already shipped as 0.9.2.

[Sergio Schvezov (sergiusens)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~chipaca/webdm/old-branches into lp:webdm failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/gorilla/context now at 50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/mvo5/uboot-go now at 69978a3e4b05cca9d7cfee489b3453dfed45e72c
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update launchpad.net/snappy failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/davecheney/gmx failed; trying to fetch newer version
launchpad.net/snappy now at snappy_tarmac-20151026170354-jjpx8mpqyss1ne5p
update github.com/davecheney/mdns failed; trying to fetch newer version
github.com/davecheney/gmx now at d765420e7fbaccecb2a38cf2a02701fe3e0888a3
update github.com/gorilla/mux failed; trying to fetch newer version
github.com/davecheney/mdns now at de174d86a3d3e87bfad9cb66cedd0433380b67b0
update github.com/gosexy/gettext failed; trying to fetch newer version
github.com/gorilla/mux now at e444e69cbd2e2e3e0749a2f3c717cec491552bbf
update github.com/miekg/dns failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/miekg/dns now at 5a357a6fc5e85268b929350aa6423e2d56dcc4ff
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
Building
Running tests from /tmp/tmp.uzvVgkq6aG/src/launchpad.net/webdm
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 60.0% of statements
ok launchpad.net/webdm/avahi 0.008s coverage: 60.0% of statements
? launchpad.net/webdm/cmd/snappyd [no test files]
? launchpad.net/webdm/oem [no test files]
FAIL launchpad.net/webdm/snappy [build failed]
? launchpad.net/webdm/webprogress [no test files]

# 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/webdm
cp -a . $GOPATH/src/launchpad.net/webdm/
cd $GOPATH/src/launchpad.net/webdm

./run-checks
github.com/davecheney/gmx
github.com/miekg/dns
gopkg.in/yaml.v2
launchpad.net/snappy/pkg
github.com/mvo5/goconfigparser
launchpad.net/snappy/logger
launchpad.net/snappy/helpers
launchpad.net/snappy/coreconfig
launchpad.net/snappy/dirs
github.com/gosexy/gettext
github.com/davecheney/mdns
launchpad.net/webdm/avahi
launchpad.net/snappy/oauth
github.com/mvo5/uboot-go/uenv
launchpad.net/snappy/partition
launchpad.net/snappy/i18n
github.com/blakesmith/ar
la...

Unmerged revisions

165. By John Lenton on 2015-10-26

bump snappy revision

164. By John Lenton on 2015-10-26

also nuke the now-useless config

163. By John Lenton on 2015-10-01

fxi typo

162. By John Lenton on 2015-10-01

silly tweaks to build and package

161. By John Lenton on 2015-09-25

update package version

160. By John Lenton on 2015-09-25

build again, ok? ta

=== modified file 'build.sh'
--- build.sh	2015-05-26 13:34:13 +0000
+++ build.sh	2015-10-26 17:15:30 +0000
@@ -9,14 +9,17 @@
     arch=$1
 
     case $arch in
+        386)
+            plat_abi=i386-linux-gnu
+        ;;
         amd64)
             plat_abi=x86_64-linux-gnu
         ;;
         arm)
             plat_abi=arm-linux-gnueabihf
         ;;
-        armhf)
-            plat_abi=arm-linux-gnueabihf
+        arm64)
+            plat_abi=aarch64-linux-gnu
         ;;
         *)
             echo "unknown platform for snappy-magic: $arch remember to file a bug or better yet: fix it :)"
@@ -28,13 +31,33 @@
 }
 
 gobuild() {
-    arch=$1
-
-    plat_abi=$(get_platform_abi $arch)
+    local arch=$1
+    local plat_abi=$(get_platform_abi $arch)
 
     mkdir -p "bin/$plat_abi"
     cd "bin/$plat_abi"
-    GOARCH=$arch GOARM=7 CGO_ENABLED=1 CC=${plat_abi}-gcc go build -ldflags "-extld=${plat_abi}-gcc" launchpad.net/webdm/cmd/snappyd
+
+    local GOARCH CGO_ENABLED CC GO386 FLAGS
+
+    export GOARCH=$arch
+    export CGO_ENABLED=1
+
+    if [ "$arch" = "386" ]; then
+        # 386 is a special snowflake, etc
+        # also, the edison doesn't have SSE, which we might care about
+        export GO386=387
+    else
+        export CC=${plat_abi}-gcc
+        if ! which $CC > /dev/null; then
+            echo "Could not find $CC. Maybe you need to install gcc-${plat_abi}?"
+            exit 1
+        fi
+        
+        FLAGS="-ldflags -extld=$CC"
+    fi
+
+    go build $FLAGS launchpad.net/webdm/cmd/snappyd
+
     cd - > /dev/null
 }
 
@@ -55,11 +78,14 @@
 cp -r www/public www/templates $builddir/www
 cd $builddir
 
-sed -i 's/\(architecture: \)UNKNOWN_ARCH/\1[amd64, armhf]/' \
+sed -i 's/\(architectures: \)UNKNOWN_ARCH/\1[i386, amd64, armhf, arm64]/' \
     $builddir/meta/package.yaml
 
-gobuild arm
-gobuild amd64
+for arch in 386 amd64 arm arm64; do
+    echo -n Building for $arch...
+    gobuild $arch
+    echo done
+done
 
 cd "$orig_pwd"
 

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2015-05-07 18:53:42 +0000
+++ dependencies.tsv	2015-10-26 17:15:30 +0000
@@ -4,9 +4,10 @@
 github.com/davecheney/mdns	git	de174d86a3d3e87bfad9cb66cedd0433380b67b0	2014-09-13T23:56:41Z
 github.com/gorilla/context	git	50c25fb3b2b3b3cc724e9b6ac75fb44b3bccd0da	2014-11-26T16:34:05Z
 github.com/gorilla/mux	git	e444e69cbd2e2e3e0749a2f3c717cec491552bbf	2014-09-26T15:38:14Z
-github.com/juju/loggo	git	4c7cbce140ca070eeb59a28f4bf9507e511711f9	2015-02-26T05:51:10Z
+github.com/gosexy/gettext	git	98b7b91596d20b96909e6b60d57411547dd9959c	2013-02-21T11:21:43Z
 github.com/miekg/dns	git	5a357a6fc5e85268b929350aa6423e2d56dcc4ff	2015-04-18T05:52:30Z
 github.com/mvo5/goconfigparser	git	26426272dda20cc76aa1fa44286dc743d2972fe8	2015-02-12T09:37:50Z
+github.com/mvo5/uboot-go	git	69978a3e4b05cca9d7cfee489b3453dfed45e72c	2015-07-23T08:17:10Z
 gopkg.in/check.v1	git	64131543e7896d5bcc6bd5a76287eb75ea96c673	2014-10-24T13:38:53Z
 gopkg.in/yaml.v2	git	49c95bdc21843256fb6c4e0d370a05f24a0bf213	2015-02-24T22:57:58Z
-launchpad.net/snappy	bzr	snappy_tarmac-20150507103214-pgd90adryua6v6wi	444
+launchpad.net/snappy	bzr	snappy_tarmac-20151026170354-jjpx8mpqyss1ne5p	798

=== modified file 'oem/oem.go'
--- oem/oem.go	2015-05-08 19:21:46 +0000
+++ oem/oem.go	2015-10-26 17:15:30 +0000
@@ -22,12 +22,13 @@
 	"io/ioutil"
 	"path/filepath"
 
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/snappy"
 
 	"gopkg.in/yaml.v2"
 )
 
-// Snap holds the package.yaml for a snappy.SnapTypeOem package.
+// Snap holds the package.yaml for a pkg.TypeOem package.
 type Snap struct {
 	Name     string `yaml:"name" json:"name"`
 	Vendor   string `yaml:"vendor" json:"vendor"`
@@ -46,7 +47,7 @@
 // ErrNotFound indicates that there is no oem package.
 var ErrNotFound = errors.New("no oem package installed")
 
-// ErrTooMany indicates that there are too many active snappy.SnapTypeOem packages, which
+// ErrTooMany indicates that there are too many active pkg.TypeOem packages, which
 // should never happen on a snappy managed system.
 var ErrTooMany = errors.New("too many oem packages found")
 
@@ -56,7 +57,7 @@
 
 // Oem returns an oem package
 func Oem() (*Snap, error) {
-	oem, err := snappy.ActiveSnapsByType(snappy.SnapTypeOem)
+	oem, err := snappy.ActiveSnapsByType(pkg.TypeOem)
 	if err != nil {
 		return nil, err
 	} else if len(oem) > 1 {

=== modified file 'package.json'
--- package.json	2015-05-29 18:45:45 +0000
+++ package.json	2015-10-26 17:15:30 +0000
@@ -37,7 +37,7 @@
     "lodash": "~3.3.1",
     "moment": "^2.10.3",
     "normalize.css": "^3.0.3",
-    "postcss-bem-linter": "git://github.com/necolas/postcss-bem-linter",
+    "postcss-bem-linter": "^0.6.0",
     "postcss-custom-media": "^3.0.0",
     "pretty-bytes": "^2.0.1",
     "vinyl-buffer": "~1.0.0",

=== removed directory 'pkg/meta/hooks'
=== removed file 'pkg/meta/hooks/config'
--- pkg/meta/hooks/config	2015-02-27 16:35:54 +0000
+++ pkg/meta/hooks/config	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-#!/usr/bin/python3
-"""python3 hook for webdm"""
-
-import configparser
-import os
-import subprocess
-import sys
-import yaml
-
-
-WEBDM_DATA_PATH = os.environ['SNAP_APP_DATA_PATH']
-WEBDM_VERSION = os.environ['SNAP_VERSION']
-AVAHI_CONFIG_FILE = os.path.join(WEBDM_DATA_PATH, 'avahi-daemon.conf')
-
-def main():
-    """main is the main function"""
-
-    config_yaml = yaml.load(sys.stdin)
-    if config_yaml:
-        avahi_config = set_config(config_yaml)
-
-        with open(AVAHI_CONFIG_FILE, 'w') as config:
-            avahi_config.write(config, space_around_delimiters=False)
-
-    yaml.dump(get_config(), stream=sys.stdout, default_flow_style=False)
-    sys.exit(0)
-
-
-def set_config(config_yaml):
-    """set_config sets a configuration and returns avahi_config"""
-
-    restart_avahi = False
-
-    config = config_yaml['config']['webdm']
-
-    avahi_config = configparser.ConfigParser()
-    avahi_config.read(AVAHI_CONFIG_FILE)
-
-    if 'avahi-hostname' in config:
-        avahi_config['server']['host-name'] = config['avahi-hostname']
-        restart_avahi = True
-
-    if restart_avahi:
-        avahi_unit = 'webdm_avahi_%s.service' % WEBDM_VERSION
-        try:
-            subprocess.check_call(['systemctl', 'restart', avahi_unit])
-        except subprocess.CalledProcessError:
-            print("Cannot restart required services to fully apply "
-                  "the configuration changes")
-
-    return avahi_config
-
-
-def get_config():
-    """get_config returns config with the current configuration"""
-
-    config = {}
-    config['config'] = {}
-    config['config']['webdm'] = {}
-
-    avahi_config = configparser.ConfigParser()
-    avahi_config.read(AVAHI_CONFIG_FILE)
-
-    hostname = avahi_config['server']['host-name']
-    config['config']['webdm']['avahi-hostname'] = hostname
-
-    return config
-
-if __name__ == '__main__':
-    main()

=== modified file 'pkg/meta/package.yaml'
--- pkg/meta/package.yaml	2015-06-10 14:41:19 +0000
+++ pkg/meta/package.yaml	2015-10-26 17:15:30 +0000
@@ -3,8 +3,8 @@
 icon: meta/webdm-icon.png
 source: lp:webdm
 type: framework
-version: 0.9
-architecture: UNKNOWN_ARCH
+version: 0.9.3
+architectures: UNKNOWN_ARCH
 services:
     - name: snappyd
       start: snappyd

=== modified file 'pkg/snappyd'
--- pkg/snappyd	2015-05-21 22:24:32 +0000
+++ pkg/snappyd	2015-10-26 17:15:30 +0000
@@ -4,6 +4,12 @@
 platform=$(uname -i)
 
 case $platform in
+    i386)
+        plat_abi=i386-linux-gnu
+        ;;
+    aarch64)
+        plat_abi=aarch64-linux-gnu
+        ;;
     x86_64)
         plat_abi=x86_64-linux-gnu
         ;;
@@ -15,7 +21,6 @@
         ;;
 esac
 
-mkdir -m1777 -p $SNAP_APP_TMPDIR
 exec $SNAP_APP_PATH/bin/$plat_abi/snappyd
 
 # never reach this

=== modified file 'snappy/converge.go'
--- snappy/converge.go	2015-05-08 15:22:21 +0000
+++ snappy/converge.go	2015-10-26 17:15:30 +0000
@@ -25,6 +25,7 @@
 
 	"log"
 
+	"launchpad.net/snappy/pkg"
 	"launchpad.net/snappy/snappy"
 	"launchpad.net/webdm/webprogress"
 )
@@ -43,7 +44,7 @@
 	Progress      float64            `json:"progress,omitempty"`
 	InstalledSize int64              `json:"installed_size,omitempty"`
 	DownloadSize  int64              `json:"download_size,omitempty"`
-	Type          snappy.SnapType    `json:"type,omitempty"`
+	Type          pkg.Type           `json:"type,omitempty"`
 	UIPort        uint64             `json:"ui_port,omitempty"`
 	UIUri         string             `json:"ui_uri,omitempty"`
 }
@@ -63,10 +64,10 @@
 var activeSnapByName = snappy.ActiveSnapByName
 
 func (h *Handler) packagePayload(resource string) (snapPkg, error) {
-	var pkgName, namespace string
+	var pkgName, origin string
 	if s := strings.Split(resource, "."); len(s) == 2 {
 		pkgName = s[0]
-		namespace = s[1]
+		origin = s[1]
 	} else {
 		pkgName = resource
 	}
@@ -74,13 +75,13 @@
 	snapQ := activeSnapByName(pkgName)
 	if snapQ != nil {
 		// the second check is for locally installed snaps that lose their origin.
-		if snapQ.Namespace() == namespace || snapQ.Type() != snappy.SnapTypeApp {
+		if snapQ.Origin() == origin || snapQ.Type() != pkg.TypeApp {
 			return h.snapQueryToPayload(snapQ), nil
 		}
 	}
 
 	mStore := snappy.NewMetaStoreRepository()
-	found, err := mStore.Details(resource)
+	found, err := mStore.Details(pkgName, origin)
 	if err == nil && len(found) != 0 {
 		return h.snapQueryToPayload(found[0]), nil
 	}
@@ -225,33 +226,24 @@
 	return snapPkgs
 }
 
-func isNamespaceless(snap snappy.Part) bool {
-	return snap.Type() == snappy.SnapTypeOem || snap.Type() == snappy.SnapTypeFramework
-}
-
 func hasPortInformation(snap snappy.Part) bool {
-	return snap.Type() == snappy.SnapTypeApp || snap.Type() == snappy.SnapTypeFramework
+	return snap.Type() == pkg.TypeApp || snap.Type() == pkg.TypeFramework
 }
 
 func (h *Handler) snapQueryToPayload(snapQ snappy.Part) snapPkg {
 	snap := snapPkg{
 		Name:        snapQ.Name(),
-		Origin:      snapQ.Namespace(),
+		Origin:      snapQ.Origin(),
 		Version:     snapQ.Version(),
 		Vendor:      snapQ.Vendor(),
 		Description: snapQ.Description(),
 		Type:        snapQ.Type(),
-	}
-
-	if isNamespaceless(snapQ) {
-		snap.ID = snapQ.Name()
-	} else {
-		snap.ID = snapQ.Name() + "." + snapQ.Namespace()
+		ID:          snappy.QualifiedName(snapQ),
 	}
 
 	if hasPortInformation(snapQ) {
-		if snapInstalled, ok := snapQ.(snappy.Services); ok {
-			port, uri := uiAccess(snapInstalled.Services())
+		if snapInstalled, ok := snapQ.(snappy.ServiceYamler); ok {
+			port, uri := uiAccess(snapInstalled.ServiceYamls())
 			snap.UIPort = port
 			snap.UIUri = uri
 		}
@@ -293,7 +285,7 @@
 	return snap
 }
 
-func uiAccess(services []snappy.Service) (port uint64, uri string) {
+func uiAccess(services []snappy.ServiceYaml) (port uint64, uri string) {
 	for i := range services {
 		if services[i].Ports == nil {
 			continue