Mercurial > python-cmd2
annotate cmd2.py @ 334:99dd71cb477a
run() folded into app.cmdloop()
author | cat@eee |
---|---|
date | Fri, 12 Feb 2010 23:29:19 -0500 |
parents | 45e70737791f |
children | f69211e2c570 |
rev | line source |
---|---|
230 | 1 """Variant on standard library's cmd with extra features. |
2 | |
3 To use, simply import cmd2.Cmd instead of cmd.Cmd; use precisely as though you | |
4 were using the standard library's cmd, while enjoying the extra features. | |
5 | |
6 Searchable command history (commands: "hi", "li", "run") | |
7 Load commands from file, save to file, edit commands in file | |
8 Multi-line commands | |
9 Case-insensitive commands | |
10 Special-character shortcut commands (beyond cmd's "@" and "!") | |
11 Settable environment parameters | |
12 Optional _onchange_{paramname} called when environment parameter changes | |
13 Parsing commands with `optparse` options (flags) | |
14 Redirection to file with >, >>; input from file with < | |
15 Easy transcript-based testing of applications (see example/example.py) | |
310 | 16 Bash-style ``select`` available |
230 | 17 |
18 Note that redirection with > and | will only work if `self.stdout.write()` | |
19 is used in place of `print`. The standard library's `cmd` module is | |
20 written to use `self.stdout.write()`, | |
21 | |
22 - Catherine Devlin, Jan 03 2008 - catherinedevlin.blogspot.com | |
23 | |
24 mercurial repository at http://www.assembla.com/wiki/show/python-cmd2 | |
25 """ | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
26 import cmd |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
27 import re |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
28 import os |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
29 import sys |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
30 import optparse |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
31 import subprocess |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
32 import tempfile |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
33 import doctest |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
34 import unittest |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
35 import datetime |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
36 import urllib |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
37 import glob |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
38 import traceback |
312 | 39 import platform |
323 | 40 import copy |
235
78ad20c2eed0
py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents:
234
diff
changeset
|
41 from code import InteractiveConsole, InteractiveInterpreter, softspace |
230 | 42 from optparse import make_option |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
43 |
309 | 44 if sys.version_info[0] > 2: |
45 import pyparsing_py3 as pyparsing | |
46 else: | |
47 import pyparsing | |
48 | |
312 | 49 __version__ = '0.6.0' |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
50 |
230 | 51 class OptionParser(optparse.OptionParser): |
52 def exit(self, status=0, msg=None): | |
53 self.values._exit = True | |
54 if msg: | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
55 print (msg) |
230 | 56 |
57 def print_help(self, *args, **kwargs): | |
58 try: | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
59 print (self._func.__doc__) |
230 | 60 except AttributeError: |
61 pass | |
62 optparse.OptionParser.print_help(self, *args, **kwargs) | |
63 | |
64 def error(self, msg): | |
65 """error(msg : string) | |
66 | |
67 Print a usage message incorporating 'msg' to stderr and exit. | |
68 If you override this in a subclass, it should not return -- it | |
69 should either exit or raise an exception. | |
70 """ | |
71 raise | |
72 | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
73 def remaining_args(oldArgs, newArgList): |
230 | 74 ''' |
285 | 75 Preserves the spacing originally in the argument after |
76 the removal of options. | |
77 | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
78 >>> remaining_args('-f bar bar cow', ['bar', 'cow']) |
230 | 79 'bar cow' |
80 ''' | |
81 pattern = '\s+'.join(re.escape(a) for a in newArgList) + '\s*$' | |
82 matchObj = re.search(pattern, oldArgs) | |
83 return oldArgs[matchObj.start():] | |
280 | 84 |
85 def _attr_get_(obj, attr): | |
86 '''Returns an attribute's value, or None (no error) if undefined. | |
286 | 87 Analagous to .get() for dictionaries. Useful when checking for |
88 value of options that may not have been defined on a given | |
89 method.''' | |
280 | 90 try: |
91 return getattr(obj, attr) | |
92 except AttributeError: | |
93 return None | |
283 | 94 |
95 optparse.Values.get = _attr_get_ | |
96 | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
97 options_defined = [] # used to distinguish --options from SQL-style --comments |
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
98 |
230 | 99 def options(option_list): |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
100 '''Used as a decorator and passed a list of optparse-style options, |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
101 alters a cmd2 methodo populate its ``opts`` argument from its |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
102 raw text argument. |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
103 |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
104 Example: transform |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
105 def do_something(self, arg): |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
106 |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
107 into |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
108 @options([make_option('-q', '--quick', action="store_true", |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
109 help="Makes things fast")]) |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
110 def do_something(self, arg, opts): |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
111 if opts.quick: |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
112 self.fast_button = True |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
113 ''' |
296 | 114 if not isinstance(option_list, list): |
298 | 115 option_list = [option_list] |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
116 for opt in option_list: |
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
117 options_defined.append(pyparsing.Literal(opt.get_opt_string())) |
230 | 118 def option_setup(func): |
119 optionParser = OptionParser() | |
120 for opt in option_list: | |
121 optionParser.add_option(opt) | |
122 optionParser.set_usage("%s [options] arg" % func.__name__.strip('do_')) | |
123 optionParser._func = func | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
124 def new_func(instance, arg): |
230 | 125 try: |
302 | 126 opts, newArgList = optionParser.parse_args(arg.split()) |
285 | 127 # Must find the remaining args in the original argument list, but |
128 # mustn't include the command itself | |
302 | 129 #if hasattr(arg, 'parsed') and newArgList[0] == arg.parsed.command: |
130 # newArgList = newArgList[1:] | |
131 newArgs = remaining_args(arg, newArgList) | |
301 | 132 if isinstance(arg, ParsedString): |
133 arg = arg.with_args_replaced(newArgs) | |
134 else: | |
135 arg = newArgs | |
230 | 136 except (optparse.OptionValueError, optparse.BadOptionError, |
137 optparse.OptionError, optparse.AmbiguousOptionError, | |
138 optparse.OptionConflictError), e: | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
139 print (e) |
230 | 140 optionParser.print_help() |
141 return | |
142 if hasattr(opts, '_exit'): | |
143 return None | |
144 result = func(instance, arg, opts) | |
145 return result | |
289 | 146 new_func.__doc__ = '%s\n%s' % (func.__doc__, optionParser.format_help()) |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
147 return new_func |
230 | 148 return option_setup |
149 | |
150 class PasteBufferError(EnvironmentError): | |
151 if sys.platform[:3] == 'win': | |
152 errmsg = """Redirecting to or from paste buffer requires pywin32 | |
153 to be installed on operating system. | |
154 Download from http://sourceforge.net/projects/pywin32/""" | |
155 else: | |
156 errmsg = """Redirecting to or from paste buffer requires xclip | |
157 to be installed on operating system. | |
158 On Debian/Ubuntu, 'sudo apt-get install xclip' will install it.""" | |
159 def __init__(self): | |
160 Exception.__init__(self, self.errmsg) | |
161 | |
162 pastebufferr = """Redirecting to or from paste buffer requires %s | |
163 to be installed on operating system. | |
164 %s""" | |
286 | 165 |
230 | 166 if subprocess.mswindows: |
167 try: | |
168 import win32clipboard | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
169 def get_paste_buffer(): |
230 | 170 win32clipboard.OpenClipboard(0) |
171 try: | |
172 result = win32clipboard.GetClipboardData() | |
173 except TypeError: | |
174 result = '' #non-text | |
175 win32clipboard.CloseClipboard() | |
176 return result | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
177 def write_to_paste_buffer(txt): |
230 | 178 win32clipboard.OpenClipboard(0) |
179 win32clipboard.EmptyClipboard() | |
180 win32clipboard.SetClipboardText(txt) | |
181 win32clipboard.CloseClipboard() | |
182 except ImportError: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
183 def get_paste_buffer(*args): |
230 | 184 raise OSError, pastebufferr % ('pywin32', 'Download from http://sourceforge.net/projects/pywin32/') |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
185 setPasteBuffer = get_paste_buffer |
230 | 186 else: |
187 can_clip = False | |
188 try: | |
189 subprocess.check_call('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
190 can_clip = True | |
191 except AttributeError: # check_call not defined, Python < 2.5 | |
192 teststring = 'Testing for presence of xclip.' | |
193 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
194 xclipproc.stdin.write(teststring) | |
195 xclipproc.stdin.close() | |
196 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
197 if xclipproc.stdout.read() == teststring: | |
198 can_clip = True | |
199 except (subprocess.CalledProcessError, OSError, IOError): | |
200 pass | |
201 if can_clip: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
202 def get_paste_buffer(): |
230 | 203 xclipproc = subprocess.Popen('xclip -o -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) |
204 return xclipproc.stdout.read() | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
205 def write_to_paste_buffer(txt): |
230 | 206 xclipproc = subprocess.Popen('xclip -sel clip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) |
207 xclipproc.stdin.write(txt) | |
208 xclipproc.stdin.close() | |
209 # but we want it in both the "primary" and "mouse" clipboards | |
210 xclipproc = subprocess.Popen('xclip', shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
211 xclipproc.stdin.write(txt) | |
212 xclipproc.stdin.close() | |
213 else: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
214 def get_paste_buffer(*args): |
230 | 215 raise OSError, pastebufferr % ('xclip', 'On Debian/Ubuntu, install with "sudo apt-get install xclip"') |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
216 setPasteBuffer = get_paste_buffer |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
217 writeToPasteBuffer = get_paste_buffer |
230 | 218 |
219 pyparsing.ParserElement.setDefaultWhitespaceChars(' \t') | |
220 | |
221 class ParsedString(str): | |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
222 def full_parsed_statement(self): |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
223 new = ParsedString('%s %s' % (self.parsed.command, self.parsed.args)) |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
224 new.parsed = self.parsed |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
225 new.parser = self.parser |
301 | 226 return new |
227 def with_args_replaced(self, newargs): | |
228 new = ParsedString(newargs) | |
229 new.parsed = self.parsed | |
230 new.parser = self.parser | |
231 new.parsed['args'] = newargs | |
232 new.parsed.statement['args'] = newargs | |
233 return new | |
230 | 234 |
235 class SkipToLast(pyparsing.SkipTo): | |
236 def parseImpl( self, instring, loc, doActions=True ): | |
237 resultStore = [] | |
238 startLoc = loc | |
239 instrlen = len(instring) | |
240 expr = self.expr | |
241 failParse = False | |
242 while loc <= instrlen: | |
243 try: | |
244 if self.failOn: | |
245 failParse = True | |
246 self.failOn.tryParse(instring, loc) | |
247 failParse = False | |
248 loc = expr._skipIgnorables( instring, loc ) | |
249 expr._parse( instring, loc, doActions=False, callPreParse=False ) | |
250 skipText = instring[startLoc:loc] | |
251 if self.includeMatch: | |
252 loc,mat = expr._parse(instring,loc,doActions,callPreParse=False) | |
253 if mat: | |
254 skipRes = ParseResults( skipText ) | |
255 skipRes += mat | |
256 resultStore.append((loc, [ skipRes ])) | |
257 else: | |
258 resultStore,append((loc, [ skipText ])) | |
259 else: | |
260 resultStore.append((loc, [ skipText ])) | |
261 loc += 1 | |
262 except (pyparsing.ParseException,IndexError): | |
263 if failParse: | |
264 raise | |
265 else: | |
266 loc += 1 | |
267 if resultStore: | |
268 return resultStore[-1] | |
269 else: | |
270 exc = self.myException | |
271 exc.loc = loc | |
272 exc.pstr = instring | |
273 raise exc | |
274 | |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
275 class StubbornDict(dict): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
276 '''Dictionary that tolerates many input formats. |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
277 Create it with stubbornDict(arg) factory function. |
319
c58cd7e48db7
begin to switch settable to TextLineList
catherine@dellzilla
parents:
317
diff
changeset
|
278 |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
279 >>> d = StubbornDict(large='gross', small='klein') |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
280 >>> sorted(d.items()) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
281 [('large', 'gross'), ('small', 'klein')] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
282 >>> d.append(['plain', ' plaid']) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
283 >>> sorted(d.items()) |
333 | 284 [('large', 'gross'), ('plaid', ''), ('plain', ''), ('small', 'klein')] |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
285 >>> d += ' girl Frauelein, Maedchen\\n\\n shoe schuh' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
286 >>> sorted(d.items()) |
333 | 287 [('girl', 'Frauelein, Maedchen'), ('large', 'gross'), ('plaid', ''), ('plain', ''), ('shoe', 'schuh'), ('small', 'klein')] |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
288 ''' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
289 def update(self, arg): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
290 dict.update(self, StubbornDict.to_dict(arg)) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
291 append = update |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
292 def __iadd__(self, arg): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
293 self.update(arg) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
294 return self |
323 | 295 def __add__(self, arg): |
296 selfcopy = copy.copy(self) | |
297 selfcopy.update(stubbornDict(arg)) | |
298 return selfcopy | |
299 def __radd__(self, arg): | |
300 selfcopy = copy.copy(self) | |
301 selfcopy.update(stubbornDict(arg)) | |
302 return selfcopy | |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
303 |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
304 @classmethod |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
305 def to_dict(cls, arg): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
306 'Generates dictionary from string or list of strings' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
307 if hasattr(arg, 'splitlines'): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
308 arg = arg.splitlines() |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
309 if hasattr(arg, '__getslice__'): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
310 result = {} |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
311 for a in arg: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
312 a = a.strip() |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
313 if a: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
314 key_val = a.split(None, 1) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
315 key = key_val[0] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
316 if len(key_val) > 1: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
317 val = key_val[1] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
318 else: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
319 val = '' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
320 result[key] = val |
319
c58cd7e48db7
begin to switch settable to TextLineList
catherine@dellzilla
parents:
317
diff
changeset
|
321 else: |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
322 result = arg |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
323 return result |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
324 |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
325 def stubbornDict(*arg, **kwarg): |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
326 ''' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
327 >>> sorted(stubbornDict('cow a bovine\\nhorse an equine').items()) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
328 [('cow', 'a bovine'), ('horse', 'an equine')] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
329 >>> sorted(stubbornDict(['badger', 'porcupine a poky creature']).items()) |
333 | 330 [('badger', ''), ('porcupine', 'a poky creature')] |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
331 >>> sorted(stubbornDict(turtle='has shell', frog='jumpy').items()) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
332 [('frog', 'jumpy'), ('turtle', 'has shell')] |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
333 ''' |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
334 result = {} |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
335 for a in arg: |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
336 result.update(StubbornDict.to_dict(a)) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
337 result.update(kwarg) |
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
338 return StubbornDict(result) |
319
c58cd7e48db7
begin to switch settable to TextLineList
catherine@dellzilla
parents:
317
diff
changeset
|
339 |
230 | 340 def replace_with_file_contents(fname): |
341 if fname: | |
342 try: | |
343 result = open(os.path.expanduser(fname[0])).read() | |
344 except IOError: | |
345 result = '< %s' % fname[0] # wasn't a file after all | |
346 else: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
347 result = get_paste_buffer() |
233 | 348 return result |
349 | |
234 | 350 class EmbeddedConsoleExit(Exception): |
351 pass | |
352 | |
235
78ad20c2eed0
py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents:
234
diff
changeset
|
353 class MyInteractiveConsole(InteractiveConsole): |
234 | 354 def runcode(self, code): |
355 """Execute a code object. | |
356 | |
357 When an exception occurs, self.showtraceback() is called to | |
358 display a traceback. All exceptions are caught except | |
359 SystemExit, which is reraised. | |
360 | |
361 A note about KeyboardInterrupt: this exception may occur | |
362 elsewhere in this code, and may not always be caught. The | |
363 caller should be prepared to deal with it. | |
364 | |
365 Copied directly from code.InteractiveInterpreter, except for | |
366 EmbeddedConsoleExit exceptions. | |
367 """ | |
368 try: | |
369 exec code in self.locals | |
370 except (SystemExit, EmbeddedConsoleExit): | |
371 raise | |
372 except: | |
373 self.showtraceback() | |
374 else: | |
235
78ad20c2eed0
py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents:
234
diff
changeset
|
375 if softspace(sys.stdout, 0): |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
376 print () |
234 | 377 |
290 | 378 def ljust(x, width, fillchar=' '): |
379 'analogous to str.ljust, but works for lists' | |
380 if hasattr(x, 'ljust'): | |
381 return x.ljust(width, fillchar) | |
382 else: | |
383 if len(x) < width: | |
384 x = (x + [fillchar] * width)[:width] | |
385 return x | |
386 | |
230 | 387 class Cmd(cmd.Cmd): |
388 echo = False | |
286 | 389 case_insensitive = True # Commands recognized regardless of case |
230 | 390 continuation_prompt = '> ' |
286 | 391 timing = False # Prints elapsed time for each command |
392 # make sure your terminators are not in legalChars! | |
393 legalChars = '!#$%.:?@_' + pyparsing.alphanums + pyparsing.alphas8bit | |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
394 shortcuts = {'?': 'help', '!': 'shell', '@': 'load', '@@': '_relative_load'} |
230 | 395 excludeFromHistory = '''run r list l history hi ed edit li eof'''.split() |
331 | 396 default_to_shell = False |
230 | 397 noSpecialParse = 'set ed edit exit'.split() |
286 | 398 defaultExtension = 'txt' # For ``save``, ``load``, etc. |
399 default_file_name = 'command.txt' # For ``save``, ``load``, etc. | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
400 abbrev = True # Abbreviated commands recognized |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
401 current_script_dir = None |
245 | 402 reserved_words = [] |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
403 feedback_to_output = False # Do include nonessentials in >, | output |
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
404 quiet = False # Do not suppress nonessential output |
324 | 405 debug = False |
328 | 406 locals_in_py = False |
320
b9f19255d4b7
transcript test stuck in infinite loop?
catherine@dellzilla
parents:
319
diff
changeset
|
407 settable = stubbornDict(''' |
290 | 408 prompt |
312 | 409 colors Colorized output (*nix only) |
331 | 410 continuation_prompt On 2nd+ line of input |
411 debug Show full error stack on error | |
412 default_file_name for ``save``, ``load``, etc. | |
413 editor Program used by ``edit`` | |
290 | 414 case_insensitive upper- and lower-case both OK |
415 feedback_to_output include nonessentials in `|`, `>` results | |
331 | 416 quiet Don't print nonessential feedback |
290 | 417 echo Echo command issued into output |
418 timing Report execution times | |
419 abbrev Accept abbreviated commands | |
319
c58cd7e48db7
begin to switch settable to TextLineList
catherine@dellzilla
parents:
317
diff
changeset
|
420 ''') |
230 | 421 |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
422 def poutput(self, msg): |
284 | 423 if msg: |
424 self.stdout.write(msg) | |
425 if msg[-1] != '\n': | |
426 self.stdout.write('\n') | |
276 | 427 def perror(self, errmsg, statement=None): |
282 | 428 if self.debug: |
429 traceback.print_exc() | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
430 print str(errmsg) |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
431 def pfeedback(self, msg): |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
432 """For printing nonessential feedback. Can be silenced with `quiet`. |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
433 Inclusion in redirected output is controlled by `feedback_to_output`.""" |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
434 if not self.quiet: |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
435 if self.feedback_to_output: |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
436 self.poutput(msg) |
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
437 else: |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
438 print (msg) |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
439 _STOP_AND_EXIT = 2 |
230 | 440 editor = os.environ.get('EDITOR') |
441 if not editor: | |
442 if sys.platform[:3] == 'win': | |
443 editor = 'notepad' | |
444 else: | |
445 for editor in ['gedit', 'kate', 'vim', 'emacs', 'nano', 'pico']: | |
446 if not os.system('which %s' % (editor)): | |
447 break | |
312 | 448 |
449 colorcodes = {'bold':{True:'\x1b[1m',False:'\x1b[22m'}, | |
450 'cyan':{True:'\x1b[36m',False:'\x1b[39m'}, | |
451 'blue':{True:'\x1b[34m',False:'\x1b[39m'}, | |
452 'red':{True:'\x1b[31m',False:'\x1b[39m'}, | |
453 'magenta':{True:'\x1b[35m',False:'\x1b[39m'}, | |
454 'green':{True:'\x1b[32m',False:'\x1b[39m'}, | |
455 'underline':{True:'\x1b[4m',False:'\x1b[24m'}} | |
456 colors = (platform.system() != 'Windows') | |
457 def colorize(self, val, color): | |
458 '''Wraps `val` in `color` markers (one of: red/blue/green/cyan/magenta, bold, underline), | |
459 but only if `colors` environment variable is True''' | |
460 if self.colors and (self.stdout == self.initial_stdout): | |
461 return self.colorcodes[color][True] + val + self.colorcodes[color][False] | |
462 return val | |
463 | |
230 | 464 def do_cmdenvironment(self, args): |
465 '''Summary report of interactive parameters.''' | |
466 self.stdout.write(""" | |
467 Commands are %(casesensitive)scase-sensitive. | |
468 Commands may be terminated with: %(terminators)s | |
237 | 469 Settable parameters: %(settable)s\n""" % \ |
230 | 470 { 'casesensitive': (self.case_insensitive and 'not ') or '', |
471 'terminators': str(self.terminators), | |
472 'settable': ' '.join(self.settable) | |
473 }) | |
474 | |
475 def do_help(self, arg): | |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
476 if arg: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
477 funcname = self.func_named(arg) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
478 if funcname: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
479 fn = getattr(self, funcname) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
480 try: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
481 fn.optionParser.print_help(file=self.stdout) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
482 except AttributeError: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
483 cmd.Cmd.do_help(self, funcname[3:]) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
484 else: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
485 cmd.Cmd.do_help(self, arg) |
230 | 486 |
487 def __init__(self, *args, **kwargs): | |
488 cmd.Cmd.__init__(self, *args, **kwargs) | |
271 | 489 self.initial_stdout = sys.stdout |
230 | 490 self.history = History() |
491 self._init_parser() | |
492 self.pystate = {} | |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
493 self.shortcuts = sorted(self.shortcuts.items(), reverse=True) |
247
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
494 self.keywords = self.reserved_words + [fname[3:] for fname in dir(self) |
290 | 495 if fname.startswith('do_')] |
317 | 496 def linelist(arg): |
497 result = [] | |
498 | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
499 self.doubleDashComment = pyparsing.NotAny(pyparsing.Or(options_defined)) + pyparsing.Literal('--') + pyparsing.restOfLine |
290 | 500 |
230 | 501 def do_shortcuts(self, args): |
502 """Lists single-key shortcuts available.""" | |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
503 result = "\n".join('%s: %s' % (sc[0], sc[1]) for sc in sorted(self.shortcuts)) |
230 | 504 self.stdout.write("Single-key shortcuts for other commands:\n%s\n" % (result)) |
505 | |
506 prefixParser = pyparsing.Empty() | |
507 commentGrammars = pyparsing.Or([pyparsing.pythonStyleComment, pyparsing.cStyleComment]) | |
508 commentGrammars.addParseAction(lambda x: '') | |
288
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
509 commentInProgress = pyparsing.Literal('/*') + pyparsing.SkipTo( |
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
510 pyparsing.stringEnd ^ '*/') |
230 | 511 terminators = [';'] |
512 blankLinesAllowed = False | |
513 multilineCommands = [] | |
514 | |
515 def _init_parser(self): | |
516 r''' | |
517 >>> c = Cmd() | |
518 >>> c.multilineCommands = ['multiline'] | |
519 >>> c.case_insensitive = True | |
520 >>> c._init_parser() | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
521 >>> print (c.parser.parseString('').dump()) |
313 | 522 [] |
523 >>> print (c.parser.parseString('').dump()) | |
230 | 524 [] |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
525 >>> print (c.parser.parseString('/* empty command */').dump()) |
230 | 526 [] |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
527 >>> print (c.parser.parseString('plainword').dump()) |
230 | 528 ['plainword', ''] |
529 - command: plainword | |
530 - statement: ['plainword', ''] | |
531 - command: plainword | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
532 >>> print (c.parser.parseString('termbare;').dump()) |
230 | 533 ['termbare', '', ';', ''] |
534 - command: termbare | |
535 - statement: ['termbare', '', ';'] | |
536 - command: termbare | |
537 - terminator: ; | |
538 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
539 >>> print (c.parser.parseString('termbare; suffx').dump()) |
230 | 540 ['termbare', '', ';', 'suffx'] |
541 - command: termbare | |
542 - statement: ['termbare', '', ';'] | |
543 - command: termbare | |
544 - terminator: ; | |
545 - suffix: suffx | |
546 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
547 >>> print (c.parser.parseString('barecommand').dump()) |
230 | 548 ['barecommand', ''] |
549 - command: barecommand | |
550 - statement: ['barecommand', ''] | |
551 - command: barecommand | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
552 >>> print (c.parser.parseString('COMmand with args').dump()) |
230 | 553 ['command', 'with args'] |
554 - args: with args | |
555 - command: command | |
556 - statement: ['command', 'with args'] | |
557 - args: with args | |
558 - command: command | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
559 >>> print (c.parser.parseString('command with args and terminator; and suffix').dump()) |
230 | 560 ['command', 'with args and terminator', ';', 'and suffix'] |
561 - args: with args and terminator | |
562 - command: command | |
563 - statement: ['command', 'with args and terminator', ';'] | |
564 - args: with args and terminator | |
565 - command: command | |
566 - terminator: ; | |
567 - suffix: and suffix | |
568 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
569 >>> print (c.parser.parseString('simple | piped').dump()) |
230 | 570 ['simple', '', '|', ' piped'] |
571 - command: simple | |
572 - pipeTo: piped | |
573 - statement: ['simple', ''] | |
574 - command: simple | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
575 >>> print (c.parser.parseString('double-pipe || is not a pipe').dump()) |
230 | 576 ['double', '-pipe || is not a pipe'] |
577 - args: -pipe || is not a pipe | |
578 - command: double | |
579 - statement: ['double', '-pipe || is not a pipe'] | |
580 - args: -pipe || is not a pipe | |
581 - command: double | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
582 >>> print (c.parser.parseString('command with args, terminator;sufx | piped').dump()) |
230 | 583 ['command', 'with args, terminator', ';', 'sufx', '|', ' piped'] |
584 - args: with args, terminator | |
585 - command: command | |
586 - pipeTo: piped | |
587 - statement: ['command', 'with args, terminator', ';'] | |
588 - args: with args, terminator | |
589 - command: command | |
590 - terminator: ; | |
591 - suffix: sufx | |
592 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
593 >>> print (c.parser.parseString('output into > afile.txt').dump()) |
230 | 594 ['output', 'into', '>', 'afile.txt'] |
595 - args: into | |
596 - command: output | |
597 - output: > | |
598 - outputTo: afile.txt | |
599 - statement: ['output', 'into'] | |
600 - args: into | |
601 - command: output | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
602 >>> print (c.parser.parseString('output into;sufx | pipethrume plz > afile.txt').dump()) |
230 | 603 ['output', 'into', ';', 'sufx', '|', ' pipethrume plz', '>', 'afile.txt'] |
604 - args: into | |
605 - command: output | |
606 - output: > | |
607 - outputTo: afile.txt | |
608 - pipeTo: pipethrume plz | |
609 - statement: ['output', 'into', ';'] | |
610 - args: into | |
611 - command: output | |
612 - terminator: ; | |
613 - suffix: sufx | |
614 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
615 >>> print (c.parser.parseString('output to paste buffer >> ').dump()) |
230 | 616 ['output', 'to paste buffer', '>>', ''] |
617 - args: to paste buffer | |
618 - command: output | |
619 - output: >> | |
620 - statement: ['output', 'to paste buffer'] | |
621 - args: to paste buffer | |
622 - command: output | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
623 >>> print (c.parser.parseString('ignore the /* commented | > */ stuff;').dump()) |
230 | 624 ['ignore', 'the /* commented | > */ stuff', ';', ''] |
625 - args: the /* commented | > */ stuff | |
626 - command: ignore | |
627 - statement: ['ignore', 'the /* commented | > */ stuff', ';'] | |
628 - args: the /* commented | > */ stuff | |
629 - command: ignore | |
630 - terminator: ; | |
631 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
632 >>> print (c.parser.parseString('has > inside;').dump()) |
230 | 633 ['has', '> inside', ';', ''] |
634 - args: > inside | |
635 - command: has | |
636 - statement: ['has', '> inside', ';'] | |
637 - args: > inside | |
638 - command: has | |
639 - terminator: ; | |
640 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
641 >>> print (c.parser.parseString('multiline has > inside an unfinished command').dump()) |
230 | 642 ['multiline', ' has > inside an unfinished command'] |
643 - multilineCommand: multiline | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
644 >>> print (c.parser.parseString('multiline has > inside;').dump()) |
230 | 645 ['multiline', 'has > inside', ';', ''] |
646 - args: has > inside | |
647 - multilineCommand: multiline | |
648 - statement: ['multiline', 'has > inside', ';'] | |
649 - args: has > inside | |
650 - multilineCommand: multiline | |
651 - terminator: ; | |
652 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
653 >>> print (c.parser.parseString('multiline command /* with comment in progress;').dump()) |
272 | 654 ['multiline', ' command'] |
655 - multilineCommand: multiline | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
656 >>> print (c.parser.parseString('multiline command /* with comment complete */ is done;').dump()) |
230 | 657 ['multiline', 'command /* with comment complete */ is done', ';', ''] |
658 - args: command /* with comment complete */ is done | |
659 - multilineCommand: multiline | |
660 - statement: ['multiline', 'command /* with comment complete */ is done', ';'] | |
661 - args: command /* with comment complete */ is done | |
662 - multilineCommand: multiline | |
663 - terminator: ; | |
664 - terminator: ; | |
311
54e2dd53ba38
excluded --options from --comments with .NotAny
catherine@bothari
parents:
310
diff
changeset
|
665 >>> print (c.parser.parseString('multiline command ends\n\n').dump()) |
230 | 666 ['multiline', 'command ends', '\n', '\n'] |
667 - args: command ends | |
668 - multilineCommand: multiline | |
669 - statement: ['multiline', 'command ends', '\n', '\n'] | |
670 - args: command ends | |
671 - multilineCommand: multiline | |
672 - terminator: ['\n', '\n'] | |
673 - terminator: ['\n', '\n'] | |
674 ''' | |
288
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
675 tstr = 'multiline command /* with comment complete */ is done;' |
230 | 676 outputParser = (pyparsing.Literal('>>') | (pyparsing.WordStart() + '>') | pyparsing.Regex('[^=]>'))('output') |
677 | |
678 terminatorParser = pyparsing.Or([(hasattr(t, 'parseString') and t) or pyparsing.Literal(t) for t in self.terminators])('terminator') | |
679 stringEnd = pyparsing.stringEnd ^ '\nEOF' | |
680 self.multilineCommand = pyparsing.Or([pyparsing.Keyword(c, caseless=self.case_insensitive) for c in self.multilineCommands])('multilineCommand') | |
681 oneLineCommand = (~self.multilineCommand + pyparsing.Word(self.legalChars))('command') | |
682 pipe = pyparsing.Keyword('|', identChars='|') | |
285 | 683 self.commentGrammars.ignore(pyparsing.quotedString).setParseAction(lambda x: '') |
230 | 684 afterElements = \ |
685 pyparsing.Optional(pipe + pyparsing.SkipTo(outputParser ^ stringEnd)('pipeTo')) + \ | |
686 pyparsing.Optional(outputParser + pyparsing.SkipTo(stringEnd).setParseAction(lambda x: x[0].strip())('outputTo')) | |
687 if self.case_insensitive: | |
688 self.multilineCommand.setParseAction(lambda x: x[0].lower()) | |
689 oneLineCommand.setParseAction(lambda x: x[0].lower()) | |
690 if self.blankLinesAllowed: | |
691 self.blankLineTerminationParser = pyparsing.NoMatch | |
692 else: | |
693 self.blankLineTerminator = (pyparsing.lineEnd + pyparsing.lineEnd)('terminator') | |
694 self.blankLineTerminator.setResultsName('terminator') | |
695 self.blankLineTerminationParser = ((self.multilineCommand ^ oneLineCommand) + pyparsing.SkipTo(self.blankLineTerminator).setParseAction(lambda x: x[0].strip())('args') + self.blankLineTerminator)('statement') | |
696 self.multilineParser = (((self.multilineCommand ^ oneLineCommand) + SkipToLast(terminatorParser).setParseAction(lambda x: x[0].strip())('args') + terminatorParser)('statement') + | |
697 pyparsing.SkipTo(outputParser ^ pipe ^ stringEnd).setParseAction(lambda x: x[0].strip())('suffix') + afterElements) | |
250 | 698 self.multilineParser.ignore(self.commentInProgress) |
230 | 699 self.singleLineParser = ((oneLineCommand + pyparsing.SkipTo(terminatorParser ^ stringEnd ^ pipe ^ outputParser).setParseAction(lambda x:x[0].strip())('args'))('statement') + |
700 pyparsing.Optional(terminatorParser) + afterElements) | |
288
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
701 #self.multilineParser = self.multilineParser.setResultsName('multilineParser') |
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
702 #self.singleLineParser = self.singleLineParser.setResultsName('singleLineParser') |
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
703 self.blankLineTerminationParser = self.blankLineTerminationParser.setResultsName('statement') |
266
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
704 self.parser = self.prefixParser + ( |
230 | 705 stringEnd | |
266
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
706 self.multilineParser | |
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
707 self.singleLineParser | |
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
708 self.blankLineTerminationParser | |
584f970ca66a
permit bare prefix
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
709 self.multilineCommand + pyparsing.SkipTo(stringEnd) |
230 | 710 ) |
249
55a12d77a4fa
finally, ls working right
catherine@Elli.myhome.westell.com
parents:
248
diff
changeset
|
711 self.parser.ignore(pyparsing.quotedString).ignore(self.commentGrammars) |
230 | 712 |
713 inputMark = pyparsing.Literal('<') | |
714 inputMark.setParseAction(lambda x: '') | |
715 fileName = pyparsing.Word(self.legalChars + '/\\') | |
716 inputFrom = fileName('inputFrom') | |
717 inputFrom.setParseAction(replace_with_file_contents) | |
718 # a not-entirely-satisfactory way of distinguishing < as in "import from" from < | |
719 # as in "lesser than" | |
720 self.inputParser = inputMark + pyparsing.Optional(inputFrom) + pyparsing.Optional('>') + \ | |
721 pyparsing.Optional(fileName) + (pyparsing.stringEnd | '|') | |
722 self.inputParser.ignore(pyparsing.quotedString).ignore(self.commentGrammars).ignore(self.commentInProgress) | |
723 | |
724 def preparse(self, raw, **kwargs): | |
725 return raw | |
726 | |
727 def parsed(self, raw, **kwargs): | |
728 if isinstance(raw, ParsedString): | |
729 p = raw | |
730 else: | |
292 | 731 # preparse is an overridable hook; default makes no changes |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
732 s = self.preparse(raw, **kwargs) |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
733 s = self.inputParser.transformString(s.lstrip()) |
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
734 s = self.commentGrammars.transformString(s) |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
735 for (shortcut, expansion) in self.shortcuts: |
230 | 736 if s.lower().startswith(shortcut): |
737 s = s.replace(shortcut, expansion + ' ', 1) | |
738 break | |
739 result = self.parser.parseString(s) | |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
740 result['raw'] = raw |
230 | 741 result['command'] = result.multilineCommand or result.command |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
742 p = ParsedString(result.args) |
230 | 743 p.parsed = result |
295 | 744 p.parser = self.parsed |
230 | 745 for (key, val) in kwargs.items(): |
746 p.parsed[key] = val | |
747 return p | |
748 | |
749 def postparsing_precmd(self, statement): | |
750 stop = 0 | |
751 return stop, statement | |
247
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
752 |
230 | 753 def postparsing_postcmd(self, stop): |
754 return stop | |
247
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
755 def func_named(self, arg): |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
756 result = None |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
757 target = 'do_' + arg |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
758 if target in dir(self): |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
759 result = target |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
760 else: |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
761 if self.abbrev: # accept shortened versions of commands |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
762 funcs = [fname for fname in self.keywords if fname.startswith(arg)] |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
763 if len(funcs) == 1: |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
764 result = 'do_' + funcs[0] |
3db4166a54ce
abbrevs working with help
catherine@Elli.myhome.westell.com
parents:
246
diff
changeset
|
765 return result |
230 | 766 def onecmd(self, line): |
767 """Interpret the argument as though it had been typed in response | |
768 to the prompt. | |
769 | |
770 This may be overridden, but should not normally need to be; | |
771 see the precmd() and postcmd() methods for useful execution hooks. | |
772 The return value is a flag indicating whether interpretation of | |
773 commands by the interpreter should stop. | |
774 | |
775 This (`cmd2`) version of `onecmd` already override's `cmd`'s `onecmd`. | |
776 | |
777 """ | |
778 if not line: | |
779 return self.emptyline() | |
780 if not pyparsing.Or(self.commentGrammars).setParseAction(lambda x: '').transformString(line): | |
781 return 0 # command was empty except for comments | |
782 try: | |
783 statement = self.parsed(line) | |
784 while statement.parsed.multilineCommand and (statement.parsed.terminator == ''): | |
785 statement = '%s\n%s' % (statement.parsed.raw, | |
786 self.pseudo_raw_input(self.continuation_prompt)) | |
787 statement = self.parsed(statement) | |
788 except Exception, e: | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
789 self.perror(e) |
230 | 790 return 0 |
246 | 791 if statement.parsed.command not in self.excludeFromHistory: |
792 self.history.append(statement.parsed.raw) | |
230 | 793 try: |
794 (stop, statement) = self.postparsing_precmd(statement) | |
795 except Exception, e: | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
796 self.perror(e) |
230 | 797 return 0 |
798 if stop: | |
799 return self.postparsing_postcmd(stop) | |
800 | |
801 if not statement.parsed.command: | |
802 return self.postparsing_postcmd(stop=0) | |
803 | |
804 statekeeper = None | |
805 | |
806 if statement.parsed.pipeTo: | |
807 redirect = subprocess.Popen(statement.parsed.pipeTo, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE) | |
808 statekeeper = Statekeeper(self, ('stdout',)) | |
809 self.stdout = redirect.stdin | |
810 elif statement.parsed.output: | |
811 statekeeper = Statekeeper(self, ('stdout',)) | |
812 if statement.parsed.outputTo: | |
813 mode = 'w' | |
814 if statement.parsed.output == '>>': | |
815 mode = 'a' | |
816 try: | |
817 self.stdout = open(os.path.expanduser(statement.parsed.outputTo), mode) | |
282 | 818 except Exception, e: |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
819 self.perror(e) |
230 | 820 return self.postparsing_postcmd(stop=0) |
821 else: | |
822 statekeeper = Statekeeper(self, ('stdout',)) | |
823 self.stdout = tempfile.TemporaryFile() | |
824 if statement.parsed.output == '>>': | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
825 self.stdout.write(get_paste_buffer()) |
230 | 826 try: |
251 | 827 try: |
292 | 828 # "heart" of the command, replaces cmd's onecmd() |
300
1e4773b325d1
assume newfunc does not have to accept unparsed arguments
catherine@dellzilla
parents:
299
diff
changeset
|
829 self.lastcmd = statement.parsed.raw |
275 | 830 funcname = self.func_named(statement.parsed.command) |
831 if not funcname: | |
330 | 832 return self._default(statement) |
275 | 833 try: |
834 func = getattr(self, funcname) | |
835 except AttributeError: | |
330 | 836 return self._default(statement) |
275 | 837 timestart = datetime.datetime.now() |
838 stop = func(statement) | |
839 if self.timing: | |
840 self.pfeedback('Elapsed: %s' % str(datetime.datetime.now() - timestart)) | |
841 except Exception, e: | |
276 | 842 self.perror(e, statement) |
230 | 843 finally: |
844 if statekeeper: | |
845 if statement.parsed.output and not statement.parsed.outputTo: | |
846 self.stdout.seek(0) | |
847 try: | |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
848 write_to_paste_buffer(self.stdout.read()) |
230 | 849 except Exception, e: |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
850 self.perror(e) |
230 | 851 elif statement.parsed.pipeTo: |
852 for result in redirect.communicate(): | |
853 statekeeper.stdout.write(result or '') | |
854 self.stdout.close() | |
855 statekeeper.restore() | |
856 | |
857 return self.postparsing_postcmd(stop) | |
858 | |
330 | 859 def _default(self, statement): |
860 arg = statement.full_parsed_statement() | |
861 if self.default_to_shell: | |
862 result = os.system(arg) | |
863 if not result: | |
864 return self.postparsing_postcmd(None) | |
865 return self.postparsing_postcmd(self.default(arg)) | |
866 | |
230 | 867 def pseudo_raw_input(self, prompt): |
868 """copied from cmd's cmdloop; like raw_input, but accounts for changed stdin, stdout""" | |
869 | |
870 if self.use_rawinput: | |
871 try: | |
872 line = raw_input(prompt) | |
873 except EOFError: | |
874 line = 'EOF' | |
875 else: | |
876 self.stdout.write(prompt) | |
877 self.stdout.flush() | |
878 line = self.stdin.readline() | |
879 if not len(line): | |
880 line = 'EOF' | |
881 else: | |
882 if line[-1] == '\n': # this was always true in Cmd | |
883 line = line[:-1] | |
884 return line | |
282 | 885 |
334 | 886 def _cmdloop(self, intro=None): |
230 | 887 """Repeatedly issue a prompt, accept input, parse an initial prefix |
888 off the received input, and dispatch to action methods, passing them | |
889 the remainder of the line as argument. | |
890 """ | |
891 | |
892 # An almost perfect copy from Cmd; however, the pseudo_raw_input portion | |
893 # has been split out so that it can be called separately | |
894 | |
895 self.preloop() | |
896 if self.use_rawinput and self.completekey: | |
897 try: | |
898 import readline | |
899 self.old_completer = readline.get_completer() | |
900 readline.set_completer(self.complete) | |
901 readline.parse_and_bind(self.completekey+": complete") | |
902 except ImportError: | |
903 pass | |
904 try: | |
905 if intro is not None: | |
906 self.intro = intro | |
907 if self.intro: | |
908 self.stdout.write(str(self.intro)+"\n") | |
909 stop = None | |
910 while not stop: | |
911 if self.cmdqueue: | |
912 line = self.cmdqueue.pop(0) | |
913 else: | |
914 line = self.pseudo_raw_input(self.prompt) | |
915 if (self.echo) and (isinstance(self.stdin, file)): | |
916 self.stdout.write(line + '\n') | |
917 line = self.precmd(line) | |
918 stop = self.onecmd(line) | |
919 stop = self.postcmd(stop, line) | |
920 self.postloop() | |
921 finally: | |
922 if self.use_rawinput and self.completekey: | |
923 try: | |
924 import readline | |
925 readline.set_completer(self.old_completer) | |
926 except ImportError: | |
927 pass | |
928 return stop | |
929 | |
930 def do_EOF(self, arg): | |
931 return True | |
932 do_eof = do_EOF | |
290 | 933 |
230 | 934 def do_quit(self, arg): |
935 return self._STOP_AND_EXIT | |
936 do_exit = do_quit | |
937 do_q = do_quit | |
938 | |
309 | 939 def select(self, options, prompt='Your choice? '): |
940 '''Presents a numbered menu to the user. Modelled after | |
310 | 941 the bash shell's SELECT. Returns the item chosen. |
942 | |
943 Argument ``options`` can be: | |
332 | 944 |
945 | a single string -> will be split into one-word options | |
946 | a list of strings -> will be offered as options | |
947 | a list of tuples -> interpreted as (value, text), so | |
948 that the return value can differ from | |
949 the text advertised to the user ''' | |
309 | 950 if isinstance(options, basestring): |
310 | 951 options = zip(options.split(), options.split()) |
952 fulloptions = [] | |
953 for opt in options: | |
954 if isinstance(opt, basestring): | |
955 fulloptions.append((opt, opt)) | |
956 else: | |
957 try: | |
958 fulloptions.append((opt[0], opt[1])) | |
959 except IndexError: | |
960 fulloptions.append((opt[0], opt[0])) | |
961 for (idx, (value, text)) in enumerate(fulloptions): | |
962 self.poutput(' %2d. %s\n' % (idx+1, text)) | |
309 | 963 while True: |
964 response = raw_input(prompt) | |
965 try: | |
966 response = int(response) | |
310 | 967 result = fulloptions[response - 1][0] |
309 | 968 break |
969 except ValueError: | |
970 pass # loop and ask again | |
971 return result | |
972 | |
290 | 973 @options([make_option('-l', '--long', action="store_true", |
974 help="describe function of parameter")]) | |
975 def do_show(self, arg, opts): | |
230 | 976 '''Shows value of a parameter.''' |
290 | 977 param = arg.strip().lower() |
978 result = {} | |
979 maxlen = 0 | |
980 for p in self.settable: | |
981 if (not param) or p.startswith(param): | |
982 result[p] = '%s: %s' % (p, str(getattr(self, p))) | |
983 maxlen = max(maxlen, len(result[p])) | |
984 if result: | |
985 for p in sorted(result): | |
986 if opts.long: | |
987 self.poutput('%s # %s' % (result[p].ljust(maxlen), self.settable[p])) | |
988 else: | |
989 self.poutput(result[p]) | |
230 | 990 else: |
290 | 991 self.perror("Parameter '%s' not supported (type 'show' for list of parameters)." % param) |
230 | 992 |
993 def do_set(self, arg): | |
290 | 994 ''' |
995 Sets a cmd2 parameter. Accepts abbreviated parameter names so long | |
996 as there is no ambiguity. Call without arguments for a list of | |
997 settable parameters with their values.''' | |
230 | 998 try: |
291 | 999 statement, paramName, val = arg.parsed.raw.split(None, 2) |
230 | 1000 paramName = paramName.strip().lower() |
290 | 1001 if paramName not in self.settable: |
291 | 1002 hits = [p for p in self.settable if p.startswith(paramName)] |
290 | 1003 if len(hits) == 1: |
1004 paramName = hits[0] | |
1005 else: | |
1006 return self.do_show(paramName) | |
1007 currentVal = getattr(self, paramName) | |
1008 if (val[0] == val[-1]) and val[0] in ("'", '"'): | |
1009 val = val[1:-1] | |
1010 else: | |
1011 val = cast(currentVal, val) | |
1012 setattr(self, paramName, val) | |
1013 self.stdout.write('%s - was: %s\nnow: %s\n' % (paramName, currentVal, val)) | |
1014 if currentVal != val: | |
1015 try: | |
1016 onchange_hook = getattr(self, '_onchange_%s' % paramName) | |
1017 onchange_hook(old=currentVal, new=val) | |
1018 except AttributeError: | |
1019 pass | |
230 | 1020 except (ValueError, AttributeError, NotSettableError), e: |
1021 self.do_show(arg) | |
1022 | |
1023 def do_pause(self, arg): | |
1024 'Displays the specified text then waits for the user to press RETURN.' | |
1025 raw_input(arg + '\n') | |
1026 | |
1027 def do_shell(self, arg): | |
1028 'execute a command as if at the OS prompt.' | |
1029 os.system(arg) | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1030 |
233 | 1031 def do_py(self, arg): |
230 | 1032 ''' |
1033 py <command>: Executes a Python command. | |
242 | 1034 py: Enters interactive Python mode. |
1035 End with `Ctrl-D` (Unix) / `Ctrl-Z` (Windows), `quit()`, 'exit()`. | |
241 | 1036 Non-python commands can be issued with `cmd("your command")`. |
230 | 1037 ''' |
280 | 1038 self.pystate['self'] = self |
274 | 1039 arg = arg.parsed.raw[2:].strip() |
230 | 1040 if arg.strip(): |
235
78ad20c2eed0
py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents:
234
diff
changeset
|
1041 interp = InteractiveInterpreter(locals=self.pystate) |
233 | 1042 interp.runcode(arg) |
230 | 1043 else: |
328 | 1044 localvars = (self.locals_in_py and self.pystate) or {} |
1045 interp = MyInteractiveConsole(locals=localvars) | |
233 | 1046 def quit(): |
328 | 1047 'blah' |
234 | 1048 raise EmbeddedConsoleExit |
236 | 1049 def onecmd(arg): |
1050 return self.onecmd(arg + '\n') | |
233 | 1051 self.pystate['quit'] = quit |
1052 self.pystate['exit'] = quit | |
328 | 1053 self.pystate['cmd'] = onecmd |
234 | 1054 try: |
240 | 1055 cprt = 'Type "help", "copyright", "credits" or "license" for more information.' |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1056 keepstate = Statekeeper(sys, ('stdin','stdout')) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1057 sys.stdout = self.stdout |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1058 sys.stdin = self.stdin |
240 | 1059 interp.interact(banner= "Python %s on %s\n%s\n(%s)\n%s" % |
1060 (sys.version, sys.platform, cprt, self.__class__.__name__, self.do_py.__doc__)) | |
235
78ad20c2eed0
py working better now; still needs a iscomplete=True on onecmd
catherine@dellzilla
parents:
234
diff
changeset
|
1061 except EmbeddedConsoleExit: |
245 | 1062 pass |
1063 keepstate.restore() | |
233 | 1064 |
230 | 1065 def do_history(self, arg): |
1066 """history [arg]: lists past commands issued | |
1067 | |
314 | 1068 | no arg: list all |
1069 | arg is integer: list one history item, by index | |
1070 | arg is string: string search | |
1071 | arg is /enclosed in forward-slashes/: regular expression search | |
230 | 1072 """ |
1073 if arg: | |
1074 history = self.history.get(arg) | |
1075 else: | |
1076 history = self.history | |
1077 for hi in history: | |
1078 self.stdout.write(hi.pr()) | |
1079 def last_matching(self, arg): | |
1080 try: | |
1081 if arg: | |
1082 return self.history.get(arg)[-1] | |
1083 else: | |
1084 return self.history[-1] | |
1085 except IndexError: | |
1086 return None | |
1087 def do_list(self, arg): | |
1088 """list [arg]: lists last command issued | |
1089 | |
307 | 1090 no arg -> list most recent command |
230 | 1091 arg is integer -> list one history item, by index |
307 | 1092 a..b, a:b, a:, ..b -> list spans from a (or start) to b (or end) |
308 | 1093 arg is string -> list all commands matching string search |
230 | 1094 arg is /enclosed in forward-slashes/ -> regular expression search |
1095 """ | |
1096 try: | |
308 | 1097 history = self.history.span(arg or '-1') |
1098 except IndexError: | |
1099 history = self.history.search(arg) | |
1100 for hi in history: | |
1101 self.poutput(hi.pr()) | |
1102 | |
230 | 1103 do_hi = do_history |
1104 do_l = do_list | |
1105 do_li = do_list | |
1106 | |
1107 def do_ed(self, arg): | |
1108 """ed: edit most recent command in text editor | |
1109 ed [N]: edit numbered command from history | |
1110 ed [filename]: edit specified file name | |
1111 | |
1112 commands are run after editor is closed. | |
1113 "set edit (program-name)" or set EDITOR environment variable | |
1114 to control which editing program is used.""" | |
1115 if not self.editor: | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1116 self.perror("Please use 'set editor' to specify your text editing program of choice.") |
230 | 1117 return |
1118 filename = self.default_file_name | |
1119 if arg: | |
1120 try: | |
1121 buffer = self.last_matching(int(arg)) | |
1122 except ValueError: | |
1123 filename = arg | |
1124 buffer = '' | |
1125 else: | |
1126 buffer = self.history[-1] | |
1127 | |
1128 if buffer: | |
1129 f = open(os.path.expanduser(filename), 'w') | |
1130 f.write(buffer or '') | |
1131 f.close() | |
1132 | |
1133 os.system('%s %s' % (self.editor, filename)) | |
1134 self.do__load(filename) | |
1135 do_edit = do_ed | |
1136 | |
1137 saveparser = (pyparsing.Optional(pyparsing.Word(pyparsing.nums)^'*')("idx") + | |
1138 pyparsing.Optional(pyparsing.Word(legalChars + '/\\'))("fname") + | |
1139 pyparsing.stringEnd) | |
1140 def do_save(self, arg): | |
1141 """`save [N] [filename.ext]` | |
329 | 1142 |
230 | 1143 Saves command from history to file. |
329 | 1144 |
1145 | N => Number of command (from history), or `*`; | |
1146 | most recent command if omitted""" | |
230 | 1147 |
1148 try: | |
1149 args = self.saveparser.parseString(arg) | |
1150 except pyparsing.ParseException: | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1151 self.perror(self.do_save.__doc__) |
230 | 1152 return |
1153 fname = args.fname or self.default_file_name | |
1154 if args.idx == '*': | |
1155 saveme = '\n\n'.join(self.history[:]) | |
1156 elif args.idx: | |
1157 saveme = self.history[int(args.idx)-1] | |
1158 else: | |
1159 saveme = self.history[-1] | |
1160 try: | |
1161 f = open(os.path.expanduser(fname), 'w') | |
1162 f.write(saveme) | |
1163 f.close() | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1164 self.pfeedback('Saved to %s' % (fname)) |
230 | 1165 except Exception, e: |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1166 self.perror('Error saving %s: %s' % (fname, str(e))) |
230 | 1167 |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1168 def read_file_or_url(self, fname): |
288
e743cf74c518
hooray, fixed bad comment parser - all unit tests pass
catherine@bothari
parents:
287
diff
changeset
|
1169 # TODO: not working on localhost |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1170 if isinstance(fname, file): |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
1171 result = open(fname, 'r') |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1172 else: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1173 match = self.urlre.match(fname) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1174 if match: |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
1175 result = urllib.urlopen(match.group(1)) |
230 | 1176 else: |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1177 fname = os.path.expanduser(fname) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1178 try: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1179 result = open(os.path.expanduser(fname), 'r') |
287
1cd23003e8d5
refactoring, but something went wrong with comments
catherine@bothari
parents:
286
diff
changeset
|
1180 except IOError: |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1181 result = open('%s.%s' % (os.path.expanduser(fname), |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1182 self.defaultExtension), 'r') |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1183 return result |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1184 |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1185 def do__relative_load(self, arg=None): |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1186 ''' |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1187 Runs commands in script at file or URL; if this is called from within an |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1188 already-running script, the filename will be interpreted relative to the |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1189 already-running script's directory.''' |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1190 if arg: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1191 arg = arg.split(None, 1) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1192 targetname, args = arg[0], (arg[1:] or [''])[0] |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1193 targetname = os.path.join(self.current_script_dir or '', targetname) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1194 self.do__load('%s %s' % (targetname, args)) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1195 |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1196 urlre = re.compile('(https?://[-\\w\\./]+)') |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1197 def do_load(self, arg=None): |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1198 """Runs script of command(s) from a file or URL.""" |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1199 if arg is None: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1200 targetname = self.default_file_name |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1201 else: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1202 arg = arg.split(None, 1) |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1203 targetname, args = arg[0], (arg[1:] or [''])[0].strip() |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1204 try: |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1205 target = self.read_file_or_url(targetname) |
230 | 1206 except IOError, e: |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1207 self.perror('Problem accessing script from %s: \n%s' % (targetname, e)) |
230 | 1208 return |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1209 keepstate = Statekeeper(self, ('stdin','use_rawinput','prompt', |
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1210 'continuation_prompt','current_script_dir')) |
230 | 1211 self.stdin = target |
1212 self.use_rawinput = False | |
1213 self.prompt = self.continuation_prompt = '' | |
244
e0c60ea7ad5d
midway through py script change
catherine@Elli.myhome.westell.com
parents:
243
diff
changeset
|
1214 self.current_script_dir = os.path.split(targetname)[0] |
334 | 1215 stop = self._cmdloop() |
230 | 1216 self.stdin.close() |
1217 keepstate.restore() | |
1218 self.lastcmd = '' | |
1219 return (stop == self._STOP_AND_EXIT) and self._STOP_AND_EXIT | |
1220 do__load = do_load # avoid an unfortunate legacy use of do_load from sqlpython | |
1221 | |
1222 def do_run(self, arg): | |
1223 """run [arg]: re-runs an earlier command | |
1224 | |
1225 no arg -> run most recent command | |
1226 arg is integer -> run one history item, by index | |
1227 arg is string -> run most recent command by string search | |
1228 arg is /enclosed in forward-slashes/ -> run most recent by regex | |
1229 """ | |
1230 'run [N]: runs the SQL that was run N commands ago' | |
1231 runme = self.last_matching(arg) | |
267
3333e61e7103
poutput, perror, pfeedback
Catherine Devlin <catherine.devlin@gmail.com>
parents:
265
diff
changeset
|
1232 self.pfeedback(runme) |
230 | 1233 if runme: |
1234 runme = self.precmd(runme) | |
1235 stop = self.onecmd(runme) | |
1236 stop = self.postcmd(stop, runme) | |
1237 do_r = do_run | |
1238 | |
1239 def fileimport(self, statement, source): | |
1240 try: | |
1241 f = open(os.path.expanduser(source)) | |
1242 except IOError: | |
1243 self.stdout.write("Couldn't read from file %s\n" % source) | |
1244 return '' | |
1245 data = f.read() | |
1246 f.close() | |
1247 return data | |
334 | 1248 |
1249 def runTranscriptTests(self, callargs): | |
1250 class TestMyAppCase(Cmd2TestCase): | |
1251 CmdApp = self.__class__ | |
1252 self.__class__.testfiles = callargs | |
1253 sys.argv = [sys.argv[0]] # the --test argument upsets unittest.main() | |
1254 testcase = TestMyAppCase() | |
1255 runner = unittest.TextTestRunner() | |
1256 result = runner.run(testcase) | |
1257 result.printErrors() | |
1258 | |
1259 def cmdloop(self): | |
1260 parser = optparse.OptionParser() | |
1261 parser.add_option('-t', '--test', dest='test', | |
1262 action="store_true", | |
1263 help='Test against transcript(s) in FILE (wildcards OK)') | |
1264 (callopts, callargs) = parser.parse_args() | |
1265 if callopts.test: | |
1266 self.runTranscriptTests(callargs) | |
1267 else: | |
1268 # hold onto the args and run .onecmd with them | |
1269 # in sqlpython, first arg has implied \connect | |
1270 for initial_command in callargs: | |
1271 if self.onecmd(initial_command + '\n') == app._STOP_AND_EXIT: | |
1272 return | |
1273 self._cmdloop() | |
230 | 1274 |
1275 class HistoryItem(str): | |
305 | 1276 listformat = '-------------------------[%d]\n%s\n' |
230 | 1277 def __init__(self, instr): |
1278 str.__init__(self) | |
1279 self.lowercase = self.lower() | |
1280 self.idx = None | |
1281 def pr(self): | |
307 | 1282 return self.listformat % (self.idx, str(self)) |
230 | 1283 |
1284 class History(list): | |
305 | 1285 '''A list of HistoryItems that knows how to respond to user requests. |
1286 >>> h = History([HistoryItem('first'), HistoryItem('second'), HistoryItem('third'), HistoryItem('fourth')]) | |
1287 >>> h.span('-2..') | |
1288 ['third', 'fourth'] | |
1289 >>> h.span('2..3') | |
1290 ['second', 'third'] | |
1291 >>> h.span('3') | |
1292 ['third'] | |
1293 >>> h.span(':') | |
1294 ['first', 'second', 'third', 'fourth'] | |
1295 >>> h.span('2..') | |
1296 ['second', 'third', 'fourth'] | |
1297 >>> h.span('-1') | |
1298 ['fourth'] | |
1299 >>> h.span('-2..-3') | |
306 | 1300 ['third', 'second'] |
308 | 1301 >>> h.search('o') |
1302 ['second', 'fourth'] | |
1303 >>> h.search('/IR/') | |
1304 ['first', 'third'] | |
305 | 1305 ''' |
1306 def zero_based_index(self, onebased): | |
1307 result = onebased | |
1308 if result > 0: | |
1309 result -= 1 | |
1310 return result | |
1311 def to_index(self, raw): | |
1312 if raw: | |
1313 result = self.zero_based_index(int(raw)) | |
1314 else: | |
1315 result = None | |
1316 return result | |
308 | 1317 def search(self, target): |
1318 target = target.strip() | |
1319 if target[0] == target[-1] == '/' and len(target) > 1: | |
1320 target = target[1:-1] | |
1321 else: | |
1322 target = re.escape(target) | |
1323 pattern = re.compile(target, re.IGNORECASE) | |
1324 return [s for s in self if pattern.search(s)] | |
305 | 1325 spanpattern = re.compile(r'^\s*(?P<start>\-?\d+)?\s*(?P<separator>:|(\.{2,}))?\s*(?P<end>\-?\d+)?\s*$') |
1326 def span(self, raw): | |
308 | 1327 if raw.lower() in ('*', '-', 'all'): |
1328 raw = ':' | |
305 | 1329 results = self.spanpattern.search(raw) |
307 | 1330 if not results: |
1331 raise IndexError | |
305 | 1332 if not results.group('separator'): |
1333 return [self[self.to_index(results.group('start'))]] | |
1334 start = self.to_index(results.group('start')) | |
1335 end = self.to_index(results.group('end')) | |
1336 reverse = False | |
1337 if end is not None: | |
1338 if end < start: | |
1339 (start, end) = (end, start) | |
1340 reverse = True | |
1341 end += 1 | |
1342 result = self[start:end] | |
1343 if reverse: | |
1344 result.reverse() | |
1345 return result | |
1346 | |
1347 rangePattern = re.compile(r'^\s*(?P<start>[\d]+)?\s*\-\s*(?P<end>[\d]+)?\s*$') | |
230 | 1348 def append(self, new): |
1349 new = HistoryItem(new) | |
1350 list.append(self, new) | |
1351 new.idx = len(self) | |
1352 def extend(self, new): | |
1353 for n in new: | |
1354 self.append(n) | |
305 | 1355 |
1356 def get(self, getme=None, fromEnd=False): | |
1357 if not getme: | |
1358 return self | |
230 | 1359 try: |
1360 getme = int(getme) | |
1361 if getme < 0: | |
1362 return self[:(-1 * getme)] | |
1363 else: | |
1364 return [self[getme-1]] | |
1365 except IndexError: | |
1366 return [] | |
305 | 1367 except ValueError: |
1368 rangeResult = self.rangePattern.search(getme) | |
1369 if rangeResult: | |
1370 start = rangeResult.group('start') or None | |
1371 end = rangeResult.group('start') or None | |
1372 if start: | |
1373 start = int(start) - 1 | |
1374 if end: | |
1375 end = int(end) | |
1376 return self[start:end] | |
1377 | |
230 | 1378 getme = getme.strip() |
305 | 1379 |
230 | 1380 if getme.startswith(r'/') and getme.endswith(r'/'): |
1381 finder = re.compile(getme[1:-1], re.DOTALL | re.MULTILINE | re.IGNORECASE) | |
1382 def isin(hi): | |
1383 return finder.search(hi) | |
1384 else: | |
1385 def isin(hi): | |
1386 return (getme.lower() in hi.lowercase) | |
1387 return [itm for itm in self if isin(itm)] | |
1388 | |
1389 class NotSettableError(Exception): | |
1390 pass | |
1391 | |
1392 def cast(current, new): | |
1393 """Tries to force a new value into the same type as the current.""" | |
1394 typ = type(current) | |
1395 if typ == bool: | |
1396 try: | |
1397 return bool(int(new)) | |
1398 except ValueError, TypeError: | |
1399 pass | |
1400 try: | |
1401 new = new.lower() | |
1402 except: | |
1403 pass | |
1404 if (new=='on') or (new[0] in ('y','t')): | |
1405 return True | |
1406 if (new=='off') or (new[0] in ('n','f')): | |
1407 return False | |
1408 else: | |
1409 try: | |
1410 return typ(new) | |
1411 except: | |
1412 pass | |
1413 print "Problem setting parameter (now %s) to %s; incorrect type?" % (current, new) | |
1414 return current | |
1415 | |
1416 class Statekeeper(object): | |
1417 def __init__(self, obj, attribs): | |
1418 self.obj = obj | |
1419 self.attribs = attribs | |
282 | 1420 if self.obj: |
1421 self.save() | |
230 | 1422 def save(self): |
1423 for attrib in self.attribs: | |
1424 setattr(self, attrib, getattr(self.obj, attrib)) | |
1425 def restore(self): | |
282 | 1426 if self.obj: |
1427 for attrib in self.attribs: | |
1428 setattr(self.obj, attrib, getattr(self, attrib)) | |
230 | 1429 |
1430 class Borg(object): | |
1431 '''All instances of any Borg subclass will share state. | |
1432 from Python Cookbook, 2nd Ed., recipe 6.16''' | |
1433 _shared_state = {} | |
1434 def __new__(cls, *a, **k): | |
1435 obj = object.__new__(cls, *a, **k) | |
1436 obj.__dict__ = cls._shared_state | |
1437 return obj | |
1438 | |
1439 class OutputTrap(Borg): | |
1440 '''Instantiate an OutputTrap to divert/capture ALL stdout output. For use in unit testing. | |
1441 Call `tearDown()` to return to normal output.''' | |
1442 def __init__(self): | |
1443 self.old_stdout = sys.stdout | |
1444 self.trap = tempfile.TemporaryFile() | |
1445 sys.stdout = self.trap | |
1446 def read(self): | |
1447 self.trap.seek(0) | |
1448 result = self.trap.read() | |
1449 self.trap.truncate(0) | |
1450 return result.strip('\x00') | |
1451 def tearDown(self): | |
1452 sys.stdout = self.old_stdout | |
1453 | |
261
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1454 |
230 | 1455 class Cmd2TestCase(unittest.TestCase): |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1456 '''Subclass this, setting CmdApp, to make a unittest.TestCase class |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1457 that will execute the commands in a transcript file and expect the results shown. |
230 | 1458 See example.py''' |
1459 CmdApp = None | |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1460 def fetchTranscripts(self): |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1461 self.transcripts = {} |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1462 for fileset in self.CmdApp.testfiles: |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1463 for fname in glob.glob(fileset): |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1464 tfile = open(fname) |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1465 self.transcripts[fname] = iter(tfile.readlines()) |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1466 tfile.close() |
260
2b69c4d72cd8
unfinished experiments with testing for regular expressions
Catherine Devlin <catherine.devlin@gmail.com>
parents:
259
diff
changeset
|
1467 if not len(self.transcripts): |
2b69c4d72cd8
unfinished experiments with testing for regular expressions
Catherine Devlin <catherine.devlin@gmail.com>
parents:
259
diff
changeset
|
1468 raise StandardError, "No test files found - nothing to test." |
230 | 1469 def setUp(self): |
1470 if self.CmdApp: | |
1471 self.outputTrap = OutputTrap() | |
1472 self.cmdapp = self.CmdApp() | |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1473 self.fetchTranscripts() |
326 | 1474 def runTest(self): # was testall |
230 | 1475 if self.CmdApp: |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1476 its = sorted(self.transcripts.items()) |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1477 for (fname, transcript) in its: |
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1478 self._test_transcript(fname, transcript) |
261
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1479 regexPattern = pyparsing.QuotedString(quoteChar=r'/', escChar='\\', multiline=True, unquoteResults=True) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1480 regexPattern.ignore(pyparsing.cStyleComment) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1481 notRegexPattern = pyparsing.Word(pyparsing.printables) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1482 notRegexPattern.setParseAction(lambda t: re.escape(t[0])) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1483 expectationParser = regexPattern | notRegexPattern |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1484 endStrippingRegex = re.compile(r'[ \t]*\n') |
257
d62bb3dd58a0
multiple test files still not quite working, yet works when run through debugger, aaargh
Catherine Devlin <catherine.devlin@gmail.com>
parents:
255
diff
changeset
|
1485 def _test_transcript(self, fname, transcript): |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1486 lineNum = 0 |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1487 try: |
304
8c96f829ba1b
tweaking transcript test newlines (complete)
catherine@dellzilla
parents:
303
diff
changeset
|
1488 line = transcript.next() |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1489 while True: |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1490 while not line.startswith(self.cmdapp.prompt): |
304
8c96f829ba1b
tweaking transcript test newlines (complete)
catherine@dellzilla
parents:
303
diff
changeset
|
1491 line = transcript.next() |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1492 command = [line[len(self.cmdapp.prompt):]] |
304
8c96f829ba1b
tweaking transcript test newlines (complete)
catherine@dellzilla
parents:
303
diff
changeset
|
1493 line = transcript.next() |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1494 while line.startswith(self.cmdapp.continuation_prompt): |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1495 command.append(line[len(self.cmdapp.continuation_prompt):]) |
304
8c96f829ba1b
tweaking transcript test newlines (complete)
catherine@dellzilla
parents:
303
diff
changeset
|
1496 line = transcript.next() |
322 | 1497 command = ''.join(command) |
305 | 1498 self.cmdapp.onecmd(command) |
322 | 1499 result = self.outputTrap.read() |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1500 if line.startswith(self.cmdapp.prompt): |
262
e81378f82c7c
transcript tests with regex now work smoothly
Catherine Devlin <catherine.devlin@gmail.com>
parents:
261
diff
changeset
|
1501 message = '\nFile %s, line %d\nCommand was:\n%s\nExpected: (nothing)\nGot:\n%s\n'%\ |
e81378f82c7c
transcript tests with regex now work smoothly
Catherine Devlin <catherine.devlin@gmail.com>
parents:
261
diff
changeset
|
1502 (fname, lineNum, command, result) |
e81378f82c7c
transcript tests with regex now work smoothly
Catherine Devlin <catherine.devlin@gmail.com>
parents:
261
diff
changeset
|
1503 self.assert_(not(result.strip()), message) |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1504 continue |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1505 expected = [] |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1506 while not line.startswith(self.cmdapp.prompt): |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1507 expected.append(line) |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1508 line = transcript.next() |
322 | 1509 expected = ''.join(expected) |
260
2b69c4d72cd8
unfinished experiments with testing for regular expressions
Catherine Devlin <catherine.devlin@gmail.com>
parents:
259
diff
changeset
|
1510 message = '\nFile %s, line %d\nCommand was:\n%s\nExpected:\n%s\nGot:\n%s\n'%\ |
261
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1511 (fname, lineNum, command, expected, result) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1512 expected = self.expectationParser.transformString(expected) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1513 expected = self.endStrippingRegex.sub('\s*\n', expected) |
57070e181cf7
line end-stripping working in transcript testing
Catherine Devlin <catherine.devlin@gmail.com>
parents:
260
diff
changeset
|
1514 self.assert_(re.match(expected, result, re.MULTILINE | re.DOTALL), message) |
253
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1515 except StopIteration: |
24289178b367
midway through allowing multiple testing files
Catherine Devlin <catherine.devlin@gmail.com>
parents:
251
diff
changeset
|
1516 pass |
230 | 1517 def tearDown(self): |
1518 if self.CmdApp: | |
1519 self.outputTrap.tearDown() | |
325
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1520 |
230 | 1521 if __name__ == '__main__': |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1522 doctest.testmod(optionflags = doctest.NORMALIZE_WHITESPACE) |
325
4172feeddf76
want to incorporate run() for tests - not yet working
catherine@dellzilla
parents:
324
diff
changeset
|
1523 |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1524 ''' |
327 | 1525 To make your application transcript-testable, replace |
1526 | |
1527 :: | |
1528 | |
1529 app = MyApp() | |
1530 app.cmdloop() | |
1531 | |
1532 with | |
1533 | |
1534 :: | |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1535 |
327 | 1536 app = MyApp() |
1537 cmd2.run(app) | |
1538 | |
1539 Then run a session of your application and paste the entire screen contents | |
1540 into a file, ``transcript.test``, and invoke the test like:: | |
1541 | |
1542 python myapp.py --test transcript.test | |
1543 | |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1544 Wildcards can be used to test against multiple transcript files. |
327 | 1545 ''' |
259
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1546 |
5147fa4166b0
multiple transcript tests working - sinister BASH trick defeated
Catherine Devlin <catherine.devlin@gmail.com>
parents:
258
diff
changeset
|
1547 |