Merge lp:~chipaca/ubuntu-push/nih into lp:ubuntu-push/automatic

[John Lenton]

Wrap nih to provide an appid -> dbus object path map.

Wrap nih to provide an appid -> dbus object path map.

[Samuele Pedroni (pedronis)]

70 +development environment. THe Ubuntu packagenames for these are listed

typo: THe

[Samuele Pedroni (pedronis)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~chipaca/ubuntu-push/nih into lp:ubuntu-push/automatic failed. Below is the output from the failed tests.

rm -f -r /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
go get -u launchpad.net/godeps
go get -d -u launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 launchpad.net/~ubuntu-push-hackers/ubuntu-push/go-uuid/uuid
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -u dependencies.tsv
"/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/src/launchpad.net/gocheck" now at <email address hidden>
go install launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 launchpad.net/~ubuntu-push-hackers/ubuntu-push/go-uuid/uuid
go test launchpad.net/ubuntu-push launchpad.net/ubuntu-push/bus launchpad.net/ubuntu-push/bus/connectivity launchpad.net/ubuntu-push/bus/networkmanager launchpad.net/ubuntu-push/bus/notifications launchpad.net/ubuntu-push/bus/systemimage launchpad.net/ubuntu-push/bus/testing launchpad.net/ubuntu-push/bus/urldispatcher launchpad.net/ubuntu-push/client launchpad.net/ubuntu-push/client/gethosts launchpad.net/ubuntu-push/client/service launchpad.net/ubuntu-push/client/session launchpad.net/ubuntu-push/client/session/seenstate launchpad.net/ubuntu-push/config launchpad.net/ubuntu-push/external/murmur3 launchpad.net/ubuntu-push/logger launchpad.net/ubuntu-push/protocol launchpad.net/ubuntu-push/server launchpad.net/ubuntu-push/server/api launchpad.net/ubuntu-push/server/broker launchpad.net/ubuntu-push/server/broker/simple launchpad.net/ubuntu-push/server/broker/testing launchpad.net/ubuntu-push/server/broker/testsuite launchpad.net/ubuntu-push/server/dev launchpad.net/ubuntu-push/server/listener launchpad.net/ubuntu-push/server/session launchpad.net/ubuntu-push/server/store launchpad.net/ubuntu-push/testing launchpad.net/ubuntu-push/testing/condition launchpad.net/ubuntu-push/util launchpad.net/ubuntu-push/whoopsie launchpad.net/ubuntu-push/whoopsie/identifier launchpad.net/ubuntu-push/whoopsie/identifier/testing
? launchpad.net/ubuntu-push [no test files]
ok launchpad.net/ubuntu-push/bus 0.009s
ok launchpad.net/ubuntu-push/bus/connectivity 1.167s
ok launchpad.net/ubuntu-push/bus/networkmanager 0.096s
ok launchpad.net/ubuntu-push/bus/notifications 0.018s
ok launchpad.net/ubuntu-push/bus/systemimage 0.014s
ok launchpad.net/ubuntu-push/bus/testing 0.032s
ok launchpad.net/ubuntu-push/bus/urldispatcher 0.008s
FAIL launchpad.net/ubuntu-push/client [build failed]
ok launchpad.net/ubuntu-push/client/gethosts 0.711s
FAIL launchpad.net/ubuntu-push/client/service [build failed]
ok launchpad.net/ubuntu-push/client/session 0.197s
ok launchpad.net/ubuntu-push/client/session/seenstate 0.178s
ok launchpad.net/ubuntu-push/config 0.035s
ok launchpad.net/ubuntu-push/external/murmur3 0.008s
ok launchpad.net/ubuntu-push/logger 0.009s
ok launchpad.net/ubuntu-push/protocol 0.013s
ok launchpad.net/ubuntu-push/server 0.041s
ok launchpad.net/ubuntu...

Unmerged revisions

162. By John Lenton on 2014-05-16

typo and doc improvement

161. By John Lenton on 2014-05-16

README/Makefile & PACKAGE_DEPS

160. By John Lenton on 2014-05-16

nih

=== modified file '.bzrignore'
--- .bzrignore	2014-05-08 22:42:35 +0000
+++ .bzrignore	2014-05-16 16:25:28 +0000
@@ -20,3 +20,4 @@
 signing-helper/moc_signing.cpp
 signing-helper/signing-helper
 signing-helper/signing-helper_automoc.cpp
+.has-fetched-deps

=== modified file 'Makefile'
--- Makefile	2014-05-08 22:42:35 +0000
+++ Makefile	2014-05-16 16:25:28 +0000
@@ -15,6 +15,15 @@
 
 TOTEST = $(shell env GOPATH=$(GOPATH) go list $(PROJECT)/...|grep -v acceptance|grep -v http13client )
 
+fetchdeps: .has-fetched-deps
+
+.has-fetched-deps: PACKAGE_DEPS
+	@touch $@
+	@$(MAKE) --no-print-directory refetchdeps
+
+refetchdeps:
+	sudo apt-get install $$( cat PACKAGE_DEPS )
+
 bootstrap:
 	$(RM) -r $(GOPATH)/pkg
 	mkdir -p $(GOPATH)/bin
@@ -78,4 +87,5 @@
 
 .PHONY: bootstrap check check-race format check-format \
 	acceptance build-client build server-dev run-server-dev \
-	coverage-summary coverage-html protocol-diagrams
+	coverage-summary coverage-html protocol-diagrams \
+	fetchdeps refetchdeps

=== added file 'PACKAGE_DEPS'
--- PACKAGE_DEPS	1970-01-01 00:00:00 +0000
+++ PACKAGE_DEPS	2014-05-16 16:25:28 +0000
@@ -0,0 +1,9 @@
+build-essential
+cmake
+libdbus-1-dev
+libgcrypt11-dev
+libglib2.0-dev
+libnih-dbus-dev
+libsqlite3-dev
+libubuntuoneauth-2.0-dev
+libwhoopsie-dev

=== modified file 'README'
--- README	2014-04-30 16:44:16 +0000
+++ README	2014-05-16 16:25:28 +0000
@@ -6,17 +6,23 @@
 The code expects to be checked out as launchpad.net/ubuntu-push in a Go
 workspace, see "go help gopath".
 
-To setup Go dependencies, install the following dependencies:
-
-               build-essential
-               libsqlite3-dev
-
-and run:
-
-   make bootstrap
-
-To run tests, install libglib2.0-dev, libgcrypt11-dev, libwhoopsie-dev,
-and run:
+You need a somewhat long list of dependencies, as well as a working Go
+development environment. The Ubuntu packagenames for these are listed
+in the file PACKAGE_DEPS.
+
+On Ubuntu, if you have sudo, you can have all those installed for you
+by do doing
+
+    make fetchdeps
+
+Once you have the packaged dependencies you can get the Go
+dependencies via
+
+    make bootstrap
+
+and then you're set. Good luck!
+
+To run the tests:
 
    make check
 

=== added file 'client/service/nih.go'
--- client/service/nih.go	1970-01-01 00:00:00 +0000
+++ client/service/nih.go	2014-05-16 16:25:28 +0000
@@ -0,0 +1,56 @@
+/*
+ Copyright 2013-2014 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package service
+
+/*
+#cgo pkg-config: dbus-1 libnih libnih-dbus
+#include <stdlib.h>
+#include <nih/alloc.h>
+#include <libnih-dbus.h>
+
+char *appid2objpath (const char *root, const char *id) {
+    if (!strcmp (root, "")) return NULL;
+    return nih_dbus_path (NULL, root, id, NULL);
+}
+*/
+import "C"
+
+import (
+	"errors"
+	"unsafe"
+
+	"launchpad.net/go-dbus/v1"
+)
+
+var AppId2ObjPathError = errors.New("Empty root, or out of memory")
+
+// AppId2ObjPath uses libnih-dbus to translate an app id to a valid
+// component of an object path, and returns it under the given root.
+func AppId2ObjPath(root string, id string) (dbus.ObjectPath, error) {
+	cid := C.CString(id)
+	defer C.free(unsafe.Pointer(cid))
+	croot := C.CString(root)
+	defer C.free(unsafe.Pointer(croot))
+
+	cop := C.appid2objpath(croot, cid)
+	if cop == nil {
+		return "", AppId2ObjPathError
+	}
+	defer C.nih_free(unsafe.Pointer(cop))
+
+	return dbus.ObjectPath(C.GoString(cop)), nil
+}

=== added file 'client/service/nih_test.go'
--- client/service/nih_test.go	1970-01-01 00:00:00 +0000
+++ client/service/nih_test.go	2014-05-16 16:25:28 +0000
@@ -0,0 +1,38 @@
+/*
+ Copyright 2013-2014 Canonical Ltd.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3, as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package service
+
+import (
+	"launchpad.net/go-dbus/v1"
+	. "launchpad.net/gocheck"
+)
+
+type nihSuite struct{}
+
+var _ = Suite(&nihSuite{})
+
+func (ns *nihSuite) TestA2P(c *C) {
+	op, err := AppId2ObjPath("/a/b", "hello")
+	c.Check(op, Equals, dbus.ObjectPath("/a/b/hello"))
+	c.Check(err, IsNil)
+	op, err = AppId2ObjPath("/a/b", "hello world")
+	c.Check(op, Equals, dbus.ObjectPath("/a/b/hello_20world"))
+	c.Check(err, IsNil)
+	op, err = AppId2ObjPath("", "hello world")
+	c.Check(err, Equals, AppId2ObjPathError)
+	c.Check(op, Equals, dbus.ObjectPath(""))
+}