1
=== modified file '.bzrignore'
2
--- .bzrignore	2014-05-08 22:42:35 +0000
3
+++ .bzrignore	2014-05-16 16:25:28 +0000
4
@@ -20,3 +20,4 @@
5
20
signing-helper/moc_signing.cpp
20
signing-helper/moc_signing.cpp
6
21
signing-helper/signing-helper
21
signing-helper/signing-helper
7
22
signing-helper/signing-helper_automoc.cpp
22
signing-helper/signing-helper_automoc.cpp
8
23
.has-fetched-deps
9
23
24
10
=== modified file 'Makefile'
11
--- Makefile	2014-05-08 22:42:35 +0000
12
+++ Makefile	2014-05-16 16:25:28 +0000
13
@@ -15,6 +15,15 @@
14
15
15
15
16
TOTEST = $(shell env GOPATH=$(GOPATH) go list $(PROJECT)/...|grep -v acceptance|grep -v http13client )
16
TOTEST = $(shell env GOPATH=$(GOPATH) go list $(PROJECT)/...|grep -v acceptance|grep -v http13client )
16
17
17
17
18
fetchdeps: .has-fetched-deps
18
19
19
20
.has-fetched-deps: PACKAGE_DEPS
20
21
	@touch $@
21
22
	@$(MAKE) --no-print-directory refetchdeps
22
23
23
24
refetchdeps:
24
25
	sudo apt-get install $$( cat PACKAGE_DEPS )
25
26
26
18
bootstrap:
27
bootstrap:
27
19
	$(RM) -r $(GOPATH)/pkg
28
	$(RM) -r $(GOPATH)/pkg
28
20
	mkdir -p $(GOPATH)/bin
29
	mkdir -p $(GOPATH)/bin
29
@@ -78,4 +87,5 @@
30
78
87
31
79
.PHONY: bootstrap check check-race format check-format \
88
.PHONY: bootstrap check check-race format check-format \
32
80
	acceptance build-client build server-dev run-server-dev \
89
	acceptance build-client build server-dev run-server-dev \
34
81
	coverage-summary coverage-html protocol-diagrams
90
	coverage-summary coverage-html protocol-diagrams \
35
91
	fetchdeps refetchdeps
36
82
92
37
=== added file 'PACKAGE_DEPS'
38
--- PACKAGE_DEPS	1970-01-01 00:00:00 +0000
39
+++ PACKAGE_DEPS	2014-05-16 16:25:28 +0000
40
@@ -0,0 +1,9 @@
41
1
build-essential
42
2
cmake
43
3
libdbus-1-dev
44
4
libgcrypt11-dev
45
5
libglib2.0-dev
46
6
libnih-dbus-dev
47
7
libsqlite3-dev
48
8
libubuntuoneauth-2.0-dev
49
9
libwhoopsie-dev
50
0
10
51
=== modified file 'README'
52
--- README	2014-04-30 16:44:16 +0000
53
+++ README	2014-05-16 16:25:28 +0000
54
@@ -6,17 +6,23 @@
55
6
The code expects to be checked out as launchpad.net/ubuntu-push in a Go
6
The code expects to be checked out as launchpad.net/ubuntu-push in a Go
56
7
workspace, see "go help gopath".
7
workspace, see "go help gopath".
57
8
8
69
9
To setup Go dependencies, install the following dependencies:
9
You need a somewhat long list of dependencies, as well as a working Go
70
10
10
development environment. The Ubuntu packagenames for these are listed
71
11
               build-essential
11
in the file PACKAGE_DEPS.
72
12
               libsqlite3-dev
12
73
13
13
On Ubuntu, if you have sudo, you can have all those installed for you
74
14
and run:
14
by do doing
75
15
15
76
16
   make bootstrap
16
    make fetchdeps
77
17
17
78
18
To run tests, install libglib2.0-dev, libgcrypt11-dev, libwhoopsie-dev,
18
Once you have the packaged dependencies you can get the Go
79
19
and run:
19
dependencies via
80
20
81
21
    make bootstrap
82
22
83
23
and then you're set. Good luck!
84
24
85
25
To run the tests:
86
20
26
87
21
   make check
27
   make check
88
22
28
89
23
29
90
=== added file 'client/service/nih.go'
91
--- client/service/nih.go	1970-01-01 00:00:00 +0000
92
+++ client/service/nih.go	2014-05-16 16:25:28 +0000
93
@@ -0,0 +1,56 @@
94
1
/*
95
2
 Copyright 2013-2014 Canonical Ltd.
96
3
97
4
 This program is free software: you can redistribute it and/or modify it
98
5
 under the terms of the GNU General Public License version 3, as published
99
6
 by the Free Software Foundation.
100
7
101
8
 This program is distributed in the hope that it will be useful, but
102
9
 WITHOUT ANY WARRANTY; without even the implied warranties of
103
10
 MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
104
11
 PURPOSE.  See the GNU General Public License for more details.
105
12
106
13
 You should have received a copy of the GNU General Public License along
107
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
108
15
*/
109
16
110
17
package service
111
18
112
19
/*
113
20
#cgo pkg-config: dbus-1 libnih libnih-dbus
114
21
#include <stdlib.h>
115
22
#include <nih/alloc.h>
116
23
#include <libnih-dbus.h>
117
24
118
25
char *appid2objpath (const char *root, const char *id) {
119
26
    if (!strcmp (root, "")) return NULL;
120
27
    return nih_dbus_path (NULL, root, id, NULL);
121
28
}
122
29
*/
123
30
import "C"
124
31
125
32
import (
126
33
	"errors"
127
34
	"unsafe"
128
35
129
36
	"launchpad.net/go-dbus/v1"
130
37
)
131
38
132
39
var AppId2ObjPathError = errors.New("Empty root, or out of memory")
133
40
134
41
// AppId2ObjPath uses libnih-dbus to translate an app id to a valid
135
42
// component of an object path, and returns it under the given root.
136
43
func AppId2ObjPath(root string, id string) (dbus.ObjectPath, error) {
137
44
	cid := C.CString(id)
138
45
	defer C.free(unsafe.Pointer(cid))
139
46
	croot := C.CString(root)
140
47
	defer C.free(unsafe.Pointer(croot))
141
48
142
49
	cop := C.appid2objpath(croot, cid)
143
50
	if cop == nil {
144
51
		return "", AppId2ObjPathError
145
52
	}
146
53
	defer C.nih_free(unsafe.Pointer(cop))
147
54
148
55
	return dbus.ObjectPath(C.GoString(cop)), nil
149
56
}
150
0
57
151
=== added file 'client/service/nih_test.go'
152
--- client/service/nih_test.go	1970-01-01 00:00:00 +0000
153
+++ client/service/nih_test.go	2014-05-16 16:25:28 +0000
154
@@ -0,0 +1,38 @@
155
1
/*
156
2
 Copyright 2013-2014 Canonical Ltd.
157
3
158
4
 This program is free software: you can redistribute it and/or modify it
159
5
 under the terms of the GNU General Public License version 3, as published
160
6
 by the Free Software Foundation.
161
7
162
8
 This program is distributed in the hope that it will be useful, but
163
9
 WITHOUT ANY WARRANTY; without even the implied warranties of
164
10
 MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
165
11
 PURPOSE.  See the GNU General Public License for more details.
166
12
167
13
 You should have received a copy of the GNU General Public License along
168
14
 with this program.  If not, see <http://www.gnu.org/licenses/>.
169
15
*/
170
16
171
17
package service
172
18
173
19
import (
174
20
	"launchpad.net/go-dbus/v1"
175
21
	. "launchpad.net/gocheck"
176
22
)
177
23
178
24
type nihSuite struct{}
179
25
180
26
var _ = Suite(&nihSuite{})
181
27
182
28
func (ns *nihSuite) TestA2P(c *C) {
183
29
	op, err := AppId2ObjPath("/a/b", "hello")
184
30
	c.Check(op, Equals, dbus.ObjectPath("/a/b/hello"))
185
31
	c.Check(err, IsNil)
186
32
	op, err = AppId2ObjPath("/a/b", "hello world")
187
33
	c.Check(op, Equals, dbus.ObjectPath("/a/b/hello_20world"))
188
34
	c.Check(err, IsNil)
189
35
	op, err = AppId2ObjPath("", "hello world")
190
36
	c.Check(err, Equals, AppId2ObjPathError)
191
37
	c.Check(op, Equals, dbus.ObjectPath(""))
192
38
}
Status:	Work in progress
Proposed branch:	lp:~chipaca/ubuntu-push/nih
Merge into:	lp:ubuntu-push/automatic
Diff against target:	192 lines (+132/-12) 6 files modified .bzrignore (+1/-0) Makefile (+11/-1) PACKAGE_DEPS (+9/-0) README (+17/-11) client/service/nih.go (+56/-0) client/service/nih_test.go (+38/-0)
To merge this branch:	bzr merge lp:~chipaca/ubuntu-push/nih
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Samuele Pedroni		2014-05-16	Approve on 2014-05-16
Review via email: mp+219843@code.launchpad.net