1
=== modified file 'scripts/lib/proof.py'
2
--- scripts/lib/proof.py	2013-04-18 22:19:06 +0000
3
+++ scripts/lib/proof.py	2013-04-25 21:00:33 +0000
4
@@ -21,6 +21,7 @@
5
21
from stat import S_IXUSR
21
from stat import S_IXUSR
6
22
import sys
22
import sys
7
23
import yaml
23
import yaml
8
24
import hashlib
9
24
25
10
25
KNOWN_METADATA_KEYS = ['name',
26
KNOWN_METADATA_KEYS = ['name',
11
26
                       'summary',
27
                       'summary',
12
@@ -41,6 +42,10 @@
13
41
    os.path.join(
42
    os.path.join(
14
42
        __file__, '..', '..', '..', 'templates', 'charm', 'README.ex'))
43
        __file__, '..', '..', '..', 'templates', 'charm', 'README.ex'))
15
43
44
16
45
TEMPLATE_ICON = os.path.abspath(
17
46
    os.path.join(
18
47
        __file__, '..', '..', '..', 'templates', 'charm', 'icon.svg'))
19
48
20
44
49
21
45
class RelationError(Exception):
50
class RelationError(Exception):
22
46
    pass
51
    pass
23
@@ -230,6 +235,20 @@
24
230
235
25
231
        if not os.path.exists(os.path.join(charm_path, 'icon.svg')):
236
        if not os.path.exists(os.path.join(charm_path, 'icon.svg')):
26
232
            lint.warn("No icon.svg file.")
237
            lint.warn("No icon.svg file.")
27
238
        else:
28
239
            # should have an icon.svg
29
240
            template_sha1 = hashlib.sha1()
30
241
            icon_sha1 = hashlib.sha1()
31
242
            try:
32
243
                with open(TEMPLATE_ICON) as ti:
33
244
                    template_sha1.update(ti.read())
34
245
                    with open(os.path.join(charm_path, 'icon.svg')) as ci:
35
246
                        icon_sha1.update(ci.read())
36
247
                if template_sha1.hexdigest() == icon_sha1.hexdigest():
37
248
                    lint.err("Includes template icon.svg file.")
38
249
            except IOError as e:
39
250
                lint.err(
40
251
                    "Error while opening %s (%s)" % (e.filename, e.strerror))
41
233
252
42
234
        # Must have a hooks dir
253
        # Must have a hooks dir
43
235
        if not os.path.exists(hooks_path):
254
        if not os.path.exists(hooks_path):
44
236
255
45
=== added file 'templates/charm/icon.svg'
46
--- templates/charm/icon.svg	1970-01-01 00:00:00 +0000
47
+++ templates/charm/icon.svg	2013-04-25 21:00:33 +0000
48
@@ -0,0 +1,279 @@
49
1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
50
2
<!-- Created with Inkscape (http://www.inkscape.org/) -->
51
3
52
4
<svg
53
5
   xmlns:dc="http://purl.org/dc/elements/1.1/"
54
6
   xmlns:cc="http://creativecommons.org/ns#"
55
7
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
56
8
   xmlns:svg="http://www.w3.org/2000/svg"
57
9
   xmlns="http://www.w3.org/2000/svg"
58
10
   xmlns:xlink="http://www.w3.org/1999/xlink"
59
11
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
60
12
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
61
13
   width="96"
62
14
   height="96"
63
15
   id="svg6517"
64
16
   version="1.1"
65
17
   inkscape:version="0.48+devel r12274"
66
18
   sodipodi:docname="Juju_charm_icon_template.svg">
67
19
  <defs
68
20
     id="defs6519">
69
21
    <linearGradient
70
22
       inkscape:collect="always"
71
23
       xlink:href="#Background"
72
24
       id="linearGradient6461"
73
25
       gradientUnits="userSpaceOnUse"
74
26
       x1="0"
75
27
       y1="970.29498"
76
28
       x2="144"
77
29
       y2="970.29498"
78
30
       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
79
31
    <linearGradient
80
32
       id="Background">
81
33
      <stop
82
34
         id="stop4178"
83
35
         offset="0"
84
36
         style="stop-color:#b8b8b8;stop-opacity:1" />
85
37
      <stop
86
38
         id="stop4180"
87
39
         offset="1"
88
40
         style="stop-color:#c9c9c9;stop-opacity:1" />
89
41
    </linearGradient>
90
42
    <filter
91
43
       style="color-interpolation-filters:sRGB;"
92
44
       inkscape:label="Inner Shadow"
93
45
       id="filter1121">
94
46
      <feFlood
95
47
         flood-opacity="0.59999999999999998"
96
48
         flood-color="rgb(0,0,0)"
97
49
         result="flood"
98
50
         id="feFlood1123" />
99
51
      <feComposite
100
52
         in="flood"
101
53
         in2="SourceGraphic"
102
54
         operator="out"
103
55
         result="composite1"
104
56
         id="feComposite1125" />
105
57
      <feGaussianBlur
106
58
         in="composite1"
107
59
         stdDeviation="1"
108
60
         result="blur"
109
61
         id="feGaussianBlur1127" />
110
62
      <feOffset
111
63
         dx="0"
112
64
         dy="2"
113
65
         result="offset"
114
66
         id="feOffset1129" />
115
67
      <feComposite
116
68
         in="offset"
117
69
         in2="SourceGraphic"
118
70
         operator="atop"
119
71
         result="composite2"
120
72
         id="feComposite1131" />
121
73
    </filter>
122
74
    <filter
123
75
       style="color-interpolation-filters:sRGB;"
124
76
       inkscape:label="Drop Shadow"
125
77
       id="filter950">
126
78
      <feFlood
127
79
         flood-opacity="0.25"
128
80
         flood-color="rgb(0,0,0)"
129
81
         result="flood"
130
82
         id="feFlood952" />
131
83
      <feComposite
132
84
         in="flood"
133
85
         in2="SourceGraphic"
134
86
         operator="in"
135
87
         result="composite1"
136
88
         id="feComposite954" />
137
89
      <feGaussianBlur
138
90
         in="composite1"
139
91
         stdDeviation="1"
140
92
         result="blur"
141
93
         id="feGaussianBlur956" />
142
94
      <feOffset
143
95
         dx="0"
144
96
         dy="1"
145
97
         result="offset"
146
98
         id="feOffset958" />
147
99
      <feComposite
148
100
         in="SourceGraphic"
149
101
         in2="offset"
150
102
         operator="over"
151
103
         result="composite2"
152
104
         id="feComposite960" />
153
105
    </filter>
154
106
    <clipPath
155
107
       clipPathUnits="userSpaceOnUse"
156
108
       id="clipPath873">
157
109
      <g
158
110
         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
159
111
         id="g875"
160
112
         inkscape:label="Layer 1"
161
113
         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
162
114
        <path
163
115
           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
164
116
           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
165
117
           id="path877"
166
118
           inkscape:connector-curvature="0"
167
119
           sodipodi:nodetypes="sssssssss" />
168
120
      </g>
169
121
    </clipPath>
170
122
    <filter
171
123
       inkscape:collect="always"
172
124
       id="filter891"
173
125
       inkscape:label="Badge Shadow">
174
126
      <feGaussianBlur
175
127
         inkscape:collect="always"
176
128
         stdDeviation="0.71999962"
177
129
         id="feGaussianBlur893" />
178
130
    </filter>
179
131
  </defs>
180
132
  <sodipodi:namedview
181
133
     id="base"
182
134
     pagecolor="#ffffff"
183
135
     bordercolor="#666666"
184
136
     borderopacity="1.0"
185
137
     inkscape:pageopacity="0.0"
186
138
     inkscape:pageshadow="2"
187
139
     inkscape:zoom="4.0745362"
188
140
     inkscape:cx="18.514671"
189
141
     inkscape:cy="49.018169"
190
142
     inkscape:document-units="px"
191
143
     inkscape:current-layer="layer1"
192
144
     showgrid="true"
193
145
     fit-margin-top="0"
194
146
     fit-margin-left="0"
195
147
     fit-margin-right="0"
196
148
     fit-margin-bottom="0"
197
149
     inkscape:window-width="1920"
198
150
     inkscape:window-height="1029"
199
151
     inkscape:window-x="0"
200
152
     inkscape:window-y="24"
201
153
     inkscape:window-maximized="1"
202
154
     showborder="true"
203
155
     showguides="true"
204
156
     inkscape:guide-bbox="true"
205
157
     inkscape:showpageshadow="false">
206
158
    <inkscape:grid
207
159
       type="xygrid"
208
160
       id="grid821" />
209
161
    <sodipodi:guide
210
162
       orientation="1,0"
211
163
       position="16,48"
212
164
       id="guide823" />
213
165
    <sodipodi:guide
214
166
       orientation="0,1"
215
167
       position="64,80"
216
168
       id="guide825" />
217
169
    <sodipodi:guide
218
170
       orientation="1,0"
219
171
       position="80,40"
220
172
       id="guide827" />
221
173
    <sodipodi:guide
222
174
       orientation="0,1"
223
175
       position="64,16"
224
176
       id="guide829" />
225
177
  </sodipodi:namedview>
226
178
  <metadata
227
179
     id="metadata6522">
228
180
    <rdf:RDF>
229
181
      <cc:Work
230
182
         rdf:about="">
231
183
        <dc:format>image/svg+xml</dc:format>
232
184
        <dc:type
233
185
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
234
186
        <dc:title></dc:title>
235
187
      </cc:Work>
236
188
    </rdf:RDF>
237
189
  </metadata>
238
190
  <g
239
191
     inkscape:label="BACKGROUND"
240
192
     inkscape:groupmode="layer"
241
193
     id="layer1"
242
194
     transform="translate(268,-635.29076)"
243
195
     style="display:inline">
244
196
    <path
245
197
       style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
246
198
       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
247
199
       id="path6455"
248
200
       inkscape:connector-curvature="0"
249
201
       sodipodi:nodetypes="sssssssss" />
250
202
  </g>
251
203
  <g
252
204
     inkscape:groupmode="layer"
253
205
     id="layer3"
254
206
     inkscape:label="PLACE YOUR PICTOGRAM HERE"
255
207
     style="display:inline" />
256
208
  <g
257
209
     inkscape:groupmode="layer"
258
210
     id="layer2"
259
211
     inkscape:label="BADGE"
260
212
     style="display:none"
261
213
     sodipodi:insensitive="true">
262
214
    <g
263
215
       style="display:inline"
264
216
       transform="translate(-340.00001,-581)"
265
217
       id="g4394"
266
218
       clip-path="none">
267
219
      <g
268
220
         id="g855">
269
221
        <g
270
222
           inkscape:groupmode="maskhelper"
271
223
           id="g870"
272
224
           clip-path="url(#clipPath873)"
273
225
           style="opacity:0.6;filter:url(#filter891)">
274
226
          <path
275
227
             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
276
228
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
277
229
             sodipodi:ry="12"
278
230
             sodipodi:rx="12"
279
231
             sodipodi:cy="552.36218"
280
232
             sodipodi:cx="252"
281
233
             id="path844"
282
234
             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
283
235
             sodipodi:type="arc" />
284
236
        </g>
285
237
        <g
286
238
           id="g862">
287
239
          <path
288
240
             sodipodi:type="arc"
289
241
             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
290
242
             id="path4398"
291
243
             sodipodi:cx="252"
292
244
             sodipodi:cy="552.36218"
293
245
             sodipodi:rx="12"
294
246
             sodipodi:ry="12"
295
247
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
296
248
             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
297
249
          <path
298
250
             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
299
251
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
300
252
             sodipodi:ry="12"
301
253
             sodipodi:rx="12"
302
254
             sodipodi:cy="552.36218"
303
255
             sodipodi:cx="252"
304
256
             id="path4400"
305
257
             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
306
258
             sodipodi:type="arc" />
307
259
          <path
308
260
             sodipodi:type="star"
309
261
             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
310
262
             id="path4459"
311
263
             sodipodi:sides="5"
312
264
             sodipodi:cx="666.19574"
313
265
             sodipodi:cy="589.50385"
314
266
             sodipodi:r1="7.2431178"
315
267
             sodipodi:r2="4.3458705"
316
268
             sodipodi:arg1="1.0471976"
317
269
             sodipodi:arg2="1.6755161"
318
270
             inkscape:flatsided="false"
319
271
             inkscape:rounded="0.1"
320
272
             inkscape:randomized="0"
321
273
             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 C 669.9821,591.68426 670.20862,595.55064 669.8173,595.77657 Z"
322
274
             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
323
275
        </g>
324
276
      </g>
325
277
    </g>
326
278
  </g>
327
279
</svg>
328
0
280
329
=== added directory 'tests/charms/icon-template'
330
=== added file 'tests/charms/icon-template/README.ex'
331
--- tests/charms/icon-template/README.ex	1970-01-01 00:00:00 +0000
332
+++ tests/charms/icon-template/README.ex	2013-04-25 21:00:33 +0000
333
@@ -0,0 +1,5 @@
334
1
Describe the intended usage of this charm and anything unique about how
335
2
this charm relates to others here.
336
3
337
4
Be sure to remove this section before submitting this to
338
5
https://launchpad.net/charms for inclusion in the charm store.
339
0
6
340
=== added directory 'tests/charms/icon-template/hooks'
341
=== added file 'tests/charms/icon-template/hooks/install'
342
--- tests/charms/icon-template/hooks/install	1970-01-01 00:00:00 +0000
343
+++ tests/charms/icon-template/hooks/install	2013-04-25 21:00:33 +0000
344
@@ -0,0 +1,5 @@
345
1
#!/bin/bash
346
2
# Here do anything needed to install the service
347
3
# i.e. apt-get install -y foo  or  bzr branch http://myserver/mycode /srv/webroot
348
4
349
5
apt-get install -y test
350
0
6
351
=== added file 'tests/charms/icon-template/hooks/relation-name-relation-broken'
352
--- tests/charms/icon-template/hooks/relation-name-relation-broken	1970-01-01 00:00:00 +0000
353
+++ tests/charms/icon-template/hooks/relation-name-relation-broken	2013-04-25 21:00:33 +0000
354
@@ -0,0 +1,2 @@
355
1
#!/bin/sh
356
2
# This hook runs when the full relation is removed (not just a single member)
357
0
3
358
=== added file 'tests/charms/icon-template/hooks/relation-name-relation-changed'
359
--- tests/charms/icon-template/hooks/relation-name-relation-changed	1970-01-01 00:00:00 +0000
360
+++ tests/charms/icon-template/hooks/relation-name-relation-changed	2013-04-25 21:00:33 +0000
361
@@ -0,0 +1,9 @@
362
1
#!/bin/bash
363
2
# This must be renamed to the name of the relation. The goal here is to
364
3
# affect any change needed by relationships being formed, modified, or broken
365
4
# This script should be idempotent.
366
5
juju-log $JUJU_REMOTE_UNIT modified its settings
367
6
juju-log Relation settings:
368
7
relation-get
369
8
juju-log Relation members:
370
9
relation-list
371
0
10
372
=== added file 'tests/charms/icon-template/hooks/relation-name-relation-departed'
373
--- tests/charms/icon-template/hooks/relation-name-relation-departed	1970-01-01 00:00:00 +0000
374
+++ tests/charms/icon-template/hooks/relation-name-relation-departed	2013-04-25 21:00:33 +0000
375
@@ -0,0 +1,5 @@
376
1
#!/bin/sh
377
2
# This must be renamed to the name of the relation. The goal here is to
378
3
# affect any change needed by the remote unit leaving the relationship.
379
4
# This script should be idempotent.
380
5
juju-log $JUJU_REMOTE_UNIT departed
381
0
6
382
=== added file 'tests/charms/icon-template/hooks/relation-name-relation-joined'
383
--- tests/charms/icon-template/hooks/relation-name-relation-joined	1970-01-01 00:00:00 +0000
384
+++ tests/charms/icon-template/hooks/relation-name-relation-joined	2013-04-25 21:00:33 +0000
385
@@ -0,0 +1,5 @@
386
1
#!/bin/sh
387
2
# This must be renamed to the name of the relation. The goal here is to
388
3
# affect any change needed by relationships being formed
389
4
# This script should be idempotent.
390
5
juju-log $JUJU_REMOTE_UNIT joined
391
0
6
392
=== added file 'tests/charms/icon-template/hooks/start'
393
--- tests/charms/icon-template/hooks/start	1970-01-01 00:00:00 +0000
394
+++ tests/charms/icon-template/hooks/start	2013-04-25 21:00:33 +0000
395
@@ -0,0 +1,4 @@
396
1
#!/bin/bash
397
2
# Here put anything that is needed to start the service.
398
3
# Note that currently this is run directly after install
399
4
# i.e. 'service apache2 start'
400
0
5
401
=== added file 'tests/charms/icon-template/hooks/stop'
402
--- tests/charms/icon-template/hooks/stop	1970-01-01 00:00:00 +0000
403
+++ tests/charms/icon-template/hooks/stop	2013-04-25 21:00:33 +0000
404
@@ -0,0 +1,7 @@
405
1
#!/bin/bash
406
2
# This will be run when the service is being torn down, allowing you to disable
407
3
# it in various ways..
408
4
# For example, if your web app uses a text file to signal to the load balancer
409
5
# that it is live... you could remove it and sleep for a bit to allow the load
410
6
# balancer to stop sending traffic.
411
7
# rm /srv/webroot/server-live.txt && sleep 30
412
0
8
413
=== added file 'tests/charms/icon-template/icon.svg'
414
--- tests/charms/icon-template/icon.svg	1970-01-01 00:00:00 +0000
415
+++ tests/charms/icon-template/icon.svg	2013-04-25 21:00:33 +0000
416
@@ -0,0 +1,279 @@
417
1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
418
2
<!-- Created with Inkscape (http://www.inkscape.org/) -->
419
3
420
4
<svg
421
5
   xmlns:dc="http://purl.org/dc/elements/1.1/"
422
6
   xmlns:cc="http://creativecommons.org/ns#"
423
7
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
424
8
   xmlns:svg="http://www.w3.org/2000/svg"
425
9
   xmlns="http://www.w3.org/2000/svg"
426
10
   xmlns:xlink="http://www.w3.org/1999/xlink"
427
11
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
428
12
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
429
13
   width="96"
430
14
   height="96"
431
15
   id="svg6517"
432
16
   version="1.1"
433
17
   inkscape:version="0.48+devel r12274"
434
18
   sodipodi:docname="Juju_charm_icon_template.svg">
435
19
  <defs
436
20
     id="defs6519">
437
21
    <linearGradient
438
22
       inkscape:collect="always"
439
23
       xlink:href="#Background"
440
24
       id="linearGradient6461"
441
25
       gradientUnits="userSpaceOnUse"
442
26
       x1="0"
443
27
       y1="970.29498"
444
28
       x2="144"
445
29
       y2="970.29498"
446
30
       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
447
31
    <linearGradient
448
32
       id="Background">
449
33
      <stop
450
34
         id="stop4178"
451
35
         offset="0"
452
36
         style="stop-color:#b8b8b8;stop-opacity:1" />
453
37
      <stop
454
38
         id="stop4180"
455
39
         offset="1"
456
40
         style="stop-color:#c9c9c9;stop-opacity:1" />
457
41
    </linearGradient>
458
42
    <filter
459
43
       style="color-interpolation-filters:sRGB;"
460
44
       inkscape:label="Inner Shadow"
461
45
       id="filter1121">
462
46
      <feFlood
463
47
         flood-opacity="0.59999999999999998"
464
48
         flood-color="rgb(0,0,0)"
465
49
         result="flood"
466
50
         id="feFlood1123" />
467
51
      <feComposite
468
52
         in="flood"
469
53
         in2="SourceGraphic"
470
54
         operator="out"
471
55
         result="composite1"
472
56
         id="feComposite1125" />
473
57
      <feGaussianBlur
474
58
         in="composite1"
475
59
         stdDeviation="1"
476
60
         result="blur"
477
61
         id="feGaussianBlur1127" />
478
62
      <feOffset
479
63
         dx="0"
480
64
         dy="2"
481
65
         result="offset"
482
66
         id="feOffset1129" />
483
67
      <feComposite
484
68
         in="offset"
485
69
         in2="SourceGraphic"
486
70
         operator="atop"
487
71
         result="composite2"
488
72
         id="feComposite1131" />
489
73
    </filter>
490
74
    <filter
491
75
       style="color-interpolation-filters:sRGB;"
492
76
       inkscape:label="Drop Shadow"
493
77
       id="filter950">
494
78
      <feFlood
495
79
         flood-opacity="0.25"
496
80
         flood-color="rgb(0,0,0)"
497
81
         result="flood"
498
82
         id="feFlood952" />
499
83
      <feComposite
500
84
         in="flood"
501
85
         in2="SourceGraphic"
502
86
         operator="in"
503
87
         result="composite1"
504
88
         id="feComposite954" />
505
89
      <feGaussianBlur
506
90
         in="composite1"
507
91
         stdDeviation="1"
508
92
         result="blur"
509
93
         id="feGaussianBlur956" />
510
94
      <feOffset
511
95
         dx="0"
512
96
         dy="1"
513
97
         result="offset"
514
98
         id="feOffset958" />
515
99
      <feComposite
516
100
         in="SourceGraphic"
517
101
         in2="offset"
518
102
         operator="over"
519
103
         result="composite2"
520
104
         id="feComposite960" />
521
105
    </filter>
522
106
    <clipPath
523
107
       clipPathUnits="userSpaceOnUse"
524
108
       id="clipPath873">
525
109
      <g
526
110
         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
527
111
         id="g875"
528
112
         inkscape:label="Layer 1"
529
113
         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
530
114
        <path
531
115
           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
532
116
           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
533
117
           id="path877"
534
118
           inkscape:connector-curvature="0"
535
119
           sodipodi:nodetypes="sssssssss" />
536
120
      </g>
537
121
    </clipPath>
538
122
    <filter
539
123
       inkscape:collect="always"
540
124
       id="filter891"
541
125
       inkscape:label="Badge Shadow">
542
126
      <feGaussianBlur
543
127
         inkscape:collect="always"
544
128
         stdDeviation="0.71999962"
545
129
         id="feGaussianBlur893" />
546
130
    </filter>
547
131
  </defs>
548
132
  <sodipodi:namedview
549
133
     id="base"
550
134
     pagecolor="#ffffff"
551
135
     bordercolor="#666666"
552
136
     borderopacity="1.0"
553
137
     inkscape:pageopacity="0.0"
554
138
     inkscape:pageshadow="2"
555
139
     inkscape:zoom="4.0745362"
556
140
     inkscape:cx="18.514671"
557
141
     inkscape:cy="49.018169"
558
142
     inkscape:document-units="px"
559
143
     inkscape:current-layer="layer1"
560
144
     showgrid="true"
561
145
     fit-margin-top="0"
562
146
     fit-margin-left="0"
563
147
     fit-margin-right="0"
564
148
     fit-margin-bottom="0"
565
149
     inkscape:window-width="1920"
566
150
     inkscape:window-height="1029"
567
151
     inkscape:window-x="0"
568
152
     inkscape:window-y="24"
569
153
     inkscape:window-maximized="1"
570
154
     showborder="true"
571
155
     showguides="true"
572
156
     inkscape:guide-bbox="true"
573
157
     inkscape:showpageshadow="false">
574
158
    <inkscape:grid
575
159
       type="xygrid"
576
160
       id="grid821" />
577
161
    <sodipodi:guide
578
162
       orientation="1,0"
579
163
       position="16,48"
580
164
       id="guide823" />
581
165
    <sodipodi:guide
582
166
       orientation="0,1"
583
167
       position="64,80"
584
168
       id="guide825" />
585
169
    <sodipodi:guide
586
170
       orientation="1,0"
587
171
       position="80,40"
588
172
       id="guide827" />
589
173
    <sodipodi:guide
590
174
       orientation="0,1"
591
175
       position="64,16"
592
176
       id="guide829" />
593
177
  </sodipodi:namedview>
594
178
  <metadata
595
179
     id="metadata6522">
596
180
    <rdf:RDF>
597
181
      <cc:Work
598
182
         rdf:about="">
599
183
        <dc:format>image/svg+xml</dc:format>
600
184
        <dc:type
601
185
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
602
186
        <dc:title></dc:title>
603
187
      </cc:Work>
604
188
    </rdf:RDF>
605
189
  </metadata>
606
190
  <g
607
191
     inkscape:label="BACKGROUND"
608
192
     inkscape:groupmode="layer"
609
193
     id="layer1"
610
194
     transform="translate(268,-635.29076)"
611
195
     style="display:inline">
612
196
    <path
613
197
       style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
614
198
       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
615
199
       id="path6455"
616
200
       inkscape:connector-curvature="0"
617
201
       sodipodi:nodetypes="sssssssss" />
618
202
  </g>
619
203
  <g
620
204
     inkscape:groupmode="layer"
621
205
     id="layer3"
622
206
     inkscape:label="PLACE YOUR PICTOGRAM HERE"
623
207
     style="display:inline" />
624
208
  <g
625
209
     inkscape:groupmode="layer"
626
210
     id="layer2"
627
211
     inkscape:label="BADGE"
628
212
     style="display:none"
629
213
     sodipodi:insensitive="true">
630
214
    <g
631
215
       style="display:inline"
632
216
       transform="translate(-340.00001,-581)"
633
217
       id="g4394"
634
218
       clip-path="none">
635
219
      <g
636
220
         id="g855">
637
221
        <g
638
222
           inkscape:groupmode="maskhelper"
639
223
           id="g870"
640
224
           clip-path="url(#clipPath873)"
641
225
           style="opacity:0.6;filter:url(#filter891)">
642
226
          <path
643
227
             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
644
228
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
645
229
             sodipodi:ry="12"
646
230
             sodipodi:rx="12"
647
231
             sodipodi:cy="552.36218"
648
232
             sodipodi:cx="252"
649
233
             id="path844"
650
234
             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
651
235
             sodipodi:type="arc" />
652
236
        </g>
653
237
        <g
654
238
           id="g862">
655
239
          <path
656
240
             sodipodi:type="arc"
657
241
             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
658
242
             id="path4398"
659
243
             sodipodi:cx="252"
660
244
             sodipodi:cy="552.36218"
661
245
             sodipodi:rx="12"
662
246
             sodipodi:ry="12"
663
247
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
664
248
             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
665
249
          <path
666
250
             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
667
251
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
668
252
             sodipodi:ry="12"
669
253
             sodipodi:rx="12"
670
254
             sodipodi:cy="552.36218"
671
255
             sodipodi:cx="252"
672
256
             id="path4400"
673
257
             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
674
258
             sodipodi:type="arc" />
675
259
          <path
676
260
             sodipodi:type="star"
677
261
             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
678
262
             id="path4459"
679
263
             sodipodi:sides="5"
680
264
             sodipodi:cx="666.19574"
681
265
             sodipodi:cy="589.50385"
682
266
             sodipodi:r1="7.2431178"
683
267
             sodipodi:r2="4.3458705"
684
268
             sodipodi:arg1="1.0471976"
685
269
             sodipodi:arg2="1.6755161"
686
270
             inkscape:flatsided="false"
687
271
             inkscape:rounded="0.1"
688
272
             inkscape:randomized="0"
689
273
             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 C 669.9821,591.68426 670.20862,595.55064 669.8173,595.77657 Z"
690
274
             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
691
275
        </g>
692
276
      </g>
693
277
    </g>
694
278
  </g>
695
279
</svg>
696
0
280
697
=== added file 'tests/charms/icon-template/metadata.yaml'
698
--- tests/charms/icon-template/metadata.yaml	1970-01-01 00:00:00 +0000
699
+++ tests/charms/icon-template/metadata.yaml	2013-04-25 21:00:33 +0000
700
@@ -0,0 +1,19 @@
701
1
name: icon-template
702
2
summary: <Fill in summary here>
703
3
maintainer: test@testhost
704
4
description: |
705
5
  <Multi-line description here>
706
6
categories:
707
7
  - misc
708
8
provides:
709
9
  relation-name:
710
10
    baz: boom
711
11
    interface: interface-name
712
12
requires:
713
13
  relation-name:
714
14
    interface: interface-name
715
15
    scope: flouride
716
16
peers:
717
17
  relation-name:
718
18
    interface: interface-name
719
19
  non-map: [ interface, interface-name ]
720
0
20
721
=== added file 'tests/charms/icon-template/revision'
722
--- tests/charms/icon-template/revision	1970-01-01 00:00:00 +0000
723
+++ tests/charms/icon-template/revision	2013-04-25 21:00:33 +0000
724
@@ -0,0 +1,1 @@
725
1
1
726
0
2
727
=== added file 'tests/create/no-package-exists/icon.svg'
728
--- tests/create/no-package-exists/icon.svg	1970-01-01 00:00:00 +0000
729
+++ tests/create/no-package-exists/icon.svg	2013-04-25 21:00:33 +0000
730
@@ -0,0 +1,279 @@
731
1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
732
2
<!-- Created with Inkscape (http://www.inkscape.org/) -->
733
3
734
4
<svg
735
5
   xmlns:dc="http://purl.org/dc/elements/1.1/"
736
6
   xmlns:cc="http://creativecommons.org/ns#"
737
7
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
738
8
   xmlns:svg="http://www.w3.org/2000/svg"
739
9
   xmlns="http://www.w3.org/2000/svg"
740
10
   xmlns:xlink="http://www.w3.org/1999/xlink"
741
11
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
742
12
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
743
13
   width="96"
744
14
   height="96"
745
15
   id="svg6517"
746
16
   version="1.1"
747
17
   inkscape:version="0.48+devel r12274"
748
18
   sodipodi:docname="Juju_charm_icon_template.svg">
749
19
  <defs
750
20
     id="defs6519">
751
21
    <linearGradient
752
22
       inkscape:collect="always"
753
23
       xlink:href="#Background"
754
24
       id="linearGradient6461"
755
25
       gradientUnits="userSpaceOnUse"
756
26
       x1="0"
757
27
       y1="970.29498"
758
28
       x2="144"
759
29
       y2="970.29498"
760
30
       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
761
31
    <linearGradient
762
32
       id="Background">
763
33
      <stop
764
34
         id="stop4178"
765
35
         offset="0"
766
36
         style="stop-color:#b8b8b8;stop-opacity:1" />
767
37
      <stop
768
38
         id="stop4180"
769
39
         offset="1"
770
40
         style="stop-color:#c9c9c9;stop-opacity:1" />
771
41
    </linearGradient>
772
42
    <filter
773
43
       style="color-interpolation-filters:sRGB;"
774
44
       inkscape:label="Inner Shadow"
775
45
       id="filter1121">
776
46
      <feFlood
777
47
         flood-opacity="0.59999999999999998"
778
48
         flood-color="rgb(0,0,0)"
779
49
         result="flood"
780
50
         id="feFlood1123" />
781
51
      <feComposite
782
52
         in="flood"
783
53
         in2="SourceGraphic"
784
54
         operator="out"
785
55
         result="composite1"
786
56
         id="feComposite1125" />
787
57
      <feGaussianBlur
788
58
         in="composite1"
789
59
         stdDeviation="1"
790
60
         result="blur"
791
61
         id="feGaussianBlur1127" />
792
62
      <feOffset
793
63
         dx="0"
794
64
         dy="2"
795
65
         result="offset"
796
66
         id="feOffset1129" />
797
67
      <feComposite
798
68
         in="offset"
799
69
         in2="SourceGraphic"
800
70
         operator="atop"
801
71
         result="composite2"
802
72
         id="feComposite1131" />
803
73
    </filter>
804
74
    <filter
805
75
       style="color-interpolation-filters:sRGB;"
806
76
       inkscape:label="Drop Shadow"
807
77
       id="filter950">
808
78
      <feFlood
809
79
         flood-opacity="0.25"
810
80
         flood-color="rgb(0,0,0)"
811
81
         result="flood"
812
82
         id="feFlood952" />
813
83
      <feComposite
814
84
         in="flood"
815
85
         in2="SourceGraphic"
816
86
         operator="in"
817
87
         result="composite1"
818
88
         id="feComposite954" />
819
89
      <feGaussianBlur
820
90
         in="composite1"
821
91
         stdDeviation="1"
822
92
         result="blur"
823
93
         id="feGaussianBlur956" />
824
94
      <feOffset
825
95
         dx="0"
826
96
         dy="1"
827
97
         result="offset"
828
98
         id="feOffset958" />
829
99
      <feComposite
830
100
         in="SourceGraphic"
831
101
         in2="offset"
832
102
         operator="over"
833
103
         result="composite2"
834
104
         id="feComposite960" />
835
105
    </filter>
836
106
    <clipPath
837
107
       clipPathUnits="userSpaceOnUse"
838
108
       id="clipPath873">
839
109
      <g
840
110
         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
841
111
         id="g875"
842
112
         inkscape:label="Layer 1"
843
113
         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
844
114
        <path
845
115
           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
846
116
           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
847
117
           id="path877"
848
118
           inkscape:connector-curvature="0"
849
119
           sodipodi:nodetypes="sssssssss" />
850
120
      </g>
851
121
    </clipPath>
852
122
    <filter
853
123
       inkscape:collect="always"
854
124
       id="filter891"
855
125
       inkscape:label="Badge Shadow">
856
126
      <feGaussianBlur
857
127
         inkscape:collect="always"
858
128
         stdDeviation="0.71999962"
859
129
         id="feGaussianBlur893" />
860
130
    </filter>
861
131
  </defs>
862
132
  <sodipodi:namedview
863
133
     id="base"
864
134
     pagecolor="#ffffff"
865
135
     bordercolor="#666666"
866
136
     borderopacity="1.0"
867
137
     inkscape:pageopacity="0.0"
868
138
     inkscape:pageshadow="2"
869
139
     inkscape:zoom="4.0745362"
870
140
     inkscape:cx="18.514671"
871
141
     inkscape:cy="49.018169"
872
142
     inkscape:document-units="px"
873
143
     inkscape:current-layer="layer1"
874
144
     showgrid="true"
875
145
     fit-margin-top="0"
876
146
     fit-margin-left="0"
877
147
     fit-margin-right="0"
878
148
     fit-margin-bottom="0"
879
149
     inkscape:window-width="1920"
880
150
     inkscape:window-height="1029"
881
151
     inkscape:window-x="0"
882
152
     inkscape:window-y="24"
883
153
     inkscape:window-maximized="1"
884
154
     showborder="true"
885
155
     showguides="true"
886
156
     inkscape:guide-bbox="true"
887
157
     inkscape:showpageshadow="false">
888
158
    <inkscape:grid
889
159
       type="xygrid"
890
160
       id="grid821" />
891
161
    <sodipodi:guide
892
162
       orientation="1,0"
893
163
       position="16,48"
894
164
       id="guide823" />
895
165
    <sodipodi:guide
896
166
       orientation="0,1"
897
167
       position="64,80"
898
168
       id="guide825" />
899
169
    <sodipodi:guide
900
170
       orientation="1,0"
901
171
       position="80,40"
902
172
       id="guide827" />
903
173
    <sodipodi:guide
904
174
       orientation="0,1"
905
175
       position="64,16"
906
176
       id="guide829" />
907
177
  </sodipodi:namedview>
908
178
  <metadata
909
179
     id="metadata6522">
910
180
    <rdf:RDF>
911
181
      <cc:Work
912
182
         rdf:about="">
913
183
        <dc:format>image/svg+xml</dc:format>
914
184
        <dc:type
915
185
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
916
186
        <dc:title></dc:title>
917
187
      </cc:Work>
918
188
    </rdf:RDF>
919
189
  </metadata>
920
190
  <g
921
191
     inkscape:label="BACKGROUND"
922
192
     inkscape:groupmode="layer"
923
193
     id="layer1"
924
194
     transform="translate(268,-635.29076)"
925
195
     style="display:inline">
926
196
    <path
927
197
       style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
928
198
       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
929
199
       id="path6455"
930
200
       inkscape:connector-curvature="0"
931
201
       sodipodi:nodetypes="sssssssss" />
932
202
  </g>
933
203
  <g
934
204
     inkscape:groupmode="layer"
935
205
     id="layer3"
936
206
     inkscape:label="PLACE YOUR PICTOGRAM HERE"
937
207
     style="display:inline" />
938
208
  <g
939
209
     inkscape:groupmode="layer"
940
210
     id="layer2"
941
211
     inkscape:label="BADGE"
942
212
     style="display:none"
943
213
     sodipodi:insensitive="true">
944
214
    <g
945
215
       style="display:inline"
946
216
       transform="translate(-340.00001,-581)"
947
217
       id="g4394"
948
218
       clip-path="none">
949
219
      <g
950
220
         id="g855">
951
221
        <g
952
222
           inkscape:groupmode="maskhelper"
953
223
           id="g870"
954
224
           clip-path="url(#clipPath873)"
955
225
           style="opacity:0.6;filter:url(#filter891)">
956
226
          <path
957
227
             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
958
228
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
959
229
             sodipodi:ry="12"
960
230
             sodipodi:rx="12"
961
231
             sodipodi:cy="552.36218"
962
232
             sodipodi:cx="252"
963
233
             id="path844"
964
234
             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
965
235
             sodipodi:type="arc" />
966
236
        </g>
967
237
        <g
968
238
           id="g862">
969
239
          <path
970
240
             sodipodi:type="arc"
971
241
             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
972
242
             id="path4398"
973
243
             sodipodi:cx="252"
974
244
             sodipodi:cy="552.36218"
975
245
             sodipodi:rx="12"
976
246
             sodipodi:ry="12"
977
247
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
978
248
             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
979
249
          <path
980
250
             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
981
251
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
982
252
             sodipodi:ry="12"
983
253
             sodipodi:rx="12"
984
254
             sodipodi:cy="552.36218"
985
255
             sodipodi:cx="252"
986
256
             id="path4400"
987
257
             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
988
258
             sodipodi:type="arc" />
989
259
          <path
990
260
             sodipodi:type="star"
991
261
             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
992
262
             id="path4459"
993
263
             sodipodi:sides="5"
994
264
             sodipodi:cx="666.19574"
995
265
             sodipodi:cy="589.50385"
996
266
             sodipodi:r1="7.2431178"
997
267
             sodipodi:r2="4.3458705"
998
268
             sodipodi:arg1="1.0471976"
999
269
             sodipodi:arg2="1.6755161"
1000
270
             inkscape:flatsided="false"
1001
271
             inkscape:rounded="0.1"
1002
272
             inkscape:randomized="0"
1003
273
             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 C 669.9821,591.68426 670.20862,595.55064 669.8173,595.77657 Z"
1004
274
             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
1005
275
        </g>
1006
276
      </g>
1007
277
    </g>
1008
278
  </g>
1009
279
</svg>
1010
0
280
1011
=== added file 'tests/create/python-apt/icon.svg'
1012
--- tests/create/python-apt/icon.svg	1970-01-01 00:00:00 +0000
1013
+++ tests/create/python-apt/icon.svg	2013-04-25 21:00:33 +0000
1014
@@ -0,0 +1,279 @@
1015
1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1016
2
<!-- Created with Inkscape (http://www.inkscape.org/) -->
1017
3
1018
4
<svg
1019
5
   xmlns:dc="http://purl.org/dc/elements/1.1/"
1020
6
   xmlns:cc="http://creativecommons.org/ns#"
1021
7
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
1022
8
   xmlns:svg="http://www.w3.org/2000/svg"
1023
9
   xmlns="http://www.w3.org/2000/svg"
1024
10
   xmlns:xlink="http://www.w3.org/1999/xlink"
1025
11
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
1026
12
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
1027
13
   width="96"
1028
14
   height="96"
1029
15
   id="svg6517"
1030
16
   version="1.1"
1031
17
   inkscape:version="0.48+devel r12274"
1032
18
   sodipodi:docname="Juju_charm_icon_template.svg">
1033
19
  <defs
1034
20
     id="defs6519">
1035
21
    <linearGradient
1036
22
       inkscape:collect="always"
1037
23
       xlink:href="#Background"
1038
24
       id="linearGradient6461"
1039
25
       gradientUnits="userSpaceOnUse"
1040
26
       x1="0"
1041
27
       y1="970.29498"
1042
28
       x2="144"
1043
29
       y2="970.29498"
1044
30
       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
1045
31
    <linearGradient
1046
32
       id="Background">
1047
33
      <stop
1048
34
         id="stop4178"
1049
35
         offset="0"
1050
36
         style="stop-color:#b8b8b8;stop-opacity:1" />
1051
37
      <stop
1052
38
         id="stop4180"
1053
39
         offset="1"
1054
40
         style="stop-color:#c9c9c9;stop-opacity:1" />
1055
41
    </linearGradient>
1056
42
    <filter
1057
43
       style="color-interpolation-filters:sRGB;"
1058
44
       inkscape:label="Inner Shadow"
1059
45
       id="filter1121">
1060
46
      <feFlood
1061
47
         flood-opacity="0.59999999999999998"
1062
48
         flood-color="rgb(0,0,0)"
1063
49
         result="flood"
1064
50
         id="feFlood1123" />
1065
51
      <feComposite
1066
52
         in="flood"
1067
53
         in2="SourceGraphic"
1068
54
         operator="out"
1069
55
         result="composite1"
1070
56
         id="feComposite1125" />
1071
57
      <feGaussianBlur
1072
58
         in="composite1"
1073
59
         stdDeviation="1"
1074
60
         result="blur"
1075
61
         id="feGaussianBlur1127" />
1076
62
      <feOffset
1077
63
         dx="0"
1078
64
         dy="2"
1079
65
         result="offset"
1080
66
         id="feOffset1129" />
1081
67
      <feComposite
1082
68
         in="offset"
1083
69
         in2="SourceGraphic"
1084
70
         operator="atop"
1085
71
         result="composite2"
1086
72
         id="feComposite1131" />
1087
73
    </filter>
1088
74
    <filter
1089
75
       style="color-interpolation-filters:sRGB;"
1090
76
       inkscape:label="Drop Shadow"
1091
77
       id="filter950">
1092
78
      <feFlood
1093
79
         flood-opacity="0.25"
1094
80
         flood-color="rgb(0,0,0)"
1095
81
         result="flood"
1096
82
         id="feFlood952" />
1097
83
      <feComposite
1098
84
         in="flood"
1099
85
         in2="SourceGraphic"
1100
86
         operator="in"
1101
87
         result="composite1"
1102
88
         id="feComposite954" />
1103
89
      <feGaussianBlur
1104
90
         in="composite1"
1105
91
         stdDeviation="1"
1106
92
         result="blur"
1107
93
         id="feGaussianBlur956" />
1108
94
      <feOffset
1109
95
         dx="0"
1110
96
         dy="1"
1111
97
         result="offset"
1112
98
         id="feOffset958" />
1113
99
      <feComposite
1114
100
         in="SourceGraphic"
1115
101
         in2="offset"
1116
102
         operator="over"
1117
103
         result="composite2"
1118
104
         id="feComposite960" />
1119
105
    </filter>
1120
106
    <clipPath
1121
107
       clipPathUnits="userSpaceOnUse"
1122
108
       id="clipPath873">
1123
109
      <g
1124
110
         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
1125
111
         id="g875"
1126
112
         inkscape:label="Layer 1"
1127
113
         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
1128
114
        <path
1129
115
           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
1130
116
           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
1131
117
           id="path877"
1132
118
           inkscape:connector-curvature="0"
1133
119
           sodipodi:nodetypes="sssssssss" />
1134
120
      </g>
1135
121
    </clipPath>
1136
122
    <filter
1137
123
       inkscape:collect="always"
1138
124
       id="filter891"
1139
125
       inkscape:label="Badge Shadow">
1140
126
      <feGaussianBlur
1141
127
         inkscape:collect="always"
1142
128
         stdDeviation="0.71999962"
1143
129
         id="feGaussianBlur893" />
1144
130
    </filter>
1145
131
  </defs>
1146
132
  <sodipodi:namedview
1147
133
     id="base"
1148
134
     pagecolor="#ffffff"
1149
135
     bordercolor="#666666"
1150
136
     borderopacity="1.0"
1151
137
     inkscape:pageopacity="0.0"
1152
138
     inkscape:pageshadow="2"
1153
139
     inkscape:zoom="4.0745362"
1154
140
     inkscape:cx="18.514671"
1155
141
     inkscape:cy="49.018169"
1156
142
     inkscape:document-units="px"
1157
143
     inkscape:current-layer="layer1"
1158
144
     showgrid="true"
1159
145
     fit-margin-top="0"
1160
146
     fit-margin-left="0"
1161
147
     fit-margin-right="0"
1162
148
     fit-margin-bottom="0"
1163
149
     inkscape:window-width="1920"
1164
150
     inkscape:window-height="1029"
1165
151
     inkscape:window-x="0"
1166
152
     inkscape:window-y="24"
1167
153
     inkscape:window-maximized="1"
1168
154
     showborder="true"
1169
155
     showguides="true"
1170
156
     inkscape:guide-bbox="true"
1171
157
     inkscape:showpageshadow="false">
1172
158
    <inkscape:grid
1173
159
       type="xygrid"
1174
160
       id="grid821" />
1175
161
    <sodipodi:guide
1176
162
       orientation="1,0"
1177
163
       position="16,48"
1178
164
       id="guide823" />
1179
165
    <sodipodi:guide
1180
166
       orientation="0,1"
1181
167
       position="64,80"
1182
168
       id="guide825" />
1183
169
    <sodipodi:guide
1184
170
       orientation="1,0"
1185
171
       position="80,40"
1186
172
       id="guide827" />
1187
173
    <sodipodi:guide
1188
174
       orientation="0,1"
1189
175
       position="64,16"
1190
176
       id="guide829" />
1191
177
  </sodipodi:namedview>
1192
178
  <metadata
1193
179
     id="metadata6522">
1194
180
    <rdf:RDF>
1195
181
      <cc:Work
1196
182
         rdf:about="">
1197
183
        <dc:format>image/svg+xml</dc:format>
1198
184
        <dc:type
1199
185
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
1200
186
        <dc:title></dc:title>
1201
187
      </cc:Work>
1202
188
    </rdf:RDF>
1203
189
  </metadata>
1204
190
  <g
1205
191
     inkscape:label="BACKGROUND"
1206
192
     inkscape:groupmode="layer"
1207
193
     id="layer1"
1208
194
     transform="translate(268,-635.29076)"
1209
195
     style="display:inline">
1210
196
    <path
1211
197
       style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
1212
198
       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
1213
199
       id="path6455"
1214
200
       inkscape:connector-curvature="0"
1215
201
       sodipodi:nodetypes="sssssssss" />
1216
202
  </g>
1217
203
  <g
1218
204
     inkscape:groupmode="layer"
1219
205
     id="layer3"
1220
206
     inkscape:label="PLACE YOUR PICTOGRAM HERE"
1221
207
     style="display:inline" />
1222
208
  <g
1223
209
     inkscape:groupmode="layer"
1224
210
     id="layer2"
1225
211
     inkscape:label="BADGE"
1226
212
     style="display:none"
1227
213
     sodipodi:insensitive="true">
1228
214
    <g
1229
215
       style="display:inline"
1230
216
       transform="translate(-340.00001,-581)"
1231
217
       id="g4394"
1232
218
       clip-path="none">
1233
219
      <g
1234
220
         id="g855">
1235
221
        <g
1236
222
           inkscape:groupmode="maskhelper"
1237
223
           id="g870"
1238
224
           clip-path="url(#clipPath873)"
1239
225
           style="opacity:0.6;filter:url(#filter891)">
1240
226
          <path
1241
227
             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
1242
228
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
1243
229
             sodipodi:ry="12"
1244
230
             sodipodi:rx="12"
1245
231
             sodipodi:cy="552.36218"
1246
232
             sodipodi:cx="252"
1247
233
             id="path844"
1248
234
             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
1249
235
             sodipodi:type="arc" />
1250
236
        </g>
1251
237
        <g
1252
238
           id="g862">
1253
239
          <path
1254
240
             sodipodi:type="arc"
1255
241
             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
1256
242
             id="path4398"
1257
243
             sodipodi:cx="252"
1258
244
             sodipodi:cy="552.36218"
1259
245
             sodipodi:rx="12"
1260
246
             sodipodi:ry="12"
1261
247
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
1262
248
             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
1263
249
          <path
1264
250
             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
1265
251
             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
1266
252
             sodipodi:ry="12"
1267
253
             sodipodi:rx="12"
1268
254
             sodipodi:cy="552.36218"
1269
255
             sodipodi:cx="252"
1270
256
             id="path4400"
1271
257
             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
1272
258
             sodipodi:type="arc" />
1273
259
          <path
1274
260
             sodipodi:type="star"
1275
261
             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
1276
262
             id="path4459"
1277
263
             sodipodi:sides="5"
1278
264
             sodipodi:cx="666.19574"
1279
265
             sodipodi:cy="589.50385"
1280
266
             sodipodi:r1="7.2431178"
1281
267
             sodipodi:r2="4.3458705"
1282
268
             sodipodi:arg1="1.0471976"
1283
269
             sodipodi:arg2="1.6755161"
1284
270
             inkscape:flatsided="false"
1285
271
             inkscape:rounded="0.1"
1286
272
             inkscape:randomized="0"
1287
273
             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 C 669.9821,591.68426 670.20862,595.55064 669.8173,595.77657 Z"
1288
274
             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
1289
275
        </g>
1290
276
      </g>
1291
277
    </g>
1292
278
  </g>
1293
279
</svg>
1294
0
280
1295
=== added file 'tests/proof/expected/icon-template'
1296
--- tests/proof/expected/icon-template	1970-01-01 00:00:00 +0000
1297
+++ tests/proof/expected/icon-template	2013-04-25 21:00:33 +0000
1298
@@ -0,0 +1,15 @@
1299
1
E: Includes template icon.svg file.
1300
2
E: no copyright file
1301
3
E: Includes template README.ex file
1302
4
E: README.ex Includes boilerplate README.ex line 1
1303
5
E: README.ex Includes boilerplate README.ex line 2
1304
6
E: template interface names should be changed: interface-name
1305
7
E: Unknown relation field in relation relation-name - (baz)
1306
8
E: template relations should be renamed to fit charm: relation-name
1307
9
E: Unknown scope found in relation relation-name - (flouride)
1308
10
E: template interface names should be changed: interface-name
1309
11
E: template relations should be renamed to fit charm: relation-name
1310
12
E: relation non-map is not a map
1311
13
I: relation non-map has no hooks
1312
14
E: template interface names should be changed: interface-name
1313
15
E: template relations should be renamed to fit charm: relation-name
Status:	Merged
Merged at revision:	177
Proposed branch:	lp:~marcoceppi/charm-tools/icon-template
Merge into:	lp:~charmers/charm-tools/trunk
Diff against target:	1313 lines (+1212/-0) 16 files modified scripts/lib/proof.py (+19/-0) templates/charm/icon.svg (+279/-0) tests/charms/icon-template/README.ex (+5/-0) tests/charms/icon-template/hooks/install (+5/-0) tests/charms/icon-template/hooks/relation-name-relation-broken (+2/-0) tests/charms/icon-template/hooks/relation-name-relation-changed (+9/-0) tests/charms/icon-template/hooks/relation-name-relation-departed (+5/-0) tests/charms/icon-template/hooks/relation-name-relation-joined (+5/-0) tests/charms/icon-template/hooks/start (+4/-0) tests/charms/icon-template/hooks/stop (+7/-0) tests/charms/icon-template/icon.svg (+279/-0) tests/charms/icon-template/metadata.yaml (+19/-0) tests/charms/icon-template/revision (+1/-0) tests/create/no-package-exists/icon.svg (+279/-0) tests/create/python-apt/icon.svg (+279/-0) tests/proof/expected/icon-template (+15/-0)
To merge this branch:	bzr merge lp:~marcoceppi/charm-tools/icon-template
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juan L. Negron (community)		2013-04-25	Approve on 2013-04-25
Review via email: mp+161020@code.launchpad.net