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