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