Mercurial > hg > MakeItSo
annotate makeitso/makeitso.py @ 93:d5da38fabdf7
note command line options needed for variable handling
| author | Jeff Hammel <jhammel@mozilla.com> | 
|---|---|
| date | Tue, 11 Jan 2011 07:30:31 -0800 | 
| parents | 26b9c3bba04e | 
| children | b6a46332cced | 
| 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 """ | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 4 filesystem template interpreter | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 5 """ | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 6 | 
| 30 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 7 import inspect | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 8 import os | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 9 import re | 
| 25 
fbf19940fa97
remove the staging directory you attempted to download
 Jeff Hammel <jhammel@mozilla.com> parents: 
24diff
changeset | 10 import shutil | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 11 import subprocess | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 12 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: 
16diff
changeset | 13 import tempfile | 
| 15 | 14 import urllib | 
| 24 
1b802678b341
add note about urllib and timeouts
 Jeff Hammel <jhammel@mozilla.com> parents: 
23diff
changeset | 15 # 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 | 16 | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 17 from optparse import OptionParser | 
| 12 
a6fd93354f23
add options for starting and ending braces (unused)
 Jeff Hammel <jhammel@mozilla.com> parents: 
9diff
changeset | 18 | 
| 33 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 19 # 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: 
16diff
changeset | 20 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: 
16diff
changeset | 21 | 
| 33 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 22 ### import tempita | 
| 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 23 | 
| 21 
c879b93c3f15
stub out fetching tempita from the internet;  bitbucket is down, so no further work here atm
 Jeff Hammel <jhammel@mozilla.com> parents: 
16diff
changeset | 24 # 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: 
16diff
changeset | 25 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: 
16diff
changeset | 26 | 
| 23 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 27 def cleanup(): | 
| 25 
fbf19940fa97
remove the staging directory you attempted to download
 Jeff Hammel <jhammel@mozilla.com> parents: 
24diff
changeset | 28 # remove temporary net module directory | 
| 23 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 29 if 'tempdir' in globals(): | 
| 25 
fbf19940fa97
remove the staging directory you attempted to download
 Jeff Hammel <jhammel@mozilla.com> parents: 
24diff
changeset | 30 shutil.remove(tempdir) | 
| 12 
a6fd93354f23
add options for starting and ending braces (unused)
 Jeff Hammel <jhammel@mozilla.com> parents: 
9diff
changeset | 31 try: | 
| 
a6fd93354f23
add options for starting and ending braces (unused)
 Jeff Hammel <jhammel@mozilla.com> parents: 
9diff
changeset | 32 import tempita | 
| 
a6fd93354f23
add options for starting and ending braces (unused)
 Jeff Hammel <jhammel@mozilla.com> parents: 
9diff
changeset | 33 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: 
16diff
changeset | 34 | 
| 
c879b93c3f15
stub out fetching tempita from the internet;  bitbucket is down, so no further work here atm
 Jeff Hammel <jhammel@mozilla.com> parents: 
16diff
changeset | 35 # Get tempita from the net | 
| 25 
fbf19940fa97
remove the staging directory you attempted to download
 Jeff Hammel <jhammel@mozilla.com> parents: 
24diff
changeset | 36 # 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: 
22diff
changeset | 37 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: 
16diff
changeset | 38 """ | 
| 
c879b93c3f15
stub out fetching tempita from the internet;  bitbucket is down, so no further work here atm
 Jeff Hammel <jhammel@mozilla.com> parents: 
16diff
changeset | 39 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: 
16diff
changeset | 40 - url : base url | 
| 23 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 41 - 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: 
16diff
changeset | 42 - 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: 
16diff
changeset | 43 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: 
16diff
changeset | 44 """ | 
| 23 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 45 globals()['tempdir'] = tempfile.mkdtemp() | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 46 os.mkdir(subdir) | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 47 url = url.rstrip('/') | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 48 for filename in files: | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 49 f, headers = urllib.urlretrive('%s/%s' % (url, filename)) | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 50 content = file(f).read() | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 51 outfile = os.path.join(globals()['tempdir'], subdir, filename) | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 52 o = file(outfile, 'w') | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 53 print >> o, content | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 54 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: 
16diff
changeset | 55 | 
| 23 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 56 tempita_files = ['__init__.py', '_looper.py', 'compat3.py'] | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 57 | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 58 try: | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 59 t = getFiles(tempita_location, 'tempita', tempita_files) | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 60 sys.path.append(t) | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 61 import tempita | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 62 except: | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 63 cleanup() | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 64 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: 
22diff
changeset | 65 | 
| 30 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 66 # does tempita support delimeters? | 
| 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 67 has_delimeters = 'delimeters' in inspect.getargspec(tempita.Template.__init__).args | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 68 | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 69 # 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 | 70 shebang_re = '#!.*makeitso.*' | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 71 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 | 72 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 73 ### URIs | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 74 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 75 def parent_uri(uri): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 76 """parent resource of a URI""" | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 77 | 
| 26 
044ac9e0b29c
add a non-working example with an include clause
 Jeff Hammel <jhammel@mozilla.com> parents: 
25diff
changeset | 78 if '://' in uri: | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 79 return uri.rsplit('/', 1)[0] + '/' | 
| 27 | 80 else: | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 81 here = os.path.dirname(os.path.abspath(uri)) | 
| 27 | 82 here = here.rstrip(os.path.sep) + os.path.sep | 
| 83 return here | |
| 26 
044ac9e0b29c
add a non-working example with an include clause
 Jeff Hammel <jhammel@mozilla.com> parents: 
25diff
changeset | 84 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 85 def basename(uri): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 86 """return the basename of a URI""" | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 87 if '://' in uri: | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 88 return uri.rsplit('/', 1)[1] | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 89 else: | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 90 return os.path.basename(uri) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 91 | 
| 26 
044ac9e0b29c
add a non-working example with an include clause
 Jeff Hammel <jhammel@mozilla.com> parents: 
25diff
changeset | 92 def include(uri): | 
| 44 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 93 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: 
25diff
changeset | 94 return file(f).read() | 
| 
044ac9e0b29c
add a non-working example with an include clause
 Jeff Hammel <jhammel@mozilla.com> parents: 
25diff
changeset | 95 | 
| 30 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 96 ### things that deal with variables | 
| 26 
044ac9e0b29c
add a non-working example with an include clause
 Jeff Hammel <jhammel@mozilla.com> parents: 
25diff
changeset | 97 | 
| 30 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 98 class MissingVariablesException(Exception): | 
| 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 99 """exception for (non-interactive) missing variables""" | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 100 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: 
28diff
changeset | 101 self.missing = missing | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 102 message = 'Missing variables: %s' % ', '.join(missing) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 103 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: 
28diff
changeset | 104 | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 105 def get_missing(name_error): | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 106 """ | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 107 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 | 108 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 | 109 you a message: | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 110 >>> try: | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 111 ... eval('2*foo') | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 112 ... except Exception, e: | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 113 ... pass | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 114 """ | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 115 message = name_error.args[0] | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 116 varname = message.split("'")[1] | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 117 return varname | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 118 | 
| 33 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 119 ### template classes | 
| 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 120 | 
| 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 121 class ContentTemplate(tempita.Template): | 
| 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 122 """MakeItSo's extension of tempita's Template class""" | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 123 | 
| 33 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 124 defaults = {'include': include} | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 125 | 
| 55 
b087a14a664b
fix several issues involving variable interpolation
 Jeff Hammel <jhammel@mozilla.com> parents: 
54diff
changeset | 126 def __init__(self, content, name=None, interactive=True, variables=None): | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 127 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 128 # default variables | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 129 self.defaults = self.__class__.defaults.copy() | 
| 55 
b087a14a664b
fix several issues involving variable interpolation
 Jeff Hammel <jhammel@mozilla.com> parents: 
54diff
changeset | 130 self.defaults.update(variables or {}) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 131 | 
| 33 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 132 # TODO: automagically tell if the program is interactive or not | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 133 self.interactive = interactive | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 134 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 135 tempita.Template.__init__(self, content, name=name) | 
| 33 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 136 | 
| 63 
b91133e3b02d
override get_variables for API template; could instead do this in the ctor, alternately
 Jeff Hammel <jhammel@mozilla.com> parents: 
56diff
changeset | 137 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: 
56diff
changeset | 138 """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: 
56diff
changeset | 139 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: 
56diff
changeset | 140 vars.update(variables) | 
| 
b91133e3b02d
override get_variables for API template; could instead do this in the ctor, alternately
 Jeff Hammel <jhammel@mozilla.com> parents: 
56diff
changeset | 141 return vars | 
| 
b91133e3b02d
override get_variables for API template; could instead do this in the ctor, alternately
 Jeff Hammel <jhammel@mozilla.com> parents: 
56diff
changeset | 142 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 143 def missing(self, **variables): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 144 """return additional variables needed""" | 
| 55 
b087a14a664b
fix several issues involving variable interpolation
 Jeff Hammel <jhammel@mozilla.com> parents: 
54diff
changeset | 145 vars = self.get_variables(**variables) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 146 missing = set([]) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 147 while True: | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 148 try: | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 149 tempita.Template.substitute(self, **vars) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 150 return missing | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 151 except NameError, e: | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 152 missed = get_missing(e) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 153 missing.add(missed) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 154 vars[missed] = '' | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 155 return missing | 
| 44 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 156 | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 157 def check_missing(self, vars): | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 158 """ | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 159 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: 
42diff
changeset | 160 update them from the command line | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 161 """ | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 162 missing = self.missing(**vars) | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 163 if missing: | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 164 if self.interactive: | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 165 vars.update(self.read_variables(missing)) | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 166 else: | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 167 raise MissingVariablesException(missing) | 
| 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 168 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 169 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 170 def variables(self): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 171 """return the variables needed for a template""" | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 172 return self.missing() | 
| 33 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 173 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 174 def substitute(self, **variables): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 175 """interactive (for now) substitution""" | 
| 54 
d3e1e5745f24
pass the variables, fixes tests
 Jeff Hammel <jhammel@mozilla.com> parents: 
53diff
changeset | 176 vars = self.get_variables(**variables) | 
| 44 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 177 self.check_missing(vars) | 
| 90 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 178 return tempita.Template.substitute(self, **vars) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 179 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 180 def read_variables(self, variables): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 181 """read variables from stdin""" | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 182 # TODO: variables should (optionally) be richer objects | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 183 retval = {} | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 184 for i in variables: | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 185 print 'Enter %s: ' % i, | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 186 retval[i] = raw_input() | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 187 return retval | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 188 | 
| 33 
190f310f2f5e
more stubbing of template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
32diff
changeset | 189 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 190 class URITemplate(ContentTemplate): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 191 """template for a file or URL""" | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 192 | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 193 def __init__(self, uri, interactive=True, variables=None): | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 194 content = include(uri) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 195 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 196 # remove makeitso shebang if it has one | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 197 if shebang_re.match(content): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 198 content = os.linesep.join(content.splitlines()[1:]) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 199 | 
| 56 
728cae02a6ed
* fix another variable-related bug
 Jeff Hammel <jhammel@mozilla.com> parents: 
55diff
changeset | 200 variables = variables or {} | 
| 76 
7909dfaef33b
note about adding more metadata
 Jeff Hammel <jhammel@mozilla.com> parents: 
63diff
changeset | 201 if 'here' not in variables: | 
| 
7909dfaef33b
note about adding more metadata
 Jeff Hammel <jhammel@mozilla.com> parents: 
63diff
changeset | 202 variables['here'] = parent_uri(uri) | 
| 
7909dfaef33b
note about adding more metadata
 Jeff Hammel <jhammel@mozilla.com> parents: 
63diff
changeset | 203 # TODO: could add other metadata about the uri, | 
| 
7909dfaef33b
note about adding more metadata
 Jeff Hammel <jhammel@mozilla.com> parents: 
63diff
changeset | 204 # such as last modification time' | 
| 
7909dfaef33b
note about adding more metadata
 Jeff Hammel <jhammel@mozilla.com> parents: 
63diff
changeset | 205 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 206 ContentTemplate.__init__(self, content, name=uri, | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 207 interactive=interactive, | 
| 55 
b087a14a664b
fix several issues involving variable interpolation
 Jeff Hammel <jhammel@mozilla.com> parents: 
54diff
changeset | 208 variables=variables) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 209 | 
| 90 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 210 def substitute(self, variables, output=None): | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 211 content = ContentTemplate.substitute(self, **variables) | 
| 90 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 212 | 
| 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 213 # write output | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 214 output = output or sys.stdout | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 215 if isinstance(output, basestring): | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 216 path = output | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 217 if os.path.isdir(output): | 
| 87 
3571417ef92e
interpolate file permissions
 Jeff Hammel <jhammel@mozilla.com> parents: 
86diff
changeset | 218 path = os.path.join(path, basename(self.name)) | 
| 
3571417ef92e
interpolate file permissions
 Jeff Hammel <jhammel@mozilla.com> parents: 
86diff
changeset | 219 f = file(path, 'w') | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 220 print >> f, content | 
| 37 
7cee2869bd7b
stub out directory example
 Jeff Hammel <jhammel@mozilla.com> parents: 
36diff
changeset | 221 f.close() | 
| 87 
3571417ef92e
interpolate file permissions
 Jeff Hammel <jhammel@mozilla.com> parents: 
86diff
changeset | 222 try: | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 223 os.chmod(path, os.stat(self.name).st_mode) | 
| 87 
3571417ef92e
interpolate file permissions
 Jeff Hammel <jhammel@mozilla.com> parents: 
86diff
changeset | 224 except: | 
| 
3571417ef92e
interpolate file permissions
 Jeff Hammel <jhammel@mozilla.com> parents: 
86diff
changeset | 225 pass | 
| 37 
7cee2869bd7b
stub out directory example
 Jeff Hammel <jhammel@mozilla.com> parents: 
36diff
changeset | 226 else: | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 227 # file handler | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 228 print >> output, content | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 229 | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 230 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 231 class DirectoryTemplate(ContentTemplate): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 232 """template for a directory structure""" | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 233 | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 234 def __init__(self, directory, interactive=True, variables=None): | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 235 """ | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 236 - output : output directory; if None will render in place | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 237 """ | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 238 assert os.path.isdir(directory) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 239 self.name = directory | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 240 self.interactive = interactive | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 241 self.defaults = ContentTemplate.defaults.copy() | 
| 55 
b087a14a664b
fix several issues involving variable interpolation
 Jeff Hammel <jhammel@mozilla.com> parents: 
54diff
changeset | 242 self.defaults.update(variables or {}) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 243 | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 244 def check_output(self, output): | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 245 """ | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 246 checks output for validity | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 247 """ | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 248 assert output # must provide output | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 249 if os.path.exists(output): | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 250 assert os.path.isdir(output), "%s: Must be a directory" % self.name | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 251 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 252 def missing(self, **variables): | 
| 55 
b087a14a664b
fix several issues involving variable interpolation
 Jeff Hammel <jhammel@mozilla.com> parents: 
54diff
changeset | 253 vars = self.defaults.copy() | 
| 
b087a14a664b
fix several issues involving variable interpolation
 Jeff Hammel <jhammel@mozilla.com> parents: 
54diff
changeset | 254 vars.update(variables) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 255 missing = set([]) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 256 for dirpath, dirnames, filenames in os.walk(self.name): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 257 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 258 # find variables from directory names | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 259 for d in dirnames: | 
| 55 
b087a14a664b
fix several issues involving variable interpolation
 Jeff Hammel <jhammel@mozilla.com> parents: 
54diff
changeset | 260 missed = ContentTemplate(d).missing(**vars) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 261 missing.update(missed) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 262 variables.update(dict([(i, '') for i in missed])) | 
| 28 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 263 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 264 # find variables from files | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 265 for f in filenames: | 
| 90 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 266 missed = ContentTemplate(d).missing(**vars) | 
| 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 267 missing.update(missed) | 
| 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 268 variables.update(dict([(i, '') for i in missed])) | 
| 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 269 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 270 path = os.path.join(dirpath, f) | 
| 54 
d3e1e5745f24
pass the variables, fixes tests
 Jeff Hammel <jhammel@mozilla.com> parents: 
53diff
changeset | 271 template = URITemplate(path, interactive=self.interactive) | 
| 55 
b087a14a664b
fix several issues involving variable interpolation
 Jeff Hammel <jhammel@mozilla.com> parents: 
54diff
changeset | 272 missed = template.missing(**vars) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 273 missing.update(missed) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 274 variables.update(dict([(i, '') for i in missed])) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 275 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 276 return missing | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 277 | 
| 90 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 278 def substitute(self, variables, output): | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 279 self.check_output(output) | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 280 vars = self.get_variables(**variables) | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 281 self.check_missing(vars) | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 282 | 
| 39 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 283 # 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: 
38diff
changeset | 284 # 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 | 285 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 286 # make output directory if necessary | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 287 if output and not os.path.exists(output): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 288 os.makedirs(output) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 289 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 290 for dirname, dirnames, filenames in os.walk(self.name): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 291 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 292 # interpolate directory names | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 293 for d in dirnames: | 
| 39 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 294 path = os.path.join(dirname, d) | 
| 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 295 interpolated = ContentTemplate(path).substitute(**variables) | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 296 target = os.path.join(output, interpolated.split(self.name, 1)[-1].strip(os.path.sep)) | 
| 39 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 297 | 
| 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 298 if os.path.exists(target): | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 299 # ensure its a directory | 
| 39 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 300 # 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: 
38diff
changeset | 301 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: 
33diff
changeset | 302 else: | 
| 39 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 303 os.makedirs(target) | 
| 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 304 | 
| 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 305 # interpolate files | 
| 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 306 for filename in filenames: | 
| 90 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 307 | 
| 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 308 # interpolate filenames | 
| 39 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 309 path = os.path.join(dirname, filename) | 
| 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 310 interpolated = ContentTemplate(path).substitute(**variables) | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 311 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: 
89diff
changeset | 312 | 
| 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 313 # interpolate their contents | 
| 39 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 314 if os.path.exists(target): | 
| 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 315 # ensure its a directory | 
| 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 316 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: 
87diff
changeset | 317 template = URITemplate(path, interactive=False) | 
| 90 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 318 template.substitute(variables, target) | 
| 39 
a2cdce0108e1
get directory substitution sorta working; start stubbing mixed case
 Jeff Hammel <jhammel@mozilla.com> parents: 
38diff
changeset | 319 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 320 | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 321 class PolyTemplate(ContentTemplate): | 
| 42 
73dac34d2692
more stubbing of API class; first get something off the ground; then rewrite
 Jeff Hammel <jhammel@mozilla.com> parents: 
41diff
changeset | 322 """template for several files/directories""" | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 323 | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 324 def __init__(self, templates, interactive=True, variables=None): | 
| 35 
7e47ff4b0cd3
started writing tests; what a surprise, everything is broken ;)
 Jeff Hammel <jhammel@mozilla.com> parents: 
34diff
changeset | 325 | 
| 54 
d3e1e5745f24
pass the variables, fixes tests
 Jeff Hammel <jhammel@mozilla.com> parents: 
53diff
changeset | 326 self.interactive = interactive | 
| 35 
7e47ff4b0cd3
started writing tests; what a surprise, everything is broken ;)
 Jeff Hammel <jhammel@mozilla.com> parents: 
34diff
changeset | 327 self._templates = templates[:] | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 328 self.templates = [] | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 329 for template in templates: | 
| 44 
6e08cca7d656
do API variable reading and stubbing a bit for control flow
 Jeff Hammel <jhammel@mozilla.com> parents: 
42diff
changeset | 330 # TODO: check if the template is a [e.g] PasteScript.template entry point | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 331 if os.path.isdir(template): | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 332 self.templates.append(DirectoryTemplate(template, interactive=self.interactive, variables=variables)) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 333 else: | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 334 self.templates.append(URITemplate(template, interactive=self.interactive, variables=variables)) | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 335 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 336 def missing(self, **variables): | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 337 vars = variables.copy() | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 338 missing = set([]) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 339 for template in self.templates: | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 340 missed = template.missing(**vars) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 341 missing.update(missed) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 342 vars.update(dict([(i, '') for i in missed])) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 343 return missing | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 344 | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 345 def check_output(self, output): | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 346 if output and isinstance(output, basestring) and os.path.exists(output) and len(self.templates) > 1: | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 347 assert os.path.isdir(output), "Must specify a directory for multiple templates" | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 348 for template in self.templates: | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 349 if hasattr(template, 'check_output'): | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 350 template.check_output(output) | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 351 | 
| 90 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 352 def substitute(self, variables, output=None): | 
| 28 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 353 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 354 # determine where the hell to put these things | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 355 self.check_output(output) | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 356 | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 357 # get the variables | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 358 vars = self.get_variables(**variables) | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 359 self.check_missing(vars) | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 360 | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 361 # make the output directory | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 362 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: 
87diff
changeset | 363 os.makedirs(output) | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 364 | 
| 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 365 # do the substitution | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 366 for template in self.templates: | 
| 90 
26b9c3bba04e
make the api for substitute() variables, output
 Jeff Hammel <jhammel@mozilla.com> parents: 
89diff
changeset | 367 template.substitute(vars, output) | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 368 | 
| 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: 
40diff
changeset | 369 ### command line interface | 
| 28 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 370 | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 371 def invocation(url, **variables): | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 372 """returns a string appropriate for TTW invocation""" | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 373 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: 
6diff
changeset | 374 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 | 375 | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 376 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 | 377 | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 378 # create option parser | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 379 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 | 380 parser = OptionParser(usage, description=__doc__) | 
| 28 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 381 | 
| 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 382 # delimeters | 
| 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 383 # XXX needs tempita trunk | 
| 30 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 384 if has_delimeters: | 
| 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 385 parser.add_option('-[', '--start-braces', dest='start_braces', | 
| 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 386 help='starting delimeter') | 
| 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 387 parser.add_option('-]', '--end-braces', dest='end_braces', | 
| 
1549be7f0fcb
dont point at trunk tempital; as expected, hg repos dont work with setuptools :(
 Jeff Hammel <jhammel@mozilla.com> parents: 
28diff
changeset | 388 help='starting delimeter') | 
| 28 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 389 | 
| 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 390 # options about where to put things | 
| 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 391 parser.add_option('-o', '--output', dest='output', | 
| 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 392 help='where to put the output (filename or directory)') | 
| 
dc18d6db4956
depend on trunk tempita; stubbing for next stage
 Jeff Hammel <jhammel@mozilla.com> parents: 
27diff
changeset | 393 | 
| 93 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 394 # TODO | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 395 # options for (.ini) variables | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 396 # parser.add_option('-c', '--config', dest='config' | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 397 # default=[], action='append', | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 398 # help='.ini config files to read variables from') | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 399 # parser.add_option('--no-defaults', dest='use_defaults', | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 400 # default=True, action='store_false', | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 401 # help="don't read ~/.makeitso") # XXX should only be displayed if ~/.makeitso exists | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 402 # parser.add_option('-u', '--update', dest='update', | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 403 # help="update the specified .ini file for variables read from this run") | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 404 # parser.add_option('-U', '--Update', dest='Update', | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 405 # help="same as -u, but update the global [DEFAULTS] section") | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 406 # parser.add_option('--dry-run', dest='dry_run', | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 407 # default=False, action='store_true', | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 408 # help="don't actually do the substitution but do everything else") | 
| 
d5da38fabdf7
note command line options needed for variable handling
 Jeff Hammel <jhammel@mozilla.com> parents: 
90diff
changeset | 409 | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 410 # options for getting information | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 411 parser.add_option('--commandline', dest='commandline', | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 412 action='store_true', default=False, | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 413 help="print the commandline to invoke this script TTW") | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 414 parser.add_option('--variables', dest='variables', | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 415 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 | 416 help='print the variables in a template') | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 417 | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 418 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 | 419 | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 420 # 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 | 421 if options.variables: | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 422 | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 423 # makes no sense without a template | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 424 if not args: | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 425 parser.print_usage() | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 426 parser.exit() | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 427 | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 428 # find all variables | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 429 template = PolyTemplate(templates=args) | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 430 variables = template.variables() | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 431 | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 432 # print them | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 433 for variable in sorted(variables): | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 434 print variable | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 435 return | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 436 | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 437 # template variables | 
| 35 
7e47ff4b0cd3
started writing tests; what a surprise, everything is broken ;)
 Jeff Hammel <jhammel@mozilla.com> parents: 
34diff
changeset | 438 variables = {} | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 439 _args = [] | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 440 for arg in args: | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 441 if '=' in arg: | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 442 key, value = arg.split('=') | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 443 variables[key] = value | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 444 else: | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 445 _args.append(arg) | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 446 args = _args | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 447 | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 448 # print TTW commandline for invocation | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 449 if options.commandline: | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 450 if args: | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 451 for arg in args: | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 452 print invocation(arg, **variables) | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 453 else: | 
| 26 
044ac9e0b29c
add a non-working example with an include clause
 Jeff Hammel <jhammel@mozilla.com> parents: 
25diff
changeset | 454 print invocation('[URI]', **variables) | 
| 9 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 455 return | 
| 
a77630b2b491
* add commandline to print commandlines
 Jeff Hammel <jhammel@mozilla.com> parents: 
6diff
changeset | 456 | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 457 # get the content | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 458 if args: | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 459 template = PolyTemplate(templates=args, | 
| 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 460 variables=variables) | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 461 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 | 462 else: | 
| 34 
46c2d0a7335a
continued refactor to have template classes
 Jeff Hammel <jhammel@mozilla.com> parents: 
33diff
changeset | 463 template = ContentTemplate(sys.stdin.read(), variables=variables) | 
| 88 
712a6d358083
fixed output broke other things
 Jeff Hammel <jhammel@mozilla.com> parents: 
87diff
changeset | 464 print template.substitute() | 
| 23 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 465 | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 466 # cleanup | 
| 
776805790c84
stub out getting tempita from the net; unttested
 Jeff Hammel <jhammel@mozilla.com> parents: 
22diff
changeset | 467 cleanup() | 
| 5 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 468 | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 469 if __name__ == '__main__': | 
| 
f064be514e53
choose a better filename and remove some stuff from shebang
 Jeff Hammel <jhammel@mozilla.com> parents: diff
changeset | 470 main() | 
