Mercurial > hg > MakeItSo
annotate makeitso/makeitso.py @ 268:64979cfff465 default tip
some py3 fixes
| author | Jeff Hammel <k0scist@gmail.com> |
|---|---|
| date | Tue, 29 May 2018 15:28:41 -0700 |
| parents | 7e3a32f2794a |
| children |
| rev | line source |
|---|---|
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
1 #!/usr/bin/env python |
| 52 | 2 |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
3 """ |
|
176
668b01d04457
STUB: makeitso/makeitso.py makeitso/script2package.py
Jeff Hammel <k0scist@gmail.com>
parents:
159
diff
changeset
|
4 boilerplate automation: |
|
668b01d04457
STUB: makeitso/makeitso.py makeitso/script2package.py
Jeff Hammel <k0scist@gmail.com>
parents:
159
diff
changeset
|
5 |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
6 filesystem template interpreter |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
7 """ |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
8 |
|
30
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
Jeff Hammel <jhammel@mozilla.com>
parents:
28
diff
changeset
|
9 import inspect |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
10 import os |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
11 import re |
|
25
fbf19940fa97
remove the staging directory you attempted to download
Jeff Hammel <jhammel@mozilla.com>
parents:
24
diff
changeset
|
12 import shutil |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
13 import subprocess |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
14 import sys |
|
21
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
15 import tempfile |
| 15 | 16 import urllib |
|
24
1b802678b341
add note about urllib and timeouts
Jeff Hammel <jhammel@mozilla.com>
parents:
23
diff
changeset
|
17 # TODO: may have to use urllib2.urlopen to get reasonable timeouts |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
18 |
| 268 | 19 try: |
| 20 # python 2 | |
| 21 from ConfigParser import RawConfigParser | |
| 22 except ImportError: | |
| 23 # python 3 | |
| 24 from configparser import RawConfigParser | |
| 25 | |
| 26 try: | |
| 27 # python 2 | |
| 28 string = (unicode, str) | |
| 29 except NameError: | |
| 30 # python 3 | |
| 31 string = (str,) | |
| 32 | |
| 33 | |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
34 from optparse import OptionParser |
|
12
a6fd93354f23
add options for starting and ending braces (unused)
Jeff Hammel <jhammel@mozilla.com>
parents:
9
diff
changeset
|
35 |
|
33
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
36 # URL of -this file- |
|
21
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
37 location = 'http://k0s.org/mozilla/hg/MakeItSo/raw-file/tip/makeitso/makeitso.py' |
|
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
38 |
|
33
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
39 ### import tempita |
|
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
40 |
|
21
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
41 # URL of tempita |
|
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
42 tempita_location = 'http://bitbucket.org/ianb/tempita/raw-file/tip/tempita/' |
|
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
43 |
|
23
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
44 def cleanup(): |
|
25
fbf19940fa97
remove the staging directory you attempted to download
Jeff Hammel <jhammel@mozilla.com>
parents:
24
diff
changeset
|
45 # remove temporary net module directory |
|
23
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
46 if 'tempdir' in globals(): |
|
25
fbf19940fa97
remove the staging directory you attempted to download
Jeff Hammel <jhammel@mozilla.com>
parents:
24
diff
changeset
|
47 shutil.remove(tempdir) |
|
12
a6fd93354f23
add options for starting and ending braces (unused)
Jeff Hammel <jhammel@mozilla.com>
parents:
9
diff
changeset
|
48 try: |
|
a6fd93354f23
add options for starting and ending braces (unused)
Jeff Hammel <jhammel@mozilla.com>
parents:
9
diff
changeset
|
49 import tempita |
|
a6fd93354f23
add options for starting and ending braces (unused)
Jeff Hammel <jhammel@mozilla.com>
parents:
9
diff
changeset
|
50 except ImportError: |
|
21
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
51 |
|
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
52 # Get tempita from the net |
|
25
fbf19940fa97
remove the staging directory you attempted to download
Jeff Hammel <jhammel@mozilla.com>
parents:
24
diff
changeset
|
53 # TODO: abstract this to get arbitrary modules from the net |
|
23
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
54 def getFiles(url, subdir, files): |
|
21
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
55 """ |
|
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
56 fetch files from the internet |
|
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
57 - url : base url |
|
23
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
58 - subdirectory: to put things in |
|
21
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
59 - files : list of files to retrieve |
|
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
60 returns the location of a temporary directory |
|
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
61 """ |
|
23
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
62 globals()['tempdir'] = tempfile.mkdtemp() |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
63 os.mkdir(subdir) |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
64 url = url.rstrip('/') |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
65 for filename in files: |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
66 f, headers = urllib.urlretrive('%s/%s' % (url, filename)) |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
67 content = file(f).read() |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
68 outfile = os.path.join(globals()['tempdir'], subdir, filename) |
|
248
407dd46857e1
fix syntax error in python.py + version bump
Jeff Hammel <k0scist@gmail.com>
parents:
213
diff
changeset
|
69 with file(outfile, 'w') as o: |
|
407dd46857e1
fix syntax error in python.py + version bump
Jeff Hammel <k0scist@gmail.com>
parents:
213
diff
changeset
|
70 o.write(content) |
|
23
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
71 return globals()['tempdir'] |
|
21
c879b93c3f15
stub out fetching tempita from the internet; bitbucket is down, so no further work here atm
Jeff Hammel <jhammel@mozilla.com>
parents:
16
diff
changeset
|
72 |
|
23
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
73 tempita_files = ['__init__.py', '_looper.py', 'compat3.py'] |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
74 |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
75 try: |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
76 t = getFiles(tempita_location, 'tempita', tempita_files) |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
77 sys.path.append(t) |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
78 import tempita |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
79 except: |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
80 cleanup() |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
81 raise NotImplementedError('This should say something like youre not connected to the net') |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
82 |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
83 # regular expressions for finding the shebang |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
84 shebang_re = '#!.*makeitso.*' |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
85 shebang_re = re.compile(shebang_re) |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
86 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
87 ### URIs |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
88 |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
89 def parent_uri(uri): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
90 """parent resource of a URI""" |
|
138
169e02e190ef
peg to tempita version and eliminate cruft
Jeff Hammel <jhammel@mozilla.com>
parents:
128
diff
changeset
|
91 |
|
26
044ac9e0b29c
add a non-working example with an include clause
Jeff Hammel <jhammel@mozilla.com>
parents:
25
diff
changeset
|
92 if '://' in uri: |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
93 return uri.rsplit('/', 1)[0] + '/' |
| 27 | 94 else: |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
95 here = os.path.dirname(os.path.abspath(uri)) |
| 27 | 96 here = here.rstrip(os.path.sep) + os.path.sep |
| 97 return here | |
|
26
044ac9e0b29c
add a non-working example with an include clause
Jeff Hammel <jhammel@mozilla.com>
parents:
25
diff
changeset
|
98 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
99 def basename(uri): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
100 """return the basename of a URI""" |
|
248
407dd46857e1
fix syntax error in python.py + version bump
Jeff Hammel <k0scist@gmail.com>
parents:
213
diff
changeset
|
101 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
102 if '://' in uri: |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
103 return uri.rsplit('/', 1)[1] |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
104 else: |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
105 return os.path.basename(uri) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
106 |
|
26
044ac9e0b29c
add a non-working example with an include clause
Jeff Hammel <jhammel@mozilla.com>
parents:
25
diff
changeset
|
107 def include(uri): |
|
44
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
108 f, headers = urllib.urlretrieve(uri) # XXX -> urllib2 for timeout |
|
26
044ac9e0b29c
add a non-working example with an include clause
Jeff Hammel <jhammel@mozilla.com>
parents:
25
diff
changeset
|
109 return file(f).read() |
|
044ac9e0b29c
add a non-working example with an include clause
Jeff Hammel <jhammel@mozilla.com>
parents:
25
diff
changeset
|
110 |
| 159 | 111 |
|
30
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
Jeff Hammel <jhammel@mozilla.com>
parents:
28
diff
changeset
|
112 ### things that deal with variables |
|
26
044ac9e0b29c
add a non-working example with an include clause
Jeff Hammel <jhammel@mozilla.com>
parents:
25
diff
changeset
|
113 |
|
30
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
Jeff Hammel <jhammel@mozilla.com>
parents:
28
diff
changeset
|
114 class MissingVariablesException(Exception): |
|
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
Jeff Hammel <jhammel@mozilla.com>
parents:
28
diff
changeset
|
115 """exception for (non-interactive) missing variables""" |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
116 def __init__(self, missing): |
|
30
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
Jeff Hammel <jhammel@mozilla.com>
parents:
28
diff
changeset
|
117 self.missing = missing |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
118 message = 'Missing variables: %s' % ', '.join(missing) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
119 Exception.__init__(self, message) |
|
30
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
Jeff Hammel <jhammel@mozilla.com>
parents:
28
diff
changeset
|
120 |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
121 def get_missing(name_error): |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
122 """ |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
123 This is a horrible hack because python doesn't do the proper thing |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
124 via eval and return the name of the variable; instead, it just gives |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
125 you a message: |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
126 >>> try: |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
127 ... eval('2*foo') |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
128 ... except Exception, e: |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
129 ... pass |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
130 """ |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
131 message = name_error.args[0] |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
132 varname = message.split("'")[1] |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
133 return varname |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
134 |
|
33
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
135 ### template classes |
|
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
136 |
|
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
137 class ContentTemplate(tempita.Template): |
|
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
138 """MakeItSo's extension of tempita's Template class""" |
| 159 | 139 |
|
33
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
140 defaults = {'include': include} |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
141 |
|
55
b087a14a664b
fix several issues involving variable interpolation
Jeff Hammel <jhammel@mozilla.com>
parents:
54
diff
changeset
|
142 def __init__(self, content, name=None, interactive=True, variables=None): |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
143 |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
144 # default variables |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
145 self.defaults = self.__class__.defaults.copy() |
|
55
b087a14a664b
fix several issues involving variable interpolation
Jeff Hammel <jhammel@mozilla.com>
parents:
54
diff
changeset
|
146 self.defaults.update(variables or {}) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
147 |
|
33
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
148 # TODO: automagically tell if the program is interactive or not |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
149 self.interactive = interactive |
| 159 | 150 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
151 tempita.Template.__init__(self, content, name=name) |
|
33
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
152 |
|
63
b91133e3b02d
override get_variables for API template; could instead do this in the ctor, alternately
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
153 def get_variables(self, **variables): |
|
b91133e3b02d
override get_variables for API template; could instead do this in the ctor, alternately
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
154 """the template's augmented variable set""" |
|
b91133e3b02d
override get_variables for API template; could instead do this in the ctor, alternately
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
155 vars = self.defaults.copy() |
|
b91133e3b02d
override get_variables for API template; could instead do this in the ctor, alternately
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
156 vars.update(variables) |
|
b91133e3b02d
override get_variables for API template; could instead do this in the ctor, alternately
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
157 return vars |
|
b91133e3b02d
override get_variables for API template; could instead do this in the ctor, alternately
Jeff Hammel <jhammel@mozilla.com>
parents:
56
diff
changeset
|
158 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
159 def missing(self, **variables): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
160 """return additional variables needed""" |
|
55
b087a14a664b
fix several issues involving variable interpolation
Jeff Hammel <jhammel@mozilla.com>
parents:
54
diff
changeset
|
161 vars = self.get_variables(**variables) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
162 missing = set([]) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
163 while True: |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
164 try: |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
165 tempita.Template.substitute(self, **vars) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
166 return missing |
| 267 | 167 except NameError as e: |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
168 missed = get_missing(e) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
169 missing.add(missed) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
170 vars[missed] = '' |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
171 return missing |
|
44
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
172 |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
173 def check_missing(self, vars): |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
174 """ |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
175 check for missing variables and, if applicable, |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
176 update them from the command line |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
177 """ |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
178 missing = self.missing(**vars) |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
179 if missing: |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
180 if self.interactive: |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
181 vars.update(self.read_variables(missing)) |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
182 else: |
|
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
183 raise MissingVariablesException(missing) |
| 159 | 184 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
185 def variables(self): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
186 """return the variables needed for a template""" |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
187 return self.missing() |
|
33
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
188 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
189 def substitute(self, **variables): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
190 """interactive (for now) substitution""" |
|
54
d3e1e5745f24
pass the variables, fixes tests
Jeff Hammel <jhammel@mozilla.com>
parents:
53
diff
changeset
|
191 vars = self.get_variables(**variables) |
|
44
6e08cca7d656
do API variable reading and stubbing a bit for control flow
Jeff Hammel <jhammel@mozilla.com>
parents:
42
diff
changeset
|
192 self.check_missing(vars) |
|
90
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
193 return tempita.Template.substitute(self, **vars) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
194 |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
195 def read_variables(self, variables): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
196 """read variables from stdin""" |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
197 retval = {} |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
198 for i in variables: |
| 267 | 199 print ('Enter %s: ' % i) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
200 retval[i] = raw_input() |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
201 return retval |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
202 |
|
33
190f310f2f5e
more stubbing of template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
32
diff
changeset
|
203 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
204 class URITemplate(ContentTemplate): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
205 """template for a file or URL""" |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
206 |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
207 def __init__(self, uri, interactive=True, variables=None): |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
208 content = include(uri) |
| 159 | 209 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
210 # remove makeitso shebang if it has one |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
211 if shebang_re.match(content): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
212 content = os.linesep.join(content.splitlines()[1:]) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
213 |
|
56
728cae02a6ed
* fix another variable-related bug
Jeff Hammel <jhammel@mozilla.com>
parents:
55
diff
changeset
|
214 variables = variables or {} |
|
76
7909dfaef33b
note about adding more metadata
Jeff Hammel <jhammel@mozilla.com>
parents:
63
diff
changeset
|
215 if 'here' not in variables: |
|
7909dfaef33b
note about adding more metadata
Jeff Hammel <jhammel@mozilla.com>
parents:
63
diff
changeset
|
216 variables['here'] = parent_uri(uri) |
|
7909dfaef33b
note about adding more metadata
Jeff Hammel <jhammel@mozilla.com>
parents:
63
diff
changeset
|
217 # TODO: could add other metadata about the uri, |
|
7909dfaef33b
note about adding more metadata
Jeff Hammel <jhammel@mozilla.com>
parents:
63
diff
changeset
|
218 # such as last modification time' |
| 159 | 219 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
220 ContentTemplate.__init__(self, content, name=uri, |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
221 interactive=interactive, |
|
55
b087a14a664b
fix several issues involving variable interpolation
Jeff Hammel <jhammel@mozilla.com>
parents:
54
diff
changeset
|
222 variables=variables) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
223 |
|
90
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
224 def substitute(self, variables, output=None): |
| 101 | 225 |
| 226 # interpolate | |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
227 content = ContentTemplate.substitute(self, **variables) |
|
90
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
228 |
|
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
229 # write output |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
230 output = output or sys.stdout |
| 268 | 231 if isinstance(output, string): |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
232 path = output |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
233 if os.path.isdir(output): |
|
87
3571417ef92e
interpolate file permissions
Jeff Hammel <jhammel@mozilla.com>
parents:
86
diff
changeset
|
234 path = os.path.join(path, basename(self.name)) |
|
3571417ef92e
interpolate file permissions
Jeff Hammel <jhammel@mozilla.com>
parents:
86
diff
changeset
|
235 f = file(path, 'w') |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
236 print >> f, content |
|
37
7cee2869bd7b
stub out directory example
Jeff Hammel <jhammel@mozilla.com>
parents:
36
diff
changeset
|
237 f.close() |
|
87
3571417ef92e
interpolate file permissions
Jeff Hammel <jhammel@mozilla.com>
parents:
86
diff
changeset
|
238 try: |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
239 os.chmod(path, os.stat(self.name).st_mode) |
|
87
3571417ef92e
interpolate file permissions
Jeff Hammel <jhammel@mozilla.com>
parents:
86
diff
changeset
|
240 except: |
|
3571417ef92e
interpolate file permissions
Jeff Hammel <jhammel@mozilla.com>
parents:
86
diff
changeset
|
241 pass |
|
37
7cee2869bd7b
stub out directory example
Jeff Hammel <jhammel@mozilla.com>
parents:
36
diff
changeset
|
242 else: |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
243 # file handler |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
244 print >> output, content |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
245 |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
246 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
247 class DirectoryTemplate(ContentTemplate): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
248 """template for a directory structure""" |
| 159 | 249 |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
250 def __init__(self, directory, interactive=True, variables=None): |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
251 """ |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
252 - output : output directory; if None will render in place |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
253 """ |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
254 assert os.path.isdir(directory) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
255 self.name = directory |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
256 self.interactive = interactive |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
257 self.defaults = ContentTemplate.defaults.copy() |
|
55
b087a14a664b
fix several issues involving variable interpolation
Jeff Hammel <jhammel@mozilla.com>
parents:
54
diff
changeset
|
258 self.defaults.update(variables or {}) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
259 |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
260 def check_output(self, output): |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
261 """ |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
262 checks output for validity |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
263 """ |
|
213
fa496c9e9d73
move away from assert to AssertionError
Jeff Hammel <k0scist@gmail.com>
parents:
185
diff
changeset
|
264 if not output: |
|
fa496c9e9d73
move away from assert to AssertionError
Jeff Hammel <k0scist@gmail.com>
parents:
185
diff
changeset
|
265 raise AssertionError("Must provide output") |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
266 if os.path.exists(output): |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
267 assert os.path.isdir(output), "%s: Must be a directory" % self.name |
| 159 | 268 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
269 def missing(self, **variables): |
|
55
b087a14a664b
fix several issues involving variable interpolation
Jeff Hammel <jhammel@mozilla.com>
parents:
54
diff
changeset
|
270 vars = self.defaults.copy() |
|
b087a14a664b
fix several issues involving variable interpolation
Jeff Hammel <jhammel@mozilla.com>
parents:
54
diff
changeset
|
271 vars.update(variables) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
272 missing = set([]) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
273 for dirpath, dirnames, filenames in os.walk(self.name): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
274 |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
275 # find variables from directory names |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
276 for d in dirnames: |
|
55
b087a14a664b
fix several issues involving variable interpolation
Jeff Hammel <jhammel@mozilla.com>
parents:
54
diff
changeset
|
277 missed = ContentTemplate(d).missing(**vars) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
278 missing.update(missed) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
279 variables.update(dict([(i, '') for i in missed])) |
|
28
dc18d6db4956
depend on trunk tempita; stubbing for next stage
Jeff Hammel <jhammel@mozilla.com>
parents:
27
diff
changeset
|
280 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
281 # find variables from files |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
282 for f in filenames: |
| 128 | 283 missed = ContentTemplate(f).missing(**vars) |
|
90
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
284 missing.update(missed) |
|
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
285 variables.update(dict([(i, '') for i in missed])) |
| 159 | 286 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
287 path = os.path.join(dirpath, f) |
|
54
d3e1e5745f24
pass the variables, fixes tests
Jeff Hammel <jhammel@mozilla.com>
parents:
53
diff
changeset
|
288 template = URITemplate(path, interactive=self.interactive) |
|
55
b087a14a664b
fix several issues involving variable interpolation
Jeff Hammel <jhammel@mozilla.com>
parents:
54
diff
changeset
|
289 missed = template.missing(**vars) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
290 missing.update(missed) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
291 variables.update(dict([(i, '') for i in missed])) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
292 |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
293 return missing |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
294 |
|
90
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
295 def substitute(self, variables, output): |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
296 self.check_output(output) |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
297 vars = self.get_variables(**variables) |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
298 self.check_missing(vars) |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
299 |
|
39
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
300 # TODO: do this with recursion instead of os.walk so that |
|
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
301 # per-directory control may be asserted |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
302 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
303 # make output directory if necessary |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
304 if output and not os.path.exists(output): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
305 os.makedirs(output) |
| 159 | 306 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
307 for dirname, dirnames, filenames in os.walk(self.name): |
| 159 | 308 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
309 # interpolate directory names |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
310 for d in dirnames: |
|
39
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
311 path = os.path.join(dirname, d) |
| 101 | 312 interpolated = ContentTemplate(path).substitute(**vars) |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
313 target = os.path.join(output, interpolated.split(self.name, 1)[-1].strip(os.path.sep)) |
| 159 | 314 |
|
39
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
315 if os.path.exists(target): |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
316 # ensure its a directory |
|
39
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
317 # TODO: check this first before interpolation is in progress |
|
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
318 assert os.path.isdir(target), "Can't substitute a directory on top of the file" |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
319 else: |
|
39
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
320 os.makedirs(target) |
|
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
321 |
|
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
322 # interpolate files |
|
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
323 for filename in filenames: |
|
90
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
324 |
|
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
325 # interpolate filenames |
|
39
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
326 path = os.path.join(dirname, filename) |
| 101 | 327 interpolated = ContentTemplate(path).substitute(**vars) |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
328 target = os.path.join(output, interpolated.split(self.name, 1)[-1].strip(os.path.sep)) |
|
90
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
329 |
|
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
330 # interpolate their contents |
|
39
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
331 if os.path.exists(target): |
|
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
332 # ensure its a directory |
|
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
333 assert os.path.isfile(target), "Can't substitute a file on top of a directory" |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
334 template = URITemplate(path, interactive=False) |
| 101 | 335 template.substitute(vars, target) |
|
39
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
Jeff Hammel <jhammel@mozilla.com>
parents:
38
diff
changeset
|
336 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
337 |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
338 class PolyTemplate(ContentTemplate): |
|
113
c3b8ce33d3ad
make variable getting logic a little less horrible
Jeff Hammel <jhammel@mozilla.com>
parents:
112
diff
changeset
|
339 """aggregate templates""" |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
340 |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
341 def __init__(self, templates, interactive=True, variables=None): |
|
54
d3e1e5745f24
pass the variables, fixes tests
Jeff Hammel <jhammel@mozilla.com>
parents:
53
diff
changeset
|
342 self.interactive = interactive |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
343 self.templates = [] |
| 107 | 344 entry_points = get_entry_points() |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
345 for template in templates: |
| 268 | 346 if isinstance(template, string): |
|
94
b6a46332cced
allow Polytemplates to take template objects
Jeff Hammel <jhammel@mozilla.com>
parents:
93
diff
changeset
|
347 # TODO: check if the template is a [e.g] PasteScript.template entry point |
|
b6a46332cced
allow Polytemplates to take template objects
Jeff Hammel <jhammel@mozilla.com>
parents:
93
diff
changeset
|
348 if os.path.isdir(template): |
|
b6a46332cced
allow Polytemplates to take template objects
Jeff Hammel <jhammel@mozilla.com>
parents:
93
diff
changeset
|
349 self.templates.append(DirectoryTemplate(template, interactive=self.interactive, variables=variables)) |
| 107 | 350 elif not os.path.exists(template) and template in entry_points: |
| 351 self.templates.append(entry_points[template](interactive=interactive, variables=variables)) | |
|
94
b6a46332cced
allow Polytemplates to take template objects
Jeff Hammel <jhammel@mozilla.com>
parents:
93
diff
changeset
|
352 else: |
|
b6a46332cced
allow Polytemplates to take template objects
Jeff Hammel <jhammel@mozilla.com>
parents:
93
diff
changeset
|
353 self.templates.append(URITemplate(template, interactive=self.interactive, variables=variables)) |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
354 else: |
|
94
b6a46332cced
allow Polytemplates to take template objects
Jeff Hammel <jhammel@mozilla.com>
parents:
93
diff
changeset
|
355 # assume the template is an object that conforms to the API |
|
b6a46332cced
allow Polytemplates to take template objects
Jeff Hammel <jhammel@mozilla.com>
parents:
93
diff
changeset
|
356 self.templates.append(template) |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
357 |
| 112 | 358 def get_variables(self, **variables): |
| 359 vars = variables.copy() | |
| 360 for template in self.templates: | |
| 361 vars.update(template.get_variables()) | |
| 362 return vars | |
| 363 | |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
364 def missing(self, **variables): |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
365 vars = variables.copy() |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
366 missing = set([]) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
367 for template in self.templates: |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
368 missed = template.missing(**vars) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
369 missing.update(missed) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
370 vars.update(dict([(i, '') for i in missed])) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
371 return missing |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
372 |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
373 def check_output(self, output): |
| 268 | 374 if output and isinstance(output, string) and os.path.exists(output) and len(self.templates) > 1: |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
375 assert os.path.isdir(output), "Must specify a directory for multiple templates" |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
376 for template in self.templates: |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
377 if hasattr(template, 'check_output'): |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
378 template.check_output(output) |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
379 |
|
90
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
380 def substitute(self, variables, output=None): |
|
28
dc18d6db4956
depend on trunk tempita; stubbing for next stage
Jeff Hammel <jhammel@mozilla.com>
parents:
27
diff
changeset
|
381 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
382 # determine where the hell to put these things |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
383 self.check_output(output) |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
384 |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
385 # get the variables |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
386 vars = self.get_variables(**variables) |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
387 self.check_missing(vars) |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
388 |
|
114
b8d5d2041fe0
stub out project name -> package name
Jeff Hammel <jhammel@mozilla.com>
parents:
113
diff
changeset
|
389 # make the output directory if multiple templates |
|
88
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
390 if output and len(self.templates) > 1 and not os.path.exists(output): |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
391 os.makedirs(output) |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
392 |
|
712a6d358083
fixed output broke other things
Jeff Hammel <jhammel@mozilla.com>
parents:
87
diff
changeset
|
393 # do the substitution |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
394 for template in self.templates: |
|
90
26b9c3bba04e
make the api for substitute() variables, output
Jeff Hammel <jhammel@mozilla.com>
parents:
89
diff
changeset
|
395 template.substitute(vars, output) |
|
138
169e02e190ef
peg to tempita version and eliminate cruft
Jeff Hammel <jhammel@mozilla.com>
parents:
128
diff
changeset
|
396 |
|
41
9956e13558dd
stub out what API templates will look like; put these in a separate file as theres no reason to clutter up the command line entry point any further
Jeff Hammel <jhammel@mozilla.com>
parents:
40
diff
changeset
|
397 ### command line interface |
|
28
dc18d6db4956
depend on trunk tempita; stubbing for next stage
Jeff Hammel <jhammel@mozilla.com>
parents:
27
diff
changeset
|
398 |
|
103
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
399 def read_config(config_files, templates=()): |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
400 """read variables from a set of .ini files""" |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
401 retval = {} |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
402 parser = RawConfigParser() |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
403 parser.read(config_files) |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
404 retval.update(dict(parser.items('DEFAULT'))) |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
405 for template in templates: |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
406 if template in parser.sections(): |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
407 retval.update(dict(parser.items(template))) |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
408 return retval |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
409 |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
410 def invocation(url, **variables): |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
411 """returns a string appropriate for TTW invocation""" |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
412 variables_string = ' '.join(['%s=%s' % (i,j) for i,j in variables.items()]) |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
413 return 'python <(curl %s) %s %s' % (location, url, variables_string) |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
414 |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
415 def main(args=sys.argv[1:]): |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
416 |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
417 # create option parser |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
418 usage = '%prog [options] template <template> <...>' |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
419 parser = OptionParser(usage, description=__doc__) |
|
28
dc18d6db4956
depend on trunk tempita; stubbing for next stage
Jeff Hammel <jhammel@mozilla.com>
parents:
27
diff
changeset
|
420 |
|
103
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
421 # find dotfile |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
422 dotfile = None |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
423 if 'HOME' in os.environ: |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
424 dotfile = os.path.join(os.environ['HOME'], '.makeitso') |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
425 if not (os.path.exists(dotfile) and os.path.isfile(dotfile)): |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
426 dotfile = None |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
427 |
|
138
169e02e190ef
peg to tempita version and eliminate cruft
Jeff Hammel <jhammel@mozilla.com>
parents:
128
diff
changeset
|
428 parser.add_option('-[', '--start-braces', dest='start_braces', |
|
169e02e190ef
peg to tempita version and eliminate cruft
Jeff Hammel <jhammel@mozilla.com>
parents:
128
diff
changeset
|
429 help='starting delimeter') |
|
169e02e190ef
peg to tempita version and eliminate cruft
Jeff Hammel <jhammel@mozilla.com>
parents:
128
diff
changeset
|
430 parser.add_option('-]', '--end-braces', dest='end_braces', |
|
169e02e190ef
peg to tempita version and eliminate cruft
Jeff Hammel <jhammel@mozilla.com>
parents:
128
diff
changeset
|
431 help='starting delimeter') |
|
28
dc18d6db4956
depend on trunk tempita; stubbing for next stage
Jeff Hammel <jhammel@mozilla.com>
parents:
27
diff
changeset
|
432 |
|
dc18d6db4956
depend on trunk tempita; stubbing for next stage
Jeff Hammel <jhammel@mozilla.com>
parents:
27
diff
changeset
|
433 # options about where to put things |
|
dc18d6db4956
depend on trunk tempita; stubbing for next stage
Jeff Hammel <jhammel@mozilla.com>
parents:
27
diff
changeset
|
434 parser.add_option('-o', '--output', dest='output', |
|
dc18d6db4956
depend on trunk tempita; stubbing for next stage
Jeff Hammel <jhammel@mozilla.com>
parents:
27
diff
changeset
|
435 help='where to put the output (filename or directory)') |
|
dc18d6db4956
depend on trunk tempita; stubbing for next stage
Jeff Hammel <jhammel@mozilla.com>
parents:
27
diff
changeset
|
436 |
|
93
d5da38fabdf7
note command line options needed for variable handling
Jeff Hammel <jhammel@mozilla.com>
parents:
90
diff
changeset
|
437 # options for (.ini) variables |
|
103
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
438 parser.add_option('-c', '--config', dest='config', |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
439 default=[], action='append', |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
440 help='.ini config files to read variables from') |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
441 if dotfile: |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
442 parser.add_option('--no-defaults', dest='use_defaults', |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
443 default=True, action='store_false', |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
444 help="don't read ~/.makeitso") |
| 104 | 445 |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
446 # options for getting information |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
447 parser.add_option('--commandline', dest='commandline', |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
448 action='store_true', default=False, |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
449 help="print the commandline to invoke this script TTW") |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
450 parser.add_option('--variables', dest='variables', |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
451 action='store_true', default=False, |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
452 help='print the variables in a template') |
|
110
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
453 entry_points = get_entry_points() |
|
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
454 if entry_points: |
|
185
0fd0cc154153
STUB: makeitso/makeitso.py setup.py
Jeff Hammel <k0scist@gmail.com>
parents:
176
diff
changeset
|
455 parser.add_option('--list', '--list-templates', |
|
0fd0cc154153
STUB: makeitso/makeitso.py setup.py
Jeff Hammel <k0scist@gmail.com>
parents:
176
diff
changeset
|
456 dest='list_templates', |
|
110
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
457 action='store_true', default=False, |
|
185
0fd0cc154153
STUB: makeitso/makeitso.py setup.py
Jeff Hammel <k0scist@gmail.com>
parents:
176
diff
changeset
|
458 help="list installed templates") |
|
110
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
459 |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
460 options, args = parser.parse_args(args) |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
461 |
|
110
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
462 # list the templates |
|
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
463 if entry_points and options.list_templates: |
|
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
464 for key in sorted(entry_points.keys()): |
|
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
465 template_class = entry_points[key] |
|
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
466 description = getattr(template_class, 'description', '') |
|
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
467 description = description or getattr(template_class, '__doc__', '') |
|
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
468 description = description.strip() |
| 267 | 469 print (key + ': ' + description) |
|
110
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
470 return |
|
613e9c19a98c
add a --list-templates command
Jeff Hammel <jhammel@mozilla.com>
parents:
108
diff
changeset
|
471 |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
472 # print the variables for the templates |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
473 if options.variables: |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
474 |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
475 # makes no sense without a template |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
476 if not args: |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
477 parser.print_usage() |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
478 parser.exit() |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
479 |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
480 # find all variables |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
481 template = PolyTemplate(templates=args) |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
482 variables = template.variables() |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
483 |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
484 # print them |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
485 for variable in sorted(variables): |
| 267 | 486 print (variable) |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
487 return |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
488 |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
489 # template variables |
|
35
7e47ff4b0cd3
started writing tests; what a surprise, everything is broken ;)
Jeff Hammel <jhammel@mozilla.com>
parents:
34
diff
changeset
|
490 variables = {} |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
491 _args = [] |
|
103
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
492 |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
493 # read variables from configuration |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
494 config_files = options.config |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
495 if dotfile and options.use_defaults: |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
496 config_files.insert(0, dotfile) |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
497 if config_files: |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
498 variables.update(read_config(config_files)) |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
499 |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
500 # override with variables from the command line |
|
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
501 _variables = {} |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
502 for arg in args: |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
503 if '=' in arg: |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
504 key, value = arg.split('=') |
|
103
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
505 _variables[key] = value |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
506 else: |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
507 _args.append(arg) |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
508 args = _args |
|
103
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
509 variables.update(_variables) |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
510 |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
511 # print TTW commandline for invocation |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
512 if options.commandline: |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
513 if args: |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
514 for arg in args: |
| 267 | 515 print (invocation(arg, **variables)) |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
516 else: |
| 267 | 517 print (invocation('[URI]', **variables)) |
|
9
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
518 return |
|
a77630b2b491
* add commandline to print commandlines
Jeff Hammel <jhammel@mozilla.com>
parents:
6
diff
changeset
|
519 |
|
103
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
520 |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
521 # get the content |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
522 if args: |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
523 template = PolyTemplate(templates=args, |
|
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
524 variables=variables) |
|
103
a6aff990985b
do rudimentary interpretation of config files
Jeff Hammel <jhammel@mozilla.com>
parents:
101
diff
changeset
|
525 template.substitute({}, output=options.output) |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
526 else: |
|
34
46c2d0a7335a
continued refactor to have template classes
Jeff Hammel <jhammel@mozilla.com>
parents:
33
diff
changeset
|
527 template = ContentTemplate(sys.stdin.read(), variables=variables) |
| 267 | 528 print (template.substitute()) |
|
23
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
529 |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
530 # cleanup |
|
776805790c84
stub out getting tempita from the net; unttested
Jeff Hammel <jhammel@mozilla.com>
parents:
22
diff
changeset
|
531 cleanup() |
|
138
169e02e190ef
peg to tempita version and eliminate cruft
Jeff Hammel <jhammel@mozilla.com>
parents:
128
diff
changeset
|
532 |
|
5
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
533 if __name__ == '__main__': |
|
f064be514e53
choose a better filename and remove some stuff from shebang
Jeff Hammel <jhammel@mozilla.com>
parents:
diff
changeset
|
534 main() |
|
106
1295df1700a4
move stubbing around...maybe last minute will work better? ::shrug::
Jeff Hammel <jhammel@mozilla.com>
parents:
105
diff
changeset
|
535 |
|
1295df1700a4
move stubbing around...maybe last minute will work better? ::shrug::
Jeff Hammel <jhammel@mozilla.com>
parents:
105
diff
changeset
|
536 |
|
1295df1700a4
move stubbing around...maybe last minute will work better? ::shrug::
Jeff Hammel <jhammel@mozilla.com>
parents:
105
diff
changeset
|
537 # get templates from pkg_resources |
|
1295df1700a4
move stubbing around...maybe last minute will work better? ::shrug::
Jeff Hammel <jhammel@mozilla.com>
parents:
105
diff
changeset
|
538 # (MakeItSo! and [TODO] pastescript templates) |
|
248
407dd46857e1
fix syntax error in python.py + version bump
Jeff Hammel <k0scist@gmail.com>
parents:
213
diff
changeset
|
539 # this should go last to ensure the module is wholly loaded [?!] |
| 107 | 540 def get_entry_points(): |
| 541 retval = {} | |
|
106
1295df1700a4
move stubbing around...maybe last minute will work better? ::shrug::
Jeff Hammel <jhammel@mozilla.com>
parents:
105
diff
changeset
|
542 try: |
|
1295df1700a4
move stubbing around...maybe last minute will work better? ::shrug::
Jeff Hammel <jhammel@mozilla.com>
parents:
105
diff
changeset
|
543 from pkg_resources import iter_entry_points |
|
1295df1700a4
move stubbing around...maybe last minute will work better? ::shrug::
Jeff Hammel <jhammel@mozilla.com>
parents:
105
diff
changeset
|
544 for i in iter_entry_points('makeitso.templates'): |
| 107 | 545 try: |
| 546 retval[i.name] = i.load() | |
| 547 except: | |
| 548 continue | |
|
106
1295df1700a4
move stubbing around...maybe last minute will work better? ::shrug::
Jeff Hammel <jhammel@mozilla.com>
parents:
105
diff
changeset
|
549 |
|
1295df1700a4
move stubbing around...maybe last minute will work better? ::shrug::
Jeff Hammel <jhammel@mozilla.com>
parents:
105
diff
changeset
|
550 except ImportError: |
| 107 | 551 return retval |
| 552 return retval |