annotate cmd2.py @ 319:c58cd7e48db7

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